diff options
2183 files changed, 47427 insertions, 23302 deletions
diff --git a/community-staging/courier-authlib/PKGBUILD b/community-staging/courier-authlib/PKGBUILD new file mode 100644 index 000000000..99e43c8c3 --- /dev/null +++ b/community-staging/courier-authlib/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 53167 2009-09-26 09:48:47Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-authlib +pkgver=0.63.0 +pkgrel=5 +pkgdesc="Authentification library for the courier mailserver(s)" +arch=(i686 x86_64) +license=('GPL2') +url="http://courier-mta.org/authlib/" +backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \ + 'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc') +depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect') +makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') +optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') +conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +options=(!libtool) +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + authdaemond.rc.d) +md5sums=('411a927d178f783a1e8fab9964ce0dd2' + '911ee9f40d70fafc6bb4cc636c5ad531') + +build() { + #export MAKEFLAGS="-j1" + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --with-db=gdbm \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-authpam --with-authpwd --with-authshadow \ + --with-authldap --with-authmysql --with-authpgsql \ + --with-authuserdb --with-authcram --with-authdaemon + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + ############################################################################### + # post_installation ---- rename the config file and change ownerschip + for distfile in ${pkgdir}/etc/authlib/*.dist; do + chown 72:72 ${distfile} + mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist` + done + # copy the .schema; mostly refered to as courier.schema -> rename it + install -Dm 444 authldap.schema \ + ${pkgdir}/etc/openldap/schema/courier.schema + ############################################################################### + # Install daemon, that wraps couriers bashscript + install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond + chown -R 72:72 ${pkgdir}/var/spool/authdaemon + mkdir ${pkgdir}/var/spool/courier + chown -R 72:72 ${pkgdir}/var/spool/courier + # docs say we can remove .a files after make + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-staging/courier-authlib/authdaemond.rc.d b/community-staging/courier-authlib/authdaemond.rc.d new file mode 100644 index 000000000..ff4abb182 --- /dev/null +++ b/community-staging/courier-authlib/authdaemond.rc.d @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start() { + stat_busy "Starting Authdaemond" + /usr/sbin/authdaemond start &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + ln -s /var/spool/authdaemon/pid /var/run/authdaemond.pid + add_daemon authdaemond + stat_done + fi +} + +stop() { + stat_busy "Stopping Authdaemond" + /usr/sbin/authdaemond stop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/authdaemond.pid + rm_daemon authdaemond + # housecleaning; just like kids'n toys - don't care when it's needed anymore + rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null + stat_done + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + # calling 'stop' and 'start' without the $0 fails... + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-authlib/courier-authlib.install b/community-staging/courier-authlib/courier-authlib.install new file mode 100644 index 000000000..cbccc636b --- /dev/null +++ b/community-staging/courier-authlib/courier-authlib.install @@ -0,0 +1,32 @@ +# arg 1: the new package version +post_install() { + # creates group and user on virgin systems + if [ -z "`grep '^courier::' /etc/group`" ]; then + groupadd -g 72 courier >& /dev/null + fi + if [ -z "`grep '^courier:' /etc/passwd`" ]; then + useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + userdel courier &> /dev/null + groupdel courier &> /dev/null +} + + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-staging/courier-imap/PKGBUILD b/community-staging/courier-imap/PKGBUILD new file mode 100644 index 000000000..f11205e2f --- /dev/null +++ b/community-staging/courier-imap/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 59060 2011-11-21 06:43:48Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Committer: Manolis Tzanidakis <manolis@archlinux.org> + +pkgname=courier-imap +pkgver=4.9.3 +pkgrel=5 +pkgdesc="IMAP(s)/POP3(s) Server" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.courier-mta.org/imap/" +depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl') +backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ + 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ + 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ + 'etc/conf.d/courier-imap') +conflicts=('courier-mta') +provides=('imap-server' 'pop3-server') +options=('!libtool') +install=$pkgname.install +source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + courier-imap.conf.d + courier-imap.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d) +md5sums=('703ddbb090569436dbda61d0d62b1eb8' + '3e08f017f6c5a52dea28f6f0dbd50b86' + '500c37831974f4676b67e650c67a59f6' + '6574c8046e44698efa7452c4b445d88e' + '437167a58efddc523f25180df284da20' + '1be23fb224bde93b23da6e771bd1cf01' + 'a326309b02fed3d7226d9aac88add7f2') + +# MIGRATION NOTE: +# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. +# Remove those files and this note and also courier-imap.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier-imap \ + --libexecdir=/usr/lib/courier-imap \ + --localstatedir=/var/spool/courier-imap \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --with-piddir=/var/run/courier \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-mailuser=courier --with-mailgroup=courier + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # cleanup - provided by courier-maildrop + rm ${pkgdir}/usr/bin/{deliverquota,maildirmake} + rm ${pkgdir}/usr/share/man/man1/maildirmake* + rm ${pkgdir}/usr/share/man/man8/deliverquota* + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier-imap/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier-imap/$(basename ${distfile} .dist) + done + sed -i 's|TLS_CERTFILE=/usr/share/|TLS_CERTFILE=/etc/courier-imap/|' \ + ${pkgdir}/etc/courier-imap/*-ssl + for pamfile in imap/*.pam; do + sed -i "s|/lib/security/||;s|pam_pwdb|pam_unix|" ${pamfile} + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .pam | sed "s/d$//") + done + # install thingies + install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap +} diff --git a/community-staging/courier-imap/courier-imap.conf.d b/community-staging/courier-imap/courier-imap.conf.d new file mode 100644 index 000000000..66049470d --- /dev/null +++ b/community-staging/courier-imap/courier-imap.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# imapd pop3d imapd-ssl pop3d-ssl +# +CI_DAEMONS="imapd pop3d imapd-ssl pop3d-ssl" + +# If you want authdaemond to be automatically started and +# stopped by courier-imap, set this to "true" +AUTO_AUTHDAEMON="false" + +# Courier will start this many seconds after autodaemond if +# AUTO_AUTHDAEMON is set to "true" +AUTO_AUTHDAEMON_LAG=2 diff --git a/community-staging/courier-imap/courier-imap.install b/community-staging/courier-imap/courier-imap.install new file mode 100644 index 000000000..9046777a7 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.install @@ -0,0 +1,16 @@ +post_upgrade() { + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-imap ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} diff --git a/community-staging/courier-imap/courier-imap.pam b/community-staging/courier-imap/courier-imap.pam new file mode 100644 index 000000000..fa52db541 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so nullok +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/community-staging/courier-imap/courier-imap.rc.d b/community-staging/courier-imap/courier-imap.rc.d new file mode 100644 index 000000000..8876fe401 --- /dev/null +++ b/community-staging/courier-imap/courier-imap.rc.d @@ -0,0 +1,62 @@ +#!/bin/bash + +CI_DAEMONS= +[ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 +[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/lib/courier-imap/${daemon}.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/lib/courier-imap/$daemon.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-staging/courier-imap/imapd-ssl.rc.d b/community-staging/courier-imap/imapd-ssl.rc.d new file mode 100644 index 000000000..6730d452c --- /dev/null +++ b/community-staging/courier-imap/imapd-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-staging/courier-imap/imapd.rc.d b/community-staging/courier-imap/imapd.rc.d new file mode 100644 index 000000000..867b52b78 --- /dev/null +++ b/community-staging/courier-imap/imapd.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/lib/courier-imap/imapd.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/lib/courier-imap/imapd.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-staging/courier-imap/pop3d-ssl.rc.d b/community-staging/courier-imap/pop3d-ssl.rc.d new file mode 100644 index 000000000..aab0f6a95 --- /dev/null +++ b/community-staging/courier-imap/pop3d-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-staging/courier-imap/pop3d.rc.d b/community-staging/courier-imap/pop3d.rc.d new file mode 100644 index 000000000..7b73c5a7a --- /dev/null +++ b/community-staging/courier-imap/pop3d.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/lib/courier-imap/pop3d.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/lib/courier-imap/pop3d.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-staging/courier-maildrop/PKGBUILD b/community-staging/courier-maildrop/PKGBUILD new file mode 100644 index 000000000..a2cd7edb0 --- /dev/null +++ b/community-staging/courier-maildrop/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-maildrop +_srcname=maildrop +pkgver=2.5.4 +pkgrel=3 +pkgdesc="mail delivery agent - procmail like but nicer syntax" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://courier-mta.org/maildrop/" +depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') +conflicts=('courier-mta') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) +md5sums=('5770345cdceae28bdc24809e7adb3426') + +build() { + cd ${srcdir}/${_srcname}-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --with-db=gdbm \ + --with-devel + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${_srcname}-${pkgver} + + make DESTDIR=${pkgdir} install + chmod u+s ${pkgdir}/usr/bin/maildrop + cd ${pkgdir}/usr/share/maildrop/html + for files in *; do + install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files} + done + rm -rf ${pkgdir}/usr/share/maildrop + + # docs say we can remove .a files after make + cd ${pkgdir} + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD new file mode 100644 index 000000000..82df2e28f --- /dev/null +++ b/community-staging/courier-mta/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +# ----------- NOTE TO ALL USERS ------------ +# Go read http://www.courier-mta.org/install.html b4 running or building courier + +pkgname=courier-mta +pkgver=0.66.3 +pkgrel=5 +pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" +arch=(i686 x86_64) +license=('GPL2') +backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ + 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ + 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ + 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ + 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ + 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ + 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ + 'etc/conf.d/courier-mta') +url="http://courier-mta.org" +depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') +optdepends=('libldap') +makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin') +provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') +conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') +options=('!libtool') +install=courier-mta.install +source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 + courier.rc.d + courier-mta.rc.d + courier-mta.conf.d + esmtpd.rc.d + esmtpd-ssl.rc.d + esmtpd-msa.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d + webmaild.rc.d) +md5sums=('3b28f14afe3db09b74b4845323c3e982' + '9055ba622efd37603186ce1f37277224' + '5cbeb5c323706058e545f74ad7752ebe' + 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' + 'caabce8c7b66296b602316aa5af5d4c5' + '1c8b1b66ebafa4ff09ffc0106a9dc82c' + 'dae6c7d5ff0cce0fba5729fedf2a9051' + 'd0cc5eab5d3e0ec33dadd0392421f63e' + '5873a96aa149edda281730010fb4db34' + 'faa09e06a5dc41ee89ab1f8fa6886b63' + '520501daa66c0a94f2e9844ce4919a09' + '33a93f400c3e87bcd207295b7d7333ca') + +# MIGRATION NOTE: +# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. +# Remove those files and this note and also courier-mta.install + +build() { + cd ${srcdir}/courier-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + # courier is more about configuring than compiling :-), lets start the mess + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var/spool/courier \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --enable-mimetypes=/etc/mime.types \ + --with-piddir=/var/run/courier \ + --with-locking-method=lockf \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-random=/dev/urandom --without-ispell \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-certdb=/etc/ssl/certs/ + make +} + +package() { + cd ${srcdir}/courier-${pkgver} + + #chown mail.mail ${pkgdir}/var/spool/courier + make DESTDIR=${pkgdir} install + # docs say we can get rid of those after make + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + # install the perftest-script for testings + install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) + done + # install pam files according to the layout used in Archlinux + for pamfile in ${pkgdir}/etc/courier/*.authpam; do + sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} + #echo "password required pam_unix.so" >> $pamfile + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") + rm -f ${pamfile} + done + + ############################################################################### + # Arch Linux specific tweaks to make things easier for the user + # create passwordfile for webadmin -> standard archwebadmin + sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile + yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password + # arch specific scripts + install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta + install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta + install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd + install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl + install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa + install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild + #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ + # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache + # bug http://bugs.archlinux.org/task/5154 + find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; + # fixing some permissions + chown -R courier:courier ${pkgdir}/usr/lib/courier/modules + rm -r ${pkgdir}/var/run + #chown -R courier:courier ${pkgdir}/var/run/courier + chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} + # make a link to /usr/sbin/sendmail + install -dm 755 ${pkgdir}/usr/sbin + cd ${pkgdir}/usr/sbin + ln -s ../bin/sendmail ./sendmail +} diff --git a/community-staging/courier-mta/courier-mta.conf.d b/community-staging/courier-mta/courier-mta.conf.d new file mode 100644 index 000000000..5856a5cda --- /dev/null +++ b/community-staging/courier-mta/courier-mta.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild +# +CI_DAEMONS="courier esmtpd imapd pop3d" + +# If you want authdaemond to be automatically started and +# stopped by courier-imap, set this to "true" +AUTO_AUTHDAEMON="false" + +# Courier will start this many seconds after autodaemond if +# AUTO_AUTHDAEMON is set to "true" +AUTO_AUTHDAEMON_LAG=2 diff --git a/community-staging/courier-mta/courier-mta.install b/community-staging/courier-mta/courier-mta.install new file mode 100644 index 000000000..e835e3efd --- /dev/null +++ b/community-staging/courier-mta/courier-mta.install @@ -0,0 +1,61 @@ +# arg 1: the new package version +post_install() { + cat << EOM + --> if you are using LDAP services to provide lookup in sqwebmail or aliases + --> then you have to install: + libldap +EOM + # create the *.dat files + makealiases + makesmtpaccess +} + +pre_upgrade() { + pre_remove $1 +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-mta ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl" + echo " pop3d pop3d-ssl webmaild ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} + + +pre_remove() { + # manual backup, since courier is always processing the whole directory + # - so it would process "system" AND "system.pacsave" -> bad + [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup + cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system + cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default + cat << EOM + --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default + --> files have been backed up to /etc/courier/_backup since the *.pacsave + --> files cannot stay in place. Read about couriers alias handling from the + --> documentation! +EOM +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-staging/courier-mta/courier-mta.rc.d b/community-staging/courier-mta/courier-mta.rc.d new file mode 100644 index 000000000..416946a5a --- /dev/null +++ b/community-staging/courier-mta/courier-mta.rc.d @@ -0,0 +1,60 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 +[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/sbin/${daemon} start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/sbin/${daemon} stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly new file mode 100644 index 000000000..6c541321e --- /dev/null +++ b/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly @@ -0,0 +1,6 @@ +#!/bin/sh + +# Cleans the cache of the sqwebmail server +if [ -x /usr/share/sqwebmail/cleancache.pl ]; then + su -c "/usr/share/sqwebmail/cleancache.pl" bin +fi diff --git a/community-staging/courier-mta/courier.rc.d b/community-staging/courier-mta/courier.rc.d new file mode 100644 index 000000000..7c581a24a --- /dev/null +++ b/community-staging/courier-mta/courier.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier daemon" + /usr/sbin/courier start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon courier + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier daemon" + /usr/sbin/courier stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon courier + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd-msa.rc.d b/community-staging/courier-mta/esmtpd-msa.rc.d new file mode 100644 index 000000000..31458aca8 --- /dev/null +++ b/community-staging/courier-mta/esmtpd-msa.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-msa" + /usr/sbin/esmtpd-msa start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-msa + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-msa" + /usr/sbin/esmtpd-msa stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-msa + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd-ssl.rc.d b/community-staging/courier-mta/esmtpd-ssl.rc.d new file mode 100644 index 000000000..2a13be03f --- /dev/null +++ b/community-staging/courier-mta/esmtpd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/esmtpd.rc.d b/community-staging/courier-mta/esmtpd.rc.d new file mode 100644 index 000000000..dbaa9d680 --- /dev/null +++ b/community-staging/courier-mta/esmtpd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd" + /usr/sbin/esmtpd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd" + /usr/sbin/esmtpd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/imapd-ssl.rc.d b/community-staging/courier-mta/imapd-ssl.rc.d new file mode 100644 index 000000000..3dc74cfdf --- /dev/null +++ b/community-staging/courier-mta/imapd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/sbin/imapd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/sbin/imapd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/imapd.rc.d b/community-staging/courier-mta/imapd.rc.d new file mode 100644 index 000000000..8bce59f6c --- /dev/null +++ b/community-staging/courier-mta/imapd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/sbin/imapd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/sbin/imapd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/pop3d-ssl.rc.d b/community-staging/courier-mta/pop3d-ssl.rc.d new file mode 100644 index 000000000..6e7ae4e12 --- /dev/null +++ b/community-staging/courier-mta/pop3d-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/sbin/pop3d-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/sbin/pop3d-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/pop3d.rc.d b/community-staging/courier-mta/pop3d.rc.d new file mode 100644 index 000000000..25f8379ba --- /dev/null +++ b/community-staging/courier-mta/pop3d.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/sbin/pop3d start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/sbin/pop3d stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/courier-mta/webmaild.rc.d b/community-staging/courier-mta/webmaild.rc.d new file mode 100644 index 000000000..835cc2bf0 --- /dev/null +++ b/community-staging/courier-mta/webmaild.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier webmaild" + /usr/sbin/webmaild start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon webmaild + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier webmaild" + /usr/sbin/webmaild stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon webmaild + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD new file mode 100644 index 000000000..b54ab1aef --- /dev/null +++ b/community-staging/freeradius/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 58982 2011-11-20 19:25:57Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jason R Begley (jayray@digitalgoat.com> + +pkgname=freeradius +pkgver=2.1.12 +pkgrel=2 +pkgdesc="The premier open source RADIUS server" +arch=('i686' 'x86_64') +url="http://www.freeradius.org/" +license=("GPL") +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' + 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') +optdepends=('libpcap' 'unixodbc' 'python2') +options=('!libtool' 'emptydirs' '!makeflags') +install=$pkgname.install +source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 + radiusd + krb5-build-fix.patch) +md5sums=('862d3a2c11011e61890ba84fa636ed8c' + 'f1a6530b1b69d2fa793aa45b2de379bb' + 'c6a61de7576933f59154a53bfc12a2d2') + +build() { + cd $srcdir/freeradius-server-$pkgver + export CFLAGS="$CFLAGS -fno-strict-aliasing" + sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in + patch -p1 <$srcdir/krb5-build-fix.patch + ./configure --with-system-libtool --with-system-libltdl \ + --prefix=/usr --enable-heimdal-krb5 \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --libdir=/usr/lib/freeradius + make +} + +package() { + cd $srcdir/freeradius-server-$pkgver + make install R=$pkgdir + install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd + chmod o+r $pkgdir/etc/raddb/* + mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default + rm -rf $pkgdir/var/run +} diff --git a/community-staging/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install new file mode 100644 index 000000000..c3b9f9415 --- /dev/null +++ b/community-staging/freeradius/freeradius.install @@ -0,0 +1,22 @@ +post_install() { + groupadd -r radiusd + useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd + + touch /var/log/radius/radius.log + chown -R radiusd.radiusd /var/log/radius/radius.log + + [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb + + /bin/true +} + +pre_remove() { + /etc/rc.d/radiusd stop + /bin/true +} + +post_remove() { + userdel radiusd + groupdel radiusd + /bin/true +} diff --git a/community-staging/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch new file mode 100644 index 000000000..11dae7090 --- /dev/null +++ b/community-staging/freeradius/krb5-build-fix.patch @@ -0,0 +1,21 @@ +diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c +--- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 ++++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 +@@ -375,7 +375,7 @@ + * Heimdal krb5 verification + */ + radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val*/, + userP->realm); + + krb5_cc_default(context, &id); +@@ -390,7 +390,7 @@ + + radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", + error_message(ret), +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val */, + userP->realm); + + return RLM_MODULE_REJECT; diff --git a/community-staging/freeradius/radiusd b/community-staging/freeradius/radiusd new file mode 100755 index 000000000..bf872b6f2 --- /dev/null +++ b/community-staging/freeradius/radiusd @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/radiusd` +case "$1" in + start) + stat_busy "Starting radiusd Server" + + [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd + [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid + chown -R radiusd.radiusd /var/run/radiusd + + [ -z "$PID" ] && /usr/sbin/radiusd + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/radiusd.pid + add_daemon radiusd + stat_done + fi + ;; + stop) + stat_busy "Stopping radiusd Server" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/radiusd.pid + rm_daemon radiusd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD new file mode 100644 index 000000000..0901a0fd6 --- /dev/null +++ b/community-staging/gpsdrive/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 59398 2011-11-24 09:02:36Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Maintainer: damir <damir@archlinux.org> + +pkgname=gpsdrive +pkgver=2.11 +pkgrel=11 +pkgdesc="A car (bike, ship, plane) navigation system" +arch=("i686" "x86_64") +url="http://www.gpsdrive.de/" +license=('GPL2') +depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' + 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' + 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' + ) # already in core ('sqlite3') +makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') +install="gpsdrive.install" +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') + +build() { + cd "$srcdir" + + # python2 fix + for file in $(find . -name '*.py' -print); do + sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + rm -rf build + mkdir build + cd build + + # fix the mapnik default values + sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" + + export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ + export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" + unset LDFLAGS + + # see DefineOptions.cmake for a list of common options and defaults + # cmake -L for a more in-depth listing + cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ + -DWITH_SCRIPTS=ON \ + -DWITH_MAPNIK=ON \ + -DWITH_POSTGIS=ON \ + -DWITH_GDAL=ON \ + -DWITH_BASEMAPS=ON \ + -DWITH_FRIENDSD=ON \ + -DWITH_KISMET=ON \ + -DWITH_NAVIGATION=ON \ + -DWITH_SPEECH=OFF \ + -DWITH_DBUS=OFF \ + -DLIBGPS_OLD=OFF \ + "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/gpsdrive/gpsd-2.96.patch b/community-staging/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community-staging/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install new file mode 100644 index 000000000..8ea63912e --- /dev/null +++ b/community-staging/gpsdrive/gpsdrive.install @@ -0,0 +1,4 @@ +post_install() { + echo "Don't forget to generate geoinfo.db with geoinfo.pl script" + echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" +} diff --git a/community-staging/librep/PKGBUILD b/community-staging/librep/PKGBUILD new file mode 100644 index 000000000..2094a204b --- /dev/null +++ b/community-staging/librep/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59051 2011-11-21 01:50:28Z ebelanger $ +# Maintainer: stefan-husmann@t-online.de +# Contributor: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=librep +pkgver=0.92.1b +pkgrel=2 +pkgdesc="A Lisp system for UNIX" +license=('GPL2') +arch=('i686' 'x86_64') +url="http://sawfish.wikia.com/wiki/Librep" +depends=('gmp' 'gdbm' 'libffi') +install=${pkgname}.install +options=('!emptydirs' '!libtool') +source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --disable-static \ + --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ + --with-readline + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # create some directories or make install fails +# install -d $pkgdir/usr/{share/aclocal,lib/pkgconfig} + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/librep/librep.install b/community-staging/librep/librep.install new file mode 100644 index 000000000..7e1b990bf --- /dev/null +++ b/community-staging/librep/librep.install @@ -0,0 +1,18 @@ +info_dir=usr/share/info +info_files=(librep.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} 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/pidgin-fonomobutton/pidgin-fonomobutton.install b/community-staging/lightspark/lightspark.install index 21b79d2d4..75e2b7b55 100644 --- a/community/pidgin-fonomobutton/pidgin-fonomobutton.install +++ b/community-staging/lightspark/lightspark.install @@ -1,4 +1,5 @@ post_install() { + update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } @@ -7,5 +8,6 @@ post_upgrade() { } 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/mailutils/PKGBUILD b/community-staging/mailutils/PKGBUILD new file mode 100644 index 000000000..8913e3d7e --- /dev/null +++ b/community-staging/mailutils/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 58984 2011-11-20 19:26:47Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=mailutils +pkgver=2.2 +pkgrel=4 +pkgdesc="MUA command line tool (mailx)" +arch=(i686 x86_64) +url="http://www.gnu.org/software/mailutils/" +license=('GPL') +depends=('libldap' 'pam' 'gnutls' 'guile') +makedepends=('python2' 'emacs') +optdepends=('python2') +conflicts=('libsieve') +install=mailutils.install +options=(zipman !emptydirs) +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) +md5sums=('834d2f616b922856127ecfe6c2de7d1a') + +build() { + cd "$srcdir/mailutils-$pkgver" + + py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` + py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` + + export PYTHON=/usr/bin/python2 + export PYTHON_CONFIG=/usr/bin/python2-config + export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" + export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" + + [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ + --libexecdir=/usr/lib/$pkgname --without-fribidi \ + --without-tcp-wrappers +# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + make -j1 +} + +package() { + cd "$srcdir/mailutils-$pkgver" + make -j1 DESTDIR=$pkgdir install + rm -f $pkgdir/usr/share/info/dir + mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail + mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1 + chown -R root:root $pkgdir +} diff --git a/testing/libtool/libtool.install b/community-staging/mailutils/mailutils.install index 73cf56422..03b451b3e 100644 --- a/testing/libtool/libtool.install +++ b/community-staging/mailutils/mailutils.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(libtool.info libtool.info-1 libtool.info-2) +filelist=(mailutils.info mailutils.info-1 mailutils.info-2) post_install() { [ -x usr/bin/install-info ] || return 0 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/testing/glib-networking/glib-networking.install b/community-staging/mapnik/mapnik.install index 595f1c75b..46f265d5b 100644 --- a/testing/glib-networking/glib-networking.install +++ b/community-staging/mapnik/mapnik.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules + /sbin/ldconfig } post_upgrade() { 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/ntop/PKGBUILD b/community-staging/ntop/PKGBUILD new file mode 100644 index 000000000..cb921ba4f --- /dev/null +++ b/community-staging/ntop/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59280 2011-11-22 10:19:42Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=ntop +pkgver=4.1.0 +pkgrel=2 +pkgdesc='A network traffic probe that shows the network usage.' +arch=('i686' 'x86_64') +url='http://www.ntop.org/' +license=('GPL') +depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +options=('!libtool' '!makeflags') +install='ntop.install' +source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" + 'ntop' + 'ntop.conf.d') +md5sums=('116df99cf548431393991ea15443c52f' + '7b0d7bb57432e768ff387e9f7236f87c' + '6a9371de1dcf31d8ef13a4cf349c02b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install-recursive + + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop" + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd" + + install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop" + install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop" + + for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do + _plug="$(basename ${_f})" + ln -sf "../../lib${_plug}" "${_f}" + done +} diff --git a/community-staging/ntop/ntop b/community-staging/ntop/ntop new file mode 100755 index 000000000..2f0dbcbdd --- /dev/null +++ b/community-staging/ntop/ntop @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop + +case "$1" in + start) + stat_busy "Starting ntop daemon" + /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ntop + stat_done + fi + ;; + stop) + stat_busy "Stopping ntop daemon" + killall /usr/bin/ntop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ntop + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/ntop/ntop.conf.d b/community-staging/ntop/ntop.conf.d new file mode 100644 index 000000000..28e2a3166 --- /dev/null +++ b/community-staging/ntop/ntop.conf.d @@ -0,0 +1,5 @@ +# Parameters to be passed to ntop. +NTOP_ARGS="-i eth0 -w 3000" + +# Location of the log file. +NTOP_LOG="/var/log/ntop.log" diff --git a/community-staging/ntop/ntop.install b/community-staging/ntop/ntop.install new file mode 100644 index 000000000..8d8063751 --- /dev/null +++ b/community-staging/ntop/ntop.install @@ -0,0 +1,8 @@ +post_install() { + /bin/cat <<EOF +==> Before running the daemon script for the first time, you need to run + ntop as the root user to set an administrator password. +==> If you attempt to run ntop as a daemon without setting a password, a + FATAL ERROR message is generated and ntop stops. +EOF +} diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD new file mode 100644 index 000000000..8a77149f1 --- /dev/null +++ b/community-staging/performous/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 59406 2011-11-24 14:52:47Z lcarlier $ +# Maintainer : Laurent Carlier <lordheavym@gmail.com> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=performous +pkgver=0.6.1 +pkgrel=11 +pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' +arch=('i686' 'x86_64') +url="http://performous.org/" +license=('GPL') +depends=('boost-libs>=1.48' 'imagemagick' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg') +#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \ +# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') +makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.48') +optdepends=('performous-freesongs: free songs for performous') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 + boost-filesystem-v3.patch + ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a") +md5sums=('451a759de77984b5a699e91107fe52e2' + '42a8c825d80b0de16bd5752d2a80e585' + 'ff0ffa681dfaa09c4f42133a65309bf0') + +build() { + cd ${srcdir}/Performous-${pkgver}-Source + + # fix to built against boost 1.46 and later, upstream (git) now support v3 + patch -Np1 -i ../boost-filesystem-v3.patch + # fix with ffmpeg-0.8 + patch -Np1 -i ../ffmpeg-0.8.patch + + mkdir -p build + cd build + + # fix config loading with libxml++ + export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} + + cmake -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr .. + + make +} + +package() { + cd ${srcdir}/Performous-${pkgver}-Source/build + + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/performous/boost-filesystem-v3.patch b/community-staging/performous/boost-filesystem-v3.patch new file mode 100644 index 000000000..22dd07213 --- /dev/null +++ b/community-staging/performous/boost-filesystem-v3.patch @@ -0,0 +1,135 @@ +diff --git a/game/backgrounds.cc b/game/backgrounds.cc +index 7fd3cd0..cdedefb 100644 +--- a/game/backgrounds.cc ++++ b/game/backgrounds.cc +@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + { +diff --git a/game/cache.cc b/game/cache.cc +index 69974e2..0f1edd0 100644 +--- a/game/cache.cc ++++ b/game/cache.cc +@@ -9,7 +9,11 @@ namespace cache { + fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ + fs::path cache_filename; + std::string const lod = (boost::format("%.2f") % factor).str(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; ++#else ++ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; ++#endif + + if (isThemeResource(svgfilename)) { + std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); +diff --git a/game/filemagic.hh b/game/filemagic.hh +index bf87ded..29e81fe 100644 +--- a/game/filemagic.hh ++++ b/game/filemagic.hh +@@ -71,7 +71,11 @@ namespace filemagic { + // For now, just check the extension an assume it's not lying. + + // Get file extension in lower case ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string ext = filename.extension(); ++#else ++ std::string ext = filename.extension().string(); ++#endif + // somehow this does not convert the extension to lower case: + //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); + std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); +diff --git a/game/fs.cc b/game/fs.cc +index e34a784..767a7ab 100644 +--- a/game/fs.cc ++++ b/game/fs.cc +@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { + + bool isThemeResource(fs::path filename){ + try { ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string themefile = getThemePath(filename.filename()); ++#else ++ std::string themefile = getThemePath(filename.filename().string()); ++#endif + return themefile == filename; + } catch (...) { return false; } + } +diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc +index 38e163b..db15d79 100644 +--- a/game/songparser-ini.cc ++++ b/game/songparser-ini.cc +@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { + // Search the dir for the music files + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++#endif + if (regex_match(name.c_str(), match, midifile)) { + s.midifilename = name; + } else if (regex_match(name.c_str(), match, audiofile_background)) { +diff --git a/game/songparser.cc b/game/songparser.cc +index 2b7b9b4..ac9f3f6 100644 +--- a/game/songparser.cc ++++ b/game/songparser.cc +@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): + + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename ++#else ++ std::string name = p.filename().string(); // File basename ++#endif + if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { + m_song.cover = name; + } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { +diff --git a/game/songs.cc b/game/songs.cc +index 62ab26d..afab383 100644 +--- a/game/songs.cc ++++ b/game/songs.cc +@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + try { +diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh +index 58e19dc..8895d94 100644 +--- a/tools/ss_helpers.hh ++++ b/tools/ss_helpers.hh +@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st + void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } + void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } + ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string filename(boost::filesystem::path const& p) { return *--p.end(); } ++#else ++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } ++#endif + + /** Fix Singstar's b0rked XML **/ + std::string xmlFix(std::vector<char> const& data) { +-- +1.7.4.1 + diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog new file mode 100644 index 000000000..c182f92eb --- /dev/null +++ b/community-staging/pingus/ChangeLog @@ -0,0 +1,21 @@ +2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + + * pingus 0.7.2-8 + * Rebuilt against boost 1.41.0 + +2010-02-23 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-7 + * Rebuilt against boost 1.42.0 + +2010-01-20 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-6 + * Rebuilt against libpng 1.4/libjpeg 8 + +2009-07-13 Eric Belanger <eric@archlinux.org> + + * pingus 0.7.2-2 + * Rebuilt against boost 1.39 + * Added gcc 4.4 patch + * Added ChangeLog diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD new file mode 100644 index 000000000..d37f588f7 --- /dev/null +++ b/community-staging/pingus/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 59408 2011-11-24 15:18:25Z lcarlier $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=pingus +pkgver=0.7.5 +pkgrel=2 +pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." +arch=('i686' 'x86_64') +url="http://pingus.seul.org" +license=('GPL') +depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.48') +makedepends=('scons' 'boost>=1.48' 'mesa') +source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +md5sums=('68e0bd1327e0eedcaab64d64528540ba' + '9eec34047bdcff49e08f41e81764e20c') +sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' + '579a1144f161ce89e6e024cea37210149b89c0c0') + +build() { + cd ${pkgname}-${pkgver} + + scons prefix=/usr +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR="${pkgdir}" PREFIX="/usr" + + install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" +} diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop new file mode 100644 index 000000000..276db36a4 --- /dev/null +++ b/community-staging/pingus/pingus.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Pingus +Comment=A free Lemmings[tm] clone +Exec=pingus +Terminal=false +Type=Application +Categories=Application;Game;LogicGame +Icon=/usr/share/pingus/images/core/editor/actions.png 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/sage-mathematics/PKGBUILD b/community-staging/sage-mathematics/PKGBUILD new file mode 100644 index 000000000..d240ce248 --- /dev/null +++ b/community-staging/sage-mathematics/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Osman Ugus <ugus11@yahoo.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD + +pkgname=sage-mathematics +pkgver=4.7.2 +pkgrel=2 +pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' +url='http://www.sagemath.org' +arch=('i686' 'x86_64') +license=('GPL') +#depends=('readline') +depends=('ppl') +makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') +optdepends=('imagemagick: some plotting functionality benefits from it' + 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' + 'sage-mathematics-spkgs: original packages used to build additional packages') +options=('!makeflags') +install="${pkgname}.install" +source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" + 'SAGE-notebook.desktop') +md5sums=('b3073997e6c7ec00a269f84ff2e54973' + 'dc391f12b7d17dd37326343ec0e99bbd') + +build() { + cd sage-${pkgver} + + # modularization of sage, sort of :) + # fixes the following error: + # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook + # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash + # this is for people who have custom kernels (sage works this around by checking uname -r) + #mkdir -p spkg/installed + #touch spkg/installed/readline-6.1 + mkdir -p spkg/installed + touch spkg/installed/ppl-0.11.2 + + # fix "missing sage.all error" during build + unset CFLAGS + unset CXXFLAGS + + # fix build errors + unset LDFLAGS + + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') + export MAKE="make -j${SAGE_BUILD_THREADS}" + + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran + export SAGE_FORTRAN='/usr/bin/gfortran' + export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + + # disable building with debugging support + export SAGE_DEBUG='no' + + # enable fat binaries (disables processor specific optimizations) + # comment out if you're only building it for yourself + export SAGE_FAT_BINARY='yes' + + # can't write to root in a clean chroot + export DOT_SAGE='/build/src/' + + # only build sage, no documents + #make build + make +} + +<< COMMENT +check() { + cd sage-${pkgver} + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong +} +COMMENT + +package() { + cd sage-${pkgver} + + # cp because make install is experimental and will corrupt the install + install -d ${pkgdir}/opt/sage + cp -r * ${pkgdir}/opt/sage + + # move SageTeX files to more appropriate directory + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/sage/local/share/texmf \ + ${pkgdir}/usr/share + + desktop-file-install ${srcdir}/SAGE-notebook.desktop \ + --dir ${pkgdir}/usr/share/applications + + # create link to main binary + install -d ${pkgdir}/usr/bin + ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage + + # remove build logs + rm -f ${pkgdir}/opt/sage/install.log + rm -rf ${pkgdir}/opt/sage/spkg/logs + + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) + # no need to package them together, put into sage-mathematics-spkgs + rm -f ${pkgdir}/opt/sage/spkg/base/*spkg + rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg +} diff --git a/community-staging/sage-mathematics/SAGE-notebook.desktop b/community-staging/sage-mathematics/SAGE-notebook.desktop new file mode 100644 index 000000000..26a35d3ac --- /dev/null +++ b/community-staging/sage-mathematics/SAGE-notebook.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Version=1.0 +Name=SAGE +Comment=SAGE NOTEBOOK +Comment[en_US]=SAGE NOTEBOOK +Exec=/opt/sage/sage -notebook +GenericName= +GenericName[de]= +Icon=/opt/sage/data/extcode/notebook/images/sageicon.png +MimeType= +Name[de]=SAGE +StartupNotify=true +Terminal=true +Type=Application +Categories=Science;Math; +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= +GenericName[en_US]= diff --git a/community-staging/sage-mathematics/sage-mathematics.install b/community-staging/sage-mathematics/sage-mathematics.install new file mode 100644 index 000000000..6caa5299e --- /dev/null +++ b/community-staging/sage-mathematics/sage-mathematics.install @@ -0,0 +1,56 @@ +post_install() { + cd /opt/sage + + # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership + # the files it writes to ~/.sage can be safely ignored + HOME=/tmp ./sage -c + + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + + # Update LaTeX db to point to SageTeX + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + else + echo 'Warning: could not find /usr/bin/texhash' + echo 'SageTeX has been installed but you need to run:' + echo '# texhash /usr/share/texmf' + echo 'So that LaTeX will be able to find it.' + fi + +echo ' + ___ +/ (_) o | +\__ _ _ __ | +/ / |/ | | / \_| | | +\___/ | |_/|/\__/ \_/|/o + /| /| + \| \| + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +' + +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # Update LaTeX db to remove SageTeX entries + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + fi + + # remove the sagemath daemon user + userdel sagemath + + # clean up left overs + rm -rf /opt/sage +} 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-staging/xkbsel/PKGBUILD b/community-staging/xkbsel/PKGBUILD new file mode 100644 index 000000000..2ffd17ef2 --- /dev/null +++ b/community-staging/xkbsel/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 58986 2011-11-20 19:27:58Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=xkbsel +pkgver=0.13 +pkgrel=5 +pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings" +arch=('i686' 'x86_64') +url="http://www.meduna.org/sw_xkbsel_en.html" +license=('GPL') +depends=('gdbm' 'libxaw') +makedepends=('patch' 'xkeyboard-config') +source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('c82196344ef920a072f413df85b9dc00' + 'dee0f7de8618d9eff073942f0e08f030') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 <../build-fix.patch + export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H" + export LDFLAGS="-lgdbm -lgdbm_compat" + + ./configure --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc/xkbsel \ + --build=`uname -m` --host=`uname -m` --target=`uname -m` \ + --mandir=/usr/share/man + make + make DESTDIR=$pkgdir install +} diff --git a/community-staging/xkbsel/build-fix.patch b/community-staging/xkbsel/build-fix.patch new file mode 100644 index 000000000..02021db47 --- /dev/null +++ b/community-staging/xkbsel/build-fix.patch @@ -0,0 +1,24 @@ +diff -wbBur xkbsel-0.13/configure xkbsel-0.13.my/configure +--- xkbsel-0.13/configure 2000-04-09 13:37:02.000000000 +0400 ++++ xkbsel-0.13.my/configure 2006-07-24 17:13:10.000000000 +0400 +@@ -6118,7 +6118,7 @@ + { echo "configure: error: "Cannot find library containing dbm_open"" 1>&2; exit 1; } + fi + +-x11xkbdir=$ac_x_libraries/X11/xkb ++x11xkbdir=/usr/share/X11/xkb + test -d $x11xkbdir || { echo "configure: error: "Directory $x11xkbdir does not exist"" 1>&2; exit 1; } + + +diff -wbBur xkbsel-0.13/libs/Makefile.in xkbsel-0.13.my/libs/Makefile.in +--- xkbsel-0.13/libs/Makefile.in 2000-04-09 13:51:01.000000000 +0400 ++++ xkbsel-0.13.my/libs/Makefile.in 2006-07-24 17:11:52.000000000 +0400 +@@ -452,7 +452,7 @@ + + + install-data-local: +- $(mkinstalldirs) ${sysxkmdir} ++ $(mkinstalldirs) $(DESTDIR)${sysxkmdir} + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/community-testing/courier-authlib/PKGBUILD b/community-testing/courier-authlib/PKGBUILD new file mode 100644 index 000000000..99e43c8c3 --- /dev/null +++ b/community-testing/courier-authlib/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 53167 2009-09-26 09:48:47Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-authlib +pkgver=0.63.0 +pkgrel=5 +pkgdesc="Authentification library for the courier mailserver(s)" +arch=(i686 x86_64) +license=('GPL2') +url="http://courier-mta.org/authlib/" +backup=('etc/authlib/authdaemonrc' 'etc/authlib/authldaprc' \ + 'etc/authlib/authmysqlrc' 'etc/authlib/authpgsqlrc') +depends=('openssl' 'gdbm' 'perl' 'libtool' 'expect') +makedepends=('pam' 'expect' 'libldap' 'libmysqlclient' 'postgresql-libs>=8.3.0') +optdepends=('libmysqlclient' 'libldap' 'postgresql-libs') +conflicts=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +provides=('courier-imap-mysql' 'courier-imap-pgsql' 'courier-imap-ldap') +options=(!libtool) +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/courier/authlib/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + authdaemond.rc.d) +md5sums=('411a927d178f783a1e8fab9964ce0dd2' + '911ee9f40d70fafc6bb4cc636c5ad531') + +build() { + #export MAKEFLAGS="-j1" + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --with-db=gdbm \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-authpam --with-authpwd --with-authshadow \ + --with-authldap --with-authmysql --with-authpgsql \ + --with-authuserdb --with-authcram --with-authdaemon + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + ############################################################################### + # post_installation ---- rename the config file and change ownerschip + for distfile in ${pkgdir}/etc/authlib/*.dist; do + chown 72:72 ${distfile} + mv ${distfile} ${pkgdir}/etc/authlib/`basename ${distfile} .dist` + done + # copy the .schema; mostly refered to as courier.schema -> rename it + install -Dm 444 authldap.schema \ + ${pkgdir}/etc/openldap/schema/courier.schema + ############################################################################### + # Install daemon, that wraps couriers bashscript + install -Dm 755 ${srcdir}/authdaemond.rc.d ${pkgdir}/etc/rc.d/authdaemond + chown -R 72:72 ${pkgdir}/var/spool/authdaemon + mkdir ${pkgdir}/var/spool/courier + chown -R 72:72 ${pkgdir}/var/spool/courier + # docs say we can remove .a files after make + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-testing/courier-authlib/authdaemond.rc.d b/community-testing/courier-authlib/authdaemond.rc.d new file mode 100644 index 000000000..ff4abb182 --- /dev/null +++ b/community-testing/courier-authlib/authdaemond.rc.d @@ -0,0 +1,48 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start() { + stat_busy "Starting Authdaemond" + /usr/sbin/authdaemond start &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + ln -s /var/spool/authdaemon/pid /var/run/authdaemond.pid + add_daemon authdaemond + stat_done + fi +} + +stop() { + stat_busy "Stopping Authdaemond" + /usr/sbin/authdaemond stop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/authdaemond.pid + rm_daemon authdaemond + # housecleaning; just like kids'n toys - don't care when it's needed anymore + rm -f /var/spool/authdaemon/{pid.lock,pid,socket} &> /dev/null + stat_done + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + # calling 'stop' and 'start' without the $0 fails... + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-authlib/courier-authlib.install b/community-testing/courier-authlib/courier-authlib.install new file mode 100644 index 000000000..cbccc636b --- /dev/null +++ b/community-testing/courier-authlib/courier-authlib.install @@ -0,0 +1,32 @@ +# arg 1: the new package version +post_install() { + # creates group and user on virgin systems + if [ -z "`grep '^courier::' /etc/group`" ]; then + groupadd -g 72 courier >& /dev/null + fi + if [ -z "`grep '^courier:' /etc/passwd`" ]; then + useradd -u 72 -d /var/spool/courier -g courier -s /bin/false courier &>/dev/null + fi +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + userdel courier &> /dev/null + groupdel courier &> /dev/null +} + + +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-testing/courier-imap/PKGBUILD b/community-testing/courier-imap/PKGBUILD new file mode 100644 index 000000000..5c248e738 --- /dev/null +++ b/community-testing/courier-imap/PKGBUILD @@ -0,0 +1,94 @@ +# $Id: PKGBUILD 59416 2011-11-24 17:03:59Z stephane $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Committer: Manolis Tzanidakis <manolis@archlinux.org> + +pkgname=courier-imap +pkgver=4.9.3 +pkgrel=5 +pkgdesc="IMAP(s)/POP3(s) Server" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.courier-mta.org/imap/" +depends=('courier-maildrop>=2.5.0' 'gcc-libs' 'gamin' 'gdbm' 'openssl') +backup=('etc/courier-imap/imapd.cnf' 'etc/courier-imap/pop3d.cnf' \ + 'etc/courier-imap/imapd' 'etc/courier-imap/imapd-ssl' \ + 'etc/courier-imap/pop3d' 'etc/courier-imap/pop3d-ssl'\ + 'etc/conf.d/courier-imap') +conflicts=('courier-mta') +provides=('imap-server' 'pop3-server') +options=('!libtool') +install=$pkgname.install +source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2 + courier-imap.conf.d + courier-imap.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d) +md5sums=('703ddbb090569436dbda61d0d62b1eb8' + '3e08f017f6c5a52dea28f6f0dbd50b86' + '500c37831974f4676b67e650c67a59f6' + '6574c8046e44698efa7452c4b445d88e' + '437167a58efddc523f25180df284da20' + '1be23fb224bde93b23da6e771bd1cf01' + 'a326309b02fed3d7226d9aac88add7f2') + +# MIGRATION NOTE: +# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed. +# Remove those files and this note and also courier-imap.install + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier-imap \ + --libexecdir=/usr/lib/courier-imap \ + --localstatedir=/var/spool/courier-imap \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --with-piddir=/var/run/courier \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-mailuser=courier --with-mailgroup=courier + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + # cleanup - provided by courier-maildrop + rm ${pkgdir}/usr/bin/{deliverquota,maildirmake} + rm ${pkgdir}/usr/share/man/man1/maildirmake* + rm ${pkgdir}/usr/share/man/man8/deliverquota* + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier-imap/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier-imap/$(basename ${distfile} .dist) + done + sed -i 's|TLS_CERTFILE=/usr/share/|TLS_CERTFILE=/etc/courier-imap/|' \ + ${pkgdir}/etc/courier-imap/*-ssl + for pamfile in imap/*.pam; do + sed -i "s|/lib/security/||;s|pam_pwdb|pam_unix|" ${pamfile} + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .pam | sed "s/d$//") + done + # install thingies + install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap +} diff --git a/community-testing/courier-imap/courier-imap.conf.d b/community-testing/courier-imap/courier-imap.conf.d new file mode 100644 index 000000000..66049470d --- /dev/null +++ b/community-testing/courier-imap/courier-imap.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# imapd pop3d imapd-ssl pop3d-ssl +# +CI_DAEMONS="imapd pop3d imapd-ssl pop3d-ssl" + +# If you want authdaemond to be automatically started and +# stopped by courier-imap, set this to "true" +AUTO_AUTHDAEMON="false" + +# Courier will start this many seconds after autodaemond if +# AUTO_AUTHDAEMON is set to "true" +AUTO_AUTHDAEMON_LAG=2 diff --git a/community-testing/courier-imap/courier-imap.install b/community-testing/courier-imap/courier-imap.install new file mode 100644 index 000000000..9046777a7 --- /dev/null +++ b/community-testing/courier-imap/courier-imap.install @@ -0,0 +1,16 @@ +post_upgrade() { + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-imap ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} diff --git a/community-testing/courier-imap/courier-imap.pam b/community-testing/courier-imap/courier-imap.pam new file mode 100644 index 000000000..fa52db541 --- /dev/null +++ b/community-testing/courier-imap/courier-imap.pam @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so nullok +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/community-testing/courier-imap/courier-imap.rc.d b/community-testing/courier-imap/courier-imap.rc.d new file mode 100644 index 000000000..8876fe401 --- /dev/null +++ b/community-testing/courier-imap/courier-imap.rc.d @@ -0,0 +1,62 @@ +#!/bin/bash + +CI_DAEMONS= +[ -f /etc/conf.d/courier-imap ] && . /etc/conf.d/courier-imap +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 +[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/lib/courier-imap/${daemon}.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/lib/courier-imap/$daemon.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-testing/courier-imap/imapd-ssl.rc.d b/community-testing/courier-imap/imapd-ssl.rc.d new file mode 100644 index 000000000..6730d452c --- /dev/null +++ b/community-testing/courier-imap/imapd-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/lib/courier-imap/imapd-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-testing/courier-imap/imapd.rc.d b/community-testing/courier-imap/imapd.rc.d new file mode 100644 index 000000000..867b52b78 --- /dev/null +++ b/community-testing/courier-imap/imapd.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/lib/courier-imap/imapd.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/lib/courier-imap/imapd.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-testing/courier-imap/pop3d-ssl.rc.d b/community-testing/courier-imap/pop3d-ssl.rc.d new file mode 100644 index 000000000..aab0f6a95 --- /dev/null +++ b/community-testing/courier-imap/pop3d-ssl.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/lib/courier-imap/pop3d-ssl.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-testing/courier-imap/pop3d.rc.d b/community-testing/courier-imap/pop3d.rc.d new file mode 100644 index 000000000..7b73c5a7a --- /dev/null +++ b/community-testing/courier-imap/pop3d.rc.d @@ -0,0 +1,47 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/lib/courier-imap/pop3d.rc start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/lib/courier-imap/pop3d.rc stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 +~ +~ diff --git a/community-testing/courier-maildrop/PKGBUILD b/community-testing/courier-maildrop/PKGBUILD new file mode 100644 index 000000000..a2cd7edb0 --- /dev/null +++ b/community-testing/courier-maildrop/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 57086 2009-10-31 13:13:36Z allan $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=courier-maildrop +_srcname=maildrop +pkgver=2.5.4 +pkgrel=3 +pkgdesc="mail delivery agent - procmail like but nicer syntax" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://courier-mta.org/maildrop/" +depends=('courier-authlib>=0.63.0' 'gamin' 'pcre' 'gdbm') +conflicts=('courier-mta') +options=(!libtool) +source=(http://downloads.sourceforge.net/project/courier/${_srcname}/${pkgver}/${_srcname}-${pkgver}.tar.bz2) +md5sums=('5770345cdceae28bdc24809e7adb3426') + +build() { + cd ${srcdir}/${_srcname}-${pkgver} + + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --with-db=gdbm \ + --with-devel + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${_srcname}-${pkgver} + + make DESTDIR=${pkgdir} install + chmod u+s ${pkgdir}/usr/bin/maildrop + cd ${pkgdir}/usr/share/maildrop/html + for files in *; do + install -Dm644 ${files} ${pkgdir}/usr/share/htmldoc/${files} + done + rm -rf ${pkgdir}/usr/share/maildrop + + # docs say we can remove .a files after make + cd ${pkgdir} + find ${pkgdir} -name '*\.a' -exec rm -f {} \; +} diff --git a/community-testing/courier-mta/PKGBUILD b/community-testing/courier-mta/PKGBUILD new file mode 100644 index 000000000..82df2e28f --- /dev/null +++ b/community-testing/courier-mta/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +# ----------- NOTE TO ALL USERS ------------ +# Go read http://www.courier-mta.org/install.html b4 running or building courier + +pkgname=courier-mta +pkgver=0.66.3 +pkgrel=5 +pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" +arch=(i686 x86_64) +license=('GPL2') +backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ + 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ + 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ + 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ + 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ + 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ + 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ + 'etc/conf.d/courier-mta') +url="http://courier-mta.org" +depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') +optdepends=('libldap') +makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin') +provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') +conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') +options=('!libtool') +install=courier-mta.install +source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 + courier.rc.d + courier-mta.rc.d + courier-mta.conf.d + esmtpd.rc.d + esmtpd-ssl.rc.d + esmtpd-msa.rc.d + imapd.rc.d + imapd-ssl.rc.d + pop3d.rc.d + pop3d-ssl.rc.d + webmaild.rc.d) +md5sums=('3b28f14afe3db09b74b4845323c3e982' + '9055ba622efd37603186ce1f37277224' + '5cbeb5c323706058e545f74ad7752ebe' + 'f3ff70b40c7a1f7a017e8c4cc4d92f4f' + 'caabce8c7b66296b602316aa5af5d4c5' + '1c8b1b66ebafa4ff09ffc0106a9dc82c' + 'dae6c7d5ff0cce0fba5729fedf2a9051' + 'd0cc5eab5d3e0ec33dadd0392421f63e' + '5873a96aa149edda281730010fb4db34' + 'faa09e06a5dc41ee89ab1f8fa6886b63' + '520501daa66c0a94f2e9844ce4919a09' + '33a93f400c3e87bcd207295b7d7333ca') + +# MIGRATION NOTE: +# In 2012, support for courier-mta.conf.d and courier-mta.rc.d will be removed. +# Remove those files and this note and also courier-mta.install + +build() { + cd ${srcdir}/courier-${pkgver} + + # fix a tiny bug + sed -i -e \ + 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ + configure && chmod 755 configure + + # courier is more about configuring than compiling :-), lets start the mess + ./configure --prefix=/usr \ + --sysconfdir=/etc/courier \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var/spool/courier \ + --disable-root-check \ + --enable-unicode \ + --enable-workarounds-for-imap-client-bugs \ + --enable-mimetypes=/etc/mime.types \ + --with-piddir=/var/run/courier \ + --with-locking-method=lockf \ + --with-trashquota \ + --with-db=gdbm \ + --with-trashquota \ + --with-random=/dev/urandom --without-ispell \ + --with-mailuser=courier --with-mailgroup=courier \ + --with-certdb=/etc/ssl/certs/ + make +} + +package() { + cd ${srcdir}/courier-${pkgver} + + #chown mail.mail ${pkgdir}/var/spool/courier + make DESTDIR=${pkgdir} install + # docs say we can get rid of those after make + find ${pkgdir} -name '*\.a' -exec -rm -f {} \; + # install the perftest-script for testings + install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 + ############################################################################### + # this is what usually "make install-configure" does + # *.dist files get rid of "dist" + for distfile in ${pkgdir}/etc/courier/*.dist; do + mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) + done + # install pam files according to the layout used in Archlinux + for pamfile in ${pkgdir}/etc/courier/*.authpam; do + sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} + #echo "password required pam_unix.so" >> $pamfile + install -Dm 644 ${pamfile} \ + ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") + rm -f ${pamfile} + done + + ############################################################################### + # Arch Linux specific tweaks to make things easier for the user + # create passwordfile for webadmin -> standard archwebadmin + sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile + yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password + # arch specific scripts + install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta + install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta + install -D -m 755 ${srcdir}/courier.rc.d ${pkgdir}/etc/rc.d/courier + install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd + install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl + install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d + install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl + install -D -m 755 ${srcdir}/esmtpd.rc.d ${pkgdir}/etc/rc.d/esmtpd + install -D -m 755 ${srcdir}/esmtpd-ssl.rc.d ${pkgdir}/etc/rc.d/esmtpd-ssl + install -D -m 755 ${srcdir}/esmtpd-msa.rc.d ${pkgdir}/etc/rc.d/esmtpd-msa + install -D -m 755 ${srcdir}/webmaild.rc.d ${pkgdir}/etc/rc.d/webmaild + #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ + # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache + # bug http://bugs.archlinux.org/task/5154 + find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; + # fixing some permissions + chown -R courier:courier ${pkgdir}/usr/lib/courier/modules + rm -r ${pkgdir}/var/run + #chown -R courier:courier ${pkgdir}/var/run/courier + chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} + # make a link to /usr/sbin/sendmail + install -dm 755 ${pkgdir}/usr/sbin + cd ${pkgdir}/usr/sbin + ln -s ../bin/sendmail ./sendmail +} diff --git a/community-testing/courier-mta/courier-mta.conf.d b/community-testing/courier-mta/courier-mta.conf.d new file mode 100644 index 000000000..5856a5cda --- /dev/null +++ b/community-testing/courier-mta/courier-mta.conf.d @@ -0,0 +1,18 @@ +# +# Parameters to be passed to courier-imap +# +# +# Select the service you want started with courier-imap +# +# Available options : +# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild +# +CI_DAEMONS="courier esmtpd imapd pop3d" + +# If you want authdaemond to be automatically started and +# stopped by courier-imap, set this to "true" +AUTO_AUTHDAEMON="false" + +# Courier will start this many seconds after autodaemond if +# AUTO_AUTHDAEMON is set to "true" +AUTO_AUTHDAEMON_LAG=2 diff --git a/community-testing/courier-mta/courier-mta.install b/community-testing/courier-mta/courier-mta.install new file mode 100644 index 000000000..e835e3efd --- /dev/null +++ b/community-testing/courier-mta/courier-mta.install @@ -0,0 +1,61 @@ +# arg 1: the new package version +post_install() { + cat << EOM + --> if you are using LDAP services to provide lookup in sqwebmail or aliases + --> then you have to install: + libldap +EOM + # create the *.dat files + makealiases + makesmtpaccess +} + +pre_upgrade() { + pre_remove $1 +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 + echo "Please migrate to the new daemon format:" + echo "/etc/rc.d/courier-imap has been split into separate daemons:" + echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo "This elimates the need for /etc/conf.d/courier-imap" + echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" + echo "you first start authdaemond before any other of these daemons." + echo "Example prior to this change:" + echo " DAEMONS=( ... courier-mta ...)" + echo "Example after this change:" + echo " DAEMONS=( ... authdaemond courier esmtpd esmtpd-ssl imapd imapd-ssl" + echo " pop3d pop3d-ssl webmaild ... )" + echo "This allows better control over the daemons and will generate" + echo "correct entries in /run/daemons" + echo "An old configuration will keep working but please do migrate in time" + echo "as support for this will be removed some time in 2012." +} + + +pre_remove() { + # manual backup, since courier is always processing the whole directory + # - so it would process "system" AND "system.pacsave" -> bad + [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup + cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system + cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default + cat << EOM + --> the /etc/courier/aliases/system and the /etc/courier/smtpaccess/default + --> files have been backed up to /etc/courier/_backup since the *.pacsave + --> files cannot stay in place. Read about couriers alias handling from the + --> documentation! +EOM +} + +# arg 1: the old package version +post_remove() { + /bin/true +} + +op=$1 +shift + +$op $* diff --git a/community-testing/courier-mta/courier-mta.rc.d b/community-testing/courier-mta/courier-mta.rc.d new file mode 100644 index 000000000..416946a5a --- /dev/null +++ b/community-testing/courier-mta/courier-mta.rc.d @@ -0,0 +1,60 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta +[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 +[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond start + sleep ${AUTO_AUTHDAEMON_LAG} + fi + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + for daemon in $CI_DAEMONS; do + stat_busy "Starting Courier ${daemon}" + /usr/sbin/${daemon} start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $daemon + stat_done + fi + done + ;; + stop) + for daemon in $CI_DAEMONS; do + stat_busy "Stopping Courier ${daemon}" + /usr/sbin/${daemon} stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon $daemon + stat_done + fi + done + if [ "$AUTO_AUTHDAEMON" == "true" ]; then + /etc/rc.d/authdaemond stop + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly new file mode 100644 index 000000000..6c541321e --- /dev/null +++ b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly @@ -0,0 +1,6 @@ +#!/bin/sh + +# Cleans the cache of the sqwebmail server +if [ -x /usr/share/sqwebmail/cleancache.pl ]; then + su -c "/usr/share/sqwebmail/cleancache.pl" bin +fi diff --git a/community-testing/courier-mta/courier.rc.d b/community-testing/courier-mta/courier.rc.d new file mode 100644 index 000000000..7c581a24a --- /dev/null +++ b/community-testing/courier-mta/courier.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier daemon" + /usr/sbin/courier start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon courier + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier daemon" + /usr/sbin/courier stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon courier + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/esmtpd-msa.rc.d b/community-testing/courier-mta/esmtpd-msa.rc.d new file mode 100644 index 000000000..31458aca8 --- /dev/null +++ b/community-testing/courier-mta/esmtpd-msa.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-msa" + /usr/sbin/esmtpd-msa start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-msa + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-msa" + /usr/sbin/esmtpd-msa stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-msa + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/esmtpd-ssl.rc.d b/community-testing/courier-mta/esmtpd-ssl.rc.d new file mode 100644 index 000000000..2a13be03f --- /dev/null +++ b/community-testing/courier-mta/esmtpd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd-ssl" + /usr/sbin/esmtpd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/esmtpd.rc.d b/community-testing/courier-mta/esmtpd.rc.d new file mode 100644 index 000000000..dbaa9d680 --- /dev/null +++ b/community-testing/courier-mta/esmtpd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier esmtpd" + /usr/sbin/esmtpd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon esmtpd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier esmtpd" + /usr/sbin/esmtpd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon esmtpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/imapd-ssl.rc.d b/community-testing/courier-mta/imapd-ssl.rc.d new file mode 100644 index 000000000..3dc74cfdf --- /dev/null +++ b/community-testing/courier-mta/imapd-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd-ssl" + /usr/sbin/imapd-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd-ssl" + /usr/sbin/imapd-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/imapd.rc.d b/community-testing/courier-mta/imapd.rc.d new file mode 100644 index 000000000..8bce59f6c --- /dev/null +++ b/community-testing/courier-mta/imapd.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier imapd" + /usr/sbin/imapd start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon imapd + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier imapd" + /usr/sbin/imapd stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon imapd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/pop3d-ssl.rc.d b/community-testing/courier-mta/pop3d-ssl.rc.d new file mode 100644 index 000000000..6e7ae4e12 --- /dev/null +++ b/community-testing/courier-mta/pop3d-ssl.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d-ssl" + /usr/sbin/pop3d-ssl start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d-ssl + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d-ssl" + /usr/sbin/pop3d-ssl stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d-ssl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/pop3d.rc.d b/community-testing/courier-mta/pop3d.rc.d new file mode 100644 index 000000000..25f8379ba --- /dev/null +++ b/community-testing/courier-mta/pop3d.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier pop3d" + /usr/sbin/pop3d start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon pop3d + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier pop3d" + /usr/sbin/pop3d stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pop3d + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/courier-mta/webmaild.rc.d b/community-testing/courier-mta/webmaild.rc.d new file mode 100644 index 000000000..835cc2bf0 --- /dev/null +++ b/community-testing/courier-mta/webmaild.rc.d @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + + [ -d /var/run/courier ] || mkdir -p /var/run/courier + chown courier:courier /var/run/courier + + if ck_daemon authdaemond; then + echo "ERROR: authdaemond is not running" + stat_fail + exit 1 + fi + + stat_busy "Starting Courier webmaild" + /usr/sbin/webmaild start + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon webmaild + stat_done + fi + ;; + stop) + stat_busy "Stopping Courier webmaild" + /usr/sbin/webmaild stop > /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon webmaild + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/expac/PKGBUILD b/community-testing/expac/PKGBUILD deleted file mode 100644 index ff83247d7..000000000 --- a/community-testing/expac/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 56821 2011-10-13 19:47:47Z dreisner $ -# Maintainer: Dave Reisner <d@falconindy.com> - -pkgname=expac -pkgver=0.07 -pkgrel=1 -pkgdesc="pacman database extraction utility" -arch=('i686' 'x86_64') -url="http://github.com/falconindy/expac" -license=('GPL') -depends=('pacman') -makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('1bc637b733051827982db12db84643f2') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install -} - -# vim: ft=sh syn=sh diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD new file mode 100644 index 000000000..bb36556ba --- /dev/null +++ b/community-testing/freeradius/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59422 2011-11-24 17:04:51Z stephane $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jason R Begley (jayray@digitalgoat.com> + +pkgname=freeradius +pkgver=2.1.12 +pkgrel=2 +pkgdesc="The premier open source RADIUS server" +arch=('i686' 'x86_64') +url="http://www.freeradius.org/" +license=("GPL") +depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam' + 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow') +optdepends=('libpcap' 'unixodbc' 'python2') +options=('!libtool' 'emptydirs' '!makeflags') +install=$pkgname.install +source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 + radiusd + krb5-build-fix.patch) +md5sums=('862d3a2c11011e61890ba84fa636ed8c' + 'f1a6530b1b69d2fa793aa45b2de379bb' + 'c6a61de7576933f59154a53bfc12a2d2') + +build() { + cd $srcdir/freeradius-server-$pkgver + export CFLAGS="$CFLAGS -fno-strict-aliasing" + sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in + patch -p1 <$srcdir/krb5-build-fix.patch + ./configure --with-system-libtool --with-system-libltdl \ + --prefix=/usr --enable-heimdal-krb5 \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --libdir=/usr/lib/freeradius + make +} + +package() { + cd $srcdir/freeradius-server-$pkgver + make install R=$pkgdir + install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd + chmod o+r $pkgdir/etc/raddb/* + mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default + rm -rf $pkgdir/var/run +} diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install new file mode 100644 index 000000000..c3b9f9415 --- /dev/null +++ b/community-testing/freeradius/freeradius.install @@ -0,0 +1,22 @@ +post_install() { + groupadd -r radiusd + useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd + + touch /var/log/radius/radius.log + chown -R radiusd.radiusd /var/log/radius/radius.log + + [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb + + /bin/true +} + +pre_remove() { + /etc/rc.d/radiusd stop + /bin/true +} + +post_remove() { + userdel radiusd + groupdel radiusd + /bin/true +} diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch new file mode 100644 index 000000000..11dae7090 --- /dev/null +++ b/community-testing/freeradius/krb5-build-fix.patch @@ -0,0 +1,21 @@ +diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c +--- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000 ++++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000 +@@ -375,7 +375,7 @@ + * Heimdal krb5 verification + */ + radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n", +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val*/, + userP->realm); + + krb5_cc_default(context, &id); +@@ -390,7 +390,7 @@ + + radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )", + error_message(ret), +- *userP->name.name_string.val, ++ "-" /* *userP->name.name_string.val */, + userP->realm); + + return RLM_MODULE_REJECT; diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd new file mode 100755 index 000000000..bf872b6f2 --- /dev/null +++ b/community-testing/freeradius/radiusd @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/radiusd` +case "$1" in + start) + stat_busy "Starting radiusd Server" + + [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd + [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid + chown -R radiusd.radiusd /var/run/radiusd + + [ -z "$PID" ] && /usr/sbin/radiusd + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/radiusd.pid + add_daemon radiusd + stat_done + fi + ;; + stop) + stat_busy "Stopping radiusd Server" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm /var/run/radiusd.pid + rm_daemon radiusd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD deleted file mode 100644 index be9ad0d28..000000000 --- a/community-testing/gedit-plugins/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 56919 2011-10-16 20:32:19Z ibiru $ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -#Contributor: Hugo Doria <hugo@archlinux.org> -#Contributor: Sergej Chodarev <sergejx@centrum.sk> -#Contributor: zhuqin <zhuqin83@gmail.com> - -pkgname=gedit-plugins -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Set of plugins for gedit" -arch=('i686' 'x86_64') -license=('GPL') -url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'dbus-python') -optdepends=('gucharmap: for charmap plugin') -makedepends=('intltool' 'gnome-doc-utils') -options=('!libtool' '!emptydirs') -install=gedit-plugins.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ - --disable-schemas-compile - - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install deleted file mode 100644 index d5bcc00ae..000000000 --- a/community-testing/gedit-plugins/gedit-plugins.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=gedit-plugins - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} - - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/librep/PKGBUILD b/community-testing/librep/PKGBUILD new file mode 100644 index 000000000..b84b8b68e --- /dev/null +++ b/community-testing/librep/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 59424 2011-11-24 17:05:01Z stephane $ +# Maintainer: stefan-husmann@t-online.de +# Contributor: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=librep +pkgver=0.92.1b +pkgrel=2 +pkgdesc="A Lisp system for UNIX" +license=('GPL2') +arch=('i686' 'x86_64') +url="http://sawfish.wikia.com/wiki/Librep" +depends=('gmp' 'gdbm' 'libffi') +install=${pkgname}.install +options=('!emptydirs' '!libtool') +source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('f75e1197646bbf1594fc4765802aab0bffe1bb02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --disable-static \ + --prefix=/usr \ + --libexecdir=/usr/lib/$pkgname \ + --with-readline + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # create some directories or make install fails +# install -d $pkgdir/usr/{share/aclocal,lib/pkgconfig} + make DESTDIR="${pkgdir}" install +} diff --git a/community-testing/librep/librep.install b/community-testing/librep/librep.install new file mode 100644 index 000000000..7e1b990bf --- /dev/null +++ b/community-testing/librep/librep.install @@ -0,0 +1,18 @@ +info_dir=usr/share/info +info_files=(librep.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} diff --git a/community-testing/mailutils/PKGBUILD b/community-testing/mailutils/PKGBUILD new file mode 100644 index 000000000..ce4c6c567 --- /dev/null +++ b/community-testing/mailutils/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 59426 2011-11-24 17:05:12Z stephane $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=mailutils +pkgver=2.2 +pkgrel=4 +pkgdesc="MUA command line tool (mailx)" +arch=(i686 x86_64) +url="http://www.gnu.org/software/mailutils/" +license=('GPL') +depends=('libldap' 'pam' 'gnutls' 'guile') +makedepends=('python2' 'emacs') +optdepends=('python2') +conflicts=('libsieve') +install=mailutils.install +options=(zipman !emptydirs) +source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2) +md5sums=('834d2f616b922856127ecfe6c2de7d1a') + +build() { + cd "$srcdir/mailutils-$pkgver" + + py2=`pacman -Q python2 | cut -d\ -f2 | cut -d. -f1-2` + py3=`pacman -Q python | cut -d\ -f2 | cut -d. -f1-2` + + export PYTHON=/usr/bin/python2 + export PYTHON_CONFIG=/usr/bin/python2-config + export CFLAGS="$CFLAGS `pkg-config --cflags python-$py2`" + export LDFLAGS="$LDFLAGS `pkg-config --libs python-$py2`" + + [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \ + --libexecdir=/usr/lib/$pkgname --without-fribidi \ + --without-tcp-wrappers +# [ -z "$py3" ] || find -type f -name Makefile -exec sed -i "s|python$py3|python$py2|" {} \; + make -j1 +} + +package() { + cd "$srcdir/mailutils-$pkgver" + make -j1 DESTDIR=$pkgdir install + rm -f $pkgdir/usr/share/info/dir + mv $pkgdir/usr/bin/mail $pkgdir/usr/bin/gnu-mail + mv $pkgdir/usr/share/man/man1/mail.1 $pkgdir/usr/share/man/man1/gnu-mail.1 + chown -R root:root $pkgdir +} diff --git a/community/gcompris/gcompris-data.install b/community-testing/mailutils/mailutils.install index 950d17bd7..03b451b3e 100644 --- a/community/gcompris/gcompris-data.install +++ b/community-testing/mailutils/mailutils.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(gcompris.info) +infodir=usr/share/info +filelist=(mailutils.info mailutils.info-1 mailutils.info-2) post_install() { [ -x usr/bin/install-info ] || return 0 @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/ntop/PKGBUILD b/community-testing/ntop/PKGBUILD new file mode 100644 index 000000000..05e45e745 --- /dev/null +++ b/community-testing/ntop/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 59428 2011-11-24 17:05:26Z stephane $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> + +pkgname=ntop +pkgver=4.1.0 +pkgrel=2 +pkgdesc='A network traffic probe that shows the network usage.' +arch=('i686' 'x86_64') +url='http://www.ntop.org/' +license=('GPL') +depends=('libevent' 'libpcap' 'gd' 'glib' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua') +options=('!libtool' '!makeflags') +install='ntop.install' +source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz" + 'ntop' + 'ntop.conf.d') +md5sums=('116df99cf548431393991ea15443c52f' + '7b0d7bb57432e768ff387e9f7236f87c' + '6a9371de1dcf31d8ef13a4cf349c02b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --disable-snmp + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install-recursive + + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop" + install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd" + + install -Dm0755 "${srcdir}/ntop" "${pkgdir}/etc/rc.d/ntop" + install -Dm0644 "${srcdir}/ntop.conf.d" "${pkgdir}/etc/conf.d/ntop" + + for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do + _plug="$(basename ${_f})" + ln -sf "../../lib${_plug}" "${_f}" + done +} diff --git a/community-testing/ntop/ntop b/community-testing/ntop/ntop new file mode 100755 index 000000000..2f0dbcbdd --- /dev/null +++ b/community-testing/ntop/ntop @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/ntop ] && . /etc/conf.d/ntop + +case "$1" in + start) + stat_busy "Starting ntop daemon" + /usr/bin/ntop -d ${NTOP_ARGS} 2>&1 >> ${NTOP_LOG} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ntop + stat_done + fi + ;; + stop) + stat_busy "Stopping ntop daemon" + killall /usr/bin/ntop &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ntop + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/ntop/ntop.conf.d b/community-testing/ntop/ntop.conf.d new file mode 100644 index 000000000..28e2a3166 --- /dev/null +++ b/community-testing/ntop/ntop.conf.d @@ -0,0 +1,5 @@ +# Parameters to be passed to ntop. +NTOP_ARGS="-i eth0 -w 3000" + +# Location of the log file. +NTOP_LOG="/var/log/ntop.log" diff --git a/community-testing/ntop/ntop.install b/community-testing/ntop/ntop.install new file mode 100644 index 000000000..8d8063751 --- /dev/null +++ b/community-testing/ntop/ntop.install @@ -0,0 +1,8 @@ +post_install() { + /bin/cat <<EOF +==> Before running the daemon script for the first time, you need to run + ntop as the root user to set an administrator password. +==> If you attempt to run ntop as a daemon without setting a password, a + FATAL ERROR message is generated and ntop stops. +EOF +} diff --git a/community-testing/pysfml/PKGBUILD b/community-testing/pysfml/PKGBUILD deleted file mode 100644 index 204197c1b..000000000 --- a/community-testing/pysfml/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 29367 2010-10-13 15:58:47Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: scj <scj(at)archlinux(dot)us> - -pkgname=('python-pysfml' 'python2-pysfml') -pkgbase=python-pysfml -pkgver=1.6 -pkgrel=2 -pkgdesc="Python bindings for the SFML library" -arch=('i686' 'x86_64') -url="http://www.sfml-dev.org" -makedepends=('sfml' 'python' 'python2') -license=('zlib') -depends=() -replaces=('pysfml') -source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip) -md5sums=('9acaf793ae9a498a51f7f6fc74307b32') - -build() { - cd "${srcdir}/SFML-${pkgver}/python" -} - -package_python-pysfml() { - depends=('sfml' 'python') - - cd "${srcdir}/SFML-${pkgver}/python" - - python3 setup.py install --root=${pkgdir} -} - -package_python2-pysfml() { - depends=('sfml' 'python2') - - cd "${srcdir}/SFML-${pkgver}/python" - - python2 setup.py install --root=${pkgdir} -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD new file mode 100644 index 000000000..1c0271947 --- /dev/null +++ b/community-testing/qtcreator/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 58646 2011-11-17 02:49:13Z svenstaro $ +# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> + +pkgname="qtcreator" +pkgver=2.4.0rc +_pkgver=2.4.0-rc +pkgrel=1 +pkgdesc='Lightweight, cross-platform integrated development environment' +arch=('i686' 'x86_64') +url='http://qt.nokia.com/products/developer-tools' +license=('LGPL') +depends=('qt>=4.7.4') +makedepends=('qt-private-headers>=4.7.4' 'git') +options=('docs') +install=qtcreator.install +source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" + 'qtcreator.desktop') +md5sums=('1967144101796674ce6e994e66213f81' + 'f1f4680b9838ff0b8f4cf11eb850d662') + +build() { + cd ${srcdir} + [[ -d build ]] && rm -r build + mkdir build && cd build + + qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro + make +} + +package() { + optdepends=('qt-doc: for the integrated Qt documentation' + 'gdb: for the debugger' + 'cmake: for cmake project suppport' + 'openssh-askpass: for ssh support' + 'git: for git support' + 'mercurial: for mercurial support' + 'bzr: for bazaar support') + + cd ${srcdir}/build + + make INSTALL_ROOT="${pkgdir}/usr/" install + + install -Dm644 ${srcdir}/qtcreator.desktop \ + ${pkgdir}/usr/share/applications/qtcreator.desktop + install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ + ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT +} diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop new file mode 100644 index 000000000..0fd562bd9 --- /dev/null +++ b/community-testing/qtcreator/qtcreator.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/qtcreator +Name=Qt-Creator +GenericName=C++ IDE +X-KDE-StartupNotify=true +Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png +Terminal=false +Type=Application +Categories=Qt;Development diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/community-testing/qtcreator/qtcreator.install index 2e02b7952..4d4a283db 100644 --- a/testing/gnome-online-accounts/gnome-online-accounts.install +++ b/community-testing/qtcreator/qtcreator.install @@ -1,4 +1,5 @@ -post_install () { +post_install() { + update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD new file mode 100644 index 000000000..d240ce248 --- /dev/null +++ b/community-testing/sage-mathematics/PKGBUILD @@ -0,0 +1,105 @@ +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Osman Ugus <ugus11@yahoo.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD + +pkgname=sage-mathematics +pkgver=4.7.2 +pkgrel=2 +pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' +url='http://www.sagemath.org' +arch=('i686' 'x86_64') +license=('GPL') +#depends=('readline') +depends=('ppl') +makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') +optdepends=('imagemagick: some plotting functionality benefits from it' + 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' + 'sage-mathematics-spkgs: original packages used to build additional packages') +options=('!makeflags') +install="${pkgname}.install" +source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" + 'SAGE-notebook.desktop') +md5sums=('b3073997e6c7ec00a269f84ff2e54973' + 'dc391f12b7d17dd37326343ec0e99bbd') + +build() { + cd sage-${pkgver} + + # modularization of sage, sort of :) + # fixes the following error: + # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook + # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash + # this is for people who have custom kernels (sage works this around by checking uname -r) + #mkdir -p spkg/installed + #touch spkg/installed/readline-6.1 + mkdir -p spkg/installed + touch spkg/installed/ppl-0.11.2 + + # fix "missing sage.all error" during build + unset CFLAGS + unset CXXFLAGS + + # fix build errors + unset LDFLAGS + + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') + export MAKE="make -j${SAGE_BUILD_THREADS}" + + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran + export SAGE_FORTRAN='/usr/bin/gfortran' + export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + + # disable building with debugging support + export SAGE_DEBUG='no' + + # enable fat binaries (disables processor specific optimizations) + # comment out if you're only building it for yourself + export SAGE_FAT_BINARY='yes' + + # can't write to root in a clean chroot + export DOT_SAGE='/build/src/' + + # only build sage, no documents + #make build + make +} + +<< COMMENT +check() { + cd sage-${pkgver} + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong +} +COMMENT + +package() { + cd sage-${pkgver} + + # cp because make install is experimental and will corrupt the install + install -d ${pkgdir}/opt/sage + cp -r * ${pkgdir}/opt/sage + + # move SageTeX files to more appropriate directory + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/sage/local/share/texmf \ + ${pkgdir}/usr/share + + desktop-file-install ${srcdir}/SAGE-notebook.desktop \ + --dir ${pkgdir}/usr/share/applications + + # create link to main binary + install -d ${pkgdir}/usr/bin + ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage + + # remove build logs + rm -f ${pkgdir}/opt/sage/install.log + rm -rf ${pkgdir}/opt/sage/spkg/logs + + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) + # no need to package them together, put into sage-mathematics-spkgs + rm -f ${pkgdir}/opt/sage/spkg/base/*spkg + rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg +} diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop new file mode 100644 index 000000000..26a35d3ac --- /dev/null +++ b/community-testing/sage-mathematics/SAGE-notebook.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Version=1.0 +Name=SAGE +Comment=SAGE NOTEBOOK +Comment[en_US]=SAGE NOTEBOOK +Exec=/opt/sage/sage -notebook +GenericName= +GenericName[de]= +Icon=/opt/sage/data/extcode/notebook/images/sageicon.png +MimeType= +Name[de]=SAGE +StartupNotify=true +Terminal=true +Type=Application +Categories=Science;Math; +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= +GenericName[en_US]= diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install new file mode 100644 index 000000000..6caa5299e --- /dev/null +++ b/community-testing/sage-mathematics/sage-mathematics.install @@ -0,0 +1,56 @@ +post_install() { + cd /opt/sage + + # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership + # the files it writes to ~/.sage can be safely ignored + HOME=/tmp ./sage -c + + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + + # Update LaTeX db to point to SageTeX + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + else + echo 'Warning: could not find /usr/bin/texhash' + echo 'SageTeX has been installed but you need to run:' + echo '# texhash /usr/share/texmf' + echo 'So that LaTeX will be able to find it.' + fi + +echo ' + ___ +/ (_) o | +\__ _ _ __ | +/ / |/ | | / \_| | | +\___/ | |_/|/\__/ \_/|/o + /| /| + \| \| + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +' + +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # Update LaTeX db to remove SageTeX entries + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + fi + + # remove the sagemath daemon user + userdel sagemath + + # clean up left overs + rm -rf /opt/sage +} diff --git a/community-testing/smalltalk/PKGBUILD b/community-testing/smalltalk/PKGBUILD new file mode 100644 index 000000000..7934fe193 --- /dev/null +++ b/community-testing/smalltalk/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 59432 2011-11-24 17:05:44Z 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-testing/speed-dreams/PKGBUILD b/community-testing/speed-dreams/PKGBUILD deleted file mode 100644 index 757a901fe..000000000 --- a/community-testing/speed-dreams/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 54504 2011-08-19 10:27:23Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> -# Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) -pkgname=speed-dreams -pkgver=2.0.0a3 -_pkgver=2.0.0-a3-r3412 -pkgrel=1 -pkgdesc="A racing simulator with rich graphics and physics" -arch=('i686' 'x86_64') -url="http://speed-dreams.sourceforge.net/" -license=('GPL2') -depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib>=1.8.3' 'libjpeg' 'zlib' 'enet' 'speed-dreams-data') -makedepends=('cmake' 'p7zip') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z" - "${pkgname}.desktop") -md5sums=('659837e8866c59c85279c31fcaba4144' - 'bd5c81bac696ec53628ba42684ef8369') - -build() { - 7z x ${pkgname}-${_pkgver}-src.tar.7z - tar xf ${pkgname}-${_pkgver}-src.tar - - cd "${pkgname}-${_pkgver}-src" - - cmake . \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSD_BINDIR=/usr/bin \ - -DSD_DATADIR=/usr/share/speed-dreams-2 \ - -DSD_LIBDIR=/usr/lib/speed-dreams-2 - - make -} - -package() { - cd "$srcdir/${pkgname}-${_pkgver}-src" - - make DESTDIR="${pkgdir}/" install - - rm -r "${pkgdir}/usr/share" - - install -Dm644 "data/data/icons/icon.png" "${pkgdir}/usr/share/pixmaps/speed-dreams.png" - install -Dm644 "data/data/icons/icon.svg" "${pkgdir}/usr/share/pixmaps/speed-dreams.svg" - install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/speed-dreams.desktop" - - mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" - cp -r doc "${pkgdir}/usr/share/doc/${pkgname}/" - - mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}" - rm doc/man/speed-dreams.es.6 - cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/speed-dreams/speed-dreams.desktop b/community-testing/speed-dreams/speed-dreams.desktop deleted file mode 100644 index 8c86d85cc..000000000 --- a/community-testing/speed-dreams/speed-dreams.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Speed Dreams -Comment=The Open Racing Car Simulator Fork -Exec=speed-dreams -Icon=speed-dreams.svg -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game; diff --git a/community-testing/speed-dreams/speed-dreams.sh b/community-testing/speed-dreams/speed-dreams.sh deleted file mode 100644 index fa6dde97a..000000000 --- a/community-testing/speed-dreams/speed-dreams.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -cd /opt/speed-dreams/bin -./speed-dreams diff --git a/community-testing/xemacs/PKGBUILD b/community-testing/xemacs/PKGBUILD new file mode 100644 index 000000000..304fb9dad --- /dev/null +++ b/community-testing/xemacs/PKGBUILD @@ -0,0 +1,65 @@ +# $Id: PKGBUILD 59434 2011-11-24 17:05:59Z 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-testing/xemacs/xemacs-21.5.29-optimization-bug.patch b/community-testing/xemacs/xemacs-21.5.29-optimization-bug.patch new file mode 100644 index 000000000..32a1a02c2 --- /dev/null +++ b/community-testing/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-testing/xemacs/xemacs.desktop b/community-testing/xemacs/xemacs.desktop new file mode 100644 index 000000000..257c56947 --- /dev/null +++ b/community-testing/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-testing/xemacs/xemacs.install b/community-testing/xemacs/xemacs.install new file mode 100644 index 000000000..a04ee187f --- /dev/null +++ b/community-testing/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-testing/xkbsel/PKGBUILD b/community-testing/xkbsel/PKGBUILD new file mode 100644 index 000000000..e936ca9eb --- /dev/null +++ b/community-testing/xkbsel/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 59436 2011-11-24 17:06:08Z stephane $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=xkbsel +pkgver=0.13 +pkgrel=5 +pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings" +arch=('i686' 'x86_64') +url="http://www.meduna.org/sw_xkbsel_en.html" +license=('GPL') +depends=('gdbm' 'libxaw') +makedepends=('patch' 'xkeyboard-config') +source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('c82196344ef920a072f413df85b9dc00' + 'dee0f7de8618d9eff073942f0e08f030') + +build() { + cd $srcdir/$pkgname-$pkgver + + patch -Np1 <../build-fix.patch + export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H" + export LDFLAGS="-lgdbm -lgdbm_compat" + + ./configure --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc/xkbsel \ + --build=`uname -m` --host=`uname -m` --target=`uname -m` \ + --mandir=/usr/share/man + make + make DESTDIR=$pkgdir install +} diff --git a/community-testing/xkbsel/build-fix.patch b/community-testing/xkbsel/build-fix.patch new file mode 100644 index 000000000..02021db47 --- /dev/null +++ b/community-testing/xkbsel/build-fix.patch @@ -0,0 +1,24 @@ +diff -wbBur xkbsel-0.13/configure xkbsel-0.13.my/configure +--- xkbsel-0.13/configure 2000-04-09 13:37:02.000000000 +0400 ++++ xkbsel-0.13.my/configure 2006-07-24 17:13:10.000000000 +0400 +@@ -6118,7 +6118,7 @@ + { echo "configure: error: "Cannot find library containing dbm_open"" 1>&2; exit 1; } + fi + +-x11xkbdir=$ac_x_libraries/X11/xkb ++x11xkbdir=/usr/share/X11/xkb + test -d $x11xkbdir || { echo "configure: error: "Directory $x11xkbdir does not exist"" 1>&2; exit 1; } + + +diff -wbBur xkbsel-0.13/libs/Makefile.in xkbsel-0.13.my/libs/Makefile.in +--- xkbsel-0.13/libs/Makefile.in 2000-04-09 13:51:01.000000000 +0400 ++++ xkbsel-0.13.my/libs/Makefile.in 2006-07-24 17:11:52.000000000 +0400 +@@ -452,7 +452,7 @@ + + + install-data-local: +- $(mkinstalldirs) ${sysxkmdir} ++ $(mkinstalldirs) $(DESTDIR)${sysxkmdir} + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD deleted file mode 100644 index f6429515e..000000000 --- a/community/acetoneiso2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Wes Brewer <brewerw@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=acetoneiso2 -pkgver=2.3 -pkgrel=2 -pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.acetoneteam.org" -license=('GPL3') -depends=('qt>=4' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') -optdepends=("p7zip: for ISO compress/decompress support") -conflicts=('acetoneiso') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) -md5sums=('225f7af687016690ff28b9771a1ce179') - -build() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - qmake - sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile - make -} - -package() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/community/acetoneiso2/acetoneiso2.install b/community/acetoneiso2/acetoneiso2.install deleted file mode 100644 index 1a3984e24..000000000 --- a/community/acetoneiso2/acetoneiso2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { -cat << EOF - --> - --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf - --> -EOF -} - -post_upgrade() { - post_install $* -} diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD index 95c0534e9..acd8be747 100644 --- a/community/acpitool/PKGBUILD +++ b/community/acpitool/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $ +# $Id: PKGBUILD 58302 2011-11-10 17:58:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> # Contributor: Milosz Piglas <archeofuture@gmail.com> pkgname=acpitool pkgver=0.5.1 -pkgrel=3 +pkgrel=5 pkgdesc="ACPI client - replacement for apm tool" url="http://sourceforge.net/projects/acpitool/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('gcc-libs') source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2 - linux-3.0.patch) + linux-3.0.patch + sysfs-battery.patch) md5sums=('9e4ec55201be0be71ffbc56d38b42b57' - 'eb149edb32be6cdf20a7d16beb3e9f70') + 'eb149edb32be6cdf20a7d16beb3e9f70' + '969fc4929cc215756db27168646c2b7a') build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 <$srcdir/linux-3.0.patch + patch -p1 <$srcdir/sysfs-battery.patch ./configure --prefix=/usr make } diff --git a/community/acpitool/sysfs-battery.patch b/community/acpitool/sysfs-battery.patch new file mode 100644 index 000000000..4f6898a78 --- /dev/null +++ b/community/acpitool/sysfs-battery.patch @@ -0,0 +1,52 @@ +diff -wbBur acpitool-0.5.1/src/acpitool.h acpitool-0.5.1.my/src/acpitool.h +--- acpitool-0.5.1/src/acpitool.h 2008-10-16 19:38:12.000000000 +0400 ++++ acpitool-0.5.1.my/src/acpitool.h 2011-11-10 21:55:23.000000000 +0400 +@@ -29,11 +29,11 @@ + + struct Battery_Info { + int Battery_Present; +- char Charging_State[12]; +- char Remaining_Cap[10]; +- char Design_Cap[10]; +- char LastFull_Cap[10]; +- char Present_Rate[10]; ++ char Charging_State[13]; ++ char Remaining_Cap[13]; ++ char Design_Cap[13]; ++ char LastFull_Cap[13]; ++ char Present_Rate[13]; + char Technology[13]; + char Model[13]; + char Serial[13]; +diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp +--- acpitool-0.5.1/src/battery.cpp 2009-08-13 23:42:43.000000000 +0400 ++++ acpitool-0.5.1.my/src/battery.cpp 2011-11-10 21:48:22.000000000 +0400 +@@ -614,7 +614,7 @@ + } + + memset(str, '\0', 100); +- for(int t=0; t<5; t++) ++ for(int t=0; t<1; t++) + fgets(str, 100, power_fp); /* skip first 5 lines */ + + /* get battery status (full, charging, ...) */ +@@ -664,8 +664,8 @@ + + + +- fgets(str, 100, power_fp); /* skip 1 line */ +- ++ fgets(str, 100, power_fp); /* cycle count - skip 1 line */ ++ fgets(str, 100, power_fp); /* voltage_min - skip 1 line */ + + /* get voltage_now */ + memset(str, '\0', 100); +@@ -756,7 +756,7 @@ + else + strncpy(batt_info->Model, "unknown", 7); + +- fgets(str, 100, power_fp); ++ fgets(str, 100, power_fp); /* manufacturer - skip 1 line */ + + /* get serial */ + memset(str, '\0', 100); diff --git a/community/alleyoop/PKGBUILD b/community/alleyoop/PKGBUILD new file mode 100644 index 000000000..895a91d77 --- /dev/null +++ b/community/alleyoop/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57801 2011-11-03 09:12:48Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> +# Contributor: Lex Rivera aka x-demon <aur@x-demon.org> +pkgname=alleyoop +pkgver=0.9.7 +pkgrel=3 +pkgdesc="A Valgrind front-end for the GNOME environment" +arch=('x86_64' 'i686') +url="http://alleyoop.sourceforge.net/" +license=('GPL') +depends=('valgrind' 'libgnomeui') +makedepends=('intltool') +install=alleyoop.install +source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('b45ab041dea15cd0ae663183bef893c6') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \ + --domain alleyoop "$pkgdir"/etc/gconf/schemas/*.schemas + rm -r "$pkgdir/etc" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/mutter/mutter.install b/community/alleyoop/alleyoop.install index 199f12584..16e3af018 100644 --- a/testing/mutter/mutter.install +++ b/community/alleyoop/alleyoop.install @@ -1,9 +1,13 @@ -pkgname=mutter +pkgname=alleyoop post_install() { usr/sbin/gconfpkg --install ${pkgname} } +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + pre_upgrade() { pre_remove $1 } @@ -12,6 +16,4 @@ post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} +# vim:set ts=2 sw=2 et: diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD index 17aaa438b..03cb2247e 100644 --- a/community/aqbanking/PKGBUILD +++ b/community/aqbanking/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55342 2011-09-10 08:52:13Z spupykin $ +# $Id: PKGBUILD 57278 2011-10-25 09:57:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Moore <davidm@sjsoft.com> pkgname=aqbanking -pkgver=5.0.15 -_dnrel=86 +pkgver=5.0.16 +_dnrel=87 pkgrel=1 pkgdesc="A library for online banking and financial applications" arch=(i686 x86_64 'mips64el') @@ -14,14 +14,14 @@ license=('GPL') depends=('gwenhywfar' 'ktoblzcheck' 'libofx') options=('!makeflags' '!libtool') source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz") -md5sums=('d7619785e50c2b9ca44b4ae8aa27aebc') +md5sums=('30549bc6a95f5814b2efe433edeb6f85') build() { cd $srcdir/aqbanking-$pkgver export PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr \ - --with-backends="aqhbci aqofxconnect" \ - --enable-gwenhywfar + --with-backends="aqhbci aqofxconnect" \ + --enable-gwenhywfar make make DESTDIR=$pkgdir install } diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index 32df8c75c..fed44e432 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aria2 pkgver=1.13.0 -pkgrel=1 +pkgrel=2 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64' 'mips64el') url='http://aria2.sourceforge.net/' diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD index 6987f26d9..e0d034389 100644 --- a/community/arp-scan/PKGBUILD +++ b/community/arp-scan/PKGBUILD @@ -6,7 +6,7 @@ pkgname=arp-scan pkgver=1.8.1 pkgrel=1 pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network" -arch=('i686' 'x86_64') +arch=(mips64el) url="http://www.nta-monitor.com/tools/arp-scan/" license=('GPL') depends=('libpcap' 'perl-libwww') diff --git a/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD index 66979829b..b46e38cd8 100644 --- a/community/aspell-pl/PKGBUILD +++ b/community/aspell-pl/PKGBUILD @@ -1,22 +1,29 @@ -# $Id: PKGBUILD 43278 2011-03-24 13:25:37Z andrea $ -# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# $Id: PKGBUILD 58727 2011-11-18 05:20:53Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Arkadiusz Laczynski <alaczynski@gmail.com> pkgname=aspell-pl -pkgver=20110324 +pkgver=20111117 pkgrel=1 pkgdesc="Polish dictionary for aspell" arch=('i686' 'x86_64' 'mips64el') url="http://www.sjp.pl/slownik/en/" license=('GPL' 'LGPL' 'MPL') depends=('aspell') -source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) -md5sums=('5f4e91bcbcf525945679064127e263c8') +#source=(http://sjp.pl/slownik/ort/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) +source=(ftp://ftp.archlinux.org/other/community/$pkgname/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2) +md5sums=('27aa9ca734d7049238399c279c5417fb') build() { cd "$srcdir/aspell6-pl-6.0_$pkgver-0" ./configure make +} + +package() { + cd "$srcdir/aspell6-pl-6.0_$pkgver-0" + make DESTDIR="$pkgdir" install } diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD deleted file mode 100644 index e4c017bb4..000000000 --- a/community/asunder/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 36555 2011-01-04 17:21:48Z xyne $ -# Maintainer: Xyne <ac xunilhcra enyx, backwards> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: cs-cam - me.at.camdaniel.com -# Contributor: Sebastien Piccand <sebcactus gmail com> - -pkgname=asunder -pkgver=2.1 -pkgrel=1 -pkgdesc="a graphical CD ripper and encoder" -arch=('i686' 'x86_64' 'mips64el') -url="http://littlesvr.ca/asunder/" -license=('GPL2') -depends=('gtk2' 'libcddb' 'cdparanoia') -makedepends=('pkgconfig') -optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \ - 'flac: for flac support') -source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('05419a29fd31321f0823c3f90ee1b911') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD index 273bc34c2..909c10bd3 100644 --- a/community/atop/PKGBUILD +++ b/community/atop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 38572 2011-01-28 12:11:54Z spupykin $ +# $Id: PKGBUILD 57413 2011-10-27 08:43:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: John Gerritse <john.gerritse@gmail.com> pkgname=atop pkgver=1.26 -pkgrel=1 +pkgrel=2 pkgdesc="A system and process level monitor." arch=(i686 x86_64 'mips64el') url="http://www.atoptool.nl/" @@ -15,6 +15,11 @@ md5sums=('9a72baf4c8f330973f1e2703f5a6c041') build() { cd $srcdir/$pkgname-$pkgver + sed -i 's#root ##' atop.cron make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir INIPATH=/etc/rc.d install } diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD index a1d238750..3b0e855f3 100644 --- a/community/audex/PKGBUILD +++ b/community/audex/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 56794 2011-10-12 23:16:45Z lcarlier $ +# $Id: PKGBUILD 57952 2011-11-04 20:47:05Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: mightyjaym <jmambrosino@gmail.com> # Contributor: moostik <mooostik_at_gmail.com> pkgname=audex pkgver=0.74b1 -pkgrel=2 +pkgrel=3 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" arch=('i686' 'x86_64' 'mips64el') -url="http://kde.maniatek.com/audex/" +url="http://kde-apps.org/content/show.php?content=77125" license=('GPL') depends=('kdemultimedia-kioslave' 'cdparanoia') makedepends=('cmake' 'automoc4') @@ -17,7 +17,7 @@ optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') install=${pkgname}.install -source=("http://kde.maniatek.com/audex/files/${pkgname}-${pkgver}.tar.xz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" "google_regex.patch") md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' '77b33d8daead89d5f4f15b78a1cd1d55') diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD new file mode 100644 index 000000000..d5ee232b4 --- /dev/null +++ b/community/audit/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 57389 2011-10-26 20:55:52Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Connor Behan <connor.behan@gmail.com> +# Contributor: henning mueller <henning@orgizm.net> + +pkgname=audit +pkgver=2.1.3 +pkgrel=1 +pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' +url=http://people.redhat.com/sgrubb/$pkgname +arch=(i686 x86_64) +depends=(linux-headers python2 libldap) +makedepends=(libldap swig) +license=(GPL) +options=(!libtool emptydirs) +backup=( + etc/libaudit.conf + etc/audit/audit.rules + etc/audit/auditd.conf + etc/audisp/audispd.conf + etc/audisp/audisp-remote.conf + etc/audisp/zos-remote.conf + etc/audisp/plugins.d/af_unix.conf + etc/audisp/plugins.d/audispd-zos-remote.conf + etc/audisp/plugins.d/au-remote.conf + etc/audisp/plugins.d/syslog.conf +) +source=( + $url/$pkgname-$pkgver.tar.gz + auditd.rc + python2.patch +) +md5sums=( + abf26e3ac09f666905c5636dd24611fa + bd5574064e0c88748aebf0cd92ebcf0c + 45a33c6bef84f8e1701cb0b5e187336b +) + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/python2.patch" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/audit \ + --with-apparmor + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd + install -d var/log/audit + rm -rf etc/rc.d/init.d etc/sysconfig + mv usr/sbin sbin +} diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc new file mode 100755 index 000000000..ea2e305ba --- /dev/null +++ b/community/audit/auditd.rc @@ -0,0 +1,55 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID auditd` + +case "$1" in + start) + stat_busy "Starting auditd" + [ -z "$PID" ] && { + /sbin/auditctl -R /etc/audit/audit.rules >/dev/null + /sbin/auditd + } + if [ $? -ne 0 ]; then + stat_fail + else + add_daemon auditd + stat_done + fi + ;; + + stop) + stat_busy "Stopping auditd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon auditd + stat_done + fi + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + reload) + stat_busy "Reloading auditd" + [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon auditd + stat_done + fi + ;; + + *) + echo "usage: $0 {start|stop|restart|reload}" +esac + +exit 0 diff --git a/community/audit/python2.patch b/community/audit/python2.patch new file mode 100644 index 000000000..b5f6cbc25 --- /dev/null +++ b/community/audit/python2.patch @@ -0,0 +1,11 @@ +--- configure.old 2010-10-22 15:54:13.193333452 +0200 ++++ configure 2010-10-22 15:54:52.546667020 +0200 +@@ -10662,7 +10662,7 @@ + + # Find any Python interpreter. + if test -z "$PYTHON"; then +- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 ++ for ac_prog in python2 + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD index 9367bc7f7..deab45541 100644 --- a/community/augeas/PKGBUILD +++ b/community/augeas/PKGBUILD @@ -1,18 +1,18 @@ +# $Id: PKGBUILD 59250 2011-11-22 01:03:57Z ebelanger $ # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=augeas -pkgver=0.8.0 +pkgver=0.9.0 pkgrel=1 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree" arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') url="http://augeas.net" -depends=('readline') -makedepends=('gcc' 'bison' 'flex') -options=(!libtool) +license=('LGPL') +depends=('readline' 'gcc-libs') +options=('!libtool') source=(http://augeas.net/download/$pkgname-$pkgver.tar.gz) -md5sums=('e425bcfc46fd5b18473a4ff47c2878d3') +md5sums=('5ef0ce53ce4c75f59ab2523506731084') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,5 +22,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install } diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD index 023533364..d7a2d697d 100644 --- a/community/aumix/PKGBUILD +++ b/community/aumix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42325 2011-03-16 11:08:26Z spupykin $ +# $Id: PKGBUILD 58670 2011-11-17 13:07:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=aumix @@ -8,6 +8,7 @@ pkgdesc="A color text mode sound mixer with GPM support" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=() +makedepends=('gtk2' 'gpm' 'ncurses') optdepends=('gtk2: aumix' 'ncurses: aumix-nox' 'gpm: aumix-nox') diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD index c8ffc89c3..01a3fb809 100644 --- a/community/avifile/PKGBUILD +++ b/community/avifile/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 20207 2010-07-03 15:40:47Z tdziedzic $ +# $Id: PKGBUILD 58655 2011-11-17 10:01:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=avifile pkgver=0.7.45 -pkgrel=7 +pkgrel=8 pkgdesc="A library that allows you to read and write compressed AVI files" arch=('i686' 'x86_64' 'mips64el') -depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' \ +depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg' 'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv') -makedepends=('lame' 'qt3') +makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath') url="http://avifile.sourceforge.net" license=('GPL') +options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgver.tar.bz2" - 'gcc.patch') + 'gcc.patch' + 'videodev.patch') md5sums=('7da94802f120d1b69e04a13170dcd21d' - '588c3ce7bdebc1244f46ba56d8ef8a42') + '588c3ce7bdebc1244f46ba56d8ef8a42' + '6cca050885afe85c2d98982f75f5e3b0') build() { cd $pkgname-0.7-$pkgver - patch -Np1 <../gcc.patch + patch -Np1 <$srcdir/gcc.patch + patch -Np1 <$srcdir/videodev.patch ./configure \ --prefix=/usr \ @@ -36,8 +40,8 @@ build() { package() { cd $pkgname-0.7-$pkgver - make prefix=$pkgdir/usr install - find $pkgdir -name '*.la' -exec rm {} \; + cd $pkgdir/usr/bin + chrpath -d avibench avicap avicat avirec kv4lsetup avimake aviplay avitype avirecompress } diff --git a/community/avifile/videodev.patch b/community/avifile/videodev.patch new file mode 100644 index 000000000..0729c8ab9 --- /dev/null +++ b/community/avifile/videodev.patch @@ -0,0 +1,180 @@ +diff -wbBur avifile-0.7-0.7.45/acinclude.m4 avifile-0.7-0.7.45.my/acinclude.m4 +--- avifile-0.7-0.7.45/acinclude.m4 2006-03-06 12:11:19.000000000 +0300 ++++ avifile-0.7-0.7.45.my/acinclude.m4 2011-11-17 13:20:52.000000000 +0400 +@@ -1158,7 +1158,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/configure avifile-0.7-0.7.45.my/configure +--- avifile-0.7-0.7.45/configure 2006-03-06 12:11:32.000000000 +0300 ++++ avifile-0.7-0.7.45.my/configure 2011-11-17 13:20:47.000000000 +0400 +@@ -27667,8 +27667,8 @@ + fi; + if test x$enable_v4l = xyes; then + if test "${ac_cv_header_linux_videodev_h+set}" = set; then +- echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++ echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +@@ -27676,8 +27676,8 @@ + echo "${ECHO_T}$ac_cv_header_linux_videodev_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking linux/videodev.h usability" >&5 +-echo $ECHO_N "checking linux/videodev.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h usability" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27685,7 +27685,7 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -27720,15 +27720,15 @@ + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking linux/videodev.h presence" >&5 +-echo $ECHO_N "checking linux/videodev.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libv4l1-videodev.h presence" >&5 ++echo $ECHO_N "checking libv4l1-videodev.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -27762,25 +27762,25 @@ + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: linux/videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: linux/videodev.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: linux/videodev.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: linux/videodev.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: linux/videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: linux/videodev.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: linux/videodev.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libv4l1-videodev.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -27791,8 +27791,8 @@ + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for linux/videodev.h" >&5 +-echo $ECHO_N "checking for linux/videodev.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for libv4l1-videodev.h" >&5 ++echo $ECHO_N "checking for libv4l1-videodev.h... $ECHO_C" >&6 + if test "${ac_cv_header_linux_videodev_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/grab.c 2006-02-04 11:57:34.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/grab.c 2011-11-17 13:21:12.000000000 +0400 +@@ -23,7 +23,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +diff -wbBur avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c +--- avifile-0.7-0.7.45/ffmpeg/libavformat/v4l2.c 2006-03-02 00:36:52.000000000 +0300 ++++ avifile-0.7-0.7.45.my/ffmpeg/libavformat/v4l2.c 2011-11-17 13:29:40.000000000 +0400 +@@ -31,7 +31,8 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#include <linux/videodev2.h> + #include <time.h> + + static const int desired_video_buffers = 256; +diff -wbBur avifile-0.7-0.7.45/m4/v4l.m4 avifile-0.7-0.7.45.my/m4/v4l.m4 +--- avifile-0.7-0.7.45/m4/v4l.m4 2004-02-18 23:53:58.000000000 +0300 ++++ avifile-0.7-0.7.45.my/m4/v4l.m4 2011-11-17 13:20:56.000000000 +0400 +@@ -10,7 +10,7 @@ + AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface. (autodetect)], + [], enable_v4l=yes) + if test x$enable_v4l = xyes; then +- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ]) ++ AC_CHECK_HEADER([libv4l1-videodev.h], [], [ enable_v4l=no; ]) + fi + + if test x$enable_v4l = xyes; then +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp +--- avifile-0.7-0.7.45/samples/qtvidcap/kv4lsetup.cpp 2005-03-23 18:18:21.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/kv4lsetup.cpp 2011-11-17 13:29:34.000000000 +0400 +@@ -39,7 +39,7 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #ifndef X_DISPLAY_MISSING + #include <X11/Xlib.h> +diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h +--- avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.h 2003-11-14 19:42:04.000000000 +0300 ++++ avifile-0.7-0.7.45.my/samples/qtvidcap/v4lxif.h 2011-11-17 13:35:57.000000000 +0400 +@@ -32,7 +32,8 @@ + + /* Necessary to prevent collisions between <linux/time.h> and <sys/time.h> when V4L2 is installed. */ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ + + #define V4L_DEVICE "/dev/video" + #define V4L_VBI_DEVICE "/dev/vbi" diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD index f775387d1..2e5b07de4 100644 --- a/community/bacula/PKGBUILD +++ b/community/bacula/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Matias Hernandez <msdark@archlinux.cl> pkgname=bacula -pkgver=5.0.3 -pkgrel=6 +pkgver=5.2.1 +pkgrel=2 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)" arch=(mips64el) url="http://www.${pkgname}.org" @@ -15,7 +15,7 @@ makedepends=("qt" "wxgtk" "gtk2") optdepends=("qt: for bat" "wxgtk: for bwx console" "gtk2: for tray monitor") -options=(!buildflags) +options=(!buildflags !libtool) conflicts=("${pkgname}-sqlite" "${pkgname}-postgresql" "${pkgname}-client") backup=("etc/${pkgname}/bconsole.conf" "etc/${pkgname}/${pkgname}-dir.conf" @@ -26,7 +26,7 @@ source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgna ${pkgname}-sd.rc.d ${pkgname}-fd.rc.d ${pkgname}-dir.rc.d) -md5sums=('9de254ae39cab0587fdb2f5d8d90b03b' +md5sums=('793da9f89fc5e024b6b95eb16a3120e5' 'e7be4c9fb3c7ce334f9ee24d71652d3e' 'a9a070a862e9cf39ae4bc374409c721d' '55619ae3094c698541a3bfedc87bdb48') @@ -64,5 +64,9 @@ package() { # Logs install -D -m644 ${srcdir}/${pkgname}-${pkgver}/scripts/logrotate ${pkgdir}/etc/logrotate.d/${pkgname} sed -i "s|/var/cache/${pkgname}/working/log|/var/log/${pkgname}.log|g" ${pkgdir}/etc/{${pkgname}/${pkgname}-dir.conf,logrotate.d/${pkgname}} + + # Temporary fix for 5.2.1 symlink mishap + cd ${pkgdir}/usr/lib + ln -sf libbaccats-mysql-5.2.1.so libbaccats-5.2.1.so } diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD index 9272f8eb6..5d5187d25 100644 --- a/community/beye/PKGBUILD +++ b/community/beye/PKGBUILD @@ -1,41 +1,29 @@ -# $Id: PKGBUILD 6531 2009-12-15 08:58:26Z spupykin $ +# $Id: PKGBUILD 58672 2011-11-17 13:41:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=beye pkgver=6.1.0 _lver=610 -pkgrel=1 +pkgrel=2 pkgdesc="Binary viewer" arch=(i686 x86_64 'mips64el') license=('GPL') -depends=(slang gpm) -replaces=(biew) +depends=('slang' 'gpm') +replaces=('biew') url="http://beye.sourceforge.net/" options=(zipman) source=(http://downloads.sourceforge.net/project/beye/biew/$pkgver/biew-${_lver}-src.tar.bz2) md5sums=('1b6477defaa61b8ca0f2ae1254978e94') build() { - cd $startdir/src/biew-${_lver} - + cd $srcdir/biew-${_lver} CFLAGS="$CFLAGS -mmmx -msse" ./configure --prefix=/usr + make +} - make || return 1 - - sed -i "s|PREFIX=/usr|PREFIX=$startdir/pkg/usr|" config.mak - sed -i "s|DATADIR=/usr/share/biew|DATADIR=$startdir/pkg/usr/share/biew|" config.mak - sed -i "s|LIBDIR=/usr/lib/biew|LIBDIR=$startdir/pkg/usr/lib/biew|" config.mak - - patch makefile <<EOF -266,267c266,266 -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/* \$(DATADIR)/xlt -< \$(INSTALL) -D -c -m 644 bin_rc/xlt/russian/* \$(DATADIR)/xlt/russian ---- -> cp -r bin_rc/xlt/* \${DATADIR}/xlt -EOF - - make prefix=$startdir/pkg/usr install || return 1 - +package() { + cd $srcdir/biew-${_lver} + make DESTDIR=$pkgdir install mv $pkgdir/usr/man $pkgdir/usr/share/ } diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD index 4f8edf09c..e7cdafe4b 100644 --- a/community/binutils-avr/PKGBUILD +++ b/community/binutils-avr/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54281 2011-08-16 06:29:48Z bfanella $ +# $Id: PKGBUILD 58711 2011-11-17 21:06:00Z jelle $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=binutils-avr pkgver=2.21.1 -pkgrel=1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/binutils/" @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc>=2.12-5' 'zlib') options=('!libtool' '!distcc' '!ccache') source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2) -md5sums=('a22801a9cad45c85e9ff6afc10537d72') +md5sums=('bde820eac53fa3a8d8696667418557ad') build() { cd ${srcdir}/${pkgname/-avr}-${pkgver} diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD index 36179c8f8..036a2ffff 100644 --- a/community/blackbox/PKGBUILD +++ b/community/blackbox/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 44299 2011-04-05 08:55:32Z spupykin $ +# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: durbatuluk <dvdscripter@gmail.org> # Contributor: Steve Ponsford <sp4d@lavabit.com> pkgname=blackbox pkgver=0.70.1 -pkgrel=9 +pkgrel=10 pkgdesc="A window manager for X11" url="http://blackboxwm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') license=('MIT') options=('!libtool') source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD index be9eaf157..05c7119e4 100644 --- a/community/blobby2/PKGBUILD +++ b/community/blobby2/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Urs Wolfer <uwolfer @ fwo.ch> pkgname=blobby2 -pkgver=0.9b +pkgver=0.9c arch=('x86_64' 'i686' 'mips64el') pkgrel=1 pkgdesc="A beach ball game with blobs of goo" url="http://sourceforge.net/projects/blobby/" license=('GPL') -depends=('sdl' 'physfs') +depends=('sdl' 'physfs' 'libgl') makedepends=('cmake' 'boost' 'mesa' 'zip') source=(http://downloads.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/Beta%20$pkgver/$pkgname-linux-$pkgver.tar.gz $pkgname.desktop $pkgname.png) -md5sums=('40ee9f34ee8187c6910f489e4fa4a76d' +md5sums=('d3a6d185c4acd1c5eddf0ce46b3f55bb' 'ab05bed794ee78db693fd3036393275a' 'c1bc427b41a0a3facd771ac83c7fb412') diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD index 4506cdc51..9a8f86538 100644 --- a/community/btanks/PKGBUILD +++ b/community/btanks/PKGBUILD @@ -1,40 +1,47 @@ +# $Id: PKGBUILD 59272 2011-11-22 09:39:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Nick B <Shirakawasuna at gmail _dot_ com> + pkgname=btanks pkgver=0.9.8083 -pkgrel=1 +pkgrel=3 pkgdesc="Fast 2d tank arcade game with multiplayer and split-screen modes." arch=('i686' 'x86_64' 'mips64el') url="http://btanks.sourceforge.net" license=('GPL') -depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' 'smpeg' 'btanks-data') -makedepends=('scons' 'chrpath') +depends=('expat' 'libgl' 'libsigc++2.0' 'libvorbis' 'lua' 'openal' 'sdl' 'sdl_image' + 'smpeg' "btanks-data=$pkgver") +makedepends=('scons' 'chrpath' 'mesa') source=(http://downloads.sourceforge.net/btanks/btanks-$pkgver.tar.bz2 btanks_desktop btanks_script - bted_script) + bted_script + gcc-4.6.patch) install=btanks.install md5sums=('49cb95c0eec47d3436c4fdf65e7c9d12' 'a2ddeb1e79dff8d3fd702984c8d3aab5' '07657cfa71b1de1d008cc5e3ade9749b' - '91a61c0f581ea27281bdaecb7a3cd58b') + '91a61c0f581ea27281bdaecb7a3cd58b' + '173f0ffe46bb1bab2c8aa240fe5331f3') build() { - # Compile with scons cd $srcdir/$pkgname-$pkgver - scons || return 1 + patch -p1 <$srcdir/gcc-4.6.patch + python2 engine/sl08/sl08.py >engine/sl08/sl08.h + scons mkdir -p $pkgdir/usr/share/btanks - cp *.so btanks bted $pkgdir/usr/share/btanks/ || return 1 + cp *.so btanks bted $pkgdir/usr/share/btanks/ # Install script - install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted && \ - install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks || return 1 + install -D -m755 $srcdir/bted_script $pkgdir/usr/bin/bted + install -D -m755 $srcdir/btanks_script $pkgdir/usr/bin/btanks # Install desktop file - install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop || return 1 + install -D -m644 $srcdir/btanks_desktop $pkgdir/usr/share/applications/btanks.desktop # Install icon - install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png || return 1 + install -D -m644 $srcdir/$pkgname-$pkgver/data/tiles/icon.png $pkgdir/usr/share/pixmaps/btanks.png # Make settings saveable touch $pkgdir/usr/share/btanks/bt.xml @@ -45,18 +52,18 @@ build() { cd $pkgdir/usr/share/btanks mkdir -p $pkgdir/usr/bin $pkgdir/usr/lib/btanks - mv btanks $pkgdir/usr/bin/btanks-bin && \ - mv bted $pkgdir/usr/bin/bted-bin && \ - mv *.so $pkgdir/usr/lib/btanks/ || return 1 + mv btanks $pkgdir/usr/bin/btanks-bin + mv bted $pkgdir/usr/bin/bted-bin + mv *.so $pkgdir/usr/lib/btanks/ - ln -s /usr/bin/btanks-bin ./btanks && \ - ln -s /usr/bin/bted-bin ./bted || return 1 + ln -s /usr/bin/btanks-bin ./btanks + ln -s /usr/bin/bted-bin ./bted ls -1 $pkgdir/usr/lib/btanks/ | while read A; do - ln -s /usr/lib/btanks/$A ./$A || return 1 + ln -s /usr/lib/btanks/$A ./$A done - chrpath -d $pkgdir/usr/bin/bted-bin && \ - chrpath -d $pkgdir/usr/bin/btanks-bin && \ + chrpath -d $pkgdir/usr/bin/bted-bin + chrpath -d $pkgdir/usr/bin/btanks-bin chrpath -d $pkgdir/usr/lib/btanks/*.so } diff --git a/community/btanks/btanks.install b/community/btanks/btanks.install index b05ede359..f9ac8fce7 100644 --- a/community/btanks/btanks.install +++ b/community/btanks/btanks.install @@ -1,36 +1,7 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version post_install() { - /bin/echo "In order to be able to change game preferences, you must be in the 'games' group." -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true + echo "In order to be able to change game preferences, you must be in the 'games' group." } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { - /bin/echo "In order to be able to change game preferences, you must be in the 'games' group." + echo "In order to be able to change game preferences, you must be in the 'games' group." } - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -# vim:set ts=2 sw=2 et: diff --git a/community/btanks/gcc-4.6.patch b/community/btanks/gcc-4.6.patch new file mode 100644 index 000000000..d371abd53 --- /dev/null +++ b/community/btanks/gcc-4.6.patch @@ -0,0 +1,26 @@ +From: Ansgar Burchardt <ansgar@debian.org> +Bug-Debian: http://bugs.debian.org/624916 +Subject: Fix FTBFS with gcc-4.6 + +--- btanks-0.9.8083.orig/engine/sl08/sl08.py ++++ btanks-0.9.8083/engine/sl08/sl08.py +@@ -152,8 +152,8 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef return_type (object_type::*func_t) %s; + +- inline slotXXX () : object(NULL), func(NULL) {} +- inline slotXXX(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {} ++ inline slotXXX () : object(0), func(0) {} ++ inline slotXXX(object_type *object, func_t func, signal_type * signal = 0) : object(object), func(func) {} + + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); } +@@ -187,7 +187,7 @@ class Generator(object): + typedef base_signalXXX %s signal_type; + typedef void (object_type::*func_t) %s ; + +- inline slotXXX () : object(NULL), func(NULL) {} ++ inline slotXXX () : object(0), func(0) {} + inline slotXXX (object_type *object, func_t func) : object(object), func(func) {} + inline void assign(object_type *o, func_t f) { object = o; func = f; } + inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); } diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD index ee73fab6e..6fa870990 100644 --- a/community/bwbar/PKGBUILD +++ b/community/bwbar/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59215 2011-11-21 15:20:03Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=bwbar @@ -8,12 +10,13 @@ pkgdesc="Generates text and graphical readout of the current bandwidth usage." url="http://www.kernel.org/pub/software/web/bwbar/" license=("GPL") depends=('libpng') -source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) +#source=(http://www.kernel.org/pub/software/web/$pkgname/$pkgname-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) md5sums=('766265ddf0615b552ff19d12f78be719') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure - make || return 1 - install -D -m755 bwbar $startdir/pkg/usr/bin/bwbar + make + install -D -m755 bwbar $pkgdir/usr/bin/bwbar } diff --git a/community/bwm-ng/PKGBUILD b/community/bwm-ng/PKGBUILD index 5a8495dd5..bfd69190f 100644 --- a/community/bwm-ng/PKGBUILD +++ b/community/bwm-ng/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 11336 2010-02-09 22:40:01Z dgriffiths $ +# $Id: PKGBUILD 58638 2011-11-16 22:54:07Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sven Kauber <celeon@gmail.com> @@ -10,19 +10,21 @@ arch=(i686 x86_64 'mips64el') url="http://www.gropp.org/" license=('GPL') depends=('ncurses') -options=('!emptydirs') -source=(http://www.gropp.org/bwm-ng/${pkgname}-${pkgver}.tar.gz) +options=('!libtool') +source=("http://www.gropp.org/bwm-ng/${pkgname}-${pkgver}.tar.gz") md5sums=('d3a02484fb7946371bfb4e10927cebfb') -build() -{ +build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --mandir=${pkgdir}/usr/share/man - make || return 1 - make prefix=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir} install - mkdir -p ${pkgdir}/usr && \ - mv ${pkgdir}/bin ${pkgdir}/usr/ && \ - #mv ${pkgdir}/share ${pkgdir}/usr/ && \ - find ${pkgdir} -name '*.la' -exec rm {} \; + install -d ${pkgdir}/usr + mv ${pkgdir}/bin ${pkgdir}/usr/ + #mv ${pkgdir}/share ${pkgdir}/usr/ } diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 1ec370976..ef2a710c6 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56939 2011-10-17 08:20:07Z ibiru $ +# $Id: PKGBUILD 58842 2011-11-18 20:05:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.22 -pkgrel=2 +pkgver=0.8.27 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" @@ -19,9 +19,11 @@ makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'desktop_integration.patch') -md5sums=('b4e968cda582f362124a52ad588f8af0' - '253ce4fe5d01f8ff76b63cd3825755ea') + 'desktop_integration.patch' + 'calibre-mount-helper') +md5sums=('6a56538249fd7ddb63d1f72d1b601272' + '253ce4fe5d01f8ff76b63cd3825755ea' + '675cd87d41342119827ef706055491e7') build() { cd "${srcdir}/${pkgname}" @@ -64,4 +66,8 @@ package() { for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do bzip2 -d "${decom}" done + + # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ + rm -rf ${pkgdir}/usr/bin/calibre-mount-helper + install -m 755 ${srcdir}/calibre-mount-helper "${pkgdir}/usr/bin" } diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper new file mode 100755 index 000000000..00cac4270 --- /dev/null +++ b/community/calibre/calibre-mount-helper @@ -0,0 +1,28 @@ +#!/bin/sh -e +# Replacement for upstream mount helper using udisks/eject +# (C) 2010 Martin Pitt <mpitt@debian.org> + +ACTION="$1" +DEV="$2" + +case "$ACTION" in + mount) + udisks --mount "$DEV" + + # check if mount worked. If not, fail + # udisks does return 0 even if mount failed + mount | grep -q "$DEV" || exit 0 + ;; + + eject) + eject "$DEV" + ;; + + cleanup) + ;; + + *) + echo "unknown action" >&2 + exit 1 +esac + diff --git a/community/camlp5/PKGBUILD b/community/camlp5/PKGBUILD index 6582c4754..9e6f0e5ce 100644 --- a/community/camlp5/PKGBUILD +++ b/community/camlp5/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('camlp5' 'camlp5-transitional') _baseversion=6.02.3 _patchlevel=1 pkgver=${_baseversion}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pauillac.inria.fr/~ddr/camlp5/' license=('BSD') diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD index d8395bf76..5a8d76997 100644 --- a/community/ccid/PKGBUILD +++ b/community/ccid/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 46907 2011-05-13 17:37:41Z giovanni $ +# $Id: PKGBUILD 59246 2011-11-21 21:28:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=ccid -pkgver=1.4.4 -pkgrel=1 +pkgver=1.4.5 +pkgrel=2 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver" arch=('i686' 'x86_64' 'mips64el') url="http://pcsclite.alioth.debian.org/ccid.html" license=('LGPL' 'GPL') depends=('pcsclite') -makedepends=('pkgconfig') +makedepends=('pkg-config') backup=(etc/reader.conf.d/libccidtwin) -source=("https://alioth.debian.org/frs/download.php/3579/${pkgname}-${pkgver}.tar.bz2") -md5sums=('79ef91103bcdd99a3b31cb5c5721a829') +source=("https://alioth.debian.org/frs/download.php/3672/${pkgname}-${pkgver}.tar.bz2") +md5sums=('cb9a77194ac335c39b262ea83a5b7d2e') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,5 +29,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 src/92_pcscd_ccid.rules "${pkgdir}/lib/udev/rules.d/85-pcscd-ccid.rules" } diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index 7643573c6..f84a0aa74 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 55940 2011-09-26 09:58:23Z lfleischer $ +# $Id: PKGBUILD 57078 2011-10-20 17:07:27Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive -pkgver=0.7.6 +pkgver=0.7.7 pkgrel=1 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64' 'mips64el') url='http://cclive.sourceforge.net/' license=('GPL3') -depends=('boost-libs' 'quvi') +depends=('boost-libs' 'pcre' 'curl' 'libquvi') makedepends=('boost') source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz") -md5sums=('714ecd9952f79ac9d2c954e5e84fb843') +md5sums=('8265be865a22fb477bcc050f0dc310dc') build() { cd "$pkgname-$pkgver" diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD index d8e765b25..95df39a45 100644 --- a/community/ccmalloc/PKGBUILD +++ b/community/ccmalloc/PKGBUILD @@ -1,22 +1,28 @@ # $Id: PKGBUILD 2304 2008-05-31 05:00:40Z paul $ -# Maintainer: aurelien <aurelien@archlinux.org> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: aurelien <aurelien@archlinux.org> + pkgname=ccmalloc pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Track down memory related problems with C and C++ programs" arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/sid/ccmalloc" license=('GPL2') -depends=() +depends=('sh') source=(http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver.orig.tar.gz - http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver-9.diff.gz) + http://ftp.de.debian.org/debian/pool/main/c/ccmalloc/ccmalloc_$pkgver-9.diff.gz) md5sums=('b90d955149569bbc6e801739f099db3d' '25c2654e6f3880bb58b82f46a7296dc6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/ccmalloc_$pkgver-9.diff + patch -p1 -i $srcdir/ccmalloc_$pkgver-9.diff ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make PREFIX=$pkgdir/usr install } diff --git a/community/cdcover/PKGBUILD b/community/cdcover/PKGBUILD index 30d6e9780..255d1136f 100644 --- a/community/cdcover/PKGBUILD +++ b/community/cdcover/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 26144 2010-09-13 19:36:37Z schuay $ +# $Id: PKGBUILD 58600 2011-11-16 15:26:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roland Schaeuble <rschaeuble@gmx.ch> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://cdcover.sourceforge.net" license=('GPL') depends=('python2' 'tk') -install=('cdcover.install') +install='cdcover.install' source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ab54e927e1c2f9210062ae9425cea669') diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 8b79de1f5..e231f2f09 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $ +# $Id: PKGBUILD 58212 2011-11-08 22:41:05Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=16 +pkgrel=17 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64 'mips64el') url="http://www.elis.UGent.be/~ronsse/cdfs/" @@ -19,10 +19,10 @@ md5sums=('ac64c014a90e3c488394832ea29605b3' build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") + _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/cdfs-3.0.0.patch - make - mkdir -p $pkgdir/lib/modules/`uname -r`/extra - cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra + make KDIR=/lib/modules/${_kernverfull}/build + install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko } diff --git a/community/centerim/PKGBUILD b/community/centerim/PKGBUILD index 6fc3f9646..f206f6f19 100644 --- a/community/centerim/PKGBUILD +++ b/community/centerim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 33529 2010-11-25 14:53:25Z spupykin $ +# $Id: PKGBUILD 58739 2011-11-18 12:12:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -19,11 +19,11 @@ md5sums=('7565c3c8cac98a4e2d8524076a44676f') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#python#python2#' misc/CenterIMLog2HTML.py + sed -i '1,1i#include <stdio.h>' libicq2000/libicq2000/sigslot.h ./configure --prefix=/usr \ --with-ssl \ --with-openssl \ --enable-locales-fix - make } diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD index 7f536231d..d8c3ebaa7 100644 --- a/community/cgit/PKGBUILD +++ b/community/cgit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 53245 2011-08-02 14:54:02Z spupykin $ +# $Id: PKGBUILD 59218 2011-11-21 15:21:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Current Maintainer: Patrick Palka <patrick@parcs.ath.cx> # Previous Maintainer: Loui Chang <louipc.ist at gmail com> @@ -8,7 +8,7 @@ pkgname=cgit pkgver=0.9.0.2 _gitver=1.7.4 -pkgrel=2 +pkgrel=3 pkgdesc="A web interface for git written in plain C" arch=('i686' 'x86_64' 'mips64el') url="http://hjemli.net/git/cgit" @@ -16,8 +16,9 @@ license=('GPL') depends=('openssl') makedepends=('git' 'zlib' 'curl' 'asciidoc') install=cgit.install +# "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2" - "http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2" + "http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2" "apache.example.conf") md5sums=('5b92b07e0107ff24a783adfb8c0cd1f2' 'fa24dc1ef0b663327ea0fe1981365b39' diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index ecb74afd1..3e509e4bc 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57044 2011-10-19 09:24:20Z foutrelis $ +# $Id: PKGBUILD 58385 2011-11-12 17:16:09Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Link Dupont <link@subpop.net> pkgname=cherokee pkgver=1.2.101 -pkgrel=1 +pkgrel=2 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64' 'mips64el') url="http://www.cherokee-project.com/" @@ -27,10 +27,10 @@ source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.ta cherokee.rc cherokee.logrotate fix-ctk-path-handler-match.patch) -sha1sums=('b27f149c7d7111207ac8c3cd8a4856c05490d136' - '85e24ccc94e6e97858226222ac62cca79c17bc80' - '266064ab6d3ebd206d7207e1d97b003d2021b2e4' - '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc') +sha256sums=('ca465ab3772479fc843b38ffc45113bf24d8bfae9185cdd5176b099d5a17feb8' + '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86' + '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e' + '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch deleted file mode 100644 index 0b266a245..000000000 --- a/community/cherokee/cherokee-admin-socket-bind.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c -index 861473f..e52b2d6 100644 ---- a/cherokee/main_admin.c -+++ b/cherokee/main_admin.c -@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port) - cherokee_buffer_add_str (&bind_, "127.0.0.1"); - - cherokee_socket_init (&s); -- cherokee_socket_create_fd (&s, AF_INET); - - while (true) { -+ cherokee_socket_create_fd (&s, AF_INET); - ret = cherokee_socket_bind (&s, p, &bind_); - if (ret == ret_ok) - break; -@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port) - } - } - -+ cherokee_socket_close (&s); - cherokee_socket_mrproper (&s); - cherokee_buffer_mrproper (&bind_); - diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index c5c86ac9b..3326b81db 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,34 +1,34 @@ -# $Id$ +# $Id: PKGBUILD 59248 2011-11-21 23:02:41Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=1.99.05 +pkgver=1.99.06 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" -license="GPL" -depends=('xulrunner>=6.0' 'chmlib' 'desktop-file-utils') +license=('GPL') +depends=('xulrunner>=8.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) install=chmsee.install -md5sums=('accef6baba2842ad13c59db3627c05f1' +md5sums=('fb11a4492795635bda843064f5b7f261' '4999362b0c89c24764cbd25173610a38') build() { - cd ${srcdir}/jungleji-chmsee-370f906/src + cd ${srcdir}/jungleji-chmsee-dd9130e/src cp Makefile.arch Makefile - sed -i -e 's/5.0/6.0/g' Makefile + sed -i -e 's/5.0/8.0/g' Makefile make } package() { - cd ${srcdir}/jungleji-chmsee-370f906 + cd ${srcdir}/jungleji-chmsee-dd9130e install -d ${pkgdir}/usr/share/chmsee cp -a * ${pkgdir}/usr/share/chmsee diff --git a/community/choqok/PKGBUILD b/community/choqok/PKGBUILD index b025bb1e4..741b8e036 100644 --- a/community/choqok/PKGBUILD +++ b/community/choqok/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 44627 2011-04-09 15:52:17Z andrea $ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> +# $Id: PKGBUILD 58036 2011-11-05 17:31:00Z plewis $ +# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Emanuele Rossi <newdna1510@yahoo.it> # Contributor: Bram Schoenmakers <me@bramschoenmakers.nl> pkgname=choqok -pkgver=1.1 -pkgrel=1 +pkgver=1.2 +pkgrel=2 pkgdesc="A Twitter/identi.ca/laconica client for KDE" url="http://choqok.gnufolks.org/" license=('GPL') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdebase-konqueror: proxy support') install="${pkgname}.install" source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5006404ce250d4a75d4bb762c747962d') +md5sums=('05d01f4c93c081f3a84ea013cfba7229') build() { cd ${srcdir} diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD index f33a3f7bf..b8b4192d0 100644 --- a/community/cksfv/PKGBUILD +++ b/community/cksfv/PKGBUILD @@ -1,9 +1,10 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> +# $Id: PKGBUILD 57202 2011-10-23 23:26:43Z andrea $ +# Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl> pkgname=cksfv pkgver=1.3.14 -pkgrel=1 +pkgrel=2 pkgdesc="SFV (Simple File Verification) Checker" arch=('i686' 'x86_64' 'mips64el') url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/" @@ -13,9 +14,13 @@ source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz) md5sums=('2e15289753ea0b90b6ea86993f93b383') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr --package-prefix=$startdir/pkg - make || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --package-prefix=$pkgdir + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make install - chmod 644 $startdir/pkg/usr/share/man/man1/$pkgname.1 + chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1 } diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD index 2822328d8..ae887294d 100644 --- a/community/clamz/PKGBUILD +++ b/community/clamz/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53892 2011-08-09 12:18:03Z lfleischer $ +# $Id: PKGBUILD 57215 2011-10-24 18:32:20Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=clamz -pkgver=0.4 -pkgrel=2 +pkgver=0.5 +pkgrel=1 pkgdesc="Command-line program to download MP3 files from Amazon.com's music store." arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/clamz/' @@ -12,7 +12,7 @@ license=('GPL3') depends=('libgcrypt' 'curl' 'expat' 'shared-mime-info' 'desktop-file-utils') install='clamz.install' source=("http://clamz.googlecode.com/files/clamz-${pkgver}.tar.gz") -md5sums=('ab7661340ee27d206f36064cfbd5bfa4') +md5sums=('84543c9346b285bdc218879e241941a8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD index e7ad135ca..64961231a 100644 --- a/community/clipgrab/PKGBUILD +++ b/community/clipgrab/PKGBUILD @@ -1,28 +1,31 @@ -# Contributor: thacrazze <thacrazze|googlemail|com> +# $Id: PKGBUILD 59252 2011-11-22 02:19:48Z ebelanger $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: thacrazze <thacrazze|googlemail|com> + pkgname=clipgrab -pkgver=3.1.0.2 +pkgver=3.1.3.0 pkgrel=1 pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...' arch=('i686' 'x86_64' 'mips64el') url='http://clipgrab.de/' -license=('GPL') +license=('GPL3') depends=('qt') optdepends=('ffmpeg: for some encodings') -source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 ${pkgname}.png ${pkgname}.desktop) -md5sums=('1250e1fb29cd88b7ce1a37d937de0146' - 'ef030502ae0922e632742f47283313f4' +source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop) +md5sums=('3e8f5ab9ef0144fa234cf3b725797123' '9a141791f6952917c441050c3dac81ce') build() { - cd $srcdir/$pkgname-$pkgver - qmake && make + cd "$srcdir/$pkgname-$pkgver" + qmake + make } + package() { - cd $srcdir/$pkgname-$pkgver - install -Dm755 ${pkgname} $pkgdir/usr/bin/${pkgname} - install -Dm644 $srcdir/${pkgname}.png \ - $pkgdir/usr/share/pixmaps/${pkgname}.png - install -Dm644 $srcdir/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + cd "$srcdir/$pkgname-$pkgver" + install -Dm755 ${pkgname} "$pkgdir/usr/bin/${pkgname}" + install -Dm644 icon.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "$srcdir/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" } diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD new file mode 100644 index 000000000..3715eb04c --- /dev/null +++ b/community/converseen/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 57374 2011-10-26 14:37:55Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: archtux <antonio.arias99999 at gmail.com> + +pkgname=converseen +pkgver=0.4.6 +pkgrel=3 +pkgdesc="The batch image converter and resizer" +arch=('i686' 'x86_64') +url="http://converseen.sourceforge.net/" +license=('GPL3') +depends=('imagemagick' 'qt') +makedepends=('cmake') +install=converseen.install +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('07c876b52e1982b8b2493c3aea3c3071') + +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/community/converseen/converseen.install b/community/converseen/converseen.install new file mode 100644 index 000000000..9af7fa81f --- /dev/null +++ b/community/converseen/converseen.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/coq/PKGBUILD b/community/coq/PKGBUILD index 0ffc230e6..4fd420e77 100644 --- a/community/coq/PKGBUILD +++ b/community/coq/PKGBUILD @@ -3,7 +3,7 @@ pkgname=coq pkgver=8.3pl2 -pkgrel=2 +pkgrel=3 pkgdesc='Formal proof management system.' arch=('i686' 'x86_64' 'mips64el') url='http://coq.inria.fr/' diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 7b6b4faaa..2722803ac 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54987 2011-08-29 12:53:53Z spupykin $ +# $Id: PKGBUILD 58574 2011-11-15 15:35:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Previous Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb -pkgver=1.1.0 -pkgrel=1.svn20110829 +pkgver=1.2.0 +pkgrel=1git20111115 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -18,10 +18,10 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') #source=("http://www.apache.org/dist/$pkgname/$pkgver/apache-$pkgname-$pkgver.tar.gz" -source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.svn20110823.tar.gz" +source=("http://arch.p5n.pp.ru/~sergej/dl/apache-couchdb-$pkgver.git20111115.tar.gz" "rc-script.patch") -md5sums=('b5a6e2dab45f19ef39f04a46ac146a0a' - '12171b097d2f98f4874e002bc1eabfc5') +md5sums=('b4236a36a473e3a1c81e7548de194c47' + '559b5e1483c3fb3e4327a9c58181a46c') build() { cd "$srcdir/apache-$pkgname-$pkgver" diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch index d7fd105c4..ef7be39df 100644 --- a/community/couchdb/rc-script.patch +++ b/community/couchdb/rc-script.patch @@ -1,5 +1,5 @@ ---- couchdb.orig 2011-08-23 13:13:45.000000000 +0400 -+++ couchdb 2011-08-23 13:34:20.000000000 +0400 +--- couchdb.orig 2011-11-15 19:06:16.000000000 +0400 ++++ couchdb 2011-11-15 19:08:24.000000000 +0400 @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/bash diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 8abffecc8..52d6fe97d 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,15 +1,17 @@ -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 57886 2011-11-04 08:24:44Z lcarlier $ +# Contributor: Allan McRae <mcrae_allan@hotmail.com> +# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=4 +pkgrel=5 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64' 'mips64el') -url="http://criticalmass.sourceforge.net/critter.php" +url="http://sourceforge.net/projects/criticalmass" license=('GPL') depends=('sdl_image' 'sdl_mixer' 'mesa') -source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 critter-gcc43.patch critter.desktop) md5sums=('e2aff114bffa717fb79c82e1dc473ebe' @@ -17,13 +19,21 @@ md5sums=('e2aff114bffa717fb79c82e1dc473ebe' '98c17809aed964c445adad09827035df') build() { - cd $startdir/src/$_origname-$pkgver + cd ${srcdir}/$_origname-${pkgver} + patch -Np1 -i ../critter-gcc43.patch sed -i 's|-lpng12|-lpng|g' configure + ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install - install -Dm644 critter.png ${startdir}/pkg/usr/share/pixmaps/critter.png + make +} + +package() { + cd ${srcdir}/$_origname-${pkgver} + + make DESTDIR=${pkgdir} install + + install -Dm644 critter.png ${pkgdir}/usr/share/pixmaps/critter.png install -Dm644 ../critter.desktop \ - ${startdir}/pkg/usr/share/applications/critter.desktop + ${pkgdir}/usr/share/applications/critter.desktop } diff --git a/community/cupsddk/PKGBUILD b/community/cupsddk/PKGBUILD index 661181208..bdb357087 100644 --- a/community/cupsddk/PKGBUILD +++ b/community/cupsddk/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59197 2011-11-21 14:56:56Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Georg Grabler (STiAT) <ggrabler@gmail.com> # Contributor: Georg Grabler (STiAT) <ggrabler@gmail.com> @@ -6,27 +8,29 @@ pkgver=1.2.3 pkgrel=3 pkgdesc="CUPSD Development Kit" url="http://cups.org" -license="GPL" +license=("GPL") depends=('libcups') -makedepends=('libcups') +makedepends=('libcups' 'cups') arch=('i686' 'x86_64' 'mips64el') options=('!emptydirs') source=(http://ftp.easysw.com/pub/cupsddk/$pkgver/$pkgname-$pkgver-source.tar.bz2) md5sums=('3ec52813bf12bf9b34d34f8a81bab508') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 - make bindir=$startdir/pkg/usr/bin \ - datadir=$startdir/pkg/usr/share \ - docdir=$startdir/pkg/usr/share/cupsddk \ - mandir=$startdir/pkg/usr/share/man \ - prefix=$startdir/pkg/usr \ - CUPS_DATADIR=$startdir/pkg/`cups-config --datadir` \ - CUPS_SERVERBIN=$startdir/pkg/`cups-config --serverbin` \ - install || return 1 + sed -i '1,1i#include <cups/ppd.h>' ppdc/ppdmerge.cxx + sed -i 's|mkdir images|mkdir -p images|' cups/Makefile* + make + make bindir=$pkgdir/usr/bin \ + datadir=$pkgdir/usr/share \ + docdir=$pkgdir/usr/share/cupsddk \ + mandir=$pkgdir/usr/share/man \ + prefix=$pkgdir/usr \ + CUPS_DATADIR=$pkgdir/`cups-config --datadir` \ + CUPS_SERVERBIN=$pkgdir/`cups-config --serverbin` \ + install rm -f $pkgdir/usr/include/cups/driver.h rm -f $pkgdir/usr/bin/ppdc diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index 24093969c..21120e17e 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,19 +1,36 @@ -# $Id: PKGBUILD 55808 2011-09-21 20:41:16Z spupykin $ +# $Id: PKGBUILD 59192 2011-11-21 14:39:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Igor Scabini <furester @ gmail.com> -pkgname=cython +pkgname=('cython' 'cython2') +pkgbase=cython pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="C-Extensions for Python " arch=(i686 x86_64 'mips64el') url="http://www.cython.org" license=('APACHE') -depends=('python2') +makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") md5sums=('171021b3845c9ca8bd6d8185b3cde664') build() { + true +} + +package_cython() { + depends=('python') + + cd $srcdir/Cython-$pkgver + python setup.py install --root=$pkgdir +} + +package_cython2() { + depends=('python2') + cd $srcdir/Cython-$pkgver python2 setup.py install --root=$pkgdir + + mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2 + mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2 } diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index e2f16517a..6bf329e70 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD 56335 2011-10-05 19:07:45Z andrea $ +# $Id: PKGBUILD 58992 2011-11-20 19:44:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=0.9.2 +pkgver=0.9.3 _pkgver=0.9 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ license=('GPL3') -depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' +depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3') -makedepends=('intltool>=0.40' 'cmake' 'sqlite3') +makedepends=('intltool>=0.40' 'cmake') +# 'gnome-doc-utils' 'libxslt' 'fop') optdepends=( 'librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('08377e80ad77c7b11f742f26fddb80f1') +md5sums=('49253a3a2990a4bf8e0b0a19295f19bd') build() { cd $srcdir/$pkgname-$pkgver +# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt mkdir -p build cd build cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_USERMANUAL=False \ -DDONT_INSTALL_GCONF_SCHEMAS=True \ -DBINARY_PACKAGE_BUILD=1 \ + -DUSE_GCONF_BACKEND=Off \ + -DBUILD_USERMANUAL=False \ .. make } @@ -38,6 +41,6 @@ package() { cd $srcdir/$pkgname-$pkgver/build make DESTDIR=$pkgdir install mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" - mkdir -p "${pkgdir}/usr/share/gconf/schemas/" - mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" +# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" +# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" } diff --git a/community/darktable/darktable.install b/community/darktable/darktable.install index b92aab488..9fd6af293 100644 --- a/community/darktable/darktable.install +++ b/community/darktable/darktable.install @@ -1,7 +1,7 @@ pkgname=darktable post_install() { - usr/sbin/gconfpkg --install ${pkgname} +# usr/sbin/gconfpkg --install ${pkgname} [ -x `which update-desktop-database` ] && update-desktop-database -q } @@ -14,7 +14,8 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +# usr/sbin/gconfpkg --uninstall ${pkgname} + true } post_remove() { diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 6886b088e..c9272ed0e 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55804 2011-09-21 11:27:26Z lfleischer $ +# $Id: PKGBUILD 58389 2011-11-12 17:16:28Z ibiru $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef pkgver=0.5.1 -pkgrel=2 +pkgrel=3 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64' 'mips64el') url='http://deadbeef.sourceforge.net' @@ -32,11 +32,11 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('be8359d1bd9cf7679cf2ca748996e726') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ffmpeg.patch") build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ffmpeg.patch ./configure --prefix=/usr make @@ -47,3 +47,5 @@ package () { make prefix="${pkgdir}/usr" install } +md5sums=('be8359d1bd9cf7679cf2ca748996e726' + '6cc7623734af310095534c361c9f64e8') diff --git a/community/deadbeef/ffmpeg.patch b/community/deadbeef/ffmpeg.patch new file mode 100644 index 000000000..925b84408 --- /dev/null +++ b/community/deadbeef/ffmpeg.patch @@ -0,0 +1,45 @@ +diff -aur deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c +--- deadbeef-0.5.1/plugins/ffmpeg/ffmpeg.c 2011-05-22 13:58:53.000000000 +0000 ++++ deadbeef-0.5.1.new/plugins/ffmpeg/ffmpeg.c 2011-11-01 10:38:11.447669741 +0000 +@@ -140,7 +140,12 @@ + for (i = 0; i < info->fctx->nb_streams; i++) + { + info->ctx = info->fctx->streams[i]->codec; +- if (info->ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (info->ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + info->codec = avcodec_find_decoder (info->ctx->codec_id); + if (info->codec != NULL) { +@@ -490,7 +495,12 @@ + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams +@@ -745,7 +755,12 @@ + for (i = 0; i < fctx->nb_streams; i++) + { + ctx = fctx->streams[i]->codec; +- if (ctx->codec_type == CODEC_TYPE_AUDIO) ++ if (ctx->codec_type == ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif + { + codec = avcodec_find_decoder(ctx->codec_id); + if (codec != NULL) diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index 52aef74b8..fddb3cc7c 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57001 2011-10-18 03:48:42Z ebelanger $ +# $Id: PKGBUILD 57890 2011-11-04 08:33:14Z lcarlier $ # Maintainer: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=7 +pkgrel=8 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" @@ -18,16 +18,16 @@ md5sums=('7918f215524589435e5ec2e8736d5e1d' '0f839ccefd43b0ee8b4b3f99806147fc') build() { - cd $srcdir/devil-$pkgver + cd ${srcdir}/devil-$pkgver - patch -Np1 -i $srcdir/libpng14.patch + patch -Np1 -i ${srcdir}/libpng14.patch ./configure --prefix=/usr --enable-ILU --enable-ILUT --enable-opengl --enable-sdl make } package() { - cd $srcdir/devil-$pkgver + cd ${srcdir}/devil-$pkgver - make prefix=$pkgdir/usr install + make prefix=${pkgdir}/usr install } diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 929b7f13c..c6597a9ac 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 49059 2011-06-10 08:42:06Z spupykin $ +# $Id: PKGBUILD 57536 2011-10-30 12:24:25Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=dia pkgver=0.97.1 -pkgrel=4 +pkgrel=5 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -25,7 +26,7 @@ build() { export PYTHON=/usr/bin/python2 sed -i 's#python2\.1#python2 python2.1#' configure - patch -p1 <$srcdir/dia-overflow-fix.patch || true + patch -p1 <$srcdir/dia-overflow-fix.patch ./configure --prefix=/usr \ --with-cairo \ @@ -34,12 +35,14 @@ build() { --with-hardbooks sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile make - cd doc && make html + cd doc + make html } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - cd doc && make DESTDIR="${pkgdir}" install-html - ln -sf ../doc/dia/html $pkgdir/usr/share/dia/help + cd doc + make DESTDIR="${pkgdir}" install-html + ln -sf dia/html "${pkgdir}"/usr/share/dia/help } diff --git a/community/dia/dia.install b/community/dia/dia.install index 499f00ea1..a49438e1f 100644 --- a/community/dia/dia.install +++ b/community/dia/dia.install @@ -1,7 +1,7 @@ post_install() { - which update-desktop-database >/dev/null && update-desktop-database -q - which update-mime-database >/dev/null && update-mime-database usr/share/mime > /dev/null - which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD index 67cbef8ce..db4218b2b 100644 --- a/community/dictd/PKGBUILD +++ b/community/dictd/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 51953 2011-07-18 13:18:14Z spupykin $ +# $Id: PKGBUILD 57578 2011-10-31 03:14:04Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: SmackleFunky <smacklefunky@optusnet.com.au> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> pkgname=dictd pkgver=1.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="Online dictionary client and server" url="http://sourceforge.net/projects/dict/" -license=("GPL") -arch=(i686 x86_64 'mips64el') -depends=('zlib' 'libmaa') +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +depends=('sh' 'zlib' 'libmaa') makedepends=('flex') backup=(etc/dict/dictd.conf etc/dict/dict.conf @@ -18,7 +18,8 @@ backup=(etc/dict/dictd.conf etc/conf.d/dictd etc/xinetd.d/dictd etc/dict/colorit.conf) -source=(http://downloads.sourceforge.net/project/dict/dictd/dictd-$pkgver/dictd-$pkgver.tar.gz +options=('!emptydirs') +source=("http://downloads.sourceforge.net/dict/$pkgname-$pkgver.tar.gz" dictd dict.conf dictd.conf diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD index 4f33fa7df..1eac2db70 100644 --- a/community/dietlibc/PKGBUILD +++ b/community/dietlibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17510 2010-05-24 14:18:16Z spupykin $ +# $Id: PKGBUILD 59221 2011-11-21 15:22:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de> @@ -9,12 +9,13 @@ pkgdesc="a libc optimized for small size" arch=('i686' 'x86_64' 'mips64el') url="http://www.fefe.de/dietlibc/" license=("GPL") -source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) +#source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) md5sums=('0098761c17924c15e21d25acdda4a8b5') build() { - cd $startdir/src/$pkgname-$pkgver - make -j1 all dyn || return 1 - mkdir -p $startdir/pkg/etc - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + make -j1 all dyn + mkdir -p $pkgdir/etc + make DESTDIR=$pkgdir install } diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD new file mode 100644 index 000000000..1f88ecec8 --- /dev/null +++ b/community/dosbox/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $ +# Maintainer : +# Contribute : Jelle van der Waa <jelle@vdwaa.nl> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Ben <ben@benmazer.net> + +pkgname=dosbox +pkgver=0.74 +pkgrel=2 +pkgdesc="An emulator with builtin DOS for running DOS Games" +arch=('i686' 'x86_64') +url="http://dosbox.sourceforge.net/" +license=('GPL') +depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs') +makedepends=('mesa') +source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" + 'dosbox.png' 'dosbox.desktop' 'gcc46.patch') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + patch -Np1 -i $srcdir/gcc46.patch + sed -i 's/png_check_sig/png_sig_cmp/' configure + ./configure --prefix=/usr \ + --sysconfdir=/etc/dosbox + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + + # install docs, make does not install them + install -d $pkgdir/usr/share/doc/$pkgname + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README + install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video + + install -Dm644 ${srcdir}/${pkgname}.png \ + ${pkgdir}/usr/share/pixmaps/${pkgname}.png + install -Dm644 ${srcdir}/${pkgname}.desktop \ + ${pkgdir}/usr/share/applications/${pkgname}.desktop +} +md5sums=('b9b240fa87104421962d14eee71351e8' + '2aac25fc06979e375953fcc36824dc5e' + '85169ca599028bee8e29e0b3b7b34dd8' + '3fba2e3c7c43290319b2928f40ed30e5') diff --git a/community/dosbox/dosbox.desktop b/community/dosbox/dosbox.desktop new file mode 100644 index 000000000..dbaf05ced --- /dev/null +++ b/community/dosbox/dosbox.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=dosbox Emulator +GenericName=Emulator +Comment=An emulator to run old DOS games +Icon=dosbox +Exec=dosbox +Terminal=false +Categories=Emulator;Application; diff --git a/community/dosbox/dosbox.png b/community/dosbox/dosbox.png Binary files differnew file mode 100644 index 000000000..b8a917986 --- /dev/null +++ b/community/dosbox/dosbox.png diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch new file mode 100644 index 000000000..eae9ae63e --- /dev/null +++ b/community/dosbox/gcc46.patch @@ -0,0 +1,12 @@ +diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h +--- dosbox-0.74/include/dos_inc.h 2010-05-10 17:43:54.000000000 +0000 ++++ dosbox-0.74.new//include/dos_inc.h 2011-06-17 20:42:43.982548979 +0000 +@@ -28,6 +28,8 @@ + #include "mem.h" + #endif + ++#include <stddef.h> //for offsetof ++ + #ifdef _MSC_VER + #pragma pack (1) + #endif diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 91b5643de..99ccfa5ba 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 53655 2011-08-07 17:18:06Z spupykin $ +# $Id: PKGBUILD 57749 2011-11-02 08:46:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" -options=('!libtool') backup=(etc/dspam/dspam.conf) license=("GPL") depends=(readline libcap ncurses zlib openssl) @@ -18,11 +17,11 @@ optdepends=('libmysqlclient: MySQL support' 'db: BerkeleyDB support' 'sqlite3: SQLite support') options=('zipman' 'docs' '!libtool') +install=$pkgname.install source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz dspam.logrotated dspam) -install=$pkgname.install -md5sums=('2e83e98a03af492df82532441e4ce335' +md5sums=('b8b57f7f4ce31de86fa13a656d3bf936' '2163ca41de383f09f4d754e2d35cb158' 'bb2300eff5b2a6eb987750c71a2c2169') @@ -34,7 +33,7 @@ build() { cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} - make -j1 + make } package() { cd $srcdir/$pkgname-$pkgver diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 4cc7fc406..665f7cae4 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55816 2011-09-22 11:26:50Z lfleischer $ +# $Id: PKGBUILD 58556 2011-11-14 12:40:26Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.15 +pkgver=0.6.16 pkgrel=1 pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('88f3c990f41fde86cd7d5af5a1bc7b81') +md5sums=('55996756a5bc9743add738cfcba2dda2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD index fe017a95c..51a15b0a2 100644 --- a/community/dvdstyler/PKGBUILD +++ b/community/dvdstyler/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 55752 2011-09-19 04:58:47Z ebelanger $ +# $Id: PKGBUILD 58391 2011-11-12 17:16:44Z ibiru $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=dvdstyler -pkgver=1.8.4.3 -pkgrel=1 +pkgver=2.0 +pkgrel=2 pkgdesc="Cross-platform DVD authoring application" arch=('i686' 'x86_64' 'mips64el') url="http://www.dvdstyler.de/" license=('GPL') -depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'libexif' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') +depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui') makedepends=('zip' 'xmlto' 'docbook-xsl') optdepends=('dvdisaster: ECC support') options=('!makeflags') -source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2 dvdstyler-ffmpeg.patch) -md5sums=('418de47c4e09a89a633b905af2a7d4fb' - '4f053158965b2be3ae26506470aeda58') +source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2) +sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6') build() { cd "${srcdir}/DVDStyler-${pkgver}" - patch -p1 -i "${srcdir}/dvdstyler-ffmpeg.patch" sed -i 's/rmdir "$$t"//' docs/Makefile.in + sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp ./configure --prefix=/usr make } diff --git a/community/dvdstyler/dvdstyler-ffmpeg.patch b/community/dvdstyler/dvdstyler-ffmpeg.patch deleted file mode 100644 index f2f56f6ff..000000000 --- a/community/dvdstyler/dvdstyler-ffmpeg.patch +++ /dev/null @@ -1,1915 +0,0 @@ -diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp ---- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.cpp 2011-05-15 09:23:34.000000000 -0400 -+++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.cpp 2011-09-18 18:13:03.000000000 -0400 -@@ -3,7 +3,7 @@ - // Purpose: FFMPEG Media Transcoder - // Author: Alex Thuering - // Created: 26.04.2008 --// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.33 2011/05/15 13:23:34 ntalex Exp $ -+// RCS-ID: $Id: mediatrc_ffmpeg.cpp,v 1.34 2011/07/24 07:58:21 ntalex Exp $ - // Copyright: (c) Alex Thuering - // Licence: GPL - ///////////////////////////////////////////////////////////////////////////// -@@ -17,21 +17,16 @@ - #include <math.h> - #include <errno.h> - extern "C" { --#ifdef HAVE_FFMPEG_AVUTIL_H --#include <opt.h> --#include <swscale.h> --#include <avutil.h> --#include <fifo.h> --#include <avfilter.h> --#include <avfiltergraph.h> --#else --#include <libavcodec/opt.h> --#include <libswscale/swscale.h> -+#include <libavutil/opt.h> - #include <libavutil/avutil.h> - #include <libavutil/fifo.h> -+#include <libavutil/dict.h> -+#include <libavutil/pixdesc.h> -+#include <libswscale/swscale.h> -+#include <libavfilter/avcodec.h> - #include <libavfilter/avfilter.h> - #include <libavfilter/avfiltergraph.h> --#endif -+#include <libavfilter/vsink_buffer.h> - } - - #define AUDIO_BUF_SIZE 50000 -@@ -48,101 +43,19 @@ - #define INT64_MAX INT64_C(9223372036854775807) - #endif - --#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 45, 0) --#define av_guess_format guess_format --#endif -- --#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 64, 0) --#define AVMediaType CodecType --#define AVMEDIA_TYPE_UNKNOWN CODEC_TYPE_UNKNOWN --#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO --#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO --#define AVMEDIA_TYPE_DATA CODEC_TYPE_DATA --#define AVMEDIA_TYPE_SUBTITLE CODEC_TYPE_SUBTITLE --#define AVMEDIA_TYPE_ATTACHMENT CODEC_TYPE_ATTACHMENT --#define AVMEDIA_TYPE_NB CODEC_TYPE_NB -+#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(53, 4, 0) -+#define AVIO_FLAG_WRITE AVIO_WRONLY - #endif - - //////////////////////////// AVAudioConvert ///////////////////////////////// -- --struct AVAudioConvert { -- int in_channels, out_channels; -- int fmt_pair; --}; -- --AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, -- enum AVSampleFormat in_fmt, int in_channels, -- const float *matrix, int flags) { -- AVAudioConvert *ctx; -- if (in_channels != out_channels) -- return NULL; -- ctx = (AVAudioConvert*) av_malloc(sizeof(AVAudioConvert)); -- if (!ctx) -- return NULL; -- ctx->in_channels = in_channels; -- ctx->out_channels = out_channels; -- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB * in_fmt; -- return ctx; --} -- --void av_audio_convert_free(AVAudioConvert *ctx) { -- av_free(ctx); --} -- --int av_audio_convert(AVAudioConvert *ctx, -- void * const out[6], const int out_stride[6], -- const void * const in[6], const int in_stride[6], int len) { -- int ch; -- -- //FIXME optimize common cases -- -- for (ch = 0; ch < ctx->out_channels; ch++) { -- const int is = in_stride[ch]; -- const int os = out_stride[ch]; -- const uint8_t *pi = (const uint8_t *) in[ch]; -- uint8_t *po = (uint8_t *) out[ch]; -- uint8_t *end = po + os * len; -- if (!out[ch]) -- continue; -- --#define CONV(ofmt, otype, ifmt, expr)\ --if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\ -- do{\ -- *(otype*)po = expr; pi += is; po += os;\ -- }while(po < end);\ --} -- --//FIXME put things below under ifdefs so we do not waste space for cases no codec will need --//FIXME rounding ? -- -- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi) -- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8) -- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24) -- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) -- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7))) -- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80) -- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi) -- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16) -- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) -- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15))) -- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80) -- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16) -- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi) -- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) -- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1U<<31))) -- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80)) -- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15)))) -- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31)))) -- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi) -- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi) -- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80)) -- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15)))) -- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31)))) -- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi) -- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi) -- else return -1; -- } -- return 0; -+// audioconvert.h -+extern "C" { -+struct AVAudioConvert; -+AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, enum AVSampleFormat in_fmt, -+ int in_channels, const float *matrix, int flags); -+void av_audio_convert_free(AVAudioConvert *ctx); -+int av_audio_convert(AVAudioConvert *ctx, void * const out[6], const int out_stride[6], const void * const in[6], -+ const int in_stride[6], int len); - } - - //////////////////////////// AVOutputStream ///////////////////////////////// -@@ -161,6 +74,8 @@ - struct AVInputStream *sync_ist; /* input stream to sync against */ - int64_t sync_opts; /* output frame counter, could be changed to some true timestamp *///FIXME look at frame_number - AVBitStreamFilterContext *bitstream_filters; -+ AVCodec *enc; -+ - /* video only */ - int video_resample; - AVFrame resample_frame; /* temporary frame for image resampling */ -@@ -168,17 +83,19 @@ - int resample_height; - int resample_width; - int resample_pix_fmt; -+ AVRational frame_rate; - - float frame_aspect_ratio; -+ - /* forced key frames */ --// int64_t *forced_kf_pts; --// int forced_kf_count; --// int forced_kf_index; -+ int64_t *forced_kf_pts; -+ int forced_kf_count; -+ int forced_kf_index; - - /* audio only */ - int audio_resample; - ReSampleContext *resample; /* for audio resampling */ -- int resample_sample_fmt; -+ AVSampleFormat resample_sample_fmt; - int resample_channels; - int resample_sample_rate; - int reformat_pair; -@@ -216,94 +133,22 @@ - } AVInputStream; - - typedef struct AVInputFile { -+ AVFormatContext *ctx; - int eof_reached; /* true if eof reached */ - int ist_index; /* index of first stream in ist_table */ - int buffer_size; /* current total buffer size */ -- int nb_streams; /* nb streams we are aware of */ - } AVInputFile; - --//#include <libavfilter/vsrc_buffer.h> --extern "C" { -- int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame, int64_t pts, -- AVRational pixel_aspect, int width, int height, enum PixelFormat pix_fmt, const char *sws_param); --} -- --//#include "cmdutils.h" --typedef struct { -- enum PixelFormat pix_fmt; --} FFSinkContext; -- --int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque) -+static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost) - { -- FFSinkContext *priv = (FFSinkContext*) ctx->priv; -- -- if (!opaque) -- return AVERROR(EINVAL); -- *priv = *(FFSinkContext *)opaque; -- -- return 0; --} -- --void null_end_frame(AVFilterLink *inlink) { } -- --int ffsink_query_formats(AVFilterContext *ctx) { -- FFSinkContext *priv = (FFSinkContext*) ctx->priv; -- int pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; -- -- avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); -- return 0; --} -- --int get_filtered_video_frame(AVFilterContext *ctx, AVFrame *frame, AVFilterBufferRef **picref_ptr, AVRational *tb) { -- int ret; -- AVFilterBufferRef *picref; -- -- if ((ret = avfilter_request_frame(ctx->inputs[0])) < 0) -- return ret; -- if (!(picref = ctx->inputs[0]->cur_buf)) -- return AVERROR(ENOENT); -- *picref_ptr = picref; -- ctx->inputs[0]->cur_buf = NULL; -- *tb = ctx->inputs[0]->time_base; -- -- memcpy(frame->data, picref->data, sizeof(frame->data)); -- memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize)); -- frame->interlaced_frame = picref->video->interlaced; -- frame->top_field_first = picref->video->top_field_first; -- -- return 1; --} -- --AVFilter ffsink; --AVFilterPad fInputs[2]; --AVFilterPad fOutputs[1]; -- --int configure_filters(AVInputStream *ist, AVOutputStream *ost) { - AVFilterContext *last_filter, *filter; - /** filter graph containing all filters including input & output */ - AVCodecContext *codec = ost->st->codec; - AVCodecContext *icodec = ist->st->codec; -- FFSinkContext ffsink_ctx; -- ffsink_ctx.pix_fmt = codec->pix_fmt; -+ enum PixelFormat pix_fmts[] = { codec->pix_fmt, PIX_FMT_NONE }; - AVRational sample_aspect_ratio; - char args[255]; - int ret; -- -- ffsink.name = "ffsink"; -- ffsink.priv_size = sizeof(FFSinkContext); -- ffsink.init = ffsink_init; -- ffsink.query_formats = ffsink_query_formats; -- -- fInputs[0].name = "default"; -- fInputs[0].type = AVMEDIA_TYPE_VIDEO; -- fInputs[0].end_frame = null_end_frame; -- fInputs[0].min_perms = AV_PERM_READ; -- fInputs[1].name = NULL; -- ffsink.inputs = fInputs; -- fOutputs[0].name = NULL; -- ffsink.outputs = fOutputs; -- -- int sws_flags = SWS_BICUBIC; - - ost->graph = avfilter_graph_alloc(); - -@@ -320,8 +165,8 @@ - "src", args, NULL, ost->graph); - if (ret < 0) - return ret; -- ret = avfilter_graph_create_filter(&ost->output_video_filter, &ffsink, -- "out", NULL, &ffsink_ctx, ost->graph); -+ ret = avfilter_graph_create_filter(&ost->output_video_filter, avfilter_get_by_name("buffersink"), -+ "out", NULL, pix_fmts, ost->graph); - if (ret < 0) - return ret; - last_filter = ost->input_video_filter; -@@ -330,7 +175,7 @@ - snprintf(args, 255, "%d:%d:flags=0x%X", - codec->width, - codec->height, -- sws_flags); -+ ost->sws_flags); - if ((ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("scale"), - NULL, args, NULL, ost->graph)) < 0) - return ret; -@@ -339,12 +184,12 @@ - last_filter = filter; - } - -- snprintf(args, sizeof(args), "flags=0x%X", sws_flags); -+ snprintf(args, sizeof(args), "flags=0x%X", ost->sws_flags); - ost->graph->scale_sws_opts = av_strdup(args); - - if (ost->avfilter) { -- AVFilterInOut* outputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); -- AVFilterInOut* inputs = (AVFilterInOut*) av_malloc(sizeof(AVFilterInOut)); -+ AVFilterInOut *outputs = avfilter_inout_alloc(); -+ AVFilterInOut *inputs = avfilter_inout_alloc(); - - outputs->name = av_strdup("in"); - outputs->filter_ctx = last_filter; -@@ -356,7 +201,7 @@ - inputs->pad_idx = 0; - inputs->next = NULL; - -- if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, inputs, outputs, NULL)) < 0) -+ if ((ret = avfilter_graph_parse(ost->graph, ost->avfilter, &inputs, &outputs, NULL)) < 0) - return ret; - av_freep(&ost->avfilter); - } else { -@@ -370,8 +215,10 @@ - codec->width = ost->output_video_filter->inputs[0]->w; - codec->height = ost->output_video_filter->inputs[0]->h; - codec->sample_aspect_ratio = ost->st->sample_aspect_ratio = -+ ost->frame_aspect_ratio ? // overriden by the -aspect cli option -+ av_d2q(ost->frame_aspect_ratio*codec->height/codec->width, 255) : - ost->output_video_filter->inputs[0]->sample_aspect_ratio; -- -+ - return 0; - } - -@@ -412,12 +259,11 @@ - } - - wxFfmpegMediaTranscoder::wxFfmpegMediaTranscoder(int threadCount) { -- nb_input_files = 0; - input_files_ts_scale[0] = NULL; - nb_input_files_ts_scale[0] = 0; -- output_codecs = NULL; -+ input_codecs = NULL; -+ nb_input_codecs = 0; - nb_output_files = 0; -- nb_output_codecs = 0; - stream_maps = NULL; - nb_stream_maps = 0; - nb_meta_data_maps = 0; -@@ -429,7 +275,6 @@ - frame_width = 0; - frame_height = 0; - frame_aspect_ratio = 0; -- frame_aspect_ratio_override = 0; - frame_pix_fmt = PIX_FMT_NONE; - frame_bits_per_raw_sample = 0; - audio_sample_fmt = SAMPLE_FMT_NONE; -@@ -476,12 +321,12 @@ - do_psnr = 0; - do_pass = 0; - pass_logfilename_prefix = "ffmpeg2pass"; -- video_sync_method= -1; -- audio_sync_method= 0; -- audio_drift_threshold= 0.1; -- copy_ts= 0; -- opt_shortest = 0; // -- video_global_header = 0; -+ video_sync_method = -1; -+ audio_sync_method = 0; -+ audio_drift_threshold = 0.1; -+ copy_ts = 0; -+ copy_tb = 0; -+ opt_shortest = 0; - vstats_filename = NULL; - vstats_file = NULL; - opt_programid = 0; -@@ -519,6 +364,11 @@ - audio_bitstream_filters = NULL; - subtitle_bitstream_filters = NULL; - -+ input_streams = NULL; -+ nb_input_streams = 0; -+ input_files = NULL; -+ nb_input_files = 0; -+ - av_log_set_callback(&av_log_wxLog_callback); - } - -@@ -531,20 +381,39 @@ - avfilter_register_all(); - } - -+// similar to ff_dynarray_add() and av_fast_realloc() -+void* grow_array(void *array, int elem_size, int *size, int new_size) { -+ if (new_size >= INT_MAX / elem_size) { -+ wxLogError(wxT("Array too big.")); -+ return NULL; -+ } -+ if (*size < new_size) { -+ uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); -+ if (!tmp) { -+ wxLogError(wxT("Could not alloc buffer.")); -+ return NULL; -+ } -+ memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); -+ *size = new_size; -+ return tmp; -+ } -+ return array; -+} -+ - bool wxFfmpegMediaTranscoder::AddInputFile(const wxString& fileName, bool disableVideo, bool disableAudio, - bool disableSubtitle) { - AVFormatContext *ic; - int err, i, ret, rfps, rfps_base; - int64_t timestamp; -- -+ - /* get default parameters from command line */ - ic = avformat_alloc_context(); - if (!ic) { - PrintError(fileName, AVERROR(ENOMEM)); - return false; - } -- ic->flags |= AVFMT_FLAG_NONBLOCK; -- -+ ic->flags |= AVFMT_FLAG_NONBLOCK | AVFMT_FLAG_PRIV_OPT; -+ - // open the input file with generic libav function - err = av_open_input_file(&ic, (const char*) fileName.mb_str(), NULL, 0, NULL); - if (err < 0) { -@@ -606,39 +475,38 @@ - for (i=0; i<(int)ic->nb_streams; i++) { - AVStream *st = ic->streams[i]; - AVCodecContext *dec = st->codec; -+ AVInputStream *ist; -+ - dec->thread_count = thread_count; -+ input_codecs = (AVCodec**) grow_array(input_codecs, sizeof(*input_codecs), &nb_input_codecs, nb_input_codecs + 1); -+ -+ input_streams = (AVInputStream*) grow_array(input_streams, sizeof(*input_streams), &nb_input_streams, nb_input_streams + 1); -+ ist = &input_streams[nb_input_streams - 1]; -+ ist->st = st; -+ ist->file_index = nb_input_files; -+ ist->discard = 1; -+ - switch (dec->codec_type) { - case AVMEDIA_TYPE_AUDIO: -+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); - channel_layout = dec->channel_layout; -- audio_channels = dec->channels; -- audio_sample_rate = dec->sample_rate; - audio_sample_fmt = dec->sample_fmt; - if (disableAudio) - st->discard = AVDISCARD_ALL; -- /* Note that av_find_stream_info can add more streams, and we -- * currently have no chance of setting up lowres decoding -- * early enough for them. */ -- if (dec->lowres) -- audio_sample_rate >>= dec->lowres; - break; - case AVMEDIA_TYPE_VIDEO: -- frame_height = dec->height; -- frame_width = dec->width; -+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); - if(st->sample_aspect_ratio.num) - frame_aspect_ratio=av_q2d(st->sample_aspect_ratio); - else - frame_aspect_ratio=av_q2d(dec->sample_aspect_ratio); - frame_aspect_ratio *= (float) dec->width / dec->height; -- frame_aspect_ratio_override = 0; -- frame_pix_fmt = dec->pix_fmt; - rfps = st->r_frame_rate.num; - rfps_base = st->r_frame_rate.den; -- if(dec->lowres) { -+ if (dec->lowres) { - dec->flags |= CODEC_FLAG_EMU_EDGE; -- frame_height >>= dec->lowres; -- frame_width >>= dec->lowres; -- dec->height = frame_height; -- dec->width = frame_width; -+ dec->height >>= dec->lowres; -+ dec->width >>= dec->lowres; - } - if (me_threshold) - dec->debug |= FF_DEBUG_MV; -@@ -650,9 +518,6 @@ - i, (float)dec->time_base.den / dec->time_base.num, dec->time_base.den, dec->time_base.num, - (float)rfps / rfps_base, rfps, rfps_base); - } -- /* update the current frame rate to match the stream frame rate */ -- frame_rate.num = rfps; -- frame_rate.den = rfps_base; - - if (disableVideo) - st->discard = AVDISCARD_ALL; -@@ -660,6 +525,7 @@ - case AVMEDIA_TYPE_DATA: - break; - case AVMEDIA_TYPE_SUBTITLE: -+ input_codecs[nb_input_codecs-1] = avcodec_find_decoder(dec->codec_id); - if (disableSubtitle) - st->discard = AVDISCARD_ALL; - break; -@@ -672,17 +538,26 @@ - } - } - -- input_files[nb_input_files] = ic; - input_files_ts_offset[nb_input_files] = input_ts_offset - (copy_ts ? 0 : timestamp); - /* dump the file content */ - if (verbose >= 0) - av_dump_format(ic, nb_input_files, (const char*)fileName.mb_str(), 0); - -- nb_input_files++; -+ input_files = (AVInputFile*) grow_array(input_files, sizeof(*input_files), &nb_input_files, nb_input_files + 1); -+ input_files[nb_input_files - 1].ctx = ic; -+ input_files[nb_input_files - 1].ist_index = nb_input_streams - ic->nb_streams; -+ - input_files_ts_scale[nb_input_files] = NULL; - nb_input_files_ts_scale[nb_input_files] = 0; -- -+ -+ top_field_first = -1; - video_channel = 0; -+ frame_rate = (AVRational){0, 0}; -+ frame_pix_fmt = PIX_FMT_NONE; -+ frame_height = 0; -+ frame_width = 0; -+ audio_sample_rate = 0; -+ audio_channels = 0; - return true; - } - -@@ -742,27 +617,27 @@ - - oc->timestamp = recording_timestamp; - -- av_metadata_copy(&oc->metadata, metadata, 0); -- av_metadata_free(&metadata); -- -+ av_dict_copy(&oc->metadata, metadata, 0); -+ av_dict_free(&metadata); -+ - output_files[nb_output_files++] = oc; - - /* check filename in case of an image number is expected */ - if (oc->oformat->flags & AVFMT_NEEDNUMBER) { - if (!av_filename_number_test(oc->filename)) { -- PrintError(fileName, AVERROR_NUMEXPECTED); -+ PrintError(fileName, AVERROR(EINVAL)); - return false; - } - } - - /* test if it already exists to avoid loosing precious files */ -- if (url_exist((const char*) fileName.mb_str())) { -+ if (avio_check((const char*) fileName.mb_str(), 0) == 0) { - wxLogError(wxT("File '%s' already exists"), fileName.c_str()); - return false; - } - - /* open the file */ -- int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), URL_WRONLY); -+ int err = avio_open(&oc->pb, (const char*) fileName.mb_str(), AVIO_FLAG_WRITE); - if (err < 0) { - PrintError(fileName, err); - return false; -@@ -777,39 +652,24 @@ - oc->preload= (int)(mux_preload*AV_TIME_BASE); - oc->max_delay= (int)(mux_max_delay*AV_TIME_BASE); - oc->loop_output = loop_output; -- oc->flags |= AVFMT_FLAG_NONBLOCK; -- -+ -+ frame_rate = (AVRational){0, 0}; -+ frame_width = 0; -+ frame_height = 0; -+ audio_sample_rate = 0; -+ audio_channels = 0; -+ - return true; - } - - void wxFfmpegMediaTranscoder::PrintError(const wxString& msg, int err) { -- switch (err) { -- case AVERROR_NUMEXPECTED: -- wxLogError(wxT("%s: Incorrect image filename syntax.\n" -- "Use '%%d' to specify the image number:\n" -- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" -- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'."), msg.c_str()); -- break; -- case AVERROR_INVALIDDATA: -- wxLogError(wxT("%s: Error while parsing header"), msg.c_str()); -- break; -- case AVERROR_NOFMT: -- wxLogError(wxT("%s: Unknown format"), msg.c_str()); -- break; -- case AVERROR(EIO): -- wxLogError(wxT("%s: I/O error occured\n" -- "Usually that means that input file is truncated and/or corrupted."), msg.c_str()); -- break; -- case AVERROR(ENOMEM): -- wxLogError(wxT("%s: memory allocation error occured"), msg.c_str()); -- break; -- case AVERROR(ENOENT): -- wxLogError(wxT("%s: no such file or directory"), msg.c_str()); -- break; -- default: -- wxLogError(wxT("%s: Error while opening file"), msg.c_str()); -- break; -- } -+ char errbuf[128]; -+ const char *errbuf_ptr = errbuf; -+ -+ if (av_strerror(err, errbuf, sizeof(errbuf)) < 0) -+ errbuf_ptr = strerror(AVUNERROR(err)); -+ wxString errorStr(errbuf_ptr, wxConvUTF8); -+ wxLogError(msg + wxT(": ") + errorStr); - } - - void choose_pixel_fmt(AVStream *st, AVCodec *codec) { -@@ -819,12 +679,15 @@ - if(*p == st->codec->pix_fmt) - break; - } -- if(*p == -1 -- && !( st->codec->codec_id==CODEC_ID_MJPEG -- && st->codec->strict_std_compliance <= FF_COMPLIANCE_INOFFICIAL -- && ( st->codec->pix_fmt == PIX_FMT_YUV420P -- || st->codec->pix_fmt == PIX_FMT_YUV422P))) -+ if (*p == -1) { -+ if(st->codec->pix_fmt != PIX_FMT_NONE) -+ av_log(NULL, AV_LOG_WARNING, -+ "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n", -+ av_pix_fmt_descriptors[st->codec->pix_fmt].name, -+ codec->name, -+ av_pix_fmt_descriptors[codec->pix_fmts[0]].name); - st->codec->pix_fmt = codec->pix_fmts[0]; -+ } - } - } - -@@ -835,30 +698,20 @@ - if(*p == st->codec->sample_fmt) - break; - } -- if (*p == -1) -+ if (*p == -1) { -+ if ((codec->capabilities & CODEC_CAP_LOSSLESS) -+ && av_get_sample_fmt_name(st->codec->sample_fmt) > av_get_sample_fmt_name(codec->sample_fmts[0])) -+ av_log(NULL, AV_LOG_ERROR, "Convertion will not be lossless'\n"); -+ av_log(NULL, AV_LOG_WARNING, -+ "Incompatible sample format '%s' for codec '%s', auto-selecting format '%s'\n", -+ av_get_sample_fmt_name(st->codec->sample_fmt), -+ codec->name, -+ av_get_sample_fmt_name(codec->sample_fmts[0])); - st->codec->sample_fmt = codec->sample_fmts[0]; -+ } - } - } - --// similar to ff_dynarray_add() and av_fast_realloc() --void* grow_array(void *array, int elem_size, int *size, int new_size) { -- if (new_size >= INT_MAX / elem_size) { -- wxLogError(wxT("Array too big.")); -- return NULL; -- } -- if (*size < new_size) { -- uint8_t* tmp = (uint8_t*) av_realloc(array, new_size*elem_size); -- if (!tmp) { -- wxLogError(wxT("Could not alloc buffer.")); -- return NULL; -- } -- memset(tmp + *size*elem_size, 0, (new_size-*size) * elem_size); -- *size = new_size; -- return tmp; -- } -- return array; --} -- - void choose_sample_rate(AVStream *st, AVCodec *codec) { - if (codec && codec->supported_samplerates){ - const int *p= codec->supported_samplerates; -@@ -893,6 +746,8 @@ - } - ost->file_index = fileIdx; - ost->index = idx; -+ -+ ost->sws_flags = SWS_BICUBIC; - return ost; - } - -@@ -913,8 +768,6 @@ - if (!ost) - return false; - -- output_codecs = (AVCodec**) -- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); - if (videoFormat != vfCOPY) { - wxSize frameSize = GetFrameSize(videoFormat); - frame_width = frameSize.GetWidth(); -@@ -929,21 +782,13 @@ - frame_rate.den = 1001; - } - codec = avcodec_find_encoder(codecId); -- output_codecs[nb_output_codecs-1] = codec; -+ ost->enc = codec; - - char* vfilters = NULL; - if (m_videoFilters.length()) { - vfilters = (char*) av_realloc(vfilters, m_videoFilters.length() + 1); - snprintf(vfilters, m_videoFilters.length() + 1, "%s", (const char*) m_videoFilters.mb_str()); - } -- if (frame_aspect_ratio_override) { -- int i = vfilters ? strlen(vfilters) : 0; -- vfilters = (char*) av_realloc(vfilters, i + 100); -- snprintf(vfilters + i, 100, "%csetdar=%f", i ? ',' : ' ', frame_aspect_ratio); -- frame_aspect_ratio = 0; -- frame_aspect_ratio_override = 0; -- } -- - ost->avfilter = vfilters; - } - -@@ -954,17 +799,14 @@ - st->codec->thread_count = thread_count; - - video_enc = st->codec; -- -+ - if (video_codec_tag) - video_enc->codec_tag= video_codec_tag; -- -- if ((video_global_header&1) || (video_global_header==0 && (oc->oformat->flags & AVFMT_GLOBALHEADER))) { -+ -+ if (oc->oformat->flags & AVFMT_GLOBALHEADER) { - video_enc->flags |= CODEC_FLAG_GLOBAL_HEADER; - } -- if (video_global_header&2) { -- video_enc->flags2 |= CODEC_FLAG2_LOCAL_HEADER; -- } -- -+ - if (videoFormat == vfCOPY) { - st->stream_copy = 1; - video_enc->codec_type = AVMEDIA_TYPE_VIDEO; -@@ -974,8 +816,6 @@ - const char *p; - int i; - -- AVRational fps= frame_rate.num ? frame_rate : (AVRational) {25,1}; -- - av_set_int(video_enc, "gop", isNTSC(videoFormat) ? 15 : 12); - av_set_int(video_enc, "b", bitrate * 1000); - av_set_int(video_enc, "maxrate", vbr ? 9000000 : bitrate * 1000); -@@ -985,20 +825,16 @@ - av_set_int(video_enc, "packetsize", 2048); - av_set_int(video_enc, "muxrate", 10080000); - -+ if (frame_rate.num) -+ ost->frame_rate = frame_rate; - video_enc->codec_id = codecId; - -- if (codec && codec->supported_framerates && !force_fps) -- fps = codec->supported_framerates[av_find_nearest_q_idx(fps, codec->supported_framerates)]; -- video_enc->time_base.den = fps.num; -- video_enc->time_base.num = fps.den; - video_enc->width = frame_width; - video_enc->height = frame_height; - video_enc->sample_aspect_ratio = av_d2q(frame_aspect_ratio*frame_height/frame_width, 255); - video_enc->pix_fmt = frame_pix_fmt; - st->sample_aspect_ratio = video_enc->sample_aspect_ratio; -- -- choose_pixel_fmt(st, codec); -- -+ - if (intra_only) - video_enc->gop_size = 0; - if (video_qscale || same_quality) { -@@ -1059,7 +895,7 @@ - // parse_forced_key_frames(forced_key_frames, ost, video_enc); - } - if (video_language) { -- av_metadata_set2(&st->metadata, "language", video_language, 0); -+ av_dict_set(&st->metadata, "language", video_language, 0); - av_freep(&video_language); - } - -@@ -1084,12 +920,10 @@ - if (!ost) - return false; - -- output_codecs = (AVCodec**) -- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); - if (audioFormat != afNONE && audioFormat != afCOPY) { - codecId = audioFormat == afMP2 ? CODEC_ID_MP2 : CODEC_ID_AC3; - codec = avcodec_find_encoder(codecId); -- output_codecs[nb_output_codecs-1] = codec; -+ ost->enc = codec; - } - - audio_sample_rate = 48000; -@@ -1110,8 +944,6 @@ - } - if (audioFormat == afCOPY) { - st->stream_copy = 1; -- audio_enc->channels = audio_channels; -- audio_enc->sample_rate = audio_sample_rate; - } else { - av_set_int(audio_enc, "ab", bitrate*1000); - codec = avcodec_find_encoder(codecId); -@@ -1122,19 +954,16 @@ - st->quality = FF_QP2LAMBDA * audio_qscale; - audio_enc->global_quality = (int) st->quality; - } -- audio_enc->channels = audio_channels; -+ if (audio_channels) -+ audio_enc->channels = audio_channels; - audio_enc->sample_fmt = audio_sample_fmt; -- audio_enc->sample_rate = audio_sample_rate; -+ if (audio_sample_rate) -+ audio_enc->sample_rate = audio_sample_rate; - audio_enc->channel_layout = channel_layout; -- if (av_get_channel_layout_nb_channels(channel_layout) != audio_channels) -- audio_enc->channel_layout = 0; - choose_sample_fmt(st, codec); -- choose_sample_rate(st, codec); - } -- audio_enc->sample_rate = audio_sample_rate; -- audio_enc->time_base= (AVRational) {1, audio_sample_rate}; - if (audio_language) { -- av_metadata_set2(&st->metadata, "language", audio_language, 0); -+ av_dict_set(&st->metadata, "language", audio_language, 0); - av_freep(&audio_language); - } - -@@ -1158,11 +987,10 @@ - return false; - subtitle_enc = st->codec; - -- output_codecs = (AVCodec**) -- grow_array(output_codecs, sizeof(*output_codecs), &nb_output_codecs, nb_output_codecs + 1); - if (subtitleFormat != sfNONE) { - codecId = CODEC_ID_DVD_SUBTITLE; -- codec = output_codecs[nb_output_codecs-1] = avcodec_find_encoder(codecId); -+ codec = avcodec_find_encoder(codecId); -+ ost->enc = codec; - } - avcodec_get_context_defaults3(st->codec, codec); - -@@ -1181,7 +1009,7 @@ - } - - if (subtitle_language) { -- av_metadata_set2(&st->metadata, "language", subtitle_language, 0); -+ av_dict_set(&st->metadata, "language", subtitle_language, 0); - av_freep(&subtitle_language); - } - -@@ -1233,7 +1061,7 @@ - } - - int wxFfmpegMediaTranscoder::CopyChapters(int infile, int outfile) { -- AVFormatContext *is = input_files[infile]; -+ AVFormatContext *is = input_files[infile].ctx; - AVFormatContext *os = output_files[outfile]; - - for (unsigned int i = 0; i < is->nb_chapters; i++) { -@@ -1259,7 +1087,7 @@ - out_ch->end = FFMIN(rt, in_ch->end - ts_off); - - if (metadata_chapters_autocopy) -- av_metadata_copy(&out_ch->metadata, in_ch->metadata, 0); -+ av_dict_copy(&out_ch->metadata, in_ch->metadata, 0); - - os->nb_chapters++; - os->chapters = (AVChapter**) av_realloc(os->chapters, sizeof(AVChapter)*os->nb_chapters); -@@ -1272,11 +1100,11 @@ - - /** Starts transcoding. */ - bool wxFfmpegMediaTranscoder::Run(bool& canceled) { -- int ret = 0, i, j, k, n, nb_istreams = 0, nb_ostreams = 0, step; -+ int ret = 0, i, j, k, n, nb_ostreams = 0, step; - AVFormatContext *is, *os; - AVCodecContext *codec, *icodec; - AVOutputStream *ost, **ost_table= NULL; -- AVInputStream *ist, **ist_table= NULL; -+ AVInputStream *ist = NULL; - wxString error; - int want_sdp = 1; - int bit_buffer_size = 1024*256; -@@ -1289,46 +1117,10 @@ - if (canceled) - return false; - -- AVInputFile* file_table = (AVInputFile*) av_mallocz(nb_input_files*sizeof(AVInputFile)); -- if (!file_table) -- goto fail; -- -- /* input stream init */ -- j = 0; -- for (i=0; i<nb_input_files; i++) { -- is = input_files[i]; -- file_table[i].ist_index = j; -- file_table[i].nb_streams = is->nb_streams; -- j += is->nb_streams;; -- } -- nb_istreams = j; -- -- ist_table = (AVInputStream**) av_mallocz(nb_istreams * sizeof(AVInputStream *)); -- if (!ist_table) -- goto fail; -- -- for (i=0; i<nb_istreams; i++) { -- ist = (AVInputStream*) av_mallocz(sizeof(AVInputStream)); -- if (!ist) -- goto fail; -- ist_table[i] = ist; -- } -- j = 0; -- for (i=0; i<nb_input_files; i++) { -- is = input_files[i]; -- for (k=0; k<(int)is->nb_streams; k++) { -- ist = ist_table[j++]; -- ist->st = is->streams[k]; -- ist->file_index = i; -- ist->index = k; -- ist->discard = 1; /* the stream is discarded by default (changed later) */ -- -- if (rate_emu) { -- ist->start = av_gettime(); -- } -- } -- } -- -+ if (rate_emu) -+ for (i = 0; i < nb_input_streams; i++) -+ input_streams[i].start = av_gettime(); -+ - /* output stream init */ - nb_ostreams = 0; - for (i=0; i<nb_output_files; i++) { -@@ -1350,15 +1142,15 @@ - int fi = stream_maps[i].file_index; - int si = stream_maps[i].stream_index; - -- if (fi < 0 || fi > nb_input_files - 1 || -- si < 0 || si > file_table[fi].nb_streams - 1) { -+ if (fi < 0 || fi > (int) nb_input_files - 1 || -+ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { - wxLogError(wxT("Could not find input stream #%d.%d"), fi, si); - return false; - } - fi = stream_maps[i].sync_file_index; - si = stream_maps[i].sync_stream_index; - if (fi < 0 || fi> nb_input_files - 1 || -- si < 0 || si> file_table[fi].nb_streams - 1) { -+ si < 0 || si > (int) input_files[fi].ctx->nb_streams - 1) { - wxLogError(wxT("Could not find sync stream #%d.%d"), fi, si); - return false; - } -@@ -1379,11 +1171,11 @@ - for(j=0; j<AVMEDIA_TYPE_NB; j++) - nb_frame_threshold[j] += step; - -- for(j=0; j<nb_istreams; j++) { -+ for(j=0; j<nb_input_streams; j++) { - int skip=0; -- ist = ist_table[j]; -+ ist = &input_streams[j]; - if(opt_programid){ -- AVFormatContext *f= input_files[ ist->file_index ]; -+ AVFormatContext *f= input_files[ist->file_index].ctx; - skip=1; - for (unsigned int pi=0; pi<f->nb_programs; pi++) { - AVProgram *p= f->programs[pi]; -@@ -1411,11 +1203,11 @@ - ost = ost_table[n] = output_streams_for_file[k][i]; - ost->st = os->streams[i]; - if (nb_stream_maps > 0) { -- ost->source_index = file_table[stream_maps[n].file_index].ist_index + -+ ost->source_index = input_files[stream_maps[n].file_index].ist_index + - stream_maps[n].stream_index; - - /* Sanity check that the stream types match */ -- if (ist_table[ost->source_index]->st->codec->codec_type -+ if (input_streams[ost->source_index].st->codec->codec_type - != ost->st->codec->codec_type) { - wxLogError(wxT("Codec type mismatch for mapping #%d.%d -> #%d.%d"), - stream_maps[n].file_index, stream_maps[n].stream_index, -@@ -1426,12 +1218,12 @@ - } else { - /* get corresponding input stream index : we select the first one with the right type */ - found = 0; -- for(j=0;j<nb_istreams;j++) { -+ for (j=0; j < nb_input_streams; j++) { - int skip=0; -- ist = ist_table[j]; -+ ist = &input_streams[j]; - if(opt_programid){ - unsigned int pi,si; -- AVFormatContext *f= input_files[ ist->file_index ]; -+ AVFormatContext *f = input_files[ist->file_index].ctx; - skip=1; - for(pi=0; pi<f->nb_programs; pi++){ - AVProgram *p= f->programs[pi]; -@@ -1453,8 +1245,8 @@ - if (!found) { - if(! opt_programid) { - /* try again and reuse existing stream */ -- for(j=0;j<nb_istreams;j++) { -- ist = ist_table[j]; -+ for (j = 0; j < nb_input_streams; j++) { -+ ist = &input_streams[j]; - if ( ist->st->codec->codec_type == ost->st->codec->codec_type - && ist->st->discard != AVDISCARD_ALL) { - ost->source_index = j; -@@ -1471,10 +1263,10 @@ - } - } - } -- ist = ist_table[ost->source_index]; -+ ist = &input_streams[ost->source_index]; - ist->discard = 0; - ost->sync_ist = (nb_stream_maps > 0) ? -- ist_table[file_table[stream_maps[n].sync_file_index].ist_index + -+ &input_streams[input_files[stream_maps[n].sync_file_index].ist_index + - stream_maps[n].sync_stream_index] : ist; - } - } -@@ -1483,13 +1275,13 @@ - for (i=0; i<nb_ostreams; i++) { - ost = ost_table[i]; - os = output_files[ost->file_index]; -- ist = ist_table[ost->source_index]; -+ ist = &input_streams[ost->source_index]; - - codec = ost->st->codec; - icodec = ist->st->codec; - - if (metadata_streams_autocopy) -- av_metadata_copy(&ost->st->metadata, ist->st->metadata, AV_METADATA_DONT_OVERWRITE); -+ av_dict_copy(&ost->st->metadata, ist->st->metadata, AV_DICT_DONT_OVERWRITE); - - ost->st->disposition = ist->st->disposition; - codec->bits_per_raw_sample= icodec->bits_per_raw_sample; -@@ -1520,11 +1312,13 @@ - goto fail; - memcpy(codec->extradata, icodec->extradata, icodec->extradata_size); - codec->extradata_size= icodec->extradata_size; -- if(av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000){ -- codec->time_base = icodec->time_base; -- codec->time_base.num *= icodec->ticks_per_frame; -- } else -- codec->time_base = ist->st->time_base; -+ if(!copy_tb && av_q2d(icodec->time_base)*icodec->ticks_per_frame > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/500){ -+ codec->time_base = icodec->time_base; -+ codec->time_base.num *= icodec->ticks_per_frame; -+ av_reduce(&codec->time_base.num, &codec->time_base.den, -+ codec->time_base.num, codec->time_base.den, INT_MAX); -+ } else -+ codec->time_base = ist->st->time_base; - switch (codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - if(audio_volume != 256) { -@@ -1566,12 +1360,25 @@ - return false; - } - } else { -+ if (!ost->enc) -+ ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); - switch (codec->codec_type) { - case AVMEDIA_TYPE_AUDIO: - ost->fifo= av_fifo_alloc(1024); - if(!ost->fifo) - goto fail; - ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); -+ if (!codec->sample_rate) { -+ codec->sample_rate = icodec->sample_rate; -+ if (icodec->lowres) -+ codec->sample_rate >>= icodec->lowres; -+ } -+ choose_sample_rate(ost->st, ost->enc); -+ codec->time_base = (AVRational){1, codec->sample_rate}; -+ if (!codec->channels) -+ codec->channels = icodec->channels; -+ if (av_get_channel_layout_nb_channels(codec->channel_layout) != codec->channels) -+ codec->channel_layout = 0; - ost->audio_resample = codec->sample_rate != icodec->sample_rate || audio_sync_method > 1; - icodec->request_channels = codec->channels; - ist->decoding_needed = 1; -@@ -1581,6 +1388,9 @@ - ost->resample_channels = icodec->channels; - break; - case AVMEDIA_TYPE_VIDEO: -+ if (codec->pix_fmt == PIX_FMT_NONE) -+ codec->pix_fmt = icodec->pix_fmt; -+ choose_pixel_fmt(ost->st, ost->enc); - if (ost->st->codec->pix_fmt == PIX_FMT_NONE) { - wxLogError(wxT("Video pixel format is unknown, stream cannot be encoded")); - return false; -@@ -1590,13 +1400,30 @@ - if (ost->video_resample) { - codec->bits_per_raw_sample= frame_bits_per_raw_sample; - } -+ if (!codec->width || !codec->height) { -+ codec->width = icodec->width; -+ codec->height = icodec->height; -+ } - ost->resample_height = icodec->height; - ost->resample_width = icodec->width; - ost->resample_pix_fmt= icodec->pix_fmt; - ost->encoding_needed = 1; - ist->decoding_needed = 1; -+ -+ if (!ost->frame_rate.num) -+ ost->frame_rate = ist->st->r_frame_rate.num ? ist->st->r_frame_rate : (AVRational){25,1}; -+ if (ost->enc && ost->enc->supported_framerates && !force_fps) { -+ int idx = av_find_nearest_q_idx(ost->frame_rate, ost->enc->supported_framerates); -+ ost->frame_rate = ost->enc->supported_framerates[idx]; -+ } -+ codec->time_base = (AVRational){ost->frame_rate.den, ost->frame_rate.num}; -+ if( av_q2d(codec->time_base) < 0.001 && video_sync_method -+ && (video_sync_method==1 || (video_sync_method<0 && !(os->oformat->flags & AVFMT_VARIABLE_FPS)))){ -+ av_log(os, AV_LOG_WARNING, "Frame rate very high for a muxer not effciciently supporting it.\n" -+ "Please consider specifiying a lower framerate, a different muxer or -vsync 2\n"); -+ } - -- if (configure_filters(ist, ost)) { -+ if (configure_video_filters(ist, ost)) { - wxLogError(wxT("Error opening filters!")); - return false; - } -@@ -1653,10 +1480,8 @@ - for (i=0; i<nb_ostreams; i++) { - ost = ost_table[i]; - if (ost->encoding_needed) { -- AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL; -- AVCodecContext *dec = ist_table[ost->source_index]->st->codec; -- if (!codec) -- codec = avcodec_find_encoder(ost->st->codec->codec_id); -+ AVCodec *codec = ost->enc; -+ AVCodecContext *dec = input_streams[ost->source_index].st->codec; - if (!codec) { - error = wxString::Format(wxT("Encoder (codec id %d) not found for output stream #%d.%d"), - ost->st->codec->codec_id, ost->file_index, ost->index); -@@ -1683,18 +1508,18 @@ - } - - /* open each decoder */ -- for (i=0; i<nb_istreams; i++) { -- ist = ist_table[i]; -+ for (i = 0; i < nb_input_streams; i++) { -+ ist = &input_streams[i]; - if (ist->decoding_needed) { - AVCodec *codec = avcodec_find_decoder(ist->st->codec->codec_id); - if (!codec) { - wxLogError(wxT("Decoder (codec id %d) not found for input stream #%d.%d"), -- ist->st->codec->codec_id, ist->file_index, ist->index); -+ ist->st->codec->codec_id, ist->file_index, ist->st->index); - return false; - } - if (avcodec_open(ist->st->codec, codec) < 0) { - wxLogError(wxT("Error while opening decoder for input stream #%d.%d"), -- ist->file_index, ist->index); -+ ist->file_index, ist->st->index); - return false; - } - //if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) -@@ -1703,20 +1528,68 @@ - } - - /* init pts */ -- for (i=0; i<nb_istreams; i++) { -+ for (i = 0; i < nb_input_streams; i++) { - AVStream *st; -- ist = ist_table[i]; -+ ist = &input_streams[i]; - st= ist->st; - ist->pts = st->avg_frame_rate.num ? - st->codec->has_b_frames*AV_TIME_BASE / av_q2d(st->avg_frame_rate) : 0; - ist->next_pts = AV_NOPTS_VALUE; - ist->is_start = 1; - } -+ -+ /* set meta data information from input file if required */ -+ for (i=0;i<nb_meta_data_maps;i++) { -+ AVFormatContext *files[2]; -+ AVDictionary **meta[2]; -+ int j; -+ -+#define METADATA_CHECK_INDEX(index, nb_elems, desc)\ -+ if ((index) < 0 || (index) >= (int) (nb_elems)) {\ -+ error = wxString::Format(wxT("Invalid %s index %d while processing metadata maps."), (desc), (index));\ -+ ret = AVERROR(EINVAL);\ -+ goto dump_format;\ -+ } -+ -+ int out_file_index = meta_data_maps[i][0].file; -+ int in_file_index = meta_data_maps[i][1].file; -+ if (in_file_index < 0 || out_file_index < 0) -+ continue; -+ METADATA_CHECK_INDEX(out_file_index, nb_output_files, "output file") -+ METADATA_CHECK_INDEX(in_file_index, nb_input_files, "input file") -+ -+ files[0] = output_files[out_file_index]; -+ files[1] = input_files[in_file_index].ctx; -+ -+ for (j = 0; j < 2; j++) { -+ AVMetaDataMap *map = &meta_data_maps[i][j]; - -+ switch (map->type) { -+ case 'g': -+ meta[j] = &files[j]->metadata; -+ break; -+ case 's': -+ METADATA_CHECK_INDEX(map->index, files[j]->nb_streams, "stream") -+ meta[j] = &files[j]->streams[map->index]->metadata; -+ break; -+ case 'c': -+ METADATA_CHECK_INDEX(map->index, files[j]->nb_chapters, "chapter") -+ meta[j] = &files[j]->chapters[map->index]->metadata; -+ break; -+ case 'p': -+ METADATA_CHECK_INDEX(map->index, files[j]->nb_programs, "program") -+ meta[j] = &files[j]->programs[map->index]->metadata; -+ break; -+ } -+ } -+ -+ av_dict_copy(meta[0], *meta[1], AV_DICT_DONT_OVERWRITE); -+ } -+ - /* copy global metadata by default */ - if (metadata_global_autocopy) { - - for (i = 0; i < nb_output_files; i++) -- av_metadata_copy(&output_files[i]->metadata, input_files[0]->metadata, AV_METADATA_DONT_OVERWRITE); -+ av_dict_copy(&output_files[i]->metadata, input_files[0].ctx->metadata, AV_DICT_DONT_OVERWRITE); - } - - /* copy chapters according to chapter maps */ -@@ -1742,7 +1615,7 @@ - /* copy chapters from the first input file that has them*/ - if (!nb_chapter_maps) - for (i = 0; i < nb_input_files; i++) { -- if (!input_files[i]->nb_chapters) -+ if (!input_files[i].ctx->nb_chapters) - continue; - - for (j = 0; j < nb_output_files; j++) -@@ -1776,10 +1649,10 @@ - for(i=0;i<nb_ostreams;i++) { - ost = ost_table[i]; - wxString msg = wxString::Format(wxT(" Stream #%d.%d -> #%d.%d"), -- ist_table[ost->source_index]->file_index, ist_table[ost->source_index]->index, -+ input_streams[ost->source_index].file_index, input_streams[ost->source_index].st->index, - ost->file_index, ost->index); -- if (ost->sync_ist != ist_table[ost->source_index]) -- msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->index); -+ if (ost->sync_ist != &input_streams[ost->source_index]) -+ msg += wxString::Format(wxT(" [sync #%d.%d]"), ost->sync_ist->file_index, ost->sync_ist->st->index); - wxLogMessage(msg); - } - } -@@ -1815,12 +1688,12 @@ - double ipts, opts; - ost = ost_table[i]; - os = output_files[ost->file_index]; -- ist = ist_table[ost->source_index]; -+ ist = &input_streams[ost->source_index]; - if (ist->is_past_recording_time || no_packet[ist->file_index]) - continue; - opts = ost->st->pts.val * av_q2d(ost->st->time_base); - ipts = (double)ist->pts; -- if (!file_table[ist->file_index].eof_reached) { -+ if (!input_files[ist->file_index].eof_reached) { - if (ipts < ipts_min) { - ipts_min = ipts; - if (input_sync) -@@ -1853,7 +1726,7 @@ - break; - - /* read a frame from it and output it in the fifo */ -- is = input_files[file_index]; -+ is = input_files[file_index].ctx; - ret= av_read_frame(is, &pkt); - if(ret == AVERROR(EAGAIN)){ - no_packet[file_index]=1; -@@ -1861,7 +1734,7 @@ - continue; - } - if (ret < 0) { -- file_table[file_index].eof_reached = 1; -+ input_files[file_index].eof_reached = 1; - if (opt_shortest) - break; - else -@@ -1876,11 +1749,11 @@ - // } - - /* the following test is needed in case new streams appear -- dynamically in stream : we ignore them */ -- if (pkt.stream_index >= file_table[file_index].nb_streams) -+ dynamically in stream : we ignore them */ -+ if (pkt.stream_index >= (int) input_files[file_index].ctx->nb_streams) - goto discard_packet; -- ist_index = file_table[file_index].ist_index + pkt.stream_index; -- ist = ist_table[ist_index]; -+ ist_index = input_files[file_index].ist_index + pkt.stream_index; -+ ist = &input_streams[ist_index]; - if (ist->discard) - goto discard_packet; - -@@ -1926,7 +1799,7 @@ - //wxLogMessage(wxT("read #%d.%d size=%d"), ist->file_index, ist->index, pkt.size); - if (!OutputPacket(ist, ist_index, ost_table, nb_ostreams, &pkt, bit_buffer_size, bit_buffer)) { - if (verbose >= 0) -- wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->index); -+ wxLogMessage(wxT("Error while decoding stream #%d.%d"), ist->file_index, ist->st->index); - if (exit_on_error) - return false; - av_free_packet(&pkt); -@@ -1941,8 +1814,8 @@ - } - - /* at the end of stream, we must flush the decoder buffers */ -- for (i=0; i<nb_istreams; i++) { -- ist = ist_table[i]; -+ for (i = 0; i < nb_input_streams; i++) { -+ ist = &input_streams[i]; - if (ist->decoding_needed) - OutputPacket(ist, i, ost_table, nb_ostreams, NULL, bit_buffer_size, bit_buffer); - } -@@ -1967,8 +1840,8 @@ - } - - /* close each decoder */ -- for (i=0; i<nb_istreams; i++) { -- ist = ist_table[i]; -+ for (i = 0; i < nb_input_streams; i++) { -+ ist = &input_streams[i]; - if (ist->decoding_needed) { - avcodec_close(ist->st->codec); - } -@@ -1978,15 +1851,7 @@ - ret = 0; - fail: - av_freep(&bit_buffer); -- av_free(file_table); - -- if (ist_table) { -- for (i=0; i<nb_istreams; i++) { -- ist = ist_table[i]; -- av_free(ist); -- } -- av_free(ist_table); -- } - if (ost_table) { - for (i=0; i<nb_ostreams; i++) { - ost = ost_table[i]; -@@ -2000,7 +1865,7 @@ - av_fifo_free(ost->fifo); /* works even if fifo is not initialized but set to zero */ - av_freep(&ost->st->codec->subtitle_header); - av_free(ost->resample_frame.data[0]); --// av_free(ost->forced_kf_pts); -+ av_free(ost->forced_kf_pts); - if (ost->video_resample) - sws_freeContext(ost->img_resample_ctx); - if (ost->resample) -@@ -2029,15 +1894,15 @@ - AVFormatContext *os; - AVOutputStream *ost; - int ret, i; -- int got_picture; -+ int got_output; - AVFrame picture; -- void *buffer_to_free; -+ void *buffer_to_free = NULL; - unsigned int samples_size = 0; - AVSubtitle subtitle, *subtitle_to_free; - int frame_available; - - AVPacket avpkt; -- int bps = av_get_bits_per_sample_fmt(ist->st->codec->sample_fmt)>>3; -+ int bps = av_get_bytes_per_sample(ist->st->codec->sample_fmt); - - if(ist->next_pts == (int64_t) AV_NOPTS_VALUE) - ist->next_pts= ist->pts; -@@ -2056,7 +1921,7 @@ - ist->next_pts = ist->pts = av_rescale_q(pkt->dts, ist->st->time_base, AV_TIME_BASE_Q); - - //while we have more to decode or while the decoder did output something on EOF -- while (avpkt.size > 0 || (!pkt && ist->next_pts != ist->pts)) { -+ while (avpkt.size > 0 || (!pkt && got_output)) { - uint8_t *data_buf, *decoded_data_buf; - int data_size, decoded_data_size; - handle_eof: -@@ -2090,9 +1955,10 @@ - avpkt.data += ret; - avpkt.size -= ret; - data_size = ret; -+ got_output = decoded_data_size > 0; - // Some bug in mpeg audio decoder gives - // decoded_data_size < 0, it seems they are overflows -- if (decoded_data_size <= 0) { -+ if (!got_output) { - // no audio frame - continue; - } -@@ -2106,11 +1972,11 @@ - // XXX: allocate picture correctly - avcodec_get_frame_defaults(&picture); - -- ret = avcodec_decode_video2(ist->st->codec, &picture, &got_picture, &avpkt); -+ ret = avcodec_decode_video2(ist->st->codec, &picture, &got_output, &avpkt); - ist->st->quality= picture.quality; - if (ret < 0) - goto fail_decode; -- if (!got_picture) { -+ if (!got_output) { - // no picture yet - goto discard_packet; - } -@@ -2121,12 +1987,14 @@ - / ist->st->codec->time_base.den; - } - avpkt.size = 0; -+ buffer_to_free = NULL; -+ pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); - break; - case AVMEDIA_TYPE_SUBTITLE: -- ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_picture, &avpkt); -+ ret = avcodec_decode_subtitle2(ist->st->codec, &subtitle, &got_output, &avpkt); - if (ret < 0) - goto fail_decode; -- if (!got_picture) { -+ if (!got_output) { - goto discard_packet; - } - subtitle_to_free = &subtitle; -@@ -2157,26 +2025,19 @@ - avpkt.size = 0; - } - -- buffer_to_free = NULL; -- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { -- pre_process_video_frame(ist, (AVPicture *)&picture, &buffer_to_free); -- } -- -- if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO){ -- for(i=0;i<nb_ostreams;i++) { -- ost = ost_table[i]; -- if (ost->input_video_filter && ost->source_index == ist_index) { -- AVRational sar; -- if (ist->st->sample_aspect_ratio.num) sar = ist->st->sample_aspect_ratio; -- else sar = ist->st->codec->sample_aspect_ratio; -- // add it to be filtered -- av_vsrc_buffer_add_frame2(ost->input_video_filter, &picture, -- ist->pts, -- sar, ist->st->codec->width, ist->st->codec->height, -- ist->st->codec->pix_fmt, "0:0"); -- } -- } -- } -+ if(ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) -+ if (start_time == 0 || ist->pts >= start_time) { -+ for(i=0;i<nb_ostreams;i++) { -+ ost = ost_table[i]; -+ if (ost->input_video_filter && ost->source_index == ist_index) { -+ if (!picture.sample_aspect_ratio.num) -+ picture.sample_aspect_ratio = ist->st->sample_aspect_ratio; -+ picture.pts = ist->pts; -+ -+ av_vsrc_buffer_add_frame(ost->input_video_filter, &picture, AV_VSRC_BUF_FLAG_OVERWRITE); -+ } -+ } -+ } - - // preprocess audio (volume) - if (ist->st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { -@@ -2209,14 +2070,18 @@ - - ost = ost_table[i]; - if (ost->source_index == ist_index) { -- frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || -- !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); -- while (frame_available) { -- AVRational ist_pts_tb; -- if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) -- get_filtered_video_frame(ost->output_video_filter, &picture, &ost->picref, &ist_pts_tb); -- if (ost->picref) -- ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); -+ frame_available = ist->st->codec->codec_type != AVMEDIA_TYPE_VIDEO || -+ !ost->output_video_filter || avfilter_poll_frame(ost->output_video_filter->inputs[0]); -+ while (frame_available) { -+ if (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && ost->output_video_filter) { -+ AVRational ist_pts_tb = ost->output_video_filter->inputs[0]->time_base; -+ if (av_vsink_buffer_get_video_buffer_ref(ost->output_video_filter, &ost->picref, 0) < 0) -+ goto cont; -+ if (ost->picref) { -+ avfilter_fill_frame_from_video_buffer_ref(&picture, ost->picref); -+ ist->pts = av_rescale_q(ost->picref->pts, ist_pts_tb, AV_TIME_BASE_Q); -+ } -+ } - os = output_files[ost->file_index]; - - // set the input output pts pairs -@@ -2232,7 +2097,7 @@ - break; - case AVMEDIA_TYPE_VIDEO: - if (ost->picref->video) -- ost->st->codec->sample_aspect_ratio = ost->picref->video->pixel_aspect; -+ ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; - if (!DoVideoOut(os, ost, ist, &picture, &frame_size, bit_buffer_size, bit_buffer)) - return false; - // if (vstats_filename && frame_size) -@@ -2249,6 +2114,7 @@ - } - } else { - AVFrame avframe; //FIXME/XXX remove this -+ AVPicture pict; - AVPacket opkt; - int64_t ost_tb_start_time= av_rescale_q(start_time, AV_TIME_BASE_Q, ost->st->time_base); - -@@ -2298,6 +2164,14 @@ - opkt.size = data_size; - } - -+ if (os->oformat->flags & AVFMT_RAWPICTURE) { -+ /* store AVPicture in AVPacket, as expected by the output format */ -+ avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height); -+ opkt.data = (uint8_t *)&pict; -+ opkt.size = sizeof(AVPicture); -+ opkt.flags |= AV_PKT_FLAG_KEY; -+ } -+ - if (!WriteFrame(os, &opkt, ost->st->codec, ost->bitstream_filters)) - return false; - -@@ -2308,8 +2182,7 @@ - cont: - frame_available = (ist->st->codec->codec_type == AVMEDIA_TYPE_VIDEO) && - ost->output_video_filter && avfilter_poll_frame(ost->output_video_filter->inputs[0]); -- if(ost->picref) -- avfilter_unref_buffer(ost->picref); -+ avfilter_unref_buffer(ost->picref); - } - } - } -@@ -2348,7 +2221,7 @@ - ret = 0; - // encode any samples remaining in fifo - if (fifo_bytes > 0) { -- int osize = av_get_bits_per_sample_fmt(enc->sample_fmt) >> 3; -+ int osize = av_get_bytes_per_sample(enc->sample_fmt); - int fs_tmp = enc->frame_size; - av_fifo_generic_read(ost->fifo, audio_buf, fifo_bytes, NULL); - if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { -@@ -2447,11 +2320,11 @@ - int64_t audio_out_size, audio_buf_size; - int64_t allocated_for_size= size; - -- int size_out, frame_bytes, ret; -+ int size_out, frame_bytes, ret, resample_changed; - AVCodecContext *enc= ost->st->codec; - AVCodecContext *dec= ist->st->codec; -- int osize= av_get_bits_per_sample_fmt(enc->sample_fmt)/8; -- int isize= av_get_bits_per_sample_fmt(dec->sample_fmt)/8; -+ int osize= av_get_bytes_per_sample(enc->sample_fmt); -+ int isize= av_get_bytes_per_sample(dec->sample_fmt); - const int coded_bps = av_get_bits_per_sample(enc->codec->id); - - need_realloc: -@@ -2481,18 +2354,42 @@ - if (enc->channels != dec->channels) - ost->audio_resample = 1; - -- if (ost->audio_resample && !ost->resample) { -- if (dec->sample_fmt != SAMPLE_FMT_S16) -- wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); -- ost->resample = av_audio_resample_init(enc->channels, dec->channels, -- enc->sample_rate, dec->sample_rate, -- enc->sample_fmt, dec->sample_fmt, -- 16, 10, 0, 0.8); -- if (!ost->resample) { -- wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), -- dec->channels, dec->sample_rate, -- enc->channels, enc->sample_rate); -- return false; -+ resample_changed = ost->resample_sample_fmt != dec->sample_fmt || -+ ost->resample_channels != dec->channels || -+ ost->resample_sample_rate != dec->sample_rate; -+ -+ if ((ost->audio_resample && !ost->resample) || resample_changed) { -+ if (resample_changed) { -+ av_log(NULL, AV_LOG_INFO, "Input stream #%d.%d frame changed from rate:%d fmt:%s ch:%d to rate:%d fmt:%s ch:%d\n", -+ ist->file_index, ist->st->index, -+ ost->resample_sample_rate, av_get_sample_fmt_name(ost->resample_sample_fmt), ost->resample_channels, -+ dec->sample_rate, av_get_sample_fmt_name(dec->sample_fmt), dec->channels); -+ ost->resample_sample_fmt = dec->sample_fmt; -+ ost->resample_channels = dec->channels; -+ ost->resample_sample_rate = dec->sample_rate; -+ if (ost->resample) -+ audio_resample_close(ost->resample); -+ } -+ /* if audio_sync_method is >1 the resampler is needed for audio drift compensation */ -+ if (audio_sync_method <= 1 && -+ ost->resample_sample_fmt == enc->sample_fmt && -+ ost->resample_channels == enc->channels && -+ ost->resample_sample_rate == enc->sample_rate) { -+ ost->resample = NULL; -+ ost->audio_resample = 0; -+ } else { -+ if (dec->sample_fmt != SAMPLE_FMT_S16) -+ wxLogWarning(wxT("Warning, using s16 intermediate sample format for resampling")); -+ ost->resample = av_audio_resample_init(enc->channels, dec->channels, -+ enc->sample_rate, dec->sample_rate, -+ enc->sample_fmt, dec->sample_fmt, -+ 16, 10, 0, 0.8); -+ if (!ost->resample) { -+ wxLogError(wxT("Can not resample %d channels @ %d Hz to %d channels @ %d Hz"), -+ dec->channels, dec->sample_rate, -+ enc->channels, enc->sample_rate); -+ return false; -+ } - } - } - -@@ -2619,7 +2516,7 @@ - pkt.size= ret; - if(enc->coded_frame && enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) - pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - if (!WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters)) - return false; - -@@ -2704,7 +2601,7 @@ - bool wxFfmpegMediaTranscoder::DoVideoOut(AVFormatContext *s, AVOutputStream *ost, - AVInputStream *ist, AVFrame *in_picture, int *frame_size, - int bit_buffer_size, uint8_t* bit_buffer) { -- int nb_frames, i, ret, av_unused resample_changed; -+ int nb_frames, i, ret; - AVFrame *final_picture, *formatted_picture; - AVCodecContext *enc, *dec; - double sync_ipts; -@@ -2787,15 +2684,13 @@ - // handles sameq here. This is not correct because it may not be a global option - big_picture.quality = same_quality ? (int) ist->st->quality : (int) ost->st->quality; - if (!me_threshold) -- big_picture.pict_type = 0; --// big_picture.pts = AV_NOPTS_VALUE; -+ big_picture.pict_type = (AVPictureType) 0; - big_picture.pts= ost->sync_opts; --// big_picture.pts= av_rescale(ost->sync_opts, AV_TIME_BASE*(int64_t)enc->time_base.num, enc->time_base.den); --// if (ost->forced_kf_index < ost->forced_kf_count && --// big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { --// big_picture.pict_type = AV_PICTURE_TYPE_I; --// ost->forced_kf_index++; --// } -+ if (ost->forced_kf_index < ost->forced_kf_count && -+ big_picture.pts >= ost->forced_kf_pts[ost->forced_kf_index]) { -+ big_picture.pict_type = AV_PICTURE_TYPE_I; -+ ost->forced_kf_index++; -+ } - ret = avcodec_encode_video(enc, bit_buffer, bit_buffer_size, &big_picture); - if (ret < 0) { - wxLogError(wxT("Video encoding failed")); -@@ -2806,17 +2701,12 @@ - pkt.size= ret; - if(enc->coded_frame->pts != (int64_t) AV_NOPTS_VALUE) - pkt.pts= av_rescale_q(enc->coded_frame->pts, enc->time_base, ost->st->time_base); -- //av_log(NULL, AV_LOG_DEBUG, "encoder -> %"PRId64"/%"PRId64"\n", -- //pkt.pts != AV_NOPTS_VALUE ? av_rescale(pkt.pts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1, -- //pkt.dts != AV_NOPTS_VALUE ? av_rescale(pkt.dts, enc->time_base.den, AV_TIME_BASE*(int64_t)enc->time_base.num) : -1); -- -+ - if(enc->coded_frame->key_frame) - pkt.flags |= AV_PKT_FLAG_KEY; - WriteFrame(s, &pkt, ost->st->codec, ost->bitstream_filters); - *frame_size = ret; - video_size += ret; -- //wxLogError(wxT("Frame: %3d size: %5d type: %d"), -- // enc->frame_number-1, ret, enc->pict_type); - // if two pass, output log - if (ost->logfile && enc->stats_out) { - fprintf(ost->logfile, "%s", enc->stats_out); -@@ -2896,7 +2786,8 @@ - int64_t total_size; - AVCodecContext *enc; - int frame_number, vid, i; -- double bitrate, ti1, pts; -+ double bitrate; -+ int64_t pts = INT64_MAX; - static int64_t last_time = -1; - static int qp_histogram[52]; - -@@ -2920,11 +2811,13 @@ - total_size= avio_tell(oc->pb); - - wxString msg; -- ti1 = 1e10; - vid = 0; - for (i=0; i<nb_ostreams; i++) { -+ float q = -1; - ost = ost_table[i]; - enc = ost->st->codec; -+ if (!ost->st->stream_copy && enc->coded_frame) -+ q = enc->coded_frame->quality/(float)FF_QP2LAMBDA; - if (vid && enc->codec_type == AVMEDIA_TYPE_VIDEO) { - msg += wxString::Format(wxT("q=%2.1f "), - !ost->st->stream_copy ? enc->coded_frame->quality/(float)FF_QP2LAMBDA : -1); -@@ -2940,7 +2833,7 @@ - msg += wxString::Format(wxT("L")); - if (qp_hist) { - int j; -- int qp = (int) rint(enc->coded_frame->quality/(float)FF_QP2LAMBDA); -+ int qp = lrintf(q); - if (qp>=0 && qp < (int) (FF_ARRAY_ELEMS(qp_histogram))) - qp_histogram[qp]++; - for (j=0; j<32; j++) -@@ -2971,18 +2864,22 @@ - vid = 1; - } - // compute min output value -- pts = (double)ost->st->pts.val * av_q2d(ost->st->time_base); -- if ((pts < ti1) && (pts > 0)) -- ti1 = pts; -+ pts = FFMIN(pts, av_rescale_q(ost->st->pts.val, ost->st->time_base, AV_TIME_BASE_Q)); - } -- if (ti1 < 0.01) -- ti1 = 0.01; - - if (verbose || is_last_report) { -- bitrate = (double)(total_size * 8) / ti1 / 1000.0; -+ int hours, mins, secs, us; -+ secs = pts / AV_TIME_BASE; -+ us = pts % AV_TIME_BASE; -+ mins = secs / 60; -+ secs %= 60; -+ hours = mins / 60; -+ mins %= 60; -+ -+ bitrate = pts ? total_size * 8 / (pts / 1000.0) : 0; - -- msg += wxString::Format(wxT("size=%8.0fkB time=%0.2f bitrate=%6.1fkbits/s"), -- (double)total_size / 1024, ti1, bitrate); -+ msg += wxString::Format(wxT("size=%8.0fkB time=%02d:%02d:%02d.%02d bitrate=%6.1fkbits/s"), -+ (double) total_size / 1024, hours, mins, secs, (100 * us) / AV_TIME_BASE, bitrate); - - if (nb_frames_dup || nb_frames_drop) - msg += wxString::Format(wxT(" dup=%d drop=%d"), nb_frames_dup, nb_frames_drop); -@@ -3013,10 +2910,9 @@ - } - nb_output_files = 0; - for (int i=0; i<nb_input_files; i++) { -- av_close_input_file(input_files[i]); -+ av_close_input_file(input_files[i].ctx); - av_free(input_files_ts_scale[i]); - } -- nb_input_files = 0; - - av_freep(&intra_matrix); - av_freep(&inter_matrix); -@@ -3025,11 +2921,14 @@ - fclose(vstats_file); - av_freep(&vstats_filename); - -- av_freep(&output_codecs); -- nb_output_codecs = 0; - av_freep(&stream_maps); - nb_stream_maps = 0; - -+ av_freep(&input_streams); -+ nb_input_streams = 0; -+ av_freep(&input_files); -+ nb_input_files = 0; -+ - av_freep(&video_standard); - av_freep(&audio_buf); - av_freep(&audio_out); -diff -Naur DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h ---- DVDStyler-1.8.4.3.orig/src/mediatrc_ffmpeg.h 2011-05-15 09:23:34.000000000 -0400 -+++ DVDStyler-1.8.4.3/src/mediatrc_ffmpeg.h 2011-09-18 18:13:29.000000000 -0400 -@@ -3,7 +3,7 @@ - // Purpose: FFMPEG Media Transcoder - // Author: Alex Thuering - // Created: 26.04.2008 --// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.19 2011/05/15 13:23:34 ntalex Exp $ -+// RCS-ID: $Id: mediatrc_ffmpeg.h,v 1.20 2011/07/24 07:58:21 ntalex Exp $ - // Copyright: (c) Alex Thuering - // Licence: GPL - ///////////////////////////////////////////////////////////////////////////// -@@ -20,13 +20,8 @@ - extern "C" { - #define __STDC_CONSTANT_MACROS - #define __STDC_LIMIT_MACROS --#ifdef HAVE_FFMPEG_AVUTIL_H --#include <avformat.h> --#include <swscale.h> --#else - #include <libavformat/avformat.h> - #include <libswscale/swscale.h> --#endif - } - - // select an input stream for an output stream -@@ -39,8 +34,9 @@ - - // select an input file for an output file - typedef struct AVMetaDataMap { -- int out_file; -- int in_file; -+ int file; //< file index -+ char type; //< type of metadata to copy -- (g)lobal, (s)tream, (c)hapter or (p)rogram -+ int index; //< stream/chapter/program number - } AVMetaDataMap; - - typedef struct AVChapterMap { -@@ -50,6 +46,8 @@ - - struct AVInputStream; - struct AVOutputStream; -+struct AVDictionary; -+struct AVInputFile; - - #define MAX_FILES 50 - #define MAX_STREAMS_ 20 -@@ -108,21 +106,20 @@ - void PrintReport(AVFormatContext **output_files, AVOutputStream **ost_table, - int nb_ostreams, int is_last_report); - int CopyChapters(int infile, int outfile); -- AVFormatContext *input_files[MAX_FILES]; -- int nb_input_files; - int64_t input_files_ts_offset[MAX_FILES]; - double* input_files_ts_scale[MAX_FILES]; - int nb_input_files_ts_scale[MAX_FILES]; -+ -+ AVCodec **input_codecs; -+ int nb_input_codecs; - - AVFormatContext* output_files[MAX_FILES]; -- AVCodec** output_codecs; - int nb_output_files; -- int nb_output_codecs; - - AVStreamMap* stream_maps; - int nb_stream_maps; - -- AVMetaDataMap meta_data_maps[MAX_FILES]; -+ AVMetaDataMap (*meta_data_maps)[2]; - int nb_meta_data_maps; - int metadata_global_autocopy; - int metadata_streams_autocopy; -@@ -134,7 +131,6 @@ - int frame_width; - int frame_height; - float frame_aspect_ratio; -- int frame_aspect_ratio_override; - PixelFormat frame_pix_fmt; - int frame_bits_per_raw_sample; - SampleFormat audio_sample_fmt; -@@ -163,10 +159,10 @@ - int audio_channels; - unsigned int audio_codec_tag; - char *audio_language; -- -+ - char *subtitle_language; - unsigned int subtitle_codec_tag; -- -+ - float mux_preload; - float mux_max_delay; - -@@ -174,7 +170,7 @@ - int64_t start_time; - int64_t recording_timestamp; - int64_t input_ts_offset; -- AVMetadata* metadata; -+ AVDictionary *metadata; - int do_psnr; - int do_pass; - const char *pass_logfilename_prefix; -@@ -182,8 +178,8 @@ - int audio_sync_method; - float audio_drift_threshold; - int copy_ts; -- int opt_shortest; // -- int video_global_header; -+ int copy_tb; -+ int opt_shortest; - char *vstats_filename; - FILE *vstats_file; - int opt_programid; -@@ -222,6 +218,12 @@ - AVBitStreamFilterContext *video_bitstream_filters; - AVBitStreamFilterContext *audio_bitstream_filters; - AVBitStreamFilterContext *subtitle_bitstream_filters; -+ -+ AVInputStream *input_streams; -+ int nb_input_streams; -+ AVInputFile *input_files; -+ int nb_input_files; -+ - AVOutputStream** output_streams_for_file[MAX_FILES]; - int nb_output_streams_for_file[MAX_FILES]; - }; diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index be3c974d1..5042e9358 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 48640 2011-06-03 16:55:04Z stephane $ +# $Id: PKGBUILD 57280 2011-10-25 09:58:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff -pkgver=1.9 -pkgrel=2 +pkgver=2.0 +pkgrel=1 pkgdesc="a front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64' 'mips64el') url="http://os.ghalkes.nl/dwdiff.html" depends=('diffutils' 'icu') license=('GPL') source=(http://os.ghalkes.nl/dist/$pkgname-$pkgver.tgz) -md5sums=('f483d8d8dab7a972ef21d5096e07fd47') +md5sums=('98dd16b58a1f136a2cd49f7dd88c5313') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dxpc/PKGBUILD b/community/dxpc/PKGBUILD index bf290ae13..d689b83e2 100644 --- a/community/dxpc/PKGBUILD +++ b/community/dxpc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23155 2010-08-07 10:04:09Z spupykin $ +# $Id: PKGBUILD 58798 2011-11-18 14:38:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -10,12 +10,13 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.vigor.nu/dxpc/" license=('GPL') depends=('lzo2' 'gcc-libs') +makedepends=('xproto') source=(http://www.vigor.nu/dxpc/dxpc-$pkgver.tgz) md5sums=('e69f58c4acc34c6746a0e5ab17bf8d0f') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --mandir='${prefix}/share/man' - make || return 1 + make make prefix="$pkgdir/usr" install } diff --git a/community/dzen2/PKGBUILD b/community/dzen2/PKGBUILD index 22216ae9c..841626991 100644 --- a/community/dzen2/PKGBUILD +++ b/community/dzen2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 27711 2010-09-27 09:27:49Z spupykin $ +# $Id: PKGBUILD 57590 2011-10-31 07:59:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Mark Taylor <skymt0@gmail.com> pkgname=dzen2 pkgver=0.8.5 -pkgrel=6 +pkgrel=7 arch=(i686 x86_64 'mips64el') pkgdesc="X notification utility" url="http://gotmor.googlepages.com/dzen" @@ -18,29 +18,20 @@ build() { cd $srcdir/dzen2-$pkgver - patch -p0 config.mk <<EOF -22,23c22,23 -< LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -< CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" ---- -> #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -> #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -34,35c34,35 -< #LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm -< #CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM ---- -> LIBS = -L/usr/lib -lc -L\${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft` -> CFLAGS = -Os \${INCS} -DVERSION=\\"\${VERSION}\\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` -EOF + CFLAGS=" -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`" + LIBS=" -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`" - sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk + echo "CFLAGS=$CFLAGS" >>config.mk + echo "LIBS=$LIBS" >>config.mk + echo "LDFLAGS=$LIBS" >>config.mk - make X11INC=/usr/include X11LIB=/usr/lib || return 1 - make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1 - install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING + make X11INC=/usr/include X11LIB=/usr/lib + (cd $srcdir/dzen2-$pkgver/gadgets && make X11INC=/usr/include X11LIB=/usr/lib) +} - cd $srcdir/dzen2-$pkgver/gadgets - sed -i "s/CFLAGS = /CFLAGS = ${CFLAGS} /" config.mk - make X11INC=/usr/include X11LIB=/usr/lib || return 1 - make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install || return 1 +package() { + cd $srcdir/dzen2-$pkgver + make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install + (cd $srcdir/dzen2-$pkgver/gadgets && make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$pkgdir install) + install -m644 -D LICENSE $pkgdir/usr/share/licenses/dzen2/COPYING } diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index b34f32956..6431e90b3 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-modules-extra-svn -pkgver=62844 +pkgver=64772 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64' 'mips64el') @@ -40,13 +40,13 @@ build() { sed -i 's|efreet/Efreet.h|efreet-0/Efreet.h|' winlist-ng/src/e_mod_main.h || return 1 for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage eooorg everything-aspell everything-mpris \ - everything-places everything-shotgun \ - everything-wallpaper everything-websearch \ + empris engage eooorg e-tiling everything-aspell everything-mpris \ + everything-pidgin everything-places everything-shotgun \ + everything-tracker everything-wallpaper everything-websearch \ execwatch flame forecasts iiirk itask language mail mem \ - moon mpdule net news notification penguins photo places quickaccess \ + moon mpdule net news penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ - weather winlist-ng winselector wlan; do + weather winlist-ng winselector wlan xkbswitch; do cd $i ./autogen.sh --prefix=/usr @@ -59,13 +59,13 @@ package() { cd $srcdir/$_svnmod-build for i in alarm calendar comp-scale cpu diskio deskshow \ - empris engage eooorg everything-aspell everything-mpris \ - everything-places everything-shotgun \ - everything-wallpaper everything-websearch \ + empris engage eooorg e-tiling everything-aspell everything-mpris \ + everything-pidgin everything-places everything-shotgun \ + everything-tracker everything-wallpaper everything-websearch \ execwatch flame forecasts iiirk itask language mail mem \ - moon mpdule net news notification penguins photo places quickaccess \ + moon mpdule net news penguins photo places quickaccess \ rain screenshot slideshow snow taskbar tclock tiling uptime \ - weather winlist-ng winselector wlan; do + weather winlist-ng winselector wlan xkbswitch; do cd $i make DESTDIR=$pkgdir install diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index 07e74dc04..db8906b12 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54908 2011-08-27 14:51:01Z rvanharen $ +# $Id: PKGBUILD 58075 2011-11-06 10:13:58Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e-svn -pkgver=62822 +pkgver=64801 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/e4rat/PKGBUILD b/community/e4rat/PKGBUILD new file mode 100644 index 000000000..85186118a --- /dev/null +++ b/community/e4rat/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 57697 2011-11-01 11:45:09Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: graysky <graysky AT archlinux DOT us> + +pkgname=e4rat +pkgver=0.2.1 +pkgrel=5 +pkgdesc="Toolset to accelerate the boot process and application startups for systems with ext4 root partitions." +arch=('i686' 'x86_64') +url="http://e4rat.sourceforge.net/" +license=('GPL') +depends=('e2fsprogs' 'util-linux') +makedepends=('audit' 'boost' 'cmake') +options=(!strip) +backup=(etc/e4rat.conf) +source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/e4rat_${pkgver}_src.tar.gz) + +build() { + unset LDFLAGS + cd "$srcdir/$pkgname-$pkgver" + cmake -DCMAKE_BUILD_TYPE=Release . + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -dm755 "$pkgdir/var/lib/$pkgname" +} + +md5sums=('cbb1f3cdd2b8c96b4402028da07b11f2') +sha256sums=('c509f165eff317f80f5d13d7b370514c457df4542ff3b31bee4c26f97ce89769') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index 60f06d611..06c75533c 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54905 2011-08-27 14:49:26Z rvanharen $ +# $Id: PKGBUILD 58073 2011-11-06 10:12:55Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=e_dbus-svn -pkgver=61974 +pkgver=64761 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 9d16458e5..ec20ba97a 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54894 2011-08-27 14:45:17Z rvanharen $ +# $Id: PKGBUILD 58089 2011-11-06 13:31:05Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ecore-svn -pkgver=62785 +pkgver=64802 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 9f711d493..912678418 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54900 2011-08-27 14:47:46Z rvanharen $ +# $Id: PKGBUILD 58090 2011-11-06 13:31:38Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=edje-svn -pkgver=62791 +pkgver=64793 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index be2ed3d41..983c417af 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54890 2011-08-27 14:43:26Z rvanharen $ +# $Id: PKGBUILD 58091 2011-11-06 13:32:00Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet-svn -pkgver=62590 +pkgver=64494 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index b4612d458..11886aae4 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: bluebugs pkgname=eeze-svn -pkgver=62160 +pkgver=63230 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD new file mode 100644 index 000000000..611b45f8b --- /dev/null +++ b/community/efax-gtk/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 57276 2011-10-25 09:32:03Z giovanni $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=efax-gtk +pkgver=3.2.8 +pkgrel=1 +pkgdesc="A GUI front end for the 'efax' fax program" +arch=('i686' 'x86_64') +url="http://efax-gtk.sourceforge.net/" +license=('GPL') +depends=('dbus-glib' 'gtk3' 'ghostscript') +makedepends=('pkg-config') +optdepends=('heirloom-mailx: to use the mail_fax script') +backup=('etc/efax-gtkrc') +install=efax-gtk.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.src.tgz") +md5sums=('275ad1706e5c38e2b153dddd8a16724f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-spooldir=/usr/bin + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -m 755 mail_fax print_fax "${pkgdir}/usr/bin" +} diff --git a/community/efax-gtk/efax-gtk.install b/community/efax-gtk/efax-gtk.install new file mode 100644 index 000000000..69e30acd6 --- /dev/null +++ b/community/efax-gtk/efax-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 2c1f5c7ca..e7609cf72 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54902 2011-08-27 14:48:35Z rvanharen $ +# $Id: PKGBUILD 58071 2011-11-06 10:11:44Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=efreet-svn -pkgver=62616 +pkgver=64137 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/egoboo/PKGBUILD b/community/egoboo/PKGBUILD index 4a2b991bb..b7fe83637 100644 --- a/community/egoboo/PKGBUILD +++ b/community/egoboo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 36333 2010-12-30 07:44:32Z lcarlier $ +# $Id: PKGBUILD 57902 2011-11-04 09:04:39Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> @@ -7,13 +7,12 @@ pkgname=egoboo pkgver=2.8.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL') pkgdesc="An open-source action RPG/dungeon crawling adventure with OpenGL 3D graphics" url="http://egoboo.sourceforge.net/" -depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet') -makedepends=('mesa') +makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname.png $pkgname.desktop) @@ -35,20 +34,13 @@ build() { } package() { - cd "$srcdir/egoboo-$pkgver" + depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'physfs' 'enet' 'mesa' 'egoboo-data>=2.8.1') - # Patch default depth to 24 and sound - sed -i -e 's/\[COLOR_DEPTH\] : "32"/\[COLOR_DEPTH\] : "24"/g' \ - -e 's/\[Z_DEPTH\] : "32"/\[Z_DEPTH\] : "24"/g' \ - -e 's/\[OUTPUT_BUFFER_SIZE\] : "2548/\[OUTPUT_BUFFER_SIZE\] : "2048/g' \ - setup.txt + cd "$srcdir/egoboo-$pkgver" - # Copy data and fix permissions install -Dm755 src/game/egoboo-2.x $pkgdir/usr/bin/egoboo - install -d $pkgdir/usr/share/{doc/,$pkgname} - cp -rf controls.txt setup.txt basicdat/ modules/ $pkgdir/usr/share/$pkgname/ + install -d $pkgdir/usr/share/doc cp -rf doc/ $pkgdir/usr/share/doc/$pkgname/ - find $pkgdir/usr/share/$pkgname -type f -exec chmod 644 {} + # Install icon and desktop files install -Dm 644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png diff --git a/community/eiciel/PKGBUILD b/community/eiciel/PKGBUILD index 0c3556667..d8baea971 100644 --- a/community/eiciel/PKGBUILD +++ b/community/eiciel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 49658 2011-06-18 21:23:03Z ebelanger $ +# $Id: PKGBUILD 58840 2011-11-18 19:58:05Z ebelanger $ # Contributor: Roman Kyrylych <roman@gmail.com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -12,7 +12,9 @@ license=('GPL') depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils' 'gnome-vfs') options=('!libtool') install=eiciel.install -source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2) +# the source for 0.9.8.1 is no longer found upstream +#source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2) +source=(https://launchpad.net/ubuntu/+archive/primary/+files/eiciel_0.9.8.1.orig.tar.bz2) md5sums=('2c9c459f0604ce03ec49bb425cc42681') build() { diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 2a437b4a5..75957b532 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54889 2011-08-27 14:42:42Z rvanharen $ +# $Id: PKGBUILD 58057 2011-11-06 10:03:11Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina-svn -pkgver=62813 +pkgver=64778 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/electricsheep/ChangeLog b/community/electricsheep/ChangeLog deleted file mode 100644 index 516a16a97..000000000 --- a/community/electricsheep/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ -2010-09-26 Eric Belanger <eric@archlinux.org> - - * electricsheep 2.7b12-3 - * Rebuilt against new ffmpeg to improve performance - -2009-10-17 Eric Belanger <eric@archlinux.org> - - * electricsheep 2.7b12-2 - * Added xscreensaver config - * Updated url - -2009-07-09 Eric Belanger <eric@archlinux.org> - - * electricsheep 2.7b12-1 - * Upstream update - * Switched to svn snapshot as source tarballs are no longer provided - * Updated url - * Splitted flam3 in a separate package - * Updated depends - * Removed install scriptlet - -2008-09-20 Eric Belanger <eric@archlinux.org> - - * electricsheep 2.6.8-4 - * Updated for KDE 4 (close FS#11378) - * Added xscreensaver optdepends to cleanup post-install messages - * FHS man pages - * Fixed build issue - * Added xscreensaver makedepends and config - * Added ChangeLog diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD index f76f336b0..41402f4b6 100644 --- a/community/electricsheep/PKGBUILD +++ b/community/electricsheep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 49560 2011-06-18 07:28:14Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 58393 2011-11-12 17:16:52Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=electricsheep pkgver=2.7b12 -pkgrel=3 +pkgrel=4 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64' 'mips64el') url="http://community.electricsheep.org/" @@ -11,13 +11,14 @@ license=('GPL') depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade') makedepends=('xscreensaver') optdepends=('xscreensaver: to use electricsheep with xscreensaver') -changelog=ChangeLog -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9c66691538941593ca9442e087b183d1') -sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + electricsheep-ffmpeg.patch) +sha1sums=('fd1c307912905ba456189efbb546ef0fe336fa32' + 'd6816e27c2a2f6c74ae61c99ad2d7fb28b1d1825') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/electricsheep-ffmpeg.patch" ./configure --prefix=/usr make } diff --git a/community/electricsheep/electricsheep-ffmpeg.patch b/community/electricsheep/electricsheep-ffmpeg.patch new file mode 100644 index 000000000..b04cf41b0 --- /dev/null +++ b/community/electricsheep/electricsheep-ffmpeg.patch @@ -0,0 +1,36 @@ +diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c +--- electricsheep-2.7b12.orig/electricsheep.c 2011-10-31 22:36:30.000000000 -0400 ++++ electricsheep-2.7b12/electricsheep.c 2011-10-31 22:40:04.000000000 -0400 +@@ -662,7 +662,7 @@ + input_stream_index = -1; + for (j = 0; j < ictx->nb_streams; j++) { + AVCodecContext *enc = ictx->streams[j]->codec; +- if (CODEC_TYPE_VIDEO == enc->codec_type) { ++ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) { + input_stream_index = j; + break; + } +@@ -730,7 +730,7 @@ + av_init_packet(&opkt); + if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec, + &opkt.data, &opkt.size, ipkt.data, ipkt.size, +- ipkt.flags & PKT_FLAG_KEY)) ++ ipkt.flags & AV_PKT_FLAG_KEY)) + opkt.destruct= av_destruct_packet; + + if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) { +diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c +--- electricsheep-2.7b12.orig/electricsheep.c 2011-11-01 00:21:51.000000000 -0400 ++++ electricsheep-2.7b12/electricsheep.c 2011-11-01 00:25:10.000000000 -0400 +@@ -686,9 +686,9 @@ + } + } + +- output_ctx = av_alloc_format_context(); ++ output_ctx = avformat_alloc_context(); + +- ofmt = guess_format(NULL, fname, NULL); ++ ofmt = av_guess_format(NULL, fname, NULL); + if (!ofmt) { + fprintf(logout, "could not determine format from %s.\n", fname); + exit(1); diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index c59daec30..e65d7a2f7 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=elementary-svn -pkgver=62830 +pkgver=64794 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index 6c854b492..4a27c760d 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54898 2011-08-27 14:46:48Z rvanharen $ +# $Id: PKGBUILD 58067 2011-11-06 10:07:33Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo-svn -pkgver=62382 +pkgver=64802 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index 5fab60f2a..2e9b856fa 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55723 2011-09-18 07:15:35Z rvanharen $ +# $Id: PKGBUILD 57431 2011-10-27 18:18:52Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Claudio Riva <firetux83@gmail.com> pkgname=emesene -pkgver=2.11.7 -pkgrel=2 +pkgver=2.11.9 +pkgrel=1 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') @@ -23,7 +23,7 @@ source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver} 'emesene.run') install=emesene.install options=('!libtool') -sha1sums=('ba18b6a40003c1e0407dc1395a237db84ce4efa1' +sha1sums=('b79ee47962db7927f2fcfdcb5fb5b042bced4b94' '2bd13ada86aa0af6307a41047f0d7caf2995660d') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -53,3 +53,4 @@ package() { # create executable install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene } + diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD index a65ae4bb0..a29008e29 100644 --- a/community/esmtp/PKGBUILD +++ b/community/esmtp/PKGBUILD @@ -1,27 +1,36 @@ -# Maintainer: Loui Chang <louipc dot ist at gmail company> -# Contributor : Jeff Mickey <j@codemac.net> -# Contributor : Aaron Griffin <aaron@archlinux.org> +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Loui Chang <louipc dot ist at gmail company> +# Contributor: Jeff Mickey <j@codemac.net> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=esmtp pkgver=1.2 -pkgrel=3 -pkgdesc="An easy smtp forwarder" +pkgrel=4 +pkgdesc="An easy SMTP forwarder." arch=('i686' 'x86_64' 'mips64el') -url="http://esmtp.sourceforge.net" +url='http://esmtp.sourceforge.net' license=('GPL') depends=('libesmtp' 'openssl') -optdepends=('liblockfile: for esmtp-wrapper script') +optdepends=('liblockfile: for esmtp-wrapper script' + 'procmail: for local mail delivery') provides=('smtp-forwarder') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('79a9c1f9023d53f35bb82bf446150a72') -build(){ - cd ${srcdir}/${pkgname}-${pkgver} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m644 README ${pkgdir}/usr/share/esmtp/README - install -m755 esmtp-wrapper ${pkgdir}/usr/share/esmtp/esmtp-wrapper - install -m755 ylwrap ${pkgdir}/usr/share/esmtp/ylwrap + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -Dm0644 README "${pkgdir}/usr/share/doc/esmtp/README" + install -Dm0644 sample.esmtprc "${pkgdir}/usr/share/doc/esmtp/sample.esmtprc" + install -Dm0755 esmtp-wrapper "${pkgdir}/usr/share/esmtp/esmtp-wrapper" + install -Dm0755 ylwrap "${pkgdir}/usr/share/esmtp/ylwrap" } diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 514616637..a6fcc5a41 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54892 2011-08-27 14:44:08Z rvanharen $ +# $Id: PKGBUILD 58061 2011-11-06 10:05:15Z rvanharen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=evas-svn -pkgver=62798 +pkgver=64779 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/extrema/PKGBUILD b/community/extrema/PKGBUILD index ad0e8a6b1..35f884b60 100644 --- a/community/extrema/PKGBUILD +++ b/community/extrema/PKGBUILD @@ -1,34 +1,40 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# $Id: PKGBUILD 58786 2011-11-18 14:18:33Z andrea $ +# Maintainer: +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Marcelo Avalos Tejeda <marcelo.avalos@gmail.com> pkgname=extrema pkgver=4.4.5 -pkgrel=1 -pkgdesc='Extrema is a powerful visualization and data analysis tool.' +pkgrel=2 +pkgdesc='A powerful visualization and data analysis tool' arch=('i686' 'x86_64' 'mips64el') url='http://exsitewebware.com/extrema/index.html' license=('GPL') -depends=('wxgtk' 'zlib' 'libxml2' 'libpng') -source=("http://downloads.sourceforge.net/project/extrema/extrema/extrema-linux%20v${pkgver}/extrema-${pkgver}.tar.gz" - 'extrema.desktop') +depends=('wxgtk') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'extrema.desktop' + 'gcc46.patch') md5sums=('8a1e82b34874db2bfa64d9a2956677b1' - '0f4d310d230e28436dff20e77aed71bb') + '0f4d310d230e28436dff20e77aed71bb' + 'be85114cee4c677d33f1522d958e76db') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr + patch -p1 -i "${srcdir}"/gcc46.patch + ./configure --prefix=/usr make + + tar xf extrema_icons.tar.bz2 } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - tar xf extrema_icons.tar.bz2 install -D -m644 32x32/apps/extrema.png \ ${pkgdir}/usr/share/pixmaps/extrema.png diff --git a/community/extrema/gcc46.patch b/community/extrema/gcc46.patch new file mode 100644 index 000000000..45a804292 --- /dev/null +++ b/community/extrema/gcc46.patch @@ -0,0 +1,15 @@ +Fix building with gcc-4.6 + +https://bugs.gentoo.org/show_bug.cgi?id=363467 + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> +--- a/src/Graphics/GRA_thiessenTriangulation.h ++++ b/src/Graphics/GRA_thiessenTriangulation.h +@@ -19,6 +19,7 @@ + #define GRA_THIESSENTRIANGULATION + + #include <vector> ++#include <cstddef> + + class GRA_thiessenTriangulation + { diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index 5eeeb3155..d41524bf7 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 52540 2011-07-26 04:27:53Z svenstaro $ +# $Id: PKGBUILD 58520 2011-11-13 15:38:01Z andrea $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> + pkgname=fatrat -pkgver=1.1.3 -pkgrel=5 +pkgver=1.2.0_beta1 +pkgrel=1 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64' 'mips64el') url="http://fatrat.dolezel.info/" license=('GPL') -depends=('gloox' 'curl' 'qt' 'libtorrent-rasterbar') +depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net') optdepends=('geoip: GeoIP support') -makedepends=('asio' 'cmake') +makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz) -md5sums=('6d4a00cdd0b59a05b1521184508d4637') +md5sums=('7ce4d5e6318361f36ba5ac86a5755da9') build() { cd $pkgname-$pkgver diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index c629faea3..26dfe6bc5 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=0.9 +pkgver=0.9.1 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') @@ -8,8 +8,9 @@ url="http://paste.xinu.at" license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') -source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz) -md5sums=('51d65d794e9bad66e06e252f90ce92fb') +source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) +md5sums=('dcb979b6d31ea56fde107251b92aaaca' + '08b1ac48b3da676621655d80c4c6a66d') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 7ce430482..65d1d9894 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32017 2010-11-09 12:39:54Z spupykin $ +# $Id: PKGBUILD 58784 2011-11-18 14:18:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.fbreader.org/" license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'gtk2' 'liblinebreak' 'sqlite3') -source=(http://only.mawhrin.net/fbreader/fbreader-sources-$pkgver.tgz +source=(http://www.fbreader.org/files/sources/fbreader-sources-$pkgver.tgz build-fix.patch) md5sums=('da9ec4721efdb0ec0aaa182bff16ad82' '66ac17d8640625b6d2a806de4aa4e76c') diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD index c4fe19273..a4d9e558e 100644 --- a/community/fcgiwrap/PKGBUILD +++ b/community/fcgiwrap/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 28017 2010-10-01 16:05:40Z aschaefer $ -# Maintainer: Aaron Bull Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 57830 2011-11-03 10:18:16Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron Bull Schaefer <aaron@elasticdog.com> # Contributor: Ron Huang <ronhuang+aur at gmail dot com> pkgname=fcgiwrap pkgver=1.0.3 _gitrev='2e301c8' -pkgrel=1 -pkgdesc='A simple server for running CGI applications over FastCGI' +pkgrel=2 +pkgdesc='A simple server for running CGI applications over FastCGI.' arch=('i686' 'x86_64' 'mips64el') url='http://nginx.localdomain.pl/wiki/FcgiWrap' license=('MIT') depends=('fcgi' 'spawn-fcgi') backup=('etc/conf.d/fcgiwrap') -source=("http://github.com/downloads/gnosek/fcgiwrap/$pkgname-$pkgver.tar.gz" - 'fcgiwrap.conf.d' 'fcgiwrap.rc.d' 'LICENSE') -md5sums=('be73d90df7c4442084463e2815fc213d' '9fbb5b0e861ffea74e655143a4c1a8f9' - '71ea12f43aebca39f73ff2e0b684f361' '5aee62c27b4308f25ab32f05da387366') +source=("https://github.com/downloads/gnosek/fcgiwrap/${pkgname}-${pkgver}.tar.gz" + 'fcgiwrap.conf.d' + 'fcgiwrap.rc.d' + 'LICENSE') +md5sums=('be73d90df7c4442084463e2815fc213d' + '9fbb5b0e861ffea74e655143a4c1a8f9' + '71ea12f43aebca39f73ff2e0b684f361' + '5aee62c27b4308f25ab32f05da387366') build() { - cd "$srcdir/gnosek-$pkgname-$_gitrev" + cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" autoreconf --install ./configure --prefix=/usr @@ -26,10 +31,10 @@ build() { } package() { - cd "$srcdir/gnosek-$pkgname-$_gitrev" + cd "${srcdir}/gnosek-${pkgname}-${_gitrev}" - make DESTDIR="$pkgdir" install - install -D -m644 ../fcgiwrap.conf.d "$pkgdir/etc/conf.d/$pkgname" - install -D -m755 ../fcgiwrap.rc.d "$pkgdir/etc/rc.d/$pkgname" - install -D -m644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + make DESTDIR="${pkgdir}" install + install -Dm0644 ../fcgiwrap.conf.d "${pkgdir}/etc/conf.d/${pkgname}" + install -Dm0755 ../fcgiwrap.rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm0644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD index c9516ffb6..049eb0cda 100644 --- a/community/ffmpeg2theora/PKGBUILD +++ b/community/ffmpeg2theora/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56650 2011-10-09 12:33:26Z jlichtblau $ +# $Id: PKGBUILD 58395 2011-11-12 17:16:59Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=ffmpeg2theora pkgver=0.28 -pkgrel=1 +pkgrel=2 pkgdesc="A simple converter to create Ogg Theora files" arch=('i686' 'x86_64' 'mips64el') url="http://www.v2v.cc/~j/ffmpeg2theora/" diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 8a3c1cc65..d126dae5f 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55926 2011-09-25 10:42:49Z bluewind $ +# $Id: PKGBUILD 58248 2011-11-09 10:50:52Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.5.1 -pkgrel=2 +pkgver=3.5.2 +pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') url="http://filezilla-project.org/" @@ -13,8 +13,8 @@ depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3' install=filezilla.install source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2" gnutls-3.patch) -md5sums=('8afb7aee4ba72b6363dcfe469bc7fbef' -'0646cf7d6f90766961724102cf2cebd6') +md5sums=('ec4847be44932dc872a7e83b94ae2c9f' + '0646cf7d6f90766961724102cf2cebd6') build() { cd "${pkgname}-${pkgver}" diff --git a/community/fityk/PKGBUILD b/community/fityk/PKGBUILD index cbde1b063..71e3fb36c 100644 --- a/community/fityk/PKGBUILD +++ b/community/fityk/PKGBUILD @@ -4,19 +4,20 @@ pkgname=fityk pkgver=1.1.1 -pkgrel=1 +pkgrel=3 pkgdesc='A program for nonlinear fitting of analytical functions to data.' arch=('i686' 'x86_64' 'mips64el') url='http://www.unipress.waw.pl/fityk/' license=('GPL') depends=('xylib' 'shared-mime-info' 'lua' 'gnuplot') # wxgtk supplied by statically linked wxWidgets -makedepends=('boost' 'git' 'python-sphinx' 'swig') +makedepends=('boost' 'git' 'python-sphinx' 'swig' 'subversion') options=('!libtool') install='fityk.install' -source=('http://biolpc22.york.ac.uk/pub/Daily_HEAD/wxWidgets.tar.gz') # daily snapshot because fityk requires a version that hasn't been released yet... -md5sums=('e02d7a4af1201d39e20a864cd15f530f') build() { + # daily snapshot because fityk requires a version that hasn't been released yet... + svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/trunk wxWidgets + cd wxWidgets ./configure --prefix=${srcdir}/usr --disable-shared --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys make diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD index 7c711c677..42c4cd155 100644 --- a/community/floyd/PKGBUILD +++ b/community/floyd/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 5264 2009-11-07 13:00:24Z ibiru $ +# $Id: PKGBUILD 58684 2011-11-17 15:37:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=floyd pkgver=2.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="displays system load with pulse of keyboard LED" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://www.asahi-net.or.jp/~pi9s-nnb/floyd/" license=("GPL") -depends=(glibc) -backup=(etc/fuse.conf) -source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz) -md5sums=('c1b80bc76ac4e25e821a193428fa42a4') +depends=() +source=(http://www.asahi-net.or.jp/~pi9s-nnb/floyd/$pkgname-$pkgver.tar.gz + build-fix.patch) +md5sums=('c1b80bc76ac4e25e821a193428fa42a4' + '0cde2017ead790f9d556ef34c6a4008f') build() { cd $startdir/src/$pkgname-$pkgver - sed -i "s#/usr/local#/usr#" ./Makefile - make floyd || return 1 - install -D -m 0755 ./floyd $startdir/pkg/usr/bin/floyd && \ - install -D -m 0644 ./floyd.1 $startdir/pkg/usr/share/man/man1/floyd.1 + patch -p1 <$srcdir/build-fix.patch + make pthread +} + +package() { + cd $startdir/src/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/man/man1 $pkgdir/usr/bin + make install MANDIR=$pkgdir/usr/share/man/man1 BINDIR=$pkgdir/usr/bin } diff --git a/community/floyd/build-fix.patch b/community/floyd/build-fix.patch new file mode 100644 index 000000000..d78737b54 --- /dev/null +++ b/community/floyd/build-fix.patch @@ -0,0 +1,30 @@ +diff -wbBur floyd-2.0.1/floyd.c floyd-2.0.1.my/floyd.c +--- floyd-2.0.1/floyd.c 2005-12-01 12:49:43.000000000 +0300 ++++ floyd-2.0.1.my/floyd.c 2011-11-17 19:31:13.000000000 +0400 +@@ -167,11 +167,6 @@ + } + if (gfprm.verbose || doargforked) /* doargforked: set by -D */ + fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid()); +-#ifdef linux +- pthread_kill_other_threads_np(); +-#else +- Maybe you loose. Check out if you have pthread_kill_other_threads_np(). +-#endif + close(fdes); /* but here ? */ + exit(0); + } +diff -wbBur floyd-2.0.1/voodoo.c floyd-2.0.1.my/voodoo.c +--- floyd-2.0.1/voodoo.c 1999-07-29 18:01:10.000000000 +0400 ++++ floyd-2.0.1.my/voodoo.c 2011-11-17 19:31:18.000000000 +0400 +@@ -101,11 +101,6 @@ + perror("KDSETLED"); + } + fprintf(stderr, "%s: signal %d received [%d]\n", progname, sig, getpid()); +-#ifdef linux +- pthread_kill_other_threads_np(); +-#else +- Maybe you loose. Check out if you have pthread_kill_other_threads_np(). +-#endif + exit(0); + } + diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD index 38e95673e..833e51f00 100644 --- a/community/fltk2/PKGBUILD +++ b/community/fltk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 33138 2010-11-22 16:59:51Z spupykin $ +# $Id: PKGBUILD 58766 2011-11-18 13:49:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=fltk2 pkgver=2.0 -_pkgver=2.0.x-r7725 -pkgrel=6 +_pkgver=2.0.x-alpha-r9166 +pkgrel=7 pkgdesc="Graphical user interface toolkit for X" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -12,8 +12,8 @@ url="http://www.fltk.org/" depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama') makedepends=('mesa') source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2 - libpng14.patch) -md5sums=('4d2680a65574e920becf968b899d5311' + libpng14.patch) +md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa' '93955f17f56ad8b419ca1f8ea8c24a7f') build() { @@ -27,7 +27,7 @@ build() { > int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); EOF - patch -Np1 -i "$srcdir/libpng14.patch" +# patch -Np1 -i "$srcdir/libpng14.patch" make make DESTDIR=$pkgdir install } diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD index c8380c111..37bd3d4c3 100644 --- a/community/flumotion/PKGBUILD +++ b/community/flumotion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55283 2011-09-08 19:32:44Z spupykin $ +# $Id: PKGBUILD 58163 2011-11-07 13:53:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: William Rea <sillywilly@gmail.com> pkgname=flumotion -pkgver=0.9.1 +pkgver=0.10.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A streaming media server" @@ -17,7 +17,7 @@ depends=('gtk2' 'pygtk' 'gstreamer0.10-python' 'kiwi' 'gstreamer0.10-good-plugin 'gstreamer0.10-base-plugins' 'python2-pyopenssl' 'twisted' 'gnome-vfs') makedepends=('perlxml') source=(http://www.flumotion.net/src/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('b2fa7c2e7ce8e2a5415f9096bfce783b') +md5sums=('d7a34333346828f19f83b24886efde14') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD index 45d4a5832..b0f6d74fd 100644 --- a/community/fonteditfs/PKGBUILD +++ b/community/fonteditfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 5263 2009-11-07 12:56:38Z ibiru $ +# $Id: PKGBUILD 58688 2011-11-17 15:43:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -9,13 +9,13 @@ pkgdesc="console font editor" arch=('i686' 'x86_64' 'mips64el') url="http://fonteditfs.sourceforge.net/" license=('GPL') -depends=(ncurses) +depends=('ncurses') source=("http://downloads.sourceforge.net/sourceforge/fonteditfs/fnteditfs-$pkgver.tgz") md5sums=('1e7c827da078d41a76459439dda0d5a9') -build () { - cd $startdir/src/fnteditfs-$pkgver - make || return 1 - install -D -m0755 fnteditfs $startdir/pkg/usr/bin/fnteditfs && \ - install -D -m0644 fnteditfs.1 $startdir/pkg/usr/share/man/man1/fnteditfs.1 +build() { + cd $srcdir/fnteditfs-$pkgver + make + install -D -m0755 fnteditfs $pkgdir/usr/bin/fnteditfs + install -D -m0644 fnteditfs.1 $pkgdir/usr/share/man/man1/fnteditfs.1 } diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD index d224ef865..b253d453b 100644 --- a/community/fotoxx/PKGBUILD +++ b/community/fotoxx/PKGBUILD @@ -1,31 +1,26 @@ +# $Id: PKGBUILD 59254 2011-11-22 03:06:06Z ebelanger $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> + pkgname=fotoxx -pkgver=11.10 -pkgrel=1 +pkgver=11.11.1 +pkgrel=3 pkgdesc="A program for improving image files made with a digital camera" url="http://kornelix.squarespace.com/fotoxx" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils') +depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils') optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning') -source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('c312f980dab199f50fc76374d062135a') install=fotoxx.install +source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") +md5sums=('c51f6682639bd7d2e5f1df4d03f09e53') build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's+xdg-deskto+#xdg-deskto+' Makefile - make PREFIX=/usr \ - CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \ - LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" - sed -i 's+^# ++' data/desktop - sed -i 's+@PREFIX@+/usr+' data/desktop + cd "$srcdir/$pkgname-$pkgver" + sed -e 's+xdg-deskto+#xdg-deskto+' -e 's/kornelix-//' -i Makefile + make PREFIX=/usr } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir PREFIX=/usr install - rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop - install -Dm644 data/desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" PREFIX=/usr install } diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD index 0d3dde1d5..1b8a62b11 100644 --- a/community/fox/PKGBUILD +++ b/community/fox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 40876 2011-03-01 10:03:57Z spupykin $ +# $Id: PKGBUILD 58793 2011-11-18 14:31:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Ben <ben@benmazer.net> pkgname=fox -pkgver=1.6.43 +pkgver=1.6.44 pkgrel=1 pkgdesc="Free Objects for X: GUI Toolkit for C++" arch=('i686' 'x86_64' 'mips64el') @@ -12,14 +12,12 @@ license=('LGPL' 'custom') depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff') optdepends=('perl') options=('!libtool') -source=(http://www.fox-toolkit.org/ftp/${pkgname}-${pkgver}.tar.gz) -md5sums=('4c6a322a8117420e417daeec8fbfeba5') +source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) +md5sums=('6ccc8cbcfa6e4c8b6e4deeeb39c36434') build() { cd ${srcdir}/${pkgname}-${pkgver} - export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" - ./configure --prefix=/usr \ --enable-release \ --with-xft=yes \ @@ -38,7 +36,6 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - cd ${srcdir}/${pkgname}-${pkgver}/tests make ControlPanel install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 432119a77..a2f839ed6 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 36137 2010-12-27 15:12:01Z spupykin $ +# $Id: PKGBUILD 58815 2011-11-18 15:51:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat pkgver=4.0 -pkgrel=4 +pkgrel=5 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" license=('GPL') -depends=('qt' 'umfpack' 'arpack' 'libmatio' 'ffcall' 'fftw' 'blas' 'lapack' 'mesa' 'portaudio') +depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio') +makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake') install=freemat.install source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz freemat-gcc-4.3.0.patch diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD index b8b323ff3..c1f0d8dd9 100644 --- a/community/freeradius/PKGBUILD +++ b/community/freeradius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51749 2011-07-14 06:47:41Z spupykin $ +# $Id: PKGBUILD 58983 2011-11-20 19:26:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jason R Begley (jayray@digitalgoat.com> pkgname=freeradius -pkgver=2.1.11 +pkgver=2.1.12 pkgrel=1 pkgdesc="The premier open source RADIUS server" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ install=$pkgname.install source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2 radiusd krb5-build-fix.patch) -md5sums=('96b21a95117d8ebde689c4c13c028d30' +md5sums=('862d3a2c11011e61890ba84fa636ed8c' 'f1a6530b1b69d2fa793aa45b2de379bb' 'c6a61de7576933f59154a53bfc12a2d2') diff --git a/community/freeradius/freeradius.install b/community/freeradius/freeradius.install index e50aa403d..c3b9f9415 100644 --- a/community/freeradius/freeradius.install +++ b/community/freeradius/freeradius.install @@ -1,6 +1,6 @@ post_install() { - groupadd radiusd - useradd -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd + groupadd -r radiusd + useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd touch /var/log/radius/radius.log chown -R radiusd.radiusd /var/log/radius/radius.log diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index da9e1278d..ba57c7f1e 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55881 2011-09-24 16:48:32Z stephane $ +# $Id: PKGBUILD 58829 2011-11-18 16:55:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -19,7 +19,8 @@ md5sums=('07fd8f193d14799ffb95a59a4887fc88' '52e4b6aacebcaf18cbec8975e0eb7fd8') build() { - . /etc/profile.d/openjdk6.sh + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/build-fix.patch export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" diff --git a/community/fuseiso/PKGBUILD b/community/fuseiso/PKGBUILD index f6865cc0c..359d7f3d1 100644 --- a/community/fuseiso/PKGBUILD +++ b/community/fuseiso/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54617 2011-08-22 06:10:07Z lcarlier $ +# $Id: PKGBUILD 57911 2011-11-04 11:59:27Z lcarlier $ # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=fuseiso pkgver=20070708 -pkgrel=3 +pkgrel=4 pkgdesc="FUSE module to mount ISO filesystem images" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/fuseiso/" diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index ba7beb938..5f2172495 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56943 2011-10-17 08:20:39Z ibiru $ +# $Id: PKGBUILD 58354 2011-11-12 10:52:35Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -20,7 +20,7 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=2 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 585e37179..32d39f84b 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56945 2011-10-17 08:20:48Z ibiru $ +# $Id: PKGBUILD 58437 2011-11-12 17:24:37Z ibiru $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> pkgbase=gambas3 @@ -12,22 +12,22 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=2.99.5 -pkgrel=1 +pkgver=2.99.6 +pkgrel=4 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64' 'mips64el') url="http://gambas.sourceforge.net/" license=('GPL') groups=('gambas3') makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew>=1.7.0' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('dfa16f5208463e81ba8ca801948c353a' +md5sums=('746aaae5494c4b267bdae802c5c006d5' 'b284be39d147ec799f1116a6abc068b4' 'b5cc403990f31b8ea1c5cf37366d3d29') @@ -42,7 +42,7 @@ build() { package_gambas3-runtime() { depends=('libffi' 'xdg-utils') - pkgdesc="Gambas3 runtime environment" + pkgdesc="Runtime environment" install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc @@ -78,7 +78,7 @@ package_gambas3-runtime() { package_gambas3-devel() { depends=('gambas3-runtime') - pkgdesc="Gambas3 development environment" + pkgdesc="Development environment" cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" install @@ -88,7 +88,7 @@ package_gambas3-ide() { depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Gambas3 Integrated Development Environment" + pkgdesc="Integrated Development Environment" cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" install @@ -106,7 +106,7 @@ package_gambas3-ide() { package_gambas3-script() { depends=('gambas3-devel') - pkgdesc="Gambas3 scripter and server programs support" + pkgdesc="Scripter and server programs support" install=gambas3-script.install cd ${srcdir}/${pkgbase}-${pkgver} @@ -133,7 +133,7 @@ package_gambas3-examples() { 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') - pkgdesc="Gambas3 examples" + pkgdesc="Applications examples" cd ${srcdir}/${pkgbase}-${pkgver} make XDG_UTILS='' DESTDIR="${pkgdir}" install @@ -144,7 +144,7 @@ package_gambas3-examples() { package_gambas3-gb-cairo() { depends=('gambas3-runtime' 'cairo') - pkgdesc="Gambas3 cairo component" + pkgdesc="Cairo component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -162,7 +162,7 @@ package_gambas3-gb-cairo() { package_gambas3-gb-chart() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 chart component" + pkgdesc="Chart component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -187,7 +187,7 @@ package_gambas3-gb-chart() { package_gambas3-gb-compress() { depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas3 compression support component" + pkgdesc="Compression support component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -208,7 +208,7 @@ package_gambas3-gb-compress() { package_gambas3-gb-crypt() { depends=('gambas3-runtime') - pkgdesc="Gambas3 MD5/DES crypting component" + pkgdesc="MD5/DES crypting component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -226,7 +226,7 @@ package_gambas3-gb-crypt() { package_gambas3-gb-db() { depends=('gambas3-runtime') - pkgdesc="Gambas3 database access component" + pkgdesc="Database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -242,7 +242,7 @@ package_gambas3-gb-db() { package_gambas3-gb-db-form() { depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Gambas3 database form component" + pkgdesc="Database form component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -267,7 +267,7 @@ package_gambas3-gb-db-form() { package_gambas3-gb-db-mysql() { depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="Gambas3 MySQL database access component" + pkgdesc="MySQL database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -285,7 +285,7 @@ package_gambas3-gb-db-mysql() { package_gambas3-gb-db-odbc() { depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="Gambas3 ODBC database access component" + pkgdesc="ODBC database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -303,7 +303,7 @@ package_gambas3-gb-db-odbc() { package_gambas3-gb-db-postgresql() { depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="Gambas3 PostgreSQL database access component" + pkgdesc="PostgreSQL database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -321,7 +321,7 @@ package_gambas3-gb-db-postgresql() { package_gambas3-gb-db-sqlite2() { depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Gambas3 Sqlite2 database access component" + pkgdesc="Sqlite2 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -339,7 +339,7 @@ package_gambas3-gb-db-sqlite2() { package_gambas3-gb-db-sqlite3() { depends=('gambas3-gb-db' 'sqlite3') - pkgdesc="Gambas3 Sqlite3 database access component" + pkgdesc="Sqlite3 database access component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -357,7 +357,7 @@ package_gambas3-gb-db-sqlite3() { package_gambas3-gb-desktop() { depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Gambas3 desktop component" + pkgdesc="Desktop component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -379,7 +379,7 @@ package_gambas3-gb-desktop() { package_gambas3-gb-dbus() { depends=('gambas3-runtime' 'dbus-core') - pkgdesc="Gambas3 DBUS component" + pkgdesc="DBUS component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -397,7 +397,7 @@ package_gambas3-gb-dbus() { package_gambas3-gb-eval-highlight() { depends=('gambas3-runtime') - pkgdesc="Gambas3 expression evaluator highlight component" + pkgdesc="Expression evaluator highlight component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -417,7 +417,7 @@ package_gambas3-gb-eval-highlight() { package_gambas3-gb-form() { depends=('gambas3-gb-gui') - pkgdesc="Gambas3 form component" + pkgdesc="Form component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -446,7 +446,7 @@ package_gambas3-gb-form() { package_gambas3-gb-form-dialog() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 form dialog component" + pkgdesc="Form dialog component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -475,7 +475,7 @@ package_gambas3-gb-form-dialog() { package_gambas3-gb-form-mdi() { depends=('gambas3-gb-form') - pkgdesc="Gambas3 form MDI component" + pkgdesc="Form MDI component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -504,7 +504,7 @@ package_gambas3-gb-form-mdi() { package_gambas3-gb-form-stock() { depends=('gambas3-runtime') - pkgdesc="Gambas3 default stock icons component" + pkgdesc="Default stock icons component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -528,7 +528,7 @@ package_gambas3-gb-form-stock() { package_gambas3-gb-gtk() { depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="Gambas3 graphical GTK+ toolkit component" + pkgdesc="GTK+ toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -546,7 +546,7 @@ package_gambas3-gb-gtk() { package_gambas3-gb-gui() { depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Gambas3 automatic gui toolkit chooser" + pkgdesc="Automatic gui toolkit chooser" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -569,7 +569,7 @@ package_gambas3-gb-gui() { package_gambas3-gb-image() { depends=('gambas3-runtime') - pkgdesc="Gambas3 image component" + pkgdesc="Image component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -585,7 +585,7 @@ package_gambas3-gb-image() { package_gambas3-gb-image-effect() { depends=('gambas3-gb-image') - pkgdesc="Gambas3 image effect component" + pkgdesc="Image effect component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -601,7 +601,7 @@ package_gambas3-gb-image-effect() { package_gambas3-gb-image-imlib() { depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Gambas3 imlib component" + pkgdesc="Imlib component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -619,7 +619,7 @@ package_gambas3-gb-image-imlib() { package_gambas3-gb-image-io() { depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Gambas3 input/output component" + pkgdesc="Input/Output component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -637,7 +637,7 @@ package_gambas3-gb-image-io() { package_gambas3-gb-net() { depends=('gambas3-runtime') - pkgdesc="Gambas3 network component" + pkgdesc="Network component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -655,7 +655,7 @@ package_gambas3-gb-net() { package_gambas3-gb-net-curl() { depends=('gambas3-gb-net' 'curl') - pkgdesc="Gambas3 curl component" + pkgdesc="Curl component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -673,7 +673,7 @@ package_gambas3-gb-net-curl() { package_gambas3-gb-net-smtp() { depends=('gambas3-runtime' 'glib2') - pkgdesc="Gambas3 SMTP component" + pkgdesc="SMTP component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -691,7 +691,7 @@ package_gambas3-gb-net-smtp() { package_gambas3-gb-opengl() { depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="Gambas3 OpenGL component" + pkgdesc="OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -713,7 +713,7 @@ package_gambas3-gb-opengl() { package_gambas3-gb-opengl-glu() { depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GL Utility component" + pkgdesc="GL Utility component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -731,7 +731,7 @@ package_gambas3-gb-opengl-glu() { package_gambas3-gb-opengl-glsl() { depends=('gambas3-gb-opengl') - pkgdesc="Gambas3 GLSL component" + pkgdesc="GLSL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -749,7 +749,7 @@ package_gambas3-gb-opengl-glsl() { package_gambas3-gb-option() { depends=('gambas3-runtime') - pkgdesc="Gambas3 getopt component" + pkgdesc="Getopt component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -765,7 +765,7 @@ package_gambas3-gb-option() { package_gambas3-gb-pcre() { depends=('gambas3-runtime' 'pcre') - pkgdesc="Gambas3 PCRE component" + pkgdesc="PCRE component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -783,7 +783,7 @@ package_gambas3-gb-pcre() { package_gambas3-gb-pdf() { depends=('gambas3-runtime' 'poppler') - pkgdesc="Gambas3 PDF component" + pkgdesc="PDF component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -801,7 +801,7 @@ package_gambas3-gb-pdf() { package_gambas3-gb-qt4() { depends=('gambas3-gb-image' 'qt') - pkgdesc="Gambas3 Qt4 toolkit component" + pkgdesc="Qt4 toolkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -825,7 +825,7 @@ package_gambas3-gb-qt4() { package_gambas3-gb-qt4-ext() { depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit extended component" + pkgdesc="Qt4 toolkit extended component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -843,7 +843,7 @@ package_gambas3-gb-qt4-ext() { package_gambas3-gb-qt4-opengl() { depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Gambas3 Qt4 toolkit OpenGL component" + pkgdesc="Qt4 toolkit OpenGL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -861,7 +861,7 @@ package_gambas3-gb-qt4-opengl() { package_gambas3-gb-qt4-webkit() { depends=('gambas3-gb-qt4') - pkgdesc="Gambas3 Qt4 toolkit webkit component" + pkgdesc="Qt4 toolkit webkit component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -879,7 +879,7 @@ package_gambas3-gb-qt4-webkit() { package_gambas3-gb-report() { depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Gambas3 report component" + pkgdesc="Report component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -904,7 +904,7 @@ package_gambas3-gb-report() { package_gambas3-gb-sdl() { depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="Gambas3 SDL component" + pkgdesc="SDL component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -922,7 +922,7 @@ package_gambas3-gb-sdl() { package_gambas3-gb-sdl-sound() { depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="Gambas3 SDL sound component" + pkgdesc="SDL sound component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -940,7 +940,7 @@ package_gambas3-gb-sdl-sound() { package_gambas3-gb-settings() { depends=('gambas3-runtime') - pkgdesc="Gambas3 setting component" + pkgdesc="Setting component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -960,7 +960,7 @@ package_gambas3-gb-settings() { package_gambas3-gb-signal() { depends=('gambas3-runtime') - pkgdesc="Gambas3 signal component" + pkgdesc="Signal component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -976,7 +976,7 @@ package_gambas3-gb-signal() { package_gambas3-gb-v4l() { depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Gambas3 video4linux component" + pkgdesc="Video4linux component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -994,7 +994,7 @@ package_gambas3-gb-v4l() { package_gambas3-gb-vb() { depends=('gambas3-runtime') - pkgdesc="Gambas3 VB transitional component" + pkgdesc="VB transitional component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1010,7 +1010,7 @@ package_gambas3-gb-vb() { package_gambas3-gb-xml() { depends=('gambas3-runtime' 'libxml2') - pkgdesc="Gambas3 XML component" + pkgdesc="XML component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1032,7 +1032,7 @@ package_gambas3-gb-xml() { package_gambas3-gb-xml-rpc() { depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="Gambas3 XML-RPC component" + pkgdesc="XML-RPC component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1060,7 +1060,7 @@ package_gambas3-gb-xml-rpc() { package_gambas3-gb-xml-xslt() { depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="Gambas3 XML-XSLT component" + pkgdesc="XML-XSLT component" ## workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main @@ -1078,7 +1078,7 @@ package_gambas3-gb-xml-xslt() { package_gambas3-gb-web() { depends=('gambas3-runtime') - pkgdesc="Gambas3 CGI component" + pkgdesc="CGI component" ## Workaround for splitting cd ${srcdir}/${pkgbase}-${pkgver}/main diff --git a/community/garmindev/51-garmin.rules b/community/garmindev/51-garmin.rules index dbed1e222..0ef61bd32 100644 --- a/community/garmindev/51-garmin.rules +++ b/community/garmindev/51-garmin.rules @@ -1 +1 @@ -SYSFS{idVendor}=="091e", SYSFS{idProduct}=="0003", GROUP="uucp", MODE="660" +ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", GROUP="uucp", MODE="660" diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD index 20e58ce94..5934b338e 100644 --- a/community/garmindev/PKGBUILD +++ b/community/garmindev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 39106 2011-02-06 22:07:54Z jlichtblau $ +# $Id: PKGBUILD 58914 2011-11-20 11:01:56Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> pkgname=garmindev pkgver=0.3.4 -pkgrel=4 +pkgrel=5 pkgdesc="Garmin Device Drivers for QlandkarteGT" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -16,7 +16,7 @@ install=$pkgname.install source=(http://downloads.sourceforge.net/qlandkartegt/$pkgname-$pkgver.tar.gz \ 51-garmin.rules) sha256sums=('86c38f65ba1a05c5d5eb076107094cb789db6ffc5d80bfd7bb209d645bcf87d5' - 'fab0bf0bbda536015cb66d00b55c5ae4078051d89f82b5b9ee231020316361d6') + '0196ae234c0daf97afb9f4af6fdc04c2af77bb742233731870ba8cfc6ae5a7d7') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/garmindev/garmindev.changelog b/community/garmindev/garmindev.changelog index 0431a6d6b..ef19de70d 100644 --- a/community/garmindev/garmindev.changelog +++ b/community/garmindev/garmindev.changelog @@ -1,3 +1,7 @@ +2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * garmindev 0.3.4-5 + * udev rule updated for Linux 3.1.1 + 2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * garmindev 0.3.4-3 * moved to [community] with 33 AUR votes diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD index 0b93f18f2..045c1f17f 100644 --- a/community/gcc-avr/PKGBUILD +++ b/community/gcc-avr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51816 2011-07-15 23:03:40Z bfanella $ +# $Id: PKGBUILD 57845 2011-11-03 12:26:59Z jelle $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=gcc-avr -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=1 pkgdesc="The GNU avr Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -55,3 +55,5 @@ package() { rm -rf ${pkgdir}/usr/share/info } +md5sums=('780f614ab18c7a9066dec6387d7490b2' + '87ecd60431e41096419dd8a10f76e46b') diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 6e4643454..3c93e3764 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 44294 2011-04-05 06:50:48Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 57322 2011-10-25 20:25:24Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> -pkgname=('gcompris' 'gcompris-data') -pkgver=9.6.1 +pkgname=gcompris +pkgver=11.09 pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64' 'mips64el') url="http://gcompris.net/" license=('GPL3') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess' - 'pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' - 'gstreamer0.10-base-plugins') +depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' + 'gstreamer0.10-base-plugins') +optdepends=('gnucap: for computer simulation within the electricity activity' + 'tuxpaint: for the painting activity' + 'gnuchess: for the chess activity') +makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('2fb1dbb331166dd19d0a758220e4caf0') +sha1sums=('aaa3b9abc2626593f7db6ddbab7e66849419e025') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,28 +26,11 @@ build() { make } -package_gcompris() { - depends=('gcompris-data' 'pygtk' 'pyxml' 'librsvg' 'gnet' 'python-pysqlite' - 'gstreamer0.10-base-plugins') - optdepends=('gnucap: for computer simulation within the electricity activity' - 'tuxpaint: for the painting activity' - 'gnuchess: for the chess activity') +package() { + depends+=('gcompris-data') cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install-exec } -package_gcompris-data() { - pkgdesc="Data files for GCompris" - #arch=('any') - install=gcompris-data.install - - cd "$srcdir/gcompris-$pkgver" - make DESTDIR="$pkgdir" install-data - - # Place GCompris menu entry under Education - sed -i 's|^Categories=.*|Categories=Education;|' \ - "$pkgdir/usr/share/applications/gcompris.desktop" -} - # vim:set ts=2 sw=2 et: diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index 8bf014c10..297355163 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,24 +1,39 @@ -# $Id: PKGBUILD 37244 2011-01-12 15:09:23Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 57822 2011-11-03 10:07:17Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: djgera # Contributor: Patrick Melo <patrick@patrickmelo.eti.br> pkgname=geany-plugins -pkgver=0.20 -pkgrel=1 -pkgdesc="The combined plugins release for Geany" +pkgver=0.21 +pkgrel=2 +pkgdesc="Combined plugins release for Geany" arch=('i686' 'x86_64' 'mips64el') -url="http://plugins.geany.org" +url="http://plugins.geany.org/" license=('GPL') -depends=('geany' 'lua' 'gtkspell' 'enchant' 'intltool') -source=(http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2) -md5sums=('94bc4901217641a07f840d92179643b0') +depends=('geany' 'lua' 'gtkspell' 'libwebkit' 'hicolor-icon-theme' 'ctpl' 'gpgme') +makedepends=('intltool') +optdepends=('hspell: hebrew spell checker') +conflicts=('geany-plugins-svn') +install=geany-plugins.install +source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2") +md5sums=('22e106d7a026e720dd91feb79e44456f') build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --libexecdir=/usr/lib # Thx djgera + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --libexecdir=/usr/lib make } package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + rmdir \ + "$pkgdir/usr/share/geany-plugins/devhelp" \ + "$pkgdir/usr/share/doc/geany-plugins/devhelp" \ + "$pkgdir/usr/share/geany-plugins/debugger" \ + "$pkgdir/usr/share/doc/geany-plugins/debugger" } + +# vim:set ts=2 sw=2 et: diff --git a/community/unetbootin/unetbootin.install b/community/geany-plugins/geany-plugins.install index a09dc920d..c5a602e43 100644 --- a/community/unetbootin/unetbootin.install +++ b/community/geany-plugins/geany-plugins.install @@ -1,12 +1,15 @@ -post_install() { +pkgname=geany-plugins + +post_upgrade() { gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q } -post_upgrade() { - post_install +post_install() { + post_upgrade } post_remove() { - post_install -}
\ No newline at end of file + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD index 89b1c5700..509b0be3a 100644 --- a/community/geany/PKGBUILD +++ b/community/geany/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56636 2011-10-09 11:13:50Z arodseth $ +# $Id: PKGBUILD 57809 2011-11-03 09:42:30Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.ro> @@ -6,7 +6,7 @@ # Contributor: Allan McRae <mcrae_allan@hotmail.com> pkgname=geany pkgver=0.21 -pkgrel=1 +pkgrel=2 pkgdesc="Fast and lightweight IDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.geany.org/" @@ -15,12 +15,12 @@ depends=('gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'python2') makedepends=('perlxml' 'intltool') optdepends=("vte: for terminal support") install=geany.install -source=("http://download.geany.org/${pkgname}-${pkgver}.tar.gz") +source=("http://download.geany.org/$pkgname-$pkgver.tar.gz") options=('!libtool') md5sums=('d2734776badc3f5f9a778814ed56fb8a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" msg2 "Configuring..." ./configure --prefix=/usr @@ -35,9 +35,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index a8c45c588..7e632f8bb 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' 'mips64el') 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/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 4c40ff518..507bd09b0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56108 2011-10-01 18:56:09Z ibiru $ +# $Id: PKGBUILD 57063 2011-10-20 05:50:26Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('c8d617a107478dba6ef0ab16e87707c5526e97eefab24a65891dbf9aa32e7839') +sha256sums=('45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD index 19f2d0e0f..c74572d99 100644 --- a/community/giggle/PKGBUILD +++ b/community/giggle/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 44519 2011-04-08 03:41:57Z tdziedzic $ +# $Id: PKGBUILD 57210 2011-10-24 13:47:08Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: neodreams <yanbrodeur@gmail.com> pkgname=giggle -pkgver=0.5 -pkgrel=5 -pkgdesc="Graphical frontend for the git directory tracker (think of gitk on GTK+)." +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Git repository viewer" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/giggle" license=('GPL') -depends=('git' 'gtksourceview2') -makedepends=('intltool' 'vte' 'evolution-data-server>=2.30.2.1') -optdepends=('vte: for terminal plugin support' - 'evolution-data-server: details autocompletion') -source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.5/${pkgname}-${pkgver}.tar.bz2) +depends=('git' 'gtksourceview3' 'vte3') +makedepends=('intltool' 'itstool') +source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.6/${pkgname}-${pkgver}.tar.xz) options=(!libtool) install=giggle.install -sha256sums=('2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259') +sha256sums=('6c0b5c2b417217509bf88096447afa4af70fd33e8a6db5caa0aa86b44c01a5b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr - make } diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD index 8d4ecf77f..a35c6bf2b 100644 --- a/community/ginac/PKGBUILD +++ b/community/ginac/PKGBUILD @@ -2,9 +2,9 @@ # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=ginac -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 -pkgdesc='A set of libraries that allow the creation of integrated systems that embed symbolic manipulations.' +pkgdesc='A library designed to allow the creation of integrated systems that embed symbolic manipulations.' arch=('i686' 'x86_64' 'mips64el') url='http://www.ginac.de' license=('GPL') @@ -12,7 +12,7 @@ depends=('cln') makedepends=('transfig' 'doxygen' 'texlive-bin') options=('!libtool') source=("ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/ginac-${pkgver}.tar.bz2") -md5sums=('d383f3ee50f88ffa1b3966fdb11d0f12') +md5sums=('4cfdd286ab0c32981ec1c9c779e87eb9') build() { cd ginac-${pkgver} diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 19c3e0fcd..53f0c8ac6 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 57270 2011-10-25 06:09:22Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Blaž Tomžič <blaz.tomazic@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,20 +7,22 @@ # Contributor: DonVla <donvla@users.sourceforge.net> pkgname=gitg -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64' 'mips64el') url='http://trac.novowork.com/gitg/' license=('GPL') -depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas') +depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ + 'hicolor-icon-theme') makedepends=('intltool') +options=('!libtool') install="${pkgname}.install" -source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('96705b0edf6525a131a34d015544da67add9ed992babbd45fc768cdd032b65d0') +source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.xz") +sha256sums=('d3dfff65834d8371d43b2e91926af1421f8ec2128580dfeceb6925b6b1ce6d8c') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr @@ -27,7 +30,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/gitg/gitg.install b/community/gitg/gitg.install index 787d6085e..7b356a632 100644 --- a/community/gitg/gitg.install +++ b/community/gitg/gitg.install @@ -5,6 +5,7 @@ post_install() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_upgrade() { @@ -14,4 +15,5 @@ post_upgrade() { post_remove() { usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD new file mode 100644 index 000000000..889f2cb87 --- /dev/null +++ b/community/glfw/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: philefou <tuxication AT gmail DOT com> +# Contributor: lindquist <tomas@famolsen.dk> +# Contributor: Christoph Siegenthaler <csi@gmx.ch> +# Contributor: Mihai Militaru <mihai.militaru@ephemeros.org> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +pkgname=glfw +pkgver=2.7.2 +pkgrel=2 +pkgdesc="A free, open source, portable framework for OpenGL application development" +arch=('i686' 'x86_64') +url="http://www.glfw.org/" +license=('custom:ZLIB') +depends=('libgl' 'libxrandr') +makedepends=('mesa') +source=("http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") +md5sums=('bb4f33b43e40f8cd3015a653dca02ed1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make x11 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make PREFIX="$pkgdir/usr" x11-dist-install + + # license + install -Dm644 COPYING.txt \ + "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # docs + install -d "$pkgdir/usr/share/doc/$pkgname" + install -Dm644 docs/*.pdf "$pkgdir/usr/share/doc/$pkgname" + + # fix pc file prefix path + sed -i "s|$pkgdir||g" "$pkgdir/usr/lib/pkgconfig/lib$pkgname.pc" +} diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD index 83075f22c..e29d3315e 100644 --- a/community/glom/PKGBUILD +++ b/community/glom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 57035 2011-10-18 22:47:54Z heftig $ +# $Id: PKGBUILD 59046 2011-11-20 23:01:47Z heftig $ # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=glom -pkgver=1.19.14 +pkgver=1.20.0 pkgrel=1 pkgdesc="An easy-to-use database designer and user interface" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('18dbbf572045380c07fb6cb2bdbca1893bbd322fb1283e1f0d0d2b295b4a28c8') +sha256sums=('047ce7bd6e5a0214f6f49cad15cc0ee1d2e8eeb61462e094328ed32676c15e5b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD index e0c68877d..f0a9c65c5 100644 --- a/community/gmerlin/PKGBUILD +++ b/community/gmerlin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54036 2011-08-12 13:08:25Z lfleischer $ +# $Id: PKGBUILD 58153 2011-11-07 10:55:45Z spupykin $ # Maintainer: Mateusz Herych <heniekk@gmail.com> pkgname=gmerlin pkgver=1.0.0 -pkgrel=2 +pkgrel=4 pkgdesc="Multimedia architecture for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" @@ -11,19 +11,22 @@ license=('GPL') depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'mesa' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools') makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils') optdepends=('alsa-lib: for ALSA support' - 'jack: for JACK support' - 'libquicktime: for movie encoding' - 'pulseaudio: for PulseAudio support' - 'v4l-utils: for video conversion') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) + 'jack: for JACK support' + 'libquicktime: for movie encoding' + 'pulseaudio: for PulseAudio support' + 'v4l-utils: for video conversion') options=('!libtool') -md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz + libpng.patch) +md5sums=('60d3c5081c8685ee7bc1afdfac8f6dc6' + 'c262023434246705296d97bc7337a212') build() { cd "$srcdir/$pkgname-$pkgver" rm -rf cpuinfo.sh + patch -p1 <$srcdir/libpng.patch ./configure --prefix=/usr --without-doxygen make } diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch new file mode 100644 index 000000000..c01105e63 --- /dev/null +++ b/community/gmerlin/libpng.patch @@ -0,0 +1,17 @@ +diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c +--- gmerlin-1.0.0/plugins/png/ir_png.c 2011-01-07 18:37:06.000000000 +0300 ++++ gmerlin-1.0.0.my/plugins/png/ir_png.c 2011-11-07 14:46:25.000000000 +0400 +@@ -127,13 +127,8 @@ + bits = 16; + } + if(bit_depth < 8) +-#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9) +- png_set_gray_1_2_4_to_8(png->png_ptr); +-#else + png_set_expand_gray_1_2_4_to_8(png->png_ptr); +-#endif + +- png_set_gray_1_2_4_to_8(png->png_ptr); + if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) + { + png_set_tRNS_to_alpha(png->png_ptr); diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 5c6e5ac1e..3a234f814 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56505 2011-10-07 13:41:51Z spupykin $ +# $Id: PKGBUILD 58115 2011-11-06 17:48:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.0.4 +pkgver=1.5.0.6 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('8a1fe1207fb09fa2d515ccd484be521c' +md5sums=('01ddab64ed2d127c2ee35602a3e141f5' 'f135182ced743c296e08ddd560fa6be9') build() { diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD index 509f37798..889ef3ce5 100644 --- a/community/gnash/PKGBUILD +++ b/community/gnash/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=gnash pkgname=(gnash-common gnash-gtk) pkgver=0.8.9 -pkgrel=4 +pkgrel=6 arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/gnash/" license=(GPL3) @@ -14,16 +14,23 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils pkgconfig boost) options=(!libtool !emptydirs) -source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2) -md5sums=('5b2be6b04a1bcc5fb404cc377034499e') +source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2 + gentoo-ffmpeg-0.8.patch xul8.patch) +md5sums=('5b2be6b04a1bcc5fb404cc377034499e' + '98dec9a5c1b1084245a3f46b4022a6e2' + '9b77325d0b8b9d4150c4097771482d26') build() { cd "$srcdir/gnash-$pkgver" - # Version is now in version.h - sed -i 's/avcodec\.h/version.h/' macros/ffmpeg.m4 - ./autogen.sh + # Consolidated gentoo patches for ffmpeg compatibility + # as of 2011-10-31 + patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch" + + # Patch for compatibility with newer xulrunner headers + patch -Np1 -i "$srcdir/xul8.patch" + ./autogen.sh ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/gnash/gentoo-ffmpeg-0.8.patch b/community/gnash/gentoo-ffmpeg-0.8.patch new file mode 100644 index 000000000..d74bcc8e0 --- /dev/null +++ b/community/gnash/gentoo-ffmpeg-0.8.patch @@ -0,0 +1,204 @@ +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 2011-10-31 17:25:56.057379760 +0100 +@@ -29,7 +29,7 @@ + + //#define GNASH_DEBUG_AUDIO_DECODING + +-#define AVCODEC_DECODE_AUDIO avcodec_decode_audio2 ++#define AVCODEC_DECODE_AUDIO avcodec_decode_audio3 + + namespace gnash { + namespace media { +@@ -549,8 +549,12 @@ + #endif + + // older ffmpeg versions didn't accept a const input.. ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = inputSize; + int tmp = AVCODEC_DECODE_AUDIO(_audioCodecCtx, outPtr, &outSize, +- input, inputSize); ++ &pkt); + + #ifdef GNASH_DEBUG_AUDIO_DECODING + log_debug(" avcodec_decode_audio[2](ctx, bufptr, %d, input, %d) " +@@ -658,13 +662,13 @@ + { + if ( _needsParsing ) + { +- return av_parser_parse(_parser, _audioCodecCtx, ++ return av_parser_parse2(_parser, _audioCodecCtx, + // as of 2008-10-28 SVN, ffmpeg doesn't + // accept a pointer to pointer to const.. + const_cast<boost::uint8_t**>(outFrame), + outFrameSize, + input, inputSize, +- 0, 0); // pts & dts ++ 0, 0, AV_NOPTS_VALUE); // pts & dts + } + else + { +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 2011-10-31 17:25:51.210668136 +0100 +@@ -46,8 +46,10 @@ + { + if ( (ctx->sample_rate != 44100) || (ctx->channels != 2) ) { + if ( ! _context ) { +- _context = audio_resample_init( +- 2, ctx->channels, 44100, ctx->sample_rate ++ _context = av_audio_resample_init( ++ 2, ctx->channels, 44100, ctx->sample_rate, ++ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, ++ 16, 10, 0, 0.8 + ); + } + +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/MediaParserFfmpeg.cpp 2011-10-31 17:25:57.720728522 +0100 +@@ -387,7 +387,7 @@ + + log_debug("Parsing FFMPEG media file: format:%s; nstreams:%d", + _inputFmt->name, _formatCtx->nb_streams); +- ++ /* + if ( _formatCtx->title[0] ) + log_debug(_(" Title:'%s'"), _formatCtx->title); + if ( _formatCtx->author[0] ) +@@ -398,7 +398,7 @@ + log_debug(_(" Comment:'%s'"), _formatCtx->comment); + if ( _formatCtx->album[0] ) + log_debug(_(" Album:'%s'"), _formatCtx->album); +- ++ */ + // Find first audio and video stream + for (unsigned int i = 0; i < static_cast<unsigned int>(_formatCtx->nb_streams); i++) + { +@@ -415,7 +415,7 @@ + } + + switch (enc->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + if (_audioStreamIndex < 0) { + _audioStreamIndex = i; + _audioStream = _formatCtx->streams[i]; +@@ -425,7 +425,7 @@ + } + break; + +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + if (_videoStreamIndex < 0) { + _videoStreamIndex = i; + _videoStream = _formatCtx->streams[i]; +diff -u -Nr gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp +--- gnash-0.8.9/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-ff/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 2011-10-31 17:25:54.590699488 +0100 +@@ -356,8 +356,12 @@ + + int bytes = 0; + // no idea why avcodec_decode_video wants a non-const input... +- avcodec_decode_video(_videoCodecCtx->getContext(), frame, &bytes, +- input, input_size); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = (uint8_t*) input; ++ pkt.size = input_size; ++ avcodec_decode_video2(_videoCodecCtx->getContext(), frame, &bytes, ++ &pkt); + + if (!bytes) { + log_error("Decoding of a video frame failed"); +diff -u -Nr gnash-0.8.9/macros/ffmpeg.m4 gnash-0.8.9-ff/macros/ffmpeg.m4 +--- gnash-0.8.9/macros/ffmpeg.m4 2011-02-26 19:11:08.000000000 +0100 ++++ gnash-0.8.9-ff/macros/ffmpeg.m4 2011-10-31 17:25:49.700654130 +0100 +@@ -22,6 +22,7 @@ + backupLIBS="$LIBS" + backupCFLAGS="$CFLAGS" + avcodec_h="" ++ avcodec_version_h="" + ffmpeg_top_incl="" + + dnl If the user specify an path to include headers from, we assume it's the full +@@ -46,6 +47,9 @@ + else + AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the avcodec.h header]) + fi ++ if test -f ${with_ffmpeg_incl}/version.h; then ++ avcodec_version_h=${with_ffmpeg_incl}/version.h ++ fi + fi + ]) + +@@ -66,6 +70,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`" + avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h" ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -83,6 +90,9 @@ + if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then + ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}/${i}; pwd)`" + avcodec_h=${ffmpeg_top_incl}/${i}/avcodec.h ++ if test -f ${ffmpeg_top_incl}/${i}/version.h; then ++ avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h ++ fi + break + fi + done +@@ -182,14 +192,24 @@ + dnl a modified form of grepping may be better, making sure all old kinds of + dnl version numbering fail gracefully. + ++ versionfile="" ++ + dnl Check avcodec version number, if it was found +- if test x"${avcodec_h}" != x; then ++ if test x"${avcodec_version_h}" != x; then ++ versionfile=${avcodec_version_h} ++ else ++ if test x"${avcodec_h}" != x; then ++ versionfile=${avcodec_h} ++ fi ++ fi ++ ++ if test x"${versionfile}" != x; then + + AC_MSG_CHECKING([ffmpeg version]) + +- ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` +- ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${avcodec_h} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " ${versionfile} | sed -e "s%[[^0-9]]%%g"` ++ ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " ${versionfile} | sed -e "s%[[^0-9]]%%g"` + + if test x"${ffmpeg_major_version}" != x ; then + +@@ -198,15 +218,15 @@ + else + + dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1 +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%,%.%g"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"` + + if test x"${ffmpeg_version}" = x ; then + + dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix +- ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` + + if test x"${ffmpeg_version}" = x ; then +- ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk '{print $'3'}'` ++ ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | awk '{print $'3'}'` + fi + fi + diff --git a/community/gnash/xul8.patch b/community/gnash/xul8.patch new file mode 100644 index 000000000..7bd708b2d --- /dev/null +++ b/community/gnash/xul8.patch @@ -0,0 +1,44 @@ +diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp +--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp 2011-11-18 16:25:55.198007371 +0100 +@@ -238,7 +238,7 @@ + return NS_PluginInitialize(); + } + +-char * ++const char * + NP_GetMIMEDescription(void) + { + return NPP_GetMIMEDescription(); +diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp +--- gnash-0.8.9/plugin/npapi/plugin.cpp 2011-03-18 14:44:30.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp 2011-11-18 16:35:42.496794816 +0100 +@@ -128,10 +128,10 @@ + } + + /// \brief Return the MIME Type description for this plugin. +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- return const_cast<char *>(MIME_TYPES_DESCRIPTION); ++ return MIME_TYPES_DESCRIPTION; + } + + static bool waitforgdb = false; +diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp +--- gnash-0.8.9/plugin/npapi/test.cpp 2011-03-13 17:47:36.000000000 +0100 ++++ gnash-0.8.9-xul/plugin/npapi/test.cpp 2011-11-18 16:37:06.997539299 +0100 +@@ -408,10 +408,10 @@ + { + } + +-char* ++const char* + NPP_GetMIMEDescription(void) + { +- char *x = 0; ++ const char *x = 0; + return x; + } + diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 12c7e56bc..e24803a9c 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56182 2011-10-03 06:12:55Z jconder $ +# $Id: PKGBUILD 58924 2011-11-20 11:38:58Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgname=gnome-packagekit -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64' 'mips64el') url='http://www.packagekit.org/' @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" 'arch.patch') -sha256sums=('a91efca58ac0781f925927772281e72abf16314ef3b9577bf42f8ab3f5b5c0e9' +sha256sums=('7a6383a2a91fd29c0b6fd9b8900d498efd2e38b89149470433748d989926c341' '9c809ac3c8bbf870442e7bc4123c70b144930a287b28626be1b8bae95edf71ac') build() { @@ -24,6 +24,7 @@ build() { patch -Np1 -i "$srcdir/arch.patch" sed -i 's@python@python2@' 'python/enum-convertor.py' + sed -i 's@python @python2 @' 'python/packagekit/Makefile.in' export PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index 600afe34b..07f1d6f7b 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55914 2011-09-24 20:06:05Z ibiru $ +# $Id: PKGBUILD 57195 2011-10-23 18:34:02Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: uastasi <uastasi@archlinux.us> pkgname=gnote -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f009852b264fb8754575524ef2937147c4d2c25eff97ecca507624ca8730c213') +sha256sums=('d20ad13814e016679e74aa51e2619000bd4468c13d219c760daa633e398bea43') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnunet-setup/PKGBUILD b/community/gnunet-setup/PKGBUILD index 312818ec8..c7147fe00 100644 --- a/community/gnunet-setup/PKGBUILD +++ b/community/gnunet-setup/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46057 2011-05-03 09:18:56Z spupykin $ +# $Id: PKGBUILD 59037 2011-11-20 20:44:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gnunet-setup @@ -9,7 +9,8 @@ arch=(i686 x86_64 'mips64el') url="http://gnunet.org/" license=('GPL') depends=('gnunet') -source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-setup-$pkgver.tar.gz) +#source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-setup-$pkgver.tar.gz) +source=(http://ftp.archlinux.org/other/community/gnunet-setup/gnunet-setup-$pkgver.tar.gz) md5sums=('b9c768fb2278b19561654c261f98062f') build() { diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 677f7fd80..e0b00efca 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ +# $Id: PKGBUILD 58379 2011-11-12 16:02:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('LGPL') -depends=(gnustep-base libungif aspell gcc-libs libcups audiofile libsndfile giflib libao) -makedepends=(gcc-objc) +depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') +makedepends=('gcc-objc') conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') @@ -22,6 +22,7 @@ build() { cd $srcdir/$pkgname-$pkgver . /etc/profile.d/GNUstep.sh ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h make make DESTDIR=$pkgdir install } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index fee111d1e..cacbd5519 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -6,7 +6,7 @@ pkgname=go pkgver=r60.3 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Google Go compiler and tools (release version)' arch=('i686' 'x86_64' 'mips64el') @@ -45,7 +45,6 @@ build() { export GOOS=linux export GOBIN="$GOROOT/bin" export PATH="$GOBIN:$PATH" - export CGO_ENABLED=0 # disable building net against libc, not needed on arch linux(?) mkdir -p "$GOROOT/bin" cd "$GOROOT/src" diff --git a/community/gobby/PKGBUILD b/community/gobby/PKGBUILD index 140bd1cea..66a3a79cd 100644 --- a/community/gobby/PKGBUILD +++ b/community/gobby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18527 2010-06-07 11:16:36Z spupykin $ +# $Id: PKGBUILD 58735 2011-11-18 10:25:12Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -10,16 +10,19 @@ pkgdesc="A collaborative text editor" arch=('i686' 'x86_64' 'mips64el') url="http://gobby.0x539.de" license=('GPL') + depends=('obby' 'libxml++' 'gtkmm' 'gnome-vfs' 'libbonobo' 'libgtksourceviewmm2' 'gtksourceview2') +#depends=('obby' 'libxml++2' 'gtkmm' 'gnome-vfs' 'libbonobo' 'libgtksourceviewmm2' +# 'gtksourceview2' 'libxml++' 'libunique' 'libinfinity' 'gsasl') + makedepends=('gettext' 'intltool') -options=(force) source=(http://releases.0x539.de/gobby/gobby-$pkgver.tar.gz) md5sums=('835cc48f5177196e4a18610c2cb013bf') build() { cd $srcdir/gobby-$pkgver ./configure --prefix=/usr --with-gnome - make || return 1 + make make DESTDIR=$pkgdir install install -D -m644 contrib/gobby.desktop \ $pkgdir/usr/share/applications/gobby.desktop diff --git a/community/goldendict/PKGBUILD b/community/goldendict/PKGBUILD index a352891a3..7ea5954a4 100644 --- a/community/goldendict/PKGBUILD +++ b/community/goldendict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 52155 2011-07-20 20:14:39Z jlichtblau $ +# $Id: PKGBUILD 58521 2011-11-13 15:39:18Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: m0rph <m0rph.mailbox@gmail.com> @@ -9,11 +9,10 @@ pkgdesc="Feature-rich dictionary lookup program" arch=('i686' 'x86_64' 'mips64el') url="http://goldendict.berlios.de/" license=('GPL3') -depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'openssl' 'phonon') -makedepends=('patch') +depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'phonon') provides=('stardict') changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 \ +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2 $pkgname-paths.diff) sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6' '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589') @@ -33,6 +32,6 @@ package() { make INSTALL_ROOT=${pkgdir} install -#removing unneeded + #removing unneeded rm -rf ${pkgdir}/usr/share/app-install } diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD index caab2fc45..5fd36fbb9 100755 --- a/community/goocanvasmm/PKGBUILD +++ b/community/goocanvasmm/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Laurent Meunier <laurent@deltalima.net> pkgname=goocanvasmm -pkgver=1.90.6 +pkgver=1.90.8 pkgrel=1 pkgdesc='C++ wrappers for goocanvas' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('goocanvas' 'gtkmm3') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz) -sha256sums=('2d63cff0ea1a20cb0ebb9b91fbefe2a80f8972b1dbcda018ba4f10fbfda5c699') +sha256sums=('721649be4f8bbbb4589800c0b973522d2104a95172f9eefd7b93e3bf59ae8721') build() { cd ${pkgname}-${pkgver} diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index fbe77e1be..d4e346228 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44556 2011-04-08 21:04:15Z spupykin $ +# $Id: PKGBUILD 58523 2011-11-13 15:42:30Z andrea $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgbase=google-gadgets diff --git a/community/gpa/ChangeLog b/community/gpa/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/gpa/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/gpa/PKGBUILD b/community/gpa/PKGBUILD deleted file mode 100644 index 2fc9a8255..000000000 --- a/community/gpa/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 528 2009-08-01 19:41:58Z giovanni $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Ravi Desai <ravster3@hotmail.com> - -pkgname=gpa -pkgver=0.9.0 -pkgrel=1 -pkgdesc="A graphical user interface for the GnuPG" -arch=('i686' 'x86_64' 'mips64el') -url="http://wald.intevation.org/projects/gpa/" -license=('GPL') -depends=('gpgme' 'gtk2') -makedepends=('pkgconfig') -source=(http://wald.intevation.org/frs/download.php/603/gpa-$pkgver.tar.bz2) -md5sums=('8859f9cf69e94e10e4895f633a0b268a') - -build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install -} diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD index d5c09a1f6..080c51871 100644 --- a/community/gpac/PKGBUILD +++ b/community/gpac/PKGBUILD @@ -1,47 +1,35 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: niQo -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 58399 2011-11-12 17:17:21Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpac pkgver=0.4.5 -pkgrel=8 +pkgrel=9 pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" arch=('i686' 'x86_64' 'mips64el') url="http://gpac.sourceforge.net" -depends=('libxml2' 'wxgtk' 'alsa-lib' 'sdl' 'libmad' - 'faad2' 'xvidcore' 'ffmpeg' 'freeglut') -# 'js' +depends=('wxgtk' 'libmad' 'faad2' 'ffmpeg' 'freeglut') license=('LGPL') -options=('!makeflags') # Multiple build jobs aren't handled correctly +options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz libpng14-infopp-null.patch openjpeg14.patch) -md5sums=('755e8c438a48ebdb13525dd491f5b0d1' - '14d6483c9eb84434aea68596f243e0ca' - '1605fc11bd49b9c8220820bb38912021') +sha1sums=('2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8' + '00ba08808ec46ef6b8301ede26e500b3449253c1' + '95747ca98cdf0efc33ec776764401f5a83818ab5') build() { - cd ${srcdir}/${pkgname} - chmod +x configure - sed -i 's|--warn-common||' configure - sed -i 's#osmozilla##g' applications/Makefile - sed -i 's#"$(prefix)#"$(DESTDIR)$(prefix)#' applications/osmo4_wx/Makefile - sed -i 's#ldconfig || true##g' Makefile + cd "${srcdir}/${pkgname}" + chmod +x configure + sed -i 's|--warn-common||' configure + sed -i 's#lib64#lib#g' configure + patch -p1 -i "${srcdir}/libpng14-infopp-null.patch" + patch -p1 -i "${srcdir}/openjpeg14.patch" - #FS#14506 - sed -i 's#lib64#lib#g' configure - patch -Np1 -i ${srcdir}/libpng14-infopp-null.patch - patch -Np1 -i ${srcdir}/openjpeg14.patch - - # Was getting "symbol lookup error: /usr/lib/gpac/gm_x11_out.so: undefined - # symbol: XvQueryExtension" with our LDFLAGS :\ - export LDFLAGS=${LDFLAGS/,--as-needed/} - - ./configure --prefix=/usr --mandir=/usr/share/man --use-js=no - make + export LDFLAGS=${LDFLAGS/,--as-needed/} + ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no + make } package() { - cd ${srcdir}/${pkgname} - make DESTDIR=${pkgdir} install install-lib + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install install-lib } diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD index 963c8d44a..6739ade04 100644 --- a/community/gphpedit/PKGBUILD +++ b/community/gphpedit/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44458 2011-04-07 16:24:21Z spupykin $ +# $Id: PKGBUILD 58832 2011-11-18 16:59:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -10,23 +10,19 @@ pkgdesc="a scintilla/gnome based editor specialized on php-files" arch=(i686 x86_64 'mips64el') license=('GPL') depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit') +makedepends=('intltool') url="http://www.gphpedit.org/" options=('!makeflags') install=gphpedit.install -source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz - doc-fix.patch) -md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525' - 'db5e427642af2971accbcd90812ae88c') +source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz) +md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525') build() { cd ${srcdir}/*$pkgname* -# patch -Np1 -i ${srcdir}/doc-fix.patch - ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make make DESTDIR=$pkgdir install - # extend MimeType declaration echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \ $pkgdir/usr/share/applications/gphpedit.desktop diff --git a/community/gphpedit/doc-fix.patch b/community/gphpedit/doc-fix.patch deleted file mode 100644 index 42dae5f72..000000000 --- a/community/gphpedit/doc-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gphpedit-0.9.91/src/tab.c.orig 2008-07-08 00:21:04.000000000 +0200 -+++ gphpedit-0.9.91/src/tab.c 2008-07-08 00:20:50.000000000 +0200 -@@ -562,6 +562,17 @@ - if (long_filename) - return long_filename; - -+ // For ArchLinux - KISS ;) -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/function.", command, ".html"); -+ if (long_filename) -+ return long_filename; -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/ref.", command, ".html"); -+ if (long_filename) -+ return long_filename; -+ long_filename = tab_help_try_filename("/usr/share/doc/php/html/", command, NULL); -+ if (long_filename) -+ return long_filename; -+ - // For Gentoo, as much as I love it - it's twatty to put docs in a version specific folder like this! - long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/function.", command, ".html"); - if (long_filename) diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index e65fcb8c7..badc9b5c5 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50772 2011-06-30 21:54:27Z spupykin $ +# $Id: PKGBUILD 58769 2011-11-18 13:54:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributer: Jason Chu <jchu@xentac.net> @@ -12,7 +12,7 @@ url="http://www.gprolog.org/" depends=('glibc') license=('GPL') source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz) -md5sums=('9d4fc311b7f6e37e524a5e7ccd0b6c28') +md5sums=('cc944e5637a04a9184c8aa46c947fd16') build() { cd "$srcdir/gprolog-$pkgver/src" diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 8aca0d76b..592191d4a 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 57048 2011-10-19 10:30:50Z spupykin $ +# $Id: PKGBUILD 58522 2011-11-13 15:40:29Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2') optdepends=('qt') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" diff --git a/community/gpsman/PKGBUILD b/community/gpsman/PKGBUILD deleted file mode 100644 index c71be72fe..000000000 --- a/community/gpsman/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 11972 2010-02-24 02:57:47Z dgriffiths $ -# Maintainer: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=gpsman -pkgver=6.4 -pkgrel=4 -pkgdesc="GPS Manager is a graphical GPS data manager for preparing, inspectiing and editing GPS data" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.ncc.up.pt/gpsman" -license=('GPL') -depends=('tcl' 'tk') -optdepends=('gpsmanshp: shapefile support') -install=gpsman.install -source=(http://www.ncc.up.pt/gpsman/gpsmanhtml/${pkgname}-${pkgver}.tgz - 'gpsman.desktop') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - mkdir -p ${pkgdir}/usr/{bin,share/${pkgname}} - - # set path to program files - sed -i "s|set SRCDIR gmsrc|set SRCDIR /usr/share/gpsman|g" ./gpsman.tcl - install -m755 gpsman.tcl ${pkgdir}/usr/bin/gpsman.tcl - - # install a gpsman launcher - install -m755 util/gpsman.sh ${pkgdir}/usr/bin/gpsman || return 1 - - #install program files - cp -r gmsrc/* ${pkgdir}/usr/share/gpsman/ || return 1 - chmod 755 ${pkgdir}/usr/share/gpsman/*.tcl - chmod -R 755 ${pkgdir}/usr/share/gpsman/gmicons - - # install some freedesktop.org compatibility - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop -} -md5sums=('3a47f1953e0bad1ea3a79aba0a713f1a' - '0341f110f61e57b316fad7bee483665b') diff --git a/community/gpsman/gpsman.desktop b/community/gpsman/gpsman.desktop deleted file mode 100644 index b0c359bd7..000000000 --- a/community/gpsman/gpsman.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=GPSMan -GenericName= -Comment="Graphical GPS data manager for preparing, inspectiing and editing GPS data" -Exec=/usr/bin/gpsman -Icon= -Terminal=false -MultipleArgs=false -Type=Application -Categories=Application;Science diff --git a/community/gpsman/gpsman.install b/community/gpsman/gpsman.install deleted file mode 100644 index 8b3a5092f..000000000 --- a/community/gpsman/gpsman.install +++ /dev/null @@ -1,39 +0,0 @@ -# This is a default template for a post-install scriptlet. You can -# remove any functions you don't need (and this header). - -# arg 1: the new package version -pre_install() { - /bin/true -} - -# arg 1: the new package version -post_install() { - echo - echo " : You should change the path to your gps serial device in" - echo " : /usr/bin/gpsman" - echo - echo " : Config options are stored in /usr/share/gpsman/config.tcl" -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - /bin/true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - /bin/true -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD index e80d6270d..9930f47ab 100644 --- a/community/gputils/PKGBUILD +++ b/community/gputils/PKGBUILD @@ -1,25 +1,27 @@ +# $Id: PKGBUILD 59445 2011-11-24 21:56:56Z ebelanger $ # Contributor: Johannes Martin <honzor@gmx.net> # Contributor: JJDaNiMoTh <jjdanimoth.aur@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gputils -pkgver=0.13.7 -pkgrel=2 +pkgver=0.14.0 +pkgrel=1 pkgdesc="PIC Programming Utilities" arch=('i686' 'x86_64' 'mips64el') url="http://gputils.sourceforge.net/" license=('GPL') +depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('242e33919e9c318d6ac58b6db291d20e') +md5sums=('04780834e30fc50f0bd92cc4c91cf11b') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/gq/PKGBUILD b/community/gq/PKGBUILD index 827bf915f..c690cd1c7 100644 --- a/community/gq/PKGBUILD +++ b/community/gq/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 18516 2010-06-07 11:11:04Z spupykin $ +# $Id: PKGBUILD 58750 2011-11-18 13:04:07Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> @@ -9,7 +9,7 @@ pkgdesc="interactive graphical LDAP browser" url="http://sourceforge.net/projects/gqclient" license=("GPL") depends=('libxml2' 'gtk2' 'libgnome-keyring' 'libglade' 'libldap>=2.4.18' 'libgpg-error' 'libgcrypt') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') arch=('i686' 'x86_64' 'mips64el') install=gq.install source=(http://downloads.sourceforge.net/sourceforge/gqclient/$pkgname-$pkgver.tar.gz) @@ -18,6 +18,6 @@ md5sums=('d7b1e183a3ecbd77aceea02d27f36b3e') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --disable-debugging --disable-update-mimedb - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/grafx2/PKGBUILD b/community/grafx2/PKGBUILD index 0eb3d0696..43da08b43 100644 --- a/community/grafx2/PKGBUILD +++ b/community/grafx2/PKGBUILD @@ -1,22 +1,22 @@ -# $Id$ +# $Id: PKGBUILD 57828 2011-11-03 10:14:39Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Simon Parzer <simon.parzer@gmail.com> pkgname=grafx2 pkgver=2.3 -pkgrel=1 -pkgdesc="Pixelart-oriented painting program (for pixling)" +pkgrel=2 +pkgdesc="Pixelart-oriented painting program" arch=('x86_64' 'i686') url="http://code.google.com/p/grafx2/" license=('GPL2') install=grafx2.install depends=('sdl_ttf' 'sdl_image' 'lua' 'desktop-file-utils') -source=("http://grafx2.googlecode.com/files/${pkgname}-${pkgver}.1781-src.tgz" - "${pkgname}.desktop") +source=("http://grafx2.googlecode.com/files/$pkgname-$pkgver.1781-src.tgz" + "grafx2.desktop") md5sums=('916a35c4762e85b4210a1041fbbfd830' - '73d1cb00b7529de5cbab5c8f00640fbc') + '9b3ecb5c2d44b987d65257184f46e6c4') build() { - cd "${srcdir}/${pkgname}/src" + cd "$srcdir/$pkgname/src" msg2 "Compiling..." make @@ -26,18 +26,18 @@ package() { cd "${srcdir}/${pkgname}/src" msg2 "Packaging files..." - make prefix="/usr" DESTDIR="${pkgdir}" install + make prefix="/usr" DESTDIR="$pkgdir" install msg2 "Packaging shortcut..." - install -Dm644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" msg2 "Packaging documentation..." - install -Dm644 "${srcdir}/${pkgname}/doc/README.txt" \ - "${pkgdir}/usr/share/doc/${pkgname}/readme.txt" + install -Dm644 "$srcdir/$pkgname/doc/README.txt" \ + "$pkgdir/usr/share/doc/$pkgname/readme.txt" msg2 "Packaging license..." - install -Dm644 "${srcdir}/${pkgname}/doc/gpl-2.0.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 "$srcdir/$pkgname/doc/gpl-2.0.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" msg2 "Cleaning up..." - rmdir ${pkgdir}/usr/share/grafx2/scripts/libs + rmdir "$pkgdir/usr/share/grafx2/scripts/libs" } # vim:set ts=2 sw=2 et: diff --git a/community/grafx2/grafx2.desktop b/community/grafx2/grafx2.desktop index fcd6e71fb..d58bc5ed3 100644 --- a/community/grafx2/grafx2.desktop +++ b/community/grafx2/grafx2.desktop @@ -2,10 +2,11 @@ Encoding=UTF-8 GenericName=GrafX2 Name=GrafX2 +Comment=Pixelart-oriented painting program Exec=grafx2 %U TryExec=grafx2 Icon=grafx2 Terminal=false Type=Application -Categories=Graphics;2DGraphics;RasterGraphics; -MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff; +Categories=Graphics;2DGraphics;RasterGraphics +MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff diff --git a/community/grafx2/grafx2.install b/community/grafx2/grafx2.install index ef816a666..12589796c 100644 --- a/community/grafx2/grafx2.install +++ b/community/grafx2/grafx2.install @@ -1,3 +1,5 @@ +pkgname=grafx2 + post_upgrade() { gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor update-desktop-database -q diff --git a/community/gri/PKGBUILD b/community/gri/PKGBUILD index b06e31849..0e4756809 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' 'mips64el') 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/gromacs/PKGBUILD b/community/gromacs/PKGBUILD index 22a806f8c..663fba240 100644 --- a/community/gromacs/PKGBUILD +++ b/community/gromacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43416 2011-03-25 21:35:12Z ebelanger $ +# $Id: PKGBUILD 57441 2011-10-27 20:16:45Z lcarlier $ # Maintainer: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Ricardo <rikardo.horo@gmail.com> pkgname=gromacs -pkgver=4.5.4 +pkgver=4.5.5 pkgrel=1 pkgdesc='A fast Molecular Dynamics program based on the GROMOS force field' url='http://www.gromacs.org/' @@ -12,8 +12,8 @@ arch=('i686' 'x86_64' 'mips64el') depends=('fftw' 'lesstif' 'perl' 'libxml2' 'libsm' 'libx11') options=('!libtool') source=(ftp://ftp.gromacs.org/pub/gromacs/${pkgname}-${pkgver}.tar.gz) -md5sums=('5013de941017e014b92d41f82c7e86d6') -sha1sums=('c7b3fbd2f3ddf915bc082e7effe76a8276563726') +md5sums=('6a87e7cdfb25d81afa9fea073eb28468') +sha1sums=('ce4b4f9a0453dd2ffea72f28ea0bc7bb7a72f479') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gshare/PKGBUILD b/community/gshare/PKGBUILD deleted file mode 100644 index 4d0e43561..000000000 --- a/community/gshare/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 18374 2010-06-03 15:40:23Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=gshare -pkgver=0.94 -pkgrel=4 -pkgdesc="Easy file sharing for Gnome" -arch=('i686' 'x86_64' 'mips64el') -url="https://launchpad.net/gshare-project" -license=('GPL') -depends=('gtk-sharp-2' 'avahi' 'gnome-sharp') -install=$pkgname.install -options=('!makeflags') -source=(http://ftp.de.debian.org/debian/pool/main/g/gshare/gshare_$pkgver.orig.tar.gz - http://ftp.de.debian.org/debian/pool/main/g/gshare/gshare_$pkgver-10.diff.gz) -md5sums=('bfb05ba7502218e9d9cacc7916098a03' - '3dd6000e9afc0db819a6ec69047b440d') - -build() { - export MONO_SHARED_DIR=$srcdir/.wabi - mkdir -p $MONO_SHARED_DIR - - cd $srcdir/gshare-$pkgver - patch -p1 <$srcdir/gshare_$pkgver-10.diff - ls -1 debian/patches/*.patch | while read A; do patch -p1 <$A; done - ./configure --prefix=/usr --sysconfdir=/usr/share --with-dbus-service-dir=/usr/share/dbus-1/services --disable-schemas-install - sed -i 's/-scrollkeeper-update/#-scrollkeeper-update/' help/C/Makefile - make || return 1 - make DESTDIR=$pkgdir install || return 1 - - mv $pkgdir/usr/share/gshare/gshared.desktop $pkgdir/usr/share/applications/ - rm -r $pkgdir/usr/share/gshare - - rm -r $MONO_SHARED_DIR -} diff --git a/community/gshare/gshare.install b/community/gshare/gshare.install deleted file mode 100644 index f1eac39c1..000000000 --- a/community/gshare/gshare.install +++ /dev/null @@ -1,40 +0,0 @@ -pkgname=gshare - -post_install() { - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null - scrollkeeper-update -q -p var/lib/scrollkeeper - update-desktop-database -q - -cat << EOF ->>> To start the ftp server have gshared start up with your session by ->>> going to: Desktop -> Preferences -> Sessions -EOF -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - schemas=(usr/share/gconf/schemas/${pkgname}.schemas) - elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then - schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas) - else - schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`) - fi - export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` - - usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null -} - -post_remove() { - scrollkeeper-update -q -p var/lib/scrollkeeper - update-desktop-database -q -} - diff --git a/community/gshare/monofix.patch b/community/gshare/monofix.patch deleted file mode 100644 index 0888c3c3e..000000000 --- a/community/gshare/monofix.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -rN -u old-gshare/src/gshared/daemon.cs new-gshare/src/gshared/daemon.cs ---- old-gshare/src/gshared/daemon.cs 2006-09-16 20:31:47.881173352 +0100 -+++ new-gshare/src/gshared/daemon.cs 2006-09-16 20:31:47.959161496 +0100 -@@ -308,11 +308,11 @@ - if (reason == FTPServerShutdownReason.Error) - { - Log.ErrorMessage("Shutting down FTP server because of an error"); -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - Utility.ShowGenericFatalErrorDialog(); - Shutdown(); -- }); -+ })); - } - } - -@@ -367,24 +367,24 @@ - { - case ClientState.Collision: - /*TODO figure out what to do*/ -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - StopDaemon(); -- }); -+ })); - break; - case ClientState.Failure: - Log.ErrorMessage("Zeroconf client failed to register"); -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - Utility.ShowCannotPublishServiceDialog(); - Shutdown(); -- }); -+ })); - break; - case ClientState.Running: -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - PublishFTPServer(); -- }); -+ })); - break; - } - -@@ -410,19 +410,19 @@ - iAvahiServiceName = EntryGroup.GetAlternativeServiceName(iAvahiServiceName); - } - -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - StartZeroConf(iFtpServer.ServerPort); -- }); -+ })); - - break; - case EntryGroupState.Failure: - Log.ErrorMessage("Failed to publish FTP service on zeroconf network"); -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - Utility.ShowCannotPublishServiceDialog(); - Shutdown(); -- }); -+ })); - break; - - case EntryGroupState.Established: -@@ -460,11 +460,11 @@ - ex.Message, - ex.StackTrace); - -- Utility.InvokeLater(delegate -+ Utility.InvokeLater((GShare.Utility.BackgroundTask)(delegate - { - Utility.ShowCannotPublishServiceDialog(); - Shutdown(); -- }); -+ })); - - } - - diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index 4dbce4da6..d38635150 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' 'mips64el') 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/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index aec8477fa..479195e01 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55148 2011-09-04 07:26:57Z spupykin $ +# $Id: PKGBUILD 58578 2011-11-15 16:25:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tor Krill <tor@krill.nu> # Contributor: Lee.MaRS <leemars@gmail.com> pkgname=gsoap -pkgver=2.8.3 +pkgver=2.8.4 pkgrel=1 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++" url="http://www.cs.fsu.edu/~engelen/soap.html" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('48e7739a5719bd635843e42d2ec670f7' +md5sums=('cb37c5cc3ef15b6b82863f45544d9473' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD index 93cf19ab0..155914731 100644 --- a/community/gsql/PKGBUILD +++ b/community/gsql/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 50643 2011-06-29 10:56:50Z spupykin $ +# $Id: PKGBUILD 58755 2011-11-18 13:09:30Z spupykin $ # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=gsql @@ -8,7 +8,8 @@ pkgdesc="Integrated database development tool for GNOME" url="http://gsql.org/" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' 'desktop-file-utils') +depends=('gtk2>=2.12' 'gtksourceview2' 'vte' 'libgnomeui' 'gconf' + 'desktop-file-utils' 'libnotify') makedepends=('libmysqlclient' 'postgresql-libs' 'libssh') optdepends=('libmysqlclient' 'postgresql-libs' 'libssh') install=gsql.install diff --git a/community/gtk-kde4/PKGBUILD b/community/gtk-kde4/PKGBUILD index 976f59934..9891313ae 100644 --- a/community/gtk-kde4/PKGBUILD +++ b/community/gtk-kde4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 31082 2010-10-26 19:44:12Z lcarlier $ +# $Id: PKGBUILD 57913 2011-11-04 12:08:54Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Viliam Pucik <viliam dot pucik at gmail dot com> pkgname=gtk-kde4 pkgver=0.9.5b -pkgrel=1 +pkgrel=2 pkgdesc='Allows you to change style, icons, font of GTK applications in KDE4.' arch=('i686' 'x86_64' 'mips64el') url='http://kde-look.org/content/show.php?content=74689' diff --git a/community/gtk2+extra/PKGBUILD b/community/gtk2+extra/PKGBUILD index 33a4e8348..f1dcb0925 100644 --- a/community/gtk2+extra/PKGBUILD +++ b/community/gtk2+extra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27873 2010-09-29 08:19:27Z spupykin $ +# $Id: PKGBUILD 59120 2011-11-21 11:35:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -11,14 +11,15 @@ url="http://gtkextra.sourceforge.net/" depends=('gtk2') license=('LGPL') options=('!libtool') -source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz) -md5sums=('10779394f39d39115fa3fd0f3dea4436') +source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz + build-fix.patch) +md5sums=('10779394f39d39115fa3fd0f3dea4436' + '114c10e7dc14dc78fc38189ee82fa225') build() { cd $srcdir/gtk+extra-$pkgver -# patch -Np0 -i ../gtksheet_unref.patch -# patch -Np1 -i ../gtk2-2.18.3-build-fix.patch + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/gtk2+extra/build-fix.patch b/community/gtk2+extra/build-fix.patch new file mode 100644 index 000000000..fe44f6ad8 --- /dev/null +++ b/community/gtk2+extra/build-fix.patch @@ -0,0 +1,85 @@ +diff -ur gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list +--- gtk+extra-2.1.2/gtkextra/gtkextra-marshal.list 2002-06-14 22:36:36.000000000 +0400 ++++ gtk+extra-2.1.2.my/gtkextra/gtkextra-marshal.list 2011-11-21 15:30:00.000000000 +0400 +@@ -10,6 +10,7 @@ + BOOL:BOXED + BOOL:INT,INT + VOID:INT ++VOID:INT,BOXED + VOID:INT,STRING + VOID:BOXED + VOID:VOID +diff -ur gtk+extra-2.1.2/gtkextra/gtkitementry.c gtk+extra-2.1.2.my/gtkextra/gtkitementry.c +--- gtk+extra-2.1.2/gtkextra/gtkitementry.c 2010-03-13 08:49:00.000000000 +0300 ++++ gtk+extra-2.1.2.my/gtkextra/gtkitementry.c 2011-11-21 15:25:18.000000000 +0400 +@@ -131,7 +131,6 @@ + static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, + gboolean include_preedit); + static void gtk_entry_queue_draw (GtkEntry *entry); +-static void gtk_entry_reset_im_context (GtkEntry *entry); + static void gtk_entry_recompute (GtkEntry *entry); + static void gtk_entry_get_cursor_locations (GtkEntry *entry, + CursorType type, +@@ -1755,16 +1754,6 @@ + } + + static void +-gtk_entry_reset_im_context (GtkEntry *entry) +-{ +- if (entry->need_im_reset) +- { +- entry->need_im_reset = 0; +- gtk_im_context_reset (entry->im_context); +- } +-} +- +-static void + gtk_entry_get_cursor_locations (GtkEntry *entry, + CursorType type, + gint *strong_x, +diff -ur gtk+extra-2.1.2/gtkextra/Makefile.am gtk+extra-2.1.2.my/gtkextra/Makefile.am +--- gtk+extra-2.1.2/gtkextra/Makefile.am 2005-06-16 02:54:34.000000000 +0400 ++++ gtk+extra-2.1.2.my/gtkextra/Makefile.am 2011-11-21 15:25:18.000000000 +0400 +@@ -197,13 +197,13 @@ + $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} + + $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + + + $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources) +diff -ur gtk+extra-2.1.2/gtkextra/Makefile.in gtk+extra-2.1.2.my/gtkextra/Makefile.in +--- gtk+extra-2.1.2/gtkextra/Makefile.in 2010-03-21 03:05:56.000000000 +0300 ++++ gtk+extra-2.1.2.my/gtkextra/Makefile.in 2011-11-21 15:25:18.000000000 +0400 +@@ -1028,13 +1028,13 @@ + $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} + + $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ +- && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ +- || ( rm -f gtkextra-marshal.tmp && exit 1 ) ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ ++ && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ ++ || ( rm -f gtkextra-marshal.tmp && exit 1 ) + + $(srcdir)/gtkextratypebuiltins.h: $(gtkextra_public_h_sources) + ( cd $(srcdir) && glib-mkenums \ diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 901d1a25b..327d7ad40 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 50208 2011-06-26 20:13:31Z spupykin $ +# $Id: PKGBUILD 57325 2011-10-25 20:41:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools -pkgver=0.12.0 -pkgrel=3 +pkgver=0.12.1 +pkgrel=1 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" license=('GPL2') @@ -11,8 +11,9 @@ arch=('i686' 'x86_64' 'mips64el') makedepends=('ghc' 'alex' 'happy') depends=('gmp') options=('strip') +provides=('haskell-gtk2hs-buildtools') source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('cbcdfd6031725d8b70ff7804f8d93648') +md5sums=('225cbf3736b5ac3053f8c797687c7554') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver diff --git a/community/gtk2hs-pango/PKGBUILD b/community/gtk2hs-pango/PKGBUILD deleted file mode 100644 index 67fdaf916..000000000 --- a/community/gtk2hs-pango/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 50217 2011-06-26 20:24:03Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=pango -pkgname=gtk2hs-pango -pkgver=0.12.0 -pkgrel=4 -pkgdesc="Binding to the pango library for Gtk2Hs." -url="http://hackage.haskell.org/package/pango" -license=('LGPL2.1') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc' 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') -makedepends=('gtk2hs-buildtools=0.12.0') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('0260ed21d6ca2a52ebaa0aa212390cf7') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'pango' 'gtk2hs-glib' 'gtk2hs-cairo') - - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD index 385738db0..e363851a6 100644 --- a/community/gtkwave/PKGBUILD +++ b/community/gtkwave/PKGBUILD @@ -1,37 +1,39 @@ +# $Id: PKGBUILD 58564 2011-11-15 03:42:53Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Jared Casper <jaredcasper@gmail.com> pkgname=gtkwave -pkgver=3.3.26 +pkgver=3.3.28 pkgrel=1 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files' arch=('i686' 'x86_64' 'mips64el') url='http://gtkwave.sourceforge.net' license=('GPL' 'MIT') -depends=('gtk2') +depends=('bzip2' 'xz' 'gtk2') makedepends=('gperf') install='gtkwave.install' source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz") -md5sums=('8b25a82cfece9611b38d6abd22125192') +md5sums=('396cc15cfc12801c9ad6af507ee4a0f1') build() { - cd gtkwave-${pkgver} + cd "${srcdir}/gtkwave-${pkgver}" ./configure \ --prefix=/usr \ - --mandir=/usr/share/man \ --disable-tcl make CFLAGS=-D_LARGEFILE64_SOURCE } package() { - cd gtkwave-${pkgver} + cd "${srcdir}/gtkwave-${pkgver}" - make -j1 prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/gtkwave-${pkgver}/.gtkwaverc \ - ${pkgdir}/usr/share/gtkwave/sample.gtkwaverc - install -D -m644 ${srcdir}/gtkwave-${pkgver}/MIT.TXT \ - ${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT + install -D -m644 "${srcdir}/gtkwave-${pkgver}/.gtkwaverc" \ + "${pkgdir}/usr/share/gtkwave/sample.gtkwaverc" + install -D -m644 "${srcdir}/gtkwave-${pkgver}/LICENSE.TXT" \ + "${pkgdir}/usr/share/licenses/gtkwave/LICENSE.TXT" + install -D -m644 "${srcdir}/gtkwave-${pkgver}/MIT.TXT" \ + "${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT" } diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 51ba68cfe..7ebff81e4 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56273 2011-10-04 13:27:12Z jelle $ +# $Id: PKGBUILD 57477 2011-10-28 12:30:44Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.90.5 -pkgrel=2 +pkgver=2.90.7 +pkgrel=1 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gtranslator/" @@ -19,7 +19,7 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.bz2) -sha256sums=('26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505') +sha256sums=('55845ad665f5e55265dd017d1c96e41a72c4c5691eb218ba9db6985b66afa556') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/gtranslator/gtranslator.changelog b/community/gtranslator/gtranslator.changelog index 4b715e6b1..f78e2aab5 100644 --- a/community/gtranslator/gtranslator.changelog +++ b/community/gtranslator/gtranslator.changelog @@ -1,3 +1,6 @@ +2011-10-28 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> + * gtranslator 2.90.7-1 + 2011-08-20 Jaroslav Lichtblau (Dragonlord) <dragonlord@aur.archlinux.org> * gtranslator 2.90.5-1 diff --git a/community/gts/PKGBUILD b/community/gts/PKGBUILD deleted file mode 100644 index 11bf99e21..000000000 --- a/community/gts/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=gts -pkgver=0.7.6 -pkgrel=1 -pkgdesc='GNU Triangulated Surface Library.' -arch=('i686' 'x86_64' 'mips64el') -url='http://gts.sourceforge.net/' -license=('LGPL') -depends=('glib2') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('9f710aefd2ed9b3cc1b1216171fc5a8a') -options=('!libtool') - -build() { - cd ${pkgname}-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD index 74851f851..84c32cba4 100644 --- a/community/gtypist/PKGBUILD +++ b/community/gtypist/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 44710 2011-04-11 12:22:30Z spupykin $ +# $Id: PKGBUILD 57751 2011-11-02 08:47:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ben Mazer <blm@groknil.org> # Contributor: Mike Douglas <code_monkey@gooeylinux.org> pkgname=gtypist -pkgver=2.8.5 +pkgver=2.9 pkgrel=1 pkgdesc="universal typing tutor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gtypist/gtypist.html" license=("GPL") -depends=('ncurses>=5.2' 'perl') +depends=('ncurses' 'perl') +makedepends=('emacs') install=gtypist.install -source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz) -md5sums=('49ea1bb5ac51c74a9c75c0dd6d890463') +source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz + ncurses.patch) +md5sums=('4500940fb1cde36899afd957d64236bb' + '17b3a69119e3bd791f0941e0f93fb8b3') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make - make prefix=$pkgdir/usr install - rm -f $pkgdir/usr/share/info/dir + cd $srcdir/$pkgname-$pkgver + patch -p1 <$srcdir/ncurses.patch + ./configure --prefix=/usr + make + make prefix=$pkgdir/usr install + rm -f $pkgdir/usr/share/info/dir } diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch new file mode 100644 index 000000000..ae17733fb --- /dev/null +++ b/community/gtypist/ncurses.patch @@ -0,0 +1,86 @@ +diff -wbBur gtypist-2.9/configure gtypist-2.9.my/configure +--- gtypist-2.9/configure 2011-11-01 01:31:47.000000000 +0400 ++++ gtypist-2.9.my/configure 2011-11-02 12:31:42.000000000 +0400 +@@ -4478,8 +4478,8 @@ + + + #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1) +-ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default" +-if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then : ++ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" ++if test "x$ac_cv_header_ncurses_h" = xyes; then : + HAVE_NCURSESW_H=1 + fi + +diff -wbBur gtypist-2.9/configure.ac gtypist-2.9.my/configure.ac +--- gtypist-2.9/configure.ac 2011-10-30 19:26:40.000000000 +0400 ++++ gtypist-2.9.my/configure.ac 2011-11-02 12:30:18.000000000 +0400 +@@ -40,7 +40,7 @@ + AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h]) + + #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1) +-AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1) ++AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1) + + # We prefer ncurses to curses if both are found. + dnl if test -n "$HAVE_NCURSES_H" -a -n "$HAVE_LIBNCURSES"; then +diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c +--- gtypist-2.9/src/cursmenu.c 2011-10-31 01:35:20.000000000 +0400 ++++ gtypist-2.9.my/src/cursmenu.c 2011-11-02 12:30:27.000000000 +0400 +@@ -24,7 +24,7 @@ + #ifdef HAVE_PDCURSES + #include <curses.h> + #else +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + #endif + + #include "error.h" +diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c +--- gtypist-2.9/src/error.c 2011-09-26 15:35:03.000000000 +0400 ++++ gtypist-2.9.my/src/error.c 2011-11-02 12:30:30.000000000 +0400 +@@ -25,7 +25,7 @@ + #ifdef HAVE_PDCURSES + #include <curses.h> + #else +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + #endif + + #include <stdlib.h> +diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c +--- gtypist-2.9/src/gtypist.c 2011-10-31 03:24:25.000000000 +0400 ++++ gtypist-2.9.my/src/gtypist.c 2011-11-02 12:30:24.000000000 +0400 +@@ -31,7 +31,7 @@ + #ifdef HAVE_PDCURSES + #include <curses.h> + #else +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + #endif + + #include <time.h> +diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c +--- gtypist-2.9/src/script.c 2011-10-26 12:51:57.000000000 +0400 ++++ gtypist-2.9.my/src/script.c 2011-11-02 12:30:37.000000000 +0400 +@@ -24,7 +24,7 @@ + #ifdef HAVE_PDCURSES + #include <curses.h> + #else +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + #endif + + #include "error.h" +diff -wbBur gtypist-2.9/src/utf8.c gtypist-2.9.my/src/utf8.c +--- gtypist-2.9/src/utf8.c 2011-10-31 03:11:27.000000000 +0400 ++++ gtypist-2.9.my/src/utf8.c 2011-11-02 12:30:43.000000000 +0400 +@@ -23,7 +23,7 @@ + #ifdef HAVE_PDCURSES + #include <curses.h> + #else +-#include <ncursesw/ncurses.h> ++#include <ncurses.h> + #endif + + #include <stdlib.h> diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD index 5b3fe7e96..fe5467a56 100644 --- a/community/guichan/PKGBUILD +++ b/community/guichan/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 4400 2009-10-22 15:03:46Z ibiru $ +# $Id: PKGBUILD 57204 2011-10-23 23:29:35Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Bjrn Lindeijer <bjorn@lindeijer.nl> +# Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl> + pkgname=guichan pkgver=0.8.2 -pkgrel=1 -pkgdesc="Guichan is a portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL." +pkgrel=2 +pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL." arch=('i686' 'x86_64' 'mips64el') url="http://guichan.sourceforge.net/" license=('BSD') @@ -18,9 +19,13 @@ md5sums=('af535d7f387e774e3197cef8023ea105') build() { cd $srcdir/$pkgname-$pkgver CXXFLAGS="-g" ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install # Install the license, as required for BSD - install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING + install -m644 -D COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/guifications/PKGBUILD b/community/guifications/PKGBUILD index 837667cbe..94a0683b9 100644 --- a/community/guifications/PKGBUILD +++ b/community/guifications/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17250 2010-05-22 14:25:10Z ibiru $ +# $Id: PKGBUILD 58837 2011-11-18 17:38:20Z jelle $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Link Dupont <link@.subpop.net> pkgname=guifications pkgver=2.16 -pkgrel=2 +pkgrel=3 pkgdesc="A set of GUI popup notifications for pidgin" arch=(i686 x86_64 'mips64el') url="http://plugins.guifications.org/trac/wiki/Guifications" @@ -12,12 +12,16 @@ license=("GPL") depends=('pidgin') makedepends=('perlxml') options=('!libtool') -source=(pidgin-${pkgname}-${pkgver}.tar.bz2::http://plugins.guifications.org/trac/downloads/7) -md5sums=('cd1f803231093cde01514feca59f643f') +source=("https://www.guifications.org/attachments/download/145/pidgin-guifications-2.16.tar.gz") +md5sums=('43fd9022160f15b4b262c4662ba62fc9') build() { cd "${srcdir}/pidgin-${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-deprecated - make || return 1 + make +} +package() +{ + cd "${srcdir}/pidgin-${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/community/gummi/PKGBUILD b/community/gummi/PKGBUILD index f9bacff80..01f064d67 100644 --- a/community/gummi/PKGBUILD +++ b/community/gummi/PKGBUILD @@ -3,16 +3,16 @@ # Contributor: soeren <nonick@posteo.de> pkgname=gummi -pkgver=0.5.8 -pkgrel=3 +pkgver=0.6.0 +pkgrel=1 pkgdesc='Simple LaTex editor for GTK users' arch=('i686' 'x86_64' 'mips64el') url='http://gummi.midnightcoding.org/' license=('MIT') depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib') makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool') -source=("http://dev.midnightcoding.org/redmine/attachments/download/141/gummi-0.5.8-2.tar.gz") -md5sums=('79cd1360779125ad85a0f0b459951b27') +source=("http://dev.midnightcoding.org/redmine/attachments/download/212/gummi-0.6.0.tar.gz") +md5sums=('45c727b815460e108a4442db27edd385') build() { cd ${pkgname}-${pkgver} diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD index ebc3df2bc..db3dee6f6 100644 --- a/community/gwenhywfar/PKGBUILD +++ b/community/gwenhywfar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54696 2011-08-23 10:04:10Z spupykin $ +# $Id: PKGBUILD 57282 2011-10-25 09:59:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=gwenhywfar -pkgver=4.2.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="OS abstraction functions for various projects" arch=(i686 x86_64 'mips64el') @@ -13,13 +13,14 @@ license=("LGPL") depends=('openssl' 'gnutls' 'libgcrypt') makedepends=('gtk2' 'qt') optdepends=('gtk2' 'qt') -source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=63&file=01&dummy=gwenhywfar-$pkgver.tar.gz") -md5sums=('b1673f601af5f07d591f6716d822275b') +source=("gwenhywfar-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=01&release=64&file=01&dummy=gwenhywfar-$pkgver.tar.gz") +md5sums=('6c3647c5a9065d0126b0e2b77752527b') build() { pacman -Q gwenhywfar && return 1 cd $srcdir/gwenhywfar-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --enable-ssl + sed -i 's|gnutls_transport_set_lowat||g' src/sio/syncio_tls.c make make DESTDIR=$pkgdir install } diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD index 6448e9840..4c964485f 100644 --- a/community/gxmessage/PKGBUILD +++ b/community/gxmessage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20450 2010-07-08 10:59:33Z spupykin $ +# $Id: PKGBUILD 58826 2011-11-18 16:48:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Jaroslav Lichtblau <tu@dragonlord.cz> @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" license=('GPL') depends=('gtk2' 'desktop-file-utils') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'intltool') install=$pkgname.install source=(http://homepages.ihug.co.nz/~trmusson/stuff/$pkgname-$pkgver.tar.gz $pkgname.desktop) @@ -20,9 +20,9 @@ md5sums=('7c94c714ebedbfa2db2d645cc4a4092a' build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir" install install -D -m644 "$srcdir/$pkgname.desktop" \ "${pkgdir}/usr/share/applications/$pkgname.desktop" } diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index 7c3572523..428053719 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,40 +1,45 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# $Id: PKGBUILD 59136 2011-11-21 12:20:52Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# As generated by cabal2arch 0.7.6 pkgname=haddock pkgver=2.9.2 -pkgrel=2 -pkgdesc="Documentation-generation tool for Haskell libraries" -url="http://hackage.haskell.org/package/${pkgname}" +pkgrel=4 +pkgdesc="Tool for generating documentation for Haskell libraries" +url="http://hackage.haskell.org/package/$pkgname" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') -makedepends=(alex happy) -depends=(ghc=7.0.3-2 sh 'haskell-mtl=2.0.1.0-3.1' 'haskell-xhtml=3000.2.0.1-7.1' 'haskell-ghc-paths=0.1.0.8-4.1') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +makedepends=('alex' 'happy') +depends=('ghc' 'haskell-mtl' 'haskell-xhtml>=3000.2' 'haskell-ghc-paths') +options=(strip) +install=haddock.install +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('04928e132827a1da20ace52babb43e47') build() { - cd ${srcdir}/${pkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/$pkgname-$pkgver" + + #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal + runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ + --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${pkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE - mv $pkgdir/usr/bin/haddock $pkgdir/usr/bin/haddock-cabal + cd "$srcdir/$pkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" } -md5sums=('04928e132827a1da20ace52babb43e47') +# vim:set ts=2 sw=2 et: diff --git a/community/haddock/haddock.install b/community/haddock/haddock.install index 278da355e..24e27a074 100644 --- a/community/haddock/haddock.install +++ b/community/haddock/haddock.install @@ -1,18 +1,25 @@ +pkgname=haddock HS_DIR=usr/share/haskell/haddock -post_install() { - ${HS_DIR}/register.sh &> /dev/null - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null -} + post_upgrade() { ${HS_DIR}/register.sh &> /dev/null + post_remove +} + +post_remove() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null } + pre_remove() { ${HS_DIR}/unregister.sh &> /dev/null } -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null + +post_install() { + post_upgrade +} + +pre_upgrade() { + pre_remove } + +# vim:set ts=2 sw=2 et: diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD index 35ef2038d..24ba4a3bf 100644 --- a/community/hashcash/PKGBUILD +++ b/community/hashcash/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 5144 2009-11-07 00:41:40Z ibiru $ +# $Id: PKGBUILD 58693 2011-11-17 15:59:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Charles Mauch <cmauch@gmail.com> pkgname=hashcash pkgver=1.22 pkgrel=2 -pkgdesc="Hashcash is a denial-of-service counter measure tool for email/spam." +pkgdesc="a denial-of-service counter measure tool for email/spam." arch=('i686' 'x86_64' 'mips64el') url="http://www.hashcash.org" license=('GPL') depends=( 'glibc' ) -source=(http://www.hashcash.org/source/${pkgname}-${pkgver}.tgz) -md5sums=(31fae207061841dffc7b90ee18e3d0fa) +source=(http://www.hashcash.org/source/${pkgname}-${pkgver}.tgz) +md5sums=('31fae207061841dffc7b90ee18e3d0fa') build() { cd ${srcdir}/${pkgname}-${pkgver} if [ "${CARCH}" = "x86_64" ]; then - make generic-openssl || return 1 - else make x86-openssl || return 1 + make generic-openssl + else + make x86-openssl fi install -Dm755 hashcash ${pkgdir}/usr/bin/hashcash install -Dm755 sha1 ${pkgdir}/usr/bin/sha1 diff --git a/community/haskell-binary/PKGBUILD b/community/haskell-binary/PKGBUILD index 6fc0df551..fd76ca872 100644 --- a/community/haskell-binary/PKGBUILD +++ b/community/haskell-binary/PKGBUILD @@ -1,39 +1,45 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=binary pkgname=haskell-binary pkgver=0.5.0.2 -pkgrel=7.1 +pkgrel=8 pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" url="http://hackage.haskell.org/package/binary" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=(ghc=7.0.3-2 sh) options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz") +install=haskell-binary.install md5sums=('6bf8f3d1441602c9ab09a75e3bd6e926') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/binary-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/binary-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/binary" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } + +# vim:set ts=2 sw=2 et: diff --git a/community/gtk2hs-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index ddd42b403..4d58b76ea 100644 --- a/community/gtk2hs-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 50211 2011-06-26 20:14:36Z spupykin $ +# $Id: PKGBUILD 58942 2011-11-20 18:00:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -_hkgname=cairo -pkgname=gtk2hs-cairo -pkgver=0.12.0 -pkgrel=4 +pkgname=haskell-cairo +pkgver=0.12.2 +pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc' 'cairo' 'haskell-mtl=2.0.1.0') -makedepends=(gtk2hs-buildtools) +arch=('i686' 'x86_64') +depends=('ghc' 'cairo' 'haskell-mtl') +makedepends=("gtk2hs-buildtools") options=('strip') -install=${pkgname}.install +conflicts=('gtk2hs-cairo') +provides=('gtk2hs-cairo') +replaces=('gtk2hs-cairo') +install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('e17c7ce086062282dbb405bfdf68191e') +md5sums=('b3583136fe84d25cd9d4f7bda3c3db0c') build() { - cd ${srcdir}/${_hkgname}-$pkgver + cd ${srcdir}/cairo-$pkgver runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock @@ -32,10 +34,10 @@ package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + cd ${srcdir}/cairo-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/gtk2hs-cairo/gtk2hs-cairo.install b/community/haskell-cairo/gtk2hs-cairo.install index 4ec5096b6..4ec5096b6 100644 --- a/community/gtk2hs-cairo/gtk2hs-cairo.install +++ b/community/haskell-cairo/gtk2hs-cairo.install diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index 594d4a3c4..d66585d8c 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -1,35 +1,45 @@ -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=ghc-paths +# $Id: PKGBUILD 58269 2011-11-09 16:24:41Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-ghc-paths pkgver=0.1.0.8 -pkgrel=4.1 +pkgrel=5 pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/${_hkgname}" +url="http://hackage.haskell.org/package/ghc-paths" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') makedepends=() -depends=(ghc=7.0.3-2) # cannot have stricter dep here due to haddock +depends=(ghc=7.0.3-2) options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") +install=haskell-ghc-paths.install md5sums=('d2b23dc563888e380588501d2ce1d82b') + build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/ghc-paths-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } + package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/ghc-paths-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths" + runhaskell Setup copy --destdir="$pkgdir" + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } +# vim:set ts=2 sw=2 et: diff --git a/community/gtk2hs-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index a6a03a1b2..7adc33eaf 100644 --- a/community/gtk2hs-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 50214 2011-06-26 20:15:38Z spupykin $ +# $Id: PKGBUILD 58944 2011-11-20 18:01:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -_hkgname=glib -pkgname=gtk2hs-glib -pkgver=0.12.0 -pkgrel=3 +pkgname=haskell-glib +pkgver=0.12.2 +pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') depends=('ghc' 'glib2') -makedepends=('gtk2hs-buildtools=0.12.0') +makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install +provides=('gtk2hs-glib') +replaces=('gtk2hs-glib') +conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('2f334374d14a2f3e221a2ebfce1f8817') +md5sums=('5d8a04be9a975fb70c6508f95aeb3265') build() { - cd ${srcdir}/${_hkgname}-$pkgver + cd ${srcdir}/glib-$pkgver runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock @@ -32,10 +34,10 @@ package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` depends=("ghc=${_ghcver}" "glib2") - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + cd ${srcdir}/glib-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/gtk2hs-glib/gtk2hs-glib.install b/community/haskell-glib/gtk2hs-glib.install index 24025f5d8..24025f5d8 100644 --- a/community/gtk2hs-glib/gtk2hs-glib.install +++ b/community/haskell-glib/gtk2hs-glib.install diff --git a/community/gtk2hs-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 8a9d12b95..0a5bb037d 100644 --- a/community/gtk2hs-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 50218 2011-06-26 20:25:06Z spupykin $ +# $Id: PKGBUILD 58946 2011-11-20 18:02:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -_hkgname=gtk -pkgname=gtk2hs-gtk -pkgver=0.12.0 -pkgrel=4 +pkgname=haskell-gtk +pkgver=0.12.2 +pkgrel=1 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') -arch=('i686' 'x86_64' 'mips64el') -depends=('ghc' 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0') -makedepends=('gtk2hs-buildtools=0.12.0') +arch=('i686' 'x86_64') +depends=('ghc' 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') +makedepends=("gtk2hs-buildtools") +provides=('gtk2hs-gtk') +replaces=('gtk2hs-gtk') +conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) -md5sums=('17a9d34085b703510d8feb2608b5d776') +md5sums=('a80d6f2ab90c673059270f2dd83c4686') build() { - cd ${srcdir}/${_hkgname}-${pkgver} + cd ${srcdir}/gtk-${pkgver} runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build runhaskell Setup haddock @@ -30,12 +32,12 @@ build() { package() { _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'gtk2' 'gtk2hs-pango=0.12.0' 'haskell-mtl=2.0.1.0') + depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/gtk2hs-gtk/gtk2hs-gtk.install b/community/haskell-gtk/gtk2hs-gtk.install index 7ed674b78..7ed674b78 100644 --- a/community/gtk2hs-gtk/gtk2hs-gtk.install +++ b/community/haskell-gtk/gtk2hs-gtk.install diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD new file mode 100644 index 000000000..def9c2c71 --- /dev/null +++ b/community/haskell-pango/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 58948 2011-11-20 18:06:21Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-pango +pkgver=0.12.2 +pkgrel=1 +pkgdesc="Binding to the pango library for Gtk2Hs." +url="http://hackage.haskell.org/package/pango" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') +makedepends=("gtk2hs-buildtools") +provides=('gtk2hs-pango') +replaces=('gtk2hs-pango') +conflicts=('gtk2hs-pango') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) +install=gtk2hs-pango.install +md5sums=('301efd2d2348698ce8d586ee14c36e2b') + +build() { + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community/gtk2hs-pango/gtk2hs-pango.install b/community/haskell-pango/gtk2hs-pango.install index f2be2100f..f2be2100f 100644 --- a/community/gtk2hs-pango/gtk2hs-pango.install +++ b/community/haskell-pango/gtk2hs-pango.install diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index e2b24d6e0..3dd8401a0 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,37 +1,44 @@ +# $Id: PKGBUILD 58293 2011-11-10 12:03:04Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=tar pkgname=haskell-tar pkgver=0.3.1.0 -pkgrel=4.2 +pkgrel=5 pkgdesc="Reading, writing and manipulating \".tar\" archive files." url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('i686' 'x86_64' 'mips64el') depends=('ghc=7.0.3-2' sh) options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") +install=haskell-tar.install md5sums=('10b54856495f9ef0a42aa270085c7d5e') build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh + cd "$srcdir/tar-$pkgver" + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh } package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE + cd "$srcdir/tar-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/tar" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" } +# vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/haskell-tar.install b/community/haskell-tar/haskell-tar.install index e8c2f6293..7e0383621 100644 --- a/community/haskell-tar/haskell-tar.install +++ b/community/haskell-tar/haskell-tar.install @@ -1,18 +1,24 @@ HS_DIR=usr/share/haskell/haskell-tar + post_install() { ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_remove } + pre_upgrade() { ${HS_DIR}/unregister.sh } + post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) + post_install } + pre_remove() { - ${HS_DIR}/unregister.sh + pre_upgrade } + post_remove() { (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) } + +# vim:set ts=2 sw=2 et: diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index 8c447c2b4..4fd525c1c 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 49962 2011-06-22 19:43:36Z vegai $ +# $Id: PKGBUILD 58950 2011-11-20 18:07:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + _hkgname=X11-xft pkgname=haskell-x11-xft -pkgver=0.3 -pkgrel=19.4 +pkgver=0.3.1 +pkgrel=1 pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" url="http://hackage.haskell.org/package/${_hkgname}" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('ghc=7.0.3-2' 'haskell-x11=1.5.0.0-7.3' 'haskell-utf8-string=0.3.6-7.2' 'libxft') options=('strip') -source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) install=haskell-x11-xft.install -md5sums=('1b4a528a2a4fe5e9de715f6758ff9015') +source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) +md5sums=('ad885150a59f63de328e73abe5ffc79e') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 05f16c13a..18ff0d9c4 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55746 2011-09-18 23:20:17Z spupykin $ +# $Id: PKGBUILD 58974 2011-11-20 18:15:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars -pkgver=0.9.16 -pkgrel=2 +pkgver=0.9.17 +pkgrel=1 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" @@ -15,7 +15,7 @@ makedepends=('fpc' 'cmake' 'ghc' source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) -md5sums=('04f28f454e370a101cbf0d82c6d39bce' +md5sums=('77c0bc4bc664604adbba67fab606d8f1' '48c66a3204d4fa0a69e9aa46f7c31e0c' 'eeb14d50df39063549ac5eca9dbc65d1') diff --git a/community/hex-a-hop/PKGBUILD b/community/hex-a-hop/PKGBUILD index 68f12f526..31a4276db 100644 --- a/community/hex-a-hop/PKGBUILD +++ b/community/hex-a-hop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42002 2011-03-11 13:44:37Z spupykin $ +# $Id: PKGBUILD 58758 2011-11-18 13:12:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: insulae <insulae@gmail.com> @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_mixer' 'sdl_ttf' 'gcc-libs') makedepends=() options=(force) -source=("https://downloads.sourceforge.net/project/hexahop/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/project/hexahop/$pkgver/hex-a-hop-$pkgver.tar.gz" "hex-a-hop.desktop") md5sums=('cc8d065c2cc0fce9e08852b8c465175e' '048ff7975024ae1eda3164620f594c09') diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD index 66076e426..7c9e8e04e 100644 --- a/community/hping/PKGBUILD +++ b/community/hping/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32612 2010-11-15 22:11:14Z lfleischer $ +# $Id: PKGBUILD 57877 2011-11-04 07:45:07Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=hping pkgver=3.0.0 -pkgrel=1 -pkgdesc='hping is a command-line oriented TCP/IP packet assembler/analyzer.' +pkgrel=2 +pkgdesc='A command-line oriented TCP/IP packet assembler/analyzer.' arch=('i686' 'x86_64' 'mips64el') url='http://www.hping.org' license=('GPL2' 'BSD') @@ -20,7 +20,7 @@ md5sums=('ca4ea4e34bcc2162aedf25df8b2d1747' build() { cd "${srcdir}/hping3-20051105" - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../bytesex.h.patch + [[ "$CARCH" == "x86_64" ]] && patch -Np1 -i ../bytesex.h.patch MANPATH=/usr/share/man ./configure --no-tcl make diff --git a/community/hsetroot/PKGBUILD b/community/hsetroot/PKGBUILD index 0c0569711..eb1f3ac85 100644 --- a/community/hsetroot/PKGBUILD +++ b/community/hsetroot/PKGBUILD @@ -4,7 +4,7 @@ pkgname=hsetroot pkgver=1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='A tool which allows you to compose wallpapers for X.' url='http://www.thegraveyard.org/hsetroot.php' license=('GPL') diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index 634b58750..cd6af53d8 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 54951 2011-08-28 19:13:33Z ttopper $ +# $Id: PKGBUILD 58366 2011-11-12 13:28:03Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 -pkgver=4.0.2 +pkgver=4.1 pkgrel=1 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') @@ -11,18 +11,22 @@ url="http://i3wm.org/" license=('BSD') replaces=("i3" "i3bar") groups=("i3") -depends=('libxcursor' 'xcb-util' 'libev' 'yajl') +depends=('libxcursor' 'libev' 'yajl' 'startup-notification' 'pcre') makedepends=('bison' 'flex') optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'dmenu: As menu.' + 'i3lock: For locking your screen.' + 'i3status: To display systeminformation with a bar.' 'perl: To migrate your configuration to v4 format.') options=('docs' '!strip') source=(http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2) -md5sums=('8b173504824d312a954ccb32b092b068') +md5sums=('1a05d605624506c2b4b9f1272fd84a5a') build() { cd "$srcdir/$_pkgsourcename-$pkgver" + # To avoid problems with bison use only a single process + MAKEFLAGS="-j1" make } diff --git a/community/i3lock/PKGBUILD b/community/i3lock/PKGBUILD index ee018e632..9ea01f608 100644 --- a/community/i3lock/PKGBUILD +++ b/community/i3lock/PKGBUILD @@ -1,17 +1,17 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3lock -pkgver=2.1 +pkgver=2.2 pkgrel=1 pkgdesc="An improved screenlocker based upon XCB and PAM" arch=('i686' 'x86_64' 'mips64el') -url="http://i3.zekjur.net/i3lock/" +url="http://i3wm.org/i3lock/" license=('MIT') groups=("i3") depends=('xcb-util' 'pam') options=('docs') -source=(http://i3.zekjur.net/i3lock/$pkgname-$pkgver.tar.gz) -md5sums=('6a86f0032eb0c09e557afae998cbe000') +source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") +md5sums=('6179a1611e333c8baf54093b57d50687') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 81ddf0964..64a5e6281 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55855 2011-09-23 21:20:50Z lcarlier $ +# $Id: PKGBUILD 57915 2011-11-04 12:13:21Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20110623 -pkgrel=1 +pkgver=20110922 +pkgrel=2 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') url="http://acpica.org" @@ -16,7 +16,7 @@ options=('!makeflags') install=iasl.install source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('93e827bf4b1f1971a1b3c2074c5f9ccb' +md5sums=('b95af67bb277657ae01844db01f2f9c7' '8615526144f69ea4e870d9bc37df9b29') build() { diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD index 539b6daf1..6b0e5ffca 100644 --- a/community/icewm-utils/PKGBUILD +++ b/community/icewm-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27018 2010-09-16 17:37:18Z schuay $ +# $Id: PKGBUILD 58602 2011-11-16 15:27:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Dominika Solarz <dominikasolarz@gmail.com> @@ -17,7 +17,7 @@ _iconcvtver=1.0 _rrunver=0.5 _mergeprefsver=0.5 -pkgrel=5 +pkgrel=6 pkgdesc="Suite of tools for IceWM" arch=(i686 x86_64 'mips64el') license=("GPL") @@ -66,11 +66,10 @@ build() { # python2 fix for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file + sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file done - (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff) cd $srcdir/icemc-$_mcver diff --git a/community/iniparser/PKGBUILD b/community/iniparser/PKGBUILD index 6ee74ba3c..f7ddc40de 100644 --- a/community/iniparser/PKGBUILD +++ b/community/iniparser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 43048 2011-03-23 21:45:17Z spupykin $ +# $Id: PKGBUILD 58761 2011-11-18 13:28:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> @@ -11,9 +11,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://ndevilla.free.fr/iniparser/" license=('MIT') depends=() -options=(force) source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz) -md5sums=('cded4eba694beed39ec932fc6c64e010') +md5sums=('133d955064d107a4fcb7739214356ce8') build() { cd $srcdir/$pkgname diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD index ea5b4240a..bf87a64d4 100644 --- a/community/inputattach/PKGBUILD +++ b/community/inputattach/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48320 2011-05-31 10:23:41Z spupykin $ +# $Id: PKGBUILD 59224 2011-11-21 15:24:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> @@ -13,10 +13,14 @@ depends=('bash') makedepends=('gcc') backup=(etc/conf.d/inputattach) install=inputattach.install -source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' - 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' - 'inputattach.conf.d' 'inputattach.rc.d' - '0001-Add-w8001-flag.patch' '0002-Allow-for-custom-baud-rates.patch') +#source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c' +# 'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h' +source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c' + 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h' + 'inputattach.conf.d' + 'inputattach.rc.d' + '0001-Add-w8001-flag.patch' + '0002-Allow-for-custom-baud-rates.patch') md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a' '7ca903e54829764c8241233af5069216' @@ -26,23 +30,15 @@ md5sums=('eb595a766ca363edb3b14c25404596ce' build() { cd "$srcdir" - # Add support for serial wacom tablets patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch" patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch" - cc $CFLAGS inputattach.c -o inputattach } package() { cd "$srcdir" - - install -Dm755 inputattach \ - "$pkgdir/usr/sbin/inputattach" - - install -Dm644 $srcdir/inputattach.conf.d \ - "$pkgdir/etc/conf.d/inputattach" - - install -Dm755 $srcdir/inputattach.rc.d \ - "$pkgdir/etc/rc.d/inputattach" + install -Dm755 inputattach "$pkgdir/usr/sbin/inputattach" + install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach" + install -Dm755 $srcdir/inputattach.rc.d "$pkgdir/etc/rc.d/inputattach" } diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index add437082..8c7b6060e 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -1,15 +1,15 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=3.0_20110427 +pkgver=4.0_20111003 pkgrel=1 pkgdesc='An award-winning C++ runtime library that abstracts the low-level threading details necessary for optimal multi-core performance.' arch=('i686' 'x86_64' 'mips64el') url='http://www.threadingbuildingblocks.org/' license=('GPL') -source=("http://threadingbuildingblocks.org/uploads/77/171/3.0%20update%207/tbb30_20110427oss_src.tgz") -md5sums=('ba406f4767592179e7930e790036f00a') +source=("http://threadingbuildingblocks.org/uploads/77/177/4.0%20update%201/tbb40_20111003oss_src.tgz") +md5sums=('7b5d94eb35a563b29ef402e0fd8f15c9') build() { cd tbb${pkgver/\./}oss diff --git a/community/ipsec-tools/PKGBUILD b/community/ipsec-tools/PKGBUILD index dde4114bb..68555e52d 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/community/ipsec-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45815 2011-04-29 12:08:18Z spupykin $ +# $Id: PKGBUILD 58775 2011-11-18 14:08:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> @@ -9,6 +9,7 @@ pkgdesc="KAME IPSec tools ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" depends=('readline' 'openssl' 'krb5') +makedepends=('linux-headers') license=('GPL') options=('!makeflags' '!libtool') source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD index db11165a8..64157d8c6 100644 --- a/community/javasqlite/PKGBUILD +++ b/community/javasqlite/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 42275 2011-03-15 23:31:24Z ebelanger $ +# $Id: PKGBUILD 58850 2011-11-19 00:04:26Z guillaume $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=javasqlite -pkgver=20110106 +pkgver=20110827 pkgrel=1 pkgdesc="Java support for SQLite database engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.ch-werner.de/javasqlite/" license=('BSD') -depends=('java-runtime') -makedepends=('java-environment' 'sqlite3') +depends=('java-runtime<7') +makedepends=('java-environment<7' 'sqlite3') options=('!libtool') source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('542a7de8af0186c61d2d68af1c14242e') -sha1sums=('13af516c83cf93a1809de950de76b4b0403a2caa') +md5sums=('6fb577b1632425ddcf45f439886623b9') +sha1sums=('b64eb3955cfba2388dd0cda7a9d5a5ff46db22e9') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 03b9b798f..806f00e61 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.8 -pkgrel=5 -_jumbover=7 +pkgrel=7 +_jumbover=8 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('e6d7f261829610d6949c706ebac0517c' - '6513d201dfc2e87033a4068143de3ef0' + '96cb581fd8447f3f96614fd365896b07' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') @@ -65,7 +65,7 @@ package() { # install password list and charset files install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \ ${pkgdir}/usr/share/john/ - install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,generic}.conf \ + install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \ ${pkgdir}/usr/share/john/ # install binaries diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD index 86bbf48f1..38674cb01 100644 --- a/community/jshon/PKGBUILD +++ b/community/jshon/PKGBUILD @@ -1,6 +1,7 @@ +# $Id: PKGBUILD 57971 2011-11-05 09:47:31Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> pkgname=jshon -pkgver=20110803 +pkgver=20111105 pkgrel=1 pkgdesc="A json parser for the shell." arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +11,7 @@ depends=('jansson') makedepends=() optdepends=() source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d14f012d6e9acf2c0ccc355fcd53c6fd') +md5sums=('5d4c6d40ef4497473445931e777e280b') build() { cd "$srcdir/$pkgname" diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index a5924f311..ce6efc4cb 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 55999 2011-09-28 14:40:31Z mherych $ +# $Id: PKGBUILD 58524 2011-11-13 15:44:01Z andrea $ # Maintainer: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.10.0 +pkgver=0.10.1 pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64' 'mips64el') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn') +depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('6d3e9889f53cf10c2cd9499aabbff67a') +md5sums=('6211a9a9e02d645268cbf055892601a0') build() { - cd $srcdir/kadu-$pkgver - cmake . -DCMAKE_INSTALL_PREFIX=/usr + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd $srcdir/kadu-$pkgver + cd $srcdir/build make DESTDIR=$pkgdir install rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD index cd3d7514c..a57c02837 100644 --- a/community/kaudiocreator/PKGBUILD +++ b/community/kaudiocreator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55199 2011-09-06 06:39:38Z lcarlier $ +# $Id: PKGBUILD 57921 2011-11-04 14:03:31Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=kaudiocreator pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645" diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD index 7ae985734..be06d5eb3 100644 --- a/community/kdbg/PKGBUILD +++ b/community/kdbg/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 44133 2011-04-03 20:08:17Z spupykin $ +# $Id: PKGBUILD 57376 2011-10-26 15:29:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Jason Taylor <jftaylor21@gmail.com> # Contributor: Georg Grabler <ggrabler@chello.at> pkgname=kdbg -pkgver=2.5.0 +pkgver=2.5.1 pkgrel=1 pkgdesc="A gdb GUI for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kdbg.org" license=('GPL') depends=('kdebase-runtime' 'gdb') -makedepends=('automoc4') +makedepends=('automoc4' 'cmake') options=('!libtool') source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz") -md5sums=('687f2892a5751d1e7d8708e37ec1a367') +md5sums=('a19095dce4cb5df0dbaa9368d400fc30') build() { cd $srcdir - mkdir build + mkdir -p build cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 27b2c395c..c08d91af7 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ +# $Id: PKGBUILD 58466 2011-11-12 20:42:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive -pkgver=0.8svn20110722 +pkgver=0.8.2 pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,21 @@ url="http://www.kdenlive.org/" license=('GPL') depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext') +makedepends=('automoc4' 'cmake' 'gettext' 'mesa') install=kdenlive.install options=('docs') -#source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") -md5sums=('390fcbce02274ee99b2a6d6a234bef0c') +source=("http://downloads.sourceforge.net/kdenlive/kdenlive-${pkgver}.tar.gz" + glu.patch) +md5sums=('0836842f489f6142cee101842ac76c54' + 'fd6c5fe46419ee505c562363d41f6e9f') build() { export LDFLAGS="$LDFLAGS -lX11" - cd "${srcdir}" - mkdir build || true + mkdir -p build cd build - cmake ../${pkgname}-${pkgver} \ + (cd ../kdenlive-${pkgver} && patch -p1 <$srcdir/glu.patch) + cmake ../kdenlive-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_INSTALL_DIR=/usr/lib \ diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch new file mode 100644 index 000000000..a4c2f21fb --- /dev/null +++ b/community/kdenlive/glu.patch @@ -0,0 +1,11 @@ +diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp +--- kdenlive-0.8.2/src/videoglwidget.cpp 2011-10-31 22:46:21.000000000 +0400 ++++ kdenlive-0.8.2.my/src/videoglwidget.cpp 2011-11-02 14:54:10.000000000 +0400 +@@ -2,6 +2,7 @@ + #include <QtGui> + #include <QtOpenGL> + #include "videoglwidget.h" ++#include <GL/glu.h> + + #ifndef GL_TEXTURE_RECTANGLE_EXT + #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV diff --git a/community/kgraphviewer/PKGBUILD b/community/kgraphviewer/PKGBUILD index a083b91d0..fe18a5398 100644 --- a/community/kgraphviewer/PKGBUILD +++ b/community/kgraphviewer/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 50630 2011-06-29 08:39:25Z lcarlier $ +# $Id: PKGBUILD 57923 2011-11-04 14:25:20Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kgraphviewer pkgver=2.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Graphviz dot graph file viewer for KDE" arch=('i686' 'x86_64' 'mips64el') url='http://opendesktop.org/content/show.php?content=23999' diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 298d6fff9..8960ffefa 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 55325 2011-09-09 23:42:21Z jlichtblau $ +# $Id: PKGBUILD 58975 2011-11-20 18:17:53Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=2.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://kid3.sourceforge.net/" license=('GPL') -depends=('id3lib' 'kdebase-runtime' 'kdelibs' 'tunepimp') -makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') +depends=('id3lib' 'qt' 'tunepimp') +makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'kdelibs') options=('!makeflags') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd') +sha256sums=('32c3bdf5a3f170076e46c5f3b9523f688e8ea6265d22d2264c1bcd318da9f32e') build() { cd ${srcdir} diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index 0d001bcb8..824a2406a 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,6 @@ +2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.0.1-1 + 2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 2.0-1 diff --git a/community/kim4/PKGBUILD b/community/kim4/PKGBUILD deleted file mode 100644 index 1c64d4b3c..000000000 --- a/community/kim4/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: raku <raczkow@gmail.com> - -pkgname=kim4 -pkgver=0.9.5 -pkgrel=3 -pkgdesc="Kde Image Menu to compress, resize, convert, rename and much more" -arch=(i686 x86_64 'mips64el') -url="http://www.kde-apps.org/content/show.php?content=11505" -license=('GPL') -depends=('imagemagick' 'kdebase-dolphin') -source=(http://bouveyron.free.fr/kim/release/$pkgname-$pkgver.tar.gz) -md5sums=('c7934ab0dbf988da5f60d9c4cbf97dd5') - -build() { - cd ${srcdir}/${pkgname}/src - - install -d ${pkgdir}/usr/share/kde4/services/ServiceMenus - install -Dm644 kim_{compressandresize,convertandrotate,publication}.desktop \ - ${pkgdir}/usr/share/kde4/services/ServiceMenus || return 1 - install -d ${pkgdir}/usr/bin - install -Dm755 bin/kim_{album,compress,convert,flipflop,galery,multiburst,other,pelemele} \ - bin/kim_{print,record,record_mpg,rename,resize,resizeandsend,rotate,rotatewithexif} \ - bin/kim_{slideshow,sortbydate,treatment,webexport} ${pkgdir}/usr/bin/ || return 1 - install -d ${pkgdir}/usr/share/kim/slideshow - install -Dm644 slideshow/{dewslider.swf,index.part1,index.part2} \ - ${pkgdir}/usr/share/kim/slideshow || return 1 - install -d ${pkgdir}/usr/share/kim/gallery - install -Dm644 gallery/{index.part1,index.part2} \ - ${pkgdir}/usr/share/kim/gallery || return 1 -} diff --git a/community/kleansweep/PKGBUILD b/community/kleansweep/PKGBUILD index af1a76b67..d3d763040 100644 --- a/community/kleansweep/PKGBUILD +++ b/community/kleansweep/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40230 2011-02-22 02:27:36Z stephane $ +# $Id: PKGBUILD 59212 2011-11-21 15:18:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Guillermo A. Amaral <me@guillermoamaral.com> @@ -12,16 +12,16 @@ arch=(i686 x86_64 'mips64el') depends=('kdelibs3' 'python') makedepends=('scons') options=('libtool') -source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz +#source=(http://linux-projects.net/d/kleansweep-$pkgver.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/kleansweep-$pkgver.tar.gz kubuntu_03_fix_scons_chmod_error.patch) md5sums=('25fea364644590acd23fe766506e0b92' 'bebb833313fc184848b5fef77a7cb310') -build() -{ +build() { cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || patch -p1 <$srcdir/kubuntu_03_fix_scons_chmod_error.patch [ $NOEXTRACT -eq 1 ] || ./configure - scons + scons scons install DESTDIR=$pkgdir } diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index 9c3b2fc4d..caf5ab674 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 40038 2011-02-19 15:18:41Z jlichtblau $ +# $Id: PKGBUILD 58094 2011-11-06 14:12:09Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Vamp898 <vamp898@web.de> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> @@ -6,30 +6,35 @@ # Contributor: Todd Maynard <arch@toddmaynard.com> pkgname=kmymoney -pkgver=4.5.3 +pkgver=4.6.1 pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64' 'mips64el') url="http://kmymoney2.sourceforge.net/" license=('GPL') -depends=('boost' 'kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx') -makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'gwenhywfar') +depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs') +makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost') replaces=('kmymoney2') install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb') +sha256sums=('5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a') build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir} - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RELEASE make } package() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/build make DESTDIR=${pkgdir} install } diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD index 84b7aea15..8928150e6 100644 --- a/community/knemo/PKGBUILD +++ b/community/knemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 53704 2011-08-07 21:16:33Z lcarlier $ +# $Id: PKGBUILD 57927 2011-11-04 15:11:18Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> pkgname=knemo pkgver=0.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="The KDE Network Monitor" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=12956" diff --git a/community/kovpn/PKGBUILD b/community/kovpn/PKGBUILD index 6bf0df2f1..aba4638d0 100644 --- a/community/kovpn/PKGBUILD +++ b/community/kovpn/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 9444 2010-01-25 14:13:42Z spupykin $ +# $Id: PKGBUILD 58772 2011-11-18 14:01:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=kovpn pkgver=0.3pre7 _pkgver=0.3.pre7 -pkgrel=4 +pkgrel=5 pkgdesc="An OpenVPN client management interface for KDE" arch=('i686' 'x86_64' 'mips64el') url="http://www.kde-apps.org/content/show.php?content=37043" @@ -14,27 +14,26 @@ depends=('openvpn' 'kdelibs3' 'xdg-utils') makedepends=('automake' 'autoconf') options=('libtool') install=kovpn.install -source=("http://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" - "kovpn-disable-dcop.patch::http://bugs.archlinux.org/task/15464?getfile=4173" - 'traywindow_x86_64.patch') +DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' + 'http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' + 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') +source=("https://projects.fslab.de/projects/kovpn/chrome/site/kovpn-${_pkgver}.tar.bz2" + "kovpn-disable-dcop.patch::https://bugs.archlinux.org/task/15464?getfile=4173") md5sums=('19b61cf9f84088baffbd5bb0a287422c' - '21171b74f76289daea1cc61eedaa4dba' - 'bf6218bf2686b6fe41874d5df4e71d63') + '21171b74f76289daea1cc61eedaa4dba') build() { - cd $startdir/src/$pkgname-$_pkgver + cd $srcdir/$pkgname-$_pkgver + unset LDFLAGS . /etc/profile.d/qt3.sh export PATH=$QTDIR/bin:$PATH export QMAKESPEC=$QTDIR/mkspecs/linux-g++ patch -Np1 -i ../kovpn-disable-dcop.patch - - [ "$CARCH" = "x86_64" ] && patch -Np0 -i ../traywindow_x86_64.patch sed -i 's#automake\*1.10\*#automake*1.10* | automake*1.11*#' admin/cvs.sh - make -f admin/Makefile.common cvs ./configure --prefix=/opt/kde --without-arts --with-qt-dir=/opt/qt - make || return 1 - make prefix=$startdir/pkg/usr install + make + make prefix=$pkgdir/usr install } diff --git a/community/kovpn/traywindow_x86_64.patch b/community/kovpn/traywindow_x86_64.patch deleted file mode 100644 index 8c50d425a..000000000 --- a/community/kovpn/traywindow_x86_64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/traywindow.cpp.orig 2006-07-23 13:26:21.236380500 +0100 -+++ src/traywindow.cpp 2006-07-23 13:26:38.625467250 +0100 -@@ -107,7 +107,7 @@ - delete mDisconnectMenuItems[ manager->id() ]; - - /* I think (int) manager is unique and static enough to be used as id for the menu */ -- mContextMenu->removeItem( ( int ) manager ); -+ mContextMenu->removeItem( ( long ) manager ); - mManagerMenus.remove( manager->id() ); - mOvpnManagers.remove( manager ); - } -@@ -125,7 +125,7 @@ - - mManagerMenus[ manager->id() ] = new KPopupMenu( mContextMenu ); - /* I think (int) manager is unique and static enough to be used as id for the menu */ -- mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( int ) manager, 5 ); -+ mContextMenu->insertItem( manager->id() , mManagerMenus[ manager->id() ] , ( long ) manager, 5 ); - - mManagerMenus[ manager->id() ] ->insertTitle( i18n( "Status: Unavailable" ), 0 ); - diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD index f8143bf09..eebd4df6b 100644 --- a/community/kphotoalbum/PKGBUILD +++ b/community/kphotoalbum/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56337 2011-10-05 19:08:01Z andrea $ +# $Id: PKGBUILD 57929 2011-11-04 16:33:01Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> @@ -7,7 +7,7 @@ pkgname=kphotoalbum pkgver=4.1.1 -pkgrel=10 +pkgrel=11 pkgdesc="KDE Photo Album, picture collection manager" url="http://www.kphotoalbum.org/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/kpovmodeler/PKGBUILD b/community/kpovmodeler/PKGBUILD index 180404725..ebe6882e7 100644 --- a/community/kpovmodeler/PKGBUILD +++ b/community/kpovmodeler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 27553 2010-09-25 08:31:17Z andrea $ +# $Id: PKGBUILD 57931 2011-11-04 17:14:03Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kpovmodeler pkgver=1.1.3 _kdever=4.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical editor for povray scenes" arch=('i686' 'x86_64' 'mips64el') url='http://kpovmodeler.org' @@ -19,8 +19,10 @@ md5sums=('aee8461cc813bb8e21ece3339c677288') build() { cd ${srcdir} + mkdir build cd build + cmake ../${pkgname}-${pkgver}-kde${_kdever} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -29,5 +31,6 @@ build() { package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index 313516ceb..f8301f1a8 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -7,7 +7,7 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=1 +pkgrel=2 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64' 'mips64el') url="http://extragear.kde.org/apps/krecipes/" @@ -21,8 +21,10 @@ md5sums=('4c01ccad7ad1409cb35c824a61250fe2') build() { cd ${srcdir} + mkdir build cd build + cmake ../${pkgname}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -31,5 +33,6 @@ build() { package() { cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/community/ksshaskpass/PKGBUILD b/community/ksshaskpass/PKGBUILD index d72b21bab..4ecd121e4 100644 --- a/community/ksshaskpass/PKGBUILD +++ b/community/ksshaskpass/PKGBUILD @@ -2,7 +2,7 @@ pkgname=ksshaskpass pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='KDE4 implementation of ssh-askpass with Kwallet integration' url='http://www.kde-apps.org/content/show.php/Ksshaskpass?content=50971' license=('GPL') @@ -17,19 +17,19 @@ md5sums=('05dad7745e9d92b08bd86e7ab7a9540d' '70396ba019ae05cc91502456f548caff') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir"/$pkgname-$pkgver + make DESTDIR="$pkgdir" install # Remove useless desktop file. - rm -rf "$pkgdir/usr/share/applications" + rm -rf "$pkgdir"/usr/share/applications # Documentation requires that this application is installed as /usr/bin/ssh-askpass. # But this way is cleaner. # Add script to profile.d to set ssh password agent to ksshasskpass. - install -Dm 755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh + install -Dm 755 "$srcdir"/$pkgname.sh "$pkgdir"/etc/profile.d/$pkgname.sh } diff --git a/community/ktechlab/PKGBUILD b/community/ktechlab/PKGBUILD index f032ead3b..04662f644 100644 --- a/community/ktechlab/PKGBUILD +++ b/community/ktechlab/PKGBUILD @@ -1,21 +1,30 @@ -# $Id: PKGBUILD 5614 2009-11-12 14:06:56Z spupykin $ +# $Id: PKGBUILD 58604 2011-11-16 15:28:16Z spupykin $ # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com> + pkgname=ktechlab pkgver=0.3.7 -pkgrel=1 +pkgrel=3 pkgdesc="IDE for electronic circuits and microcontrollers" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/ktechlab" license=("GPL") depends=('kdelibs3' 'gputils' 'gpsim') -makedepends=() -source=(http://downloads.sourceforge.net/sourceforge/ktechlab/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8e778ef8ce6d0dd4539f5532c933f6bf') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + "$pkgname-gcc45.patch::http://patch-tracker.debian.org/patch/series/dl/ktechlab/0.3.7-10/40-gcc-4.5.patch") +md5sums=('8e778ef8ce6d0dd4539f5532c933f6bf' + '126a04255a8288a7ee42fe47a81c0079') build() { - cd ${startdir}/src/${pkgname}-$pkgver + . /etc/profile.d/qt3.sh + cd "${srcdir}/${pkgname}-$pkgver" + patch -p1 <$srcdir/$pkgname-gcc45.patch + ./configure --prefix=/opt/kde \ + --disable-debug \ + --without-arts + make +} - ./configure --prefix=/opt/kde --disable-debug --without-arts - make || return 1 - make DESTDIR=${startdir}/pkg install +package() { + cd "${srcdir}/${pkgname}-$pkgver" + make DESTDIR="${pkgdir}" install } diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD index 094d64b9c..2c1779253 100644 --- a/community/kvirc/PKGBUILD +++ b/community/kvirc/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 53306 2011-08-02 18:26:59Z spupykin $ +# $Id: PKGBUILD 58785 2011-11-18 14:18:17Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=kvirc pkgver=4.0.4 @@ -13,12 +12,22 @@ makedepends=('cmake') license=('GPL') options=("!libtool") install=kvirc.install -source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/kvirc-$pkgver.tar.bz2) +source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2) md5sums=('26fd24979ae4a29bac9309b3b0c98788') build() { - cd $srcdir/kvirc-$pkgver - [ $NOEXTRACT -eq 1 ] || cmake -DWANT_KDE4=OFF -DWANT_PERL=ON -DWANT_PHONON=OFF -DCMAKE_INSTALL_PREFIX=/usr . + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DWANT_KDE4=OFF \ + -DWANT_PERL=ON \ + -DWANT_PHONON=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr make +} + +package() { + cd ${srcdir}/build make DESTDIR=$pkgdir install } diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD index de1568042..ff3de078c 100644 --- a/community/kvpnc/PKGBUILD +++ b/community/kvpnc/PKGBUILD @@ -1,27 +1,33 @@ -# $Id: PKGBUILD 18438 2010-06-04 15:44:00Z spupykin $ +# $Id: PKGBUILD 58789 2011-11-18 14:22:42Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Danial Olsen <do@meyl.fo> +# Contributor: Danial Olsen <do@meyl.fo> pkgname=kvpnc pkgver=0.9.6a pkgrel=1 -pkgdesc="KVpnc is a KDE Desktop Environment frontend for various vpn clients" +pkgdesc="A KDE Desktop Environment frontend for various vpn clients" arch=(i686 x86_64 'mips64el') url="http://home.gna.org/kvpnc/" license=("GPL") depends=('kdelibs' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4') install=kvpnc.install -options=(force) source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2) md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7') build() { - cd $srcdir/${pkgname}-${pkgver}-kde4 - export LDFLAGS=-lX11 - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd $srcdir + mkdir build + cd build + cmake ../${pkgname}-${pkgver}-kde4 \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install } diff --git a/community/kydpdict/PKGBUILD b/community/kydpdict/PKGBUILD index d217794f6..b53c4a581 100644 --- a/community/kydpdict/PKGBUILD +++ b/community/kydpdict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23962 2010-08-18 13:20:20Z lcarlier $ +# $Id: PKGBUILD 58593 2011-11-16 14:44:57Z andrea $ # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> pkgname=kydpdict @@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://ytm.bossstation.dnsalias.org/html/kydpdict.html" license=('GPL') depends=('qt3') -install=(kydpdict.install) +install=kydpdict.install source=(http://ytm.bossstation.dnsalias.org/src/$pkgname-$pkgver.tar.bz2 \ $pkgname.png $pkgname.desktop) md5sums=('bf8aa06d4a3bbe401d7972e01c07609d' diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD index 70985c530..16390c3ec 100644 --- a/community/lash/PKGBUILD +++ b/community/lash/PKGBUILD @@ -5,11 +5,12 @@ pkgname=lash pkgver=0.6.0~rc2 _relver=0.6.0.594 -pkgrel=5 +pkgrel=6 pkgdesc="A session management system for JACK and ALSA" arch=('i686' 'x86_64') options=('!libtool') -url="http://lash-audio.org" +#url="http://lash-audio.org" +url="http://lash.nongnu.org/" license=('GPL') depends=('dbus-core' 'gtk2' 'jack' 'libxml2' 'python2') install=$pkgname.install diff --git a/community/lat/PKGBUILD b/community/lat/PKGBUILD deleted file mode 100755 index 351ca06e8..000000000 --- a/community/lat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 5402 2009-11-08 07:59:58Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=lat -pkgver=1.2.3 -pkgrel=2 -pkgdesc="LDAP Administration Tool" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceforge.net/projects/ldap-at/" -license=("GPL") -depends=('gnome-keyring' 'gtk-sharp-2' 'avahi' 'gnome-sharp' 'rarian') -makedepends=('gettext' 'intltool' 'pkgconfig') -install=$pkgname.install -source=(http://downloads.sourceforge.net/ldap-at/lat-$pkgver.tar.gz) -md5sums=('0725508d180720d260a70c5b39d387ba') -sha1sums=('52e2de528d2fa35519b2d67cd2937d4d524001de') - -build() { - export MONO_SHARED_DIR="$srcdir/.wabi" - mkdir -p $MONO_SHARED_DIR - cd "$srcdir/lat-$pkgver" - find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \; - if [ -f omf.make ]; then - sed -i -e 's/-scrollkeeper-update.*//' omf.make - fi - - ./configure --prefix=/usr --enable-avahi=yes || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 - - rm -rf $MONO_SHARED_DIR -} diff --git a/community/lat/lat.install b/community/lat/lat.install deleted file mode 100644 index 70bbdd964..000000000 --- a/community/lat/lat.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=lat - -post_install() { - scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`) - - for scroll in "${scrolls[@]}" ; do - scrollkeeper-install -q -p var/lib/scrollkeeper "$scroll" - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - scrolls=(`pacman -Ql $pkgname | grep 'share/omf/.*\.omf$' | awk '{ print $2 }'`) - - for scroll in "${scrolls[@]}" ; do - scrollkeeper-uninstall -q -p var/lib/scrollkeeper "$scroll" - done -} - diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index ffc62aba9..f01801220 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48949 2011-06-08 09:13:19Z spupykin $ +# $Id: PKGBUILD 58159 2011-11-07 11:17:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> pkgname=lazarus -pkgver=0.9.30 -pkgrel=2 +pkgver=0.9.30.2 +pkgrel=1 pkgdesc='Delphi-like IDE for FreePascal' url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') @@ -13,7 +13,7 @@ depends=('fpc' 'fpc-src' 'gtk2') #makedepends=(rpmextract) options=('!emptydirs' '!makeflags') source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2) -md5sums=('5ece11700df569ebb518ccca37d93f1d') +md5sums=('0dcf54613c2f9d38a32d183431e2dfc9') build() { cd $srcdir/${pkgname} diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index 06ddb1d8b..7afa1252e 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 18744 2010-06-14 12:55:42Z spupykin $ +# $Id: PKGBUILD 59410 2011-11-24 15:33:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# You need an news user and group to build this package pkgname=leafnode pkgver=1.11.8 -pkgrel=1 +pkgrel=4 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://leafnode.sourceforge.net/" -depends=(pcre xinetd) +depends=('pcre' 'xinetd') license=('GPL') -install=(leafnode.install) +install=leafnode.install options=(!emptydirs) -backup=(etc/xinet.d/leafnode) +backup=('etc/xinetd.d/leafnode') source=(http://downloads.sf.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 leafnode.xinetd) md5sums=('a3edafeb854efaa3fbb0f7951d02160f' @@ -20,10 +19,13 @@ md5sums=('a3edafeb854efaa3fbb0f7951d02160f' build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode - make || return 1 - make DESTDIR=$pkgdir install && \ - chown -R root.root $pkgdir && \ + ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc/leafnode \ + --with-user=9 \ + --with-group=13 + sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h + sed -i 's|#define NEWS_GROUP .*|#define NEWS_GROUP "news"|' config.h + make + make DESTDIR=$pkgdir install + chown -R root.root $pkgdir install -D -m0644 $srcdir/leafnode.xinetd $pkgdir/etc/xinetd.d/leafnode } - diff --git a/community/leafnode/leafnode.install b/community/leafnode/leafnode.install index eb942009e..5f8a74c04 100644 --- a/community/leafnode/leafnode.install +++ b/community/leafnode/leafnode.install @@ -1,10 +1,8 @@ post_install() { echo "-- Adding user 'news' and group 'news', chowning /var/spool/news" - groupadd -K GID_MIN=5000 news &>/dev/null - gid=`cat /etc/group | grep news | cut -d: -f 3` - useradd -u $gid -g news -d /var/spool/news -s /bin/false news &>/dev/null + grep -e "^news:" /etc/group 2>&- >&- || groupadd -g 13 -r news 2>&- >&- + grep -e "^news:" /etc/passwd 2>&- >&- || useradd -u 9 -r -m -g news news 2>&- >&- chown -R root:news etc/leafnode - # create dir if necessary if [ ! -d var/spool/news ]; then install -d -m 770 -o news -g news var/spool/news @@ -12,9 +10,5 @@ post_install() { } post_remove() { - echo "-- Removing user 'news' and group 'news', deleting spool directory" - userdel news &>/dev/null - groupdel news &>/dev/null - rm -rf var/spool/news + echo "-- Don't forget to remove /var/spool/news directory" } - diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD new file mode 100644 index 000000000..d5e3fec82 --- /dev/null +++ b/community/leptonica/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 57411 2011-10-27 08:39:19Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Christoph Drexler <chrdr at gmx dot at> + +pkgname=leptonica +pkgver=1.68 +pkgrel=2 +pkgdesc="Software that is broadly useful for image processing and image analysis applications" +arch=('i686' 'x86_64') +url="http://www.leptonica.com/" +license=('custom') +depends=('glibc') +makedepends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib') +# 'webp' +optdepends=('giflib: for supporting gif files' + 'gnuplot: gnuplot support' + 'libjpeg: for supporting jpeg files' + 'libpng: for supporting png files' + 'libtiff: for supporting tiff files' + 'zlib: for supporting compressed files') +# 'webp: for supporting webp files' +source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) +md5sums=('5cd7092f9ff2ca7e3f3e73bfcd556403') + +build() { + cd ${srcdir}/leptonica-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/leptonica-${pkgver} + make DESTDIR=${pkgdir} install + install -D leptonica-license.txt ${pkgdir}/usr/share/licenses/leptonica/leptonica-license.txt +} diff --git a/community/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD new file mode 100644 index 000000000..2f14f4bf6 --- /dev/null +++ b/community/libalkimia/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 58105 2011-11-06 17:14:04Z lcarlier $ +# Contributor: gumper <gumper1034@gmail.com> + +pkgname=libalkimia +pkgver=4.3.1 +pkgrel=2 +pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC." +depends=('kdelibs') +makedepends=('cmake' 'automoc4' 'doxygen') +url=('http://kde-apps.org/content/show.php/libalkimia?content=137323') +license=('LGPL') +arch=('i686' 'x86_64') +source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2") +md5sums=('73d7f1365118019030b2045d95c92456') + +build() { + cd "${srcdir}" + + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=DebugFull \ + -Wno-dev + make +} + +package() { + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install +} + diff --git a/community/libcuefile/ChangeLog b/community/libcuefile/ChangeLog deleted file mode 100644 index e5a5d81dd..000000000 --- a/community/libcuefile/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2010-02-04 Corrado Primier <bardo@aur.archlinux.org> - - * PKGBUILD: added to [community] diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD index fa9ae5ac0..7d20e122b 100644 --- a/community/libcuefile/PKGBUILD +++ b/community/libcuefile/PKGBUILD @@ -1,26 +1,33 @@ +# $Id: PKGBUILD 57124 2011-10-22 02:51:18Z ebelanger $ # Maintainer: Corrado Primier <bardo@aur.archlinux.org> + pkgname=libcuefile -pkgver=453 +pkgver=475 pkgrel=1 pkgdesc="A library to work with CUE files" arch=('i686' 'x86_64' 'mips64el') url="http://www.musepack.net/index.php?pg=src" -license=('LGPL') +license=('GPL2') depends=('glibc') makedepends=('cmake') source=(http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz) -md5sums=('59826363984c51546258fe4213beb272') +md5sums=('1a6ac52e1080fd54f0f59372345f1e4e') build() { mkdir "${srcdir}/${pkgname}_r${pkgver}/build" cd "${srcdir}/${pkgname}_r${pkgver}/build" cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "${srcdir}/${pkgname}_r${pkgver}/build" make DESTDIR="${pkgdir}/" install mkdir -p "${pkgdir}/usr/include/cuetools" - install -Dm644 ${srcdir}/${pkgname}_r${pkgver}/include/cuetools/{cd,cdtext,cuefile}.h \ - ${pkgdir}/usr/include/cuetools + install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/cuetools/{cd,cdtext,cuefile}.h \ + "${pkgdir}/usr/include/cuetools" } # vim:set ts=2 sw=2 et: diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index a5d6be8f5..f3fd73aa4 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 7626 2010-01-08 23:34:07Z dgriffiths $ +# $Id: PKGBUILD 58580 2011-11-15 20:11:36Z spupykin $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> + pkgname=libdlna pkgver=0.2.3 -pkgrel=8 +pkgrel=10 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") arch=('i686' 'x86_64' 'mips64el') -options=('!libtool') +options=('!libtool' '!makeflags') # not parallel safe, error find -ldlna makedepends=('ctags') depends=('glibc' 'ffmpeg') -source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2c974f95b711e5fd07f78fc4ebfcca66') +source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch") +md5sums=('2c974f95b711e5fd07f78fc4ebfcca66' + '937f1aebf930571127856056bd1d3959' + 'a5c9f58233fc7fc79b5fe550b297273b') build() { cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c || return 1 - sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c || return 1 - ./configure --prefix=/usr --includedir=/usr/include/libavformat || return 1 - make || return 1 + patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + ./configure --prefix=/usr --includedir=/usr/include/libavformat + make -j1 # not parallel safe, error find -ldlna +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make INSTALL=/bin/install DESTDIR=${pkgdir} install } diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch new file mode 100644 index 000000000..63b33a451 --- /dev/null +++ b/community/libdlna/ffmpeg-0.8.patch @@ -0,0 +1,19 @@ +diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c +--- libdlna-0.2.3/src/profiles.c 2007-11-26 21:47:43.000000000 +0100 ++++ libdlna-0.2.3.new/src/profiles.c 2011-10-31 16:06:34.000000000 +0100 +@@ -205,13 +205,13 @@ + for (i = 0; i < ctx->nb_streams; i++) + { + if (audio_stream == -1 && +- ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) + { + audio_stream = i; + continue; + } + else if (video_stream == -1 && +- ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) ++ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) + { + video_stream = i; + continue; diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch new file mode 100644 index 000000000..8620ab2eb --- /dev/null +++ b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch @@ -0,0 +1,89 @@ +https://bugs.gentoo.org/show_bug.cgi?id=297872 +http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca + +From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001 +From: Jeremy Olexa <darkside@gentoo.org> +Date: Tue, 22 Dec 2009 00:22:42 -0600 +Subject: [PATCH] Update reference to ffmpeg header files + +--- + configure | 4 ++-- + src/av_mpeg4_part10.c | 2 +- + src/av_mpeg4_part2.c | 2 +- + src/containers.c | 2 +- + src/profiles.h | 4 ++-- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure b/configure +index 8acbd9d..85c1091 100755 +--- a/configure ++++ b/configure +@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then + fi + + echolog "Checking for libavformat ..." +-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" ++check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" + echolog "Checking for libavcodec ..." +-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" ++check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" + + ################################################# + # version +diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c +index bd17022..f9c8ee5 100644 +--- a/src/av_mpeg4_part10.c ++++ b/src/av_mpeg4_part10.c +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c +index 0148384..823e1b6 100644 +--- a/src/av_mpeg4_part2.c ++++ b/src/av_mpeg4_part2.c +@@ -26,7 +26,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avcodec.h> ++#include <libavcodec/avcodec.h> + + #include "dlna_internals.h" + #include "profiles.h" +diff --git a/src/containers.c b/src/containers.c +index 71b51f7..ca0819b 100644 +--- a/src/containers.c ++++ b/src/containers.c +@@ -4,7 +4,7 @@ + #include <sys/stat.h> + #include <fcntl.h> + +-#include <ffmpeg/avformat.h> ++#include <libavformat/avformat.h> + + #include "containers.h" + #include "profiles.h" +diff --git a/src/profiles.h b/src/profiles.h +index 7b86d33..a7fc0fd 100644 +--- a/src/profiles.h ++++ b/src/profiles.h +@@ -22,8 +22,8 @@ + #ifndef _PROFILES_H_ + #define _PROFILES_H_ + +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avformat.h> ++#include <libavcodec/avcodec.h> ++#include <libavformat/avformat.h> + + #include "dlna_internals.h" + #include "containers.h" +-- +1.6.4.4 + diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD index cb3d793a0..433626ab2 100644 --- a/community/libdnet/PKGBUILD +++ b/community/libdnet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 27071 2010-09-17 12:26:08Z schuay $ +# $Id: PKGBUILD 58611 2011-11-16 15:32:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: James Fryman <jfryman@gmail.com> @@ -9,7 +9,7 @@ pkgdesc="A simplified, portable interface to several low-level networking routin arch=(i686 x86_64 'mips64el') makedepends=(python2) optdepends=(python2) -install=(libdnet.install) +install=libdnet.install license=("BSD") url="http://code.google.com/p/libdnet/" options=('!libtool') @@ -20,9 +20,10 @@ build() { mkdir -p $pkgdir/usr/bin [ $CARCH == "x86_64" ] && export CFLAGS=-fPIC + [ $CARCH == "mips64el" ] && export CFLAGS+=-fPIC cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr + ./configure --prefix=/usr --target=${CHOST} --host=${CHOST} --build=${CHOST} make && make DESTDIR=$pkgdir install cd python && \ diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD index b1ef1f07f..cb6999ace 100644 --- a/community/libesmtp/PKGBUILD +++ b/community/libesmtp/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 31477 2010-10-31 23:37:55Z loui $ +# $Id: PKGBUILD 57896 2011-11-04 08:47:23Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libesmtp pkgver=1.0.6 -pkgrel=1 -pkgdesc="A library to manage posting (or submission of) electronic mail using SMTP to a preconfigured Mail Transport Agent (MTA)" +pkgrel=2 +pkgdesc='A library to manage posting mail to a preconfigured MTA.' arch=('i686' 'x86_64' 'mips64el') -url="http://www.stafford.uklinux.net/libesmtp/" +url='http://www.stafford.uklinux.net/libesmtp/' license=('LGPL') depends=('openssl') -source=(http://www.stafford.uklinux.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +source=("http://www.stafford.uklinux.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('bf3915e627fd8f35524a8fdfeed979c8') options=('!libtool') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('bf3915e627fd8f35524a8fdfeed979c8') diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD index 14018852b..339bf28da 100644 --- a/community/libextractor/PKGBUILD +++ b/community/libextractor/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56341 2011-10-05 19:08:14Z andrea $ +# $Id: PKGBUILD 58358 2011-11-12 10:52:51Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libextractor pkgver=0.6.2 -pkgrel=4 +pkgrel=5 pkgdesc="A library used to extract meta-data from files of arbitrary type" arch=("i686" "x86_64" 'mips64el') license=('GPL') diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index b3f1f9b02..5f9ac10f4 100755 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 48689 2011-06-04 20:28:04Z lcarlier $ +# $Id: PKGBUILD 58848 2011-11-18 21:30:35Z lcarlier $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient -pkgver=2.5.0.26074 -pkgrel=3 +pkgver=2.5.1.26351 +pkgrel=1 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64' 'mips64el') url="http://www.firebirdsql.org/" license=('custom') depends=('gcc-libs' 'icu') +options=('!makeflags') source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 LICENSE) -md5sums=('780f162ee71f087fc277adf09f966529' +md5sums=('1772fba4f09c8fc84d989282405f90fd' '0d61798861e159c85dbdf0f30fe2f2ce') build() { diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD index e0e3ad970..d4c978a1f 100644 --- a/community/libfm/PKGBUILD +++ b/community/libfm/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=libfm -pkgver=0.1.16 -pkgrel=2 +pkgver=0.1.17 +pkgrel=1 pkgdesc="the core of next generation file manager PCManFM" url="http://pcmanfm.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') @@ -14,11 +14,12 @@ options=('!libtool') install=libfm.install depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils') source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz) -md5sums=('c09bce415ff6dc2dd835e28aeddeabe3') +md5sums=('a97e03d973e6ac727f28d0934d6c9ad5') build() { cd $srcdir/$pkgname-$pkgver - sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure + +# sed -i -e "s|docs/Makefile docs/reference/Makefile docs/reference/libfm/Makefile ||" configure ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-udisks \ @@ -28,5 +29,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD index eabda7cc4..080555e83 100644 --- a/community/libgda4/PKGBUILD +++ b/community/libgda4/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 56183 2011-10-03 07:07:15Z jelle $ +# $Id: PKGBUILD 57409 2011-10-27 03:51:27Z ebelanger $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda4 -pkgver=4.2.9 +pkgver=4.2.10 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL') -depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup' +depends=('gtksourceview2' 'libunique' 'libxslt' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('intltool' 'gobject-introspection' ) @@ -16,7 +16,7 @@ options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz) -sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814') +sha256sums=('cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431') build() { cd "${srcdir}/libgda-${pkgver}" @@ -31,6 +31,8 @@ build() { package() { cd "${srcdir}/libgda-${pkgver}" make DESTDIR="${pkgdir}" install - rm -rf $pkgdir/usr/share/icons - rm -rf $pkgdir/usr/share/gtk-doc + rm -rf "$pkgdir/usr/share/icons" + rm -rf "$pkgdir/usr/share/gtk-doc" + rm -rf "$pkgdir"/usr/bin/{gda-list-config,gda-list-server-op,gda-sql} + rm -rf "$pkgdir"/usr/share/man/man1/gda-sql.1 } diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install index c317fbaca..eb5d48353 100644 --- a/community/libgda4/libgda.install +++ b/community/libgda4/libgda.install @@ -1,6 +1,6 @@ post_install() { update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f usr/share/libgda-4.0/icons/hicolor } post_upgrade() { diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD index dffdf753f..d9e1dd036 100644 --- a/community/libgdamm/PKGBUILD +++ b/community/libgdamm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 56662 2011-10-09 15:04:32Z ibiru $ +# $Id: PKGBUILD 59045 2011-11-20 22:55:36Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Jan de Groot <jan@jgc.homeip.net> pkgbase=libgdamm pkgname=(libgdamm libgdamm-docs) -pkgver=4.99.4.1 +pkgver=4.99.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs') -url="http://gtkmm.sourceforge.net/" +url="http://www.gtkmm.org/" license=('LGPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7be24b0a7e992724478abda029974f7200a8ef000b8592659dd5068f47b02c6a') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d1b7e5101c192695e1fad96f6371d4c2362adb3e8f452f2cb2c89e4380d4f492') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/community/libmaa/PKGBUILD b/community/libmaa/PKGBUILD index 16f934a13..ea5a4e14e 100644 --- a/community/libmaa/PKGBUILD +++ b/community/libmaa/PKGBUILD @@ -2,20 +2,25 @@ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libmaa -pkgver=1.1.1 +pkgver=1.3.1 pkgrel=1 -pkgdesc="provides many low-level data structures which are helpful for writing compilers" +pkgdesc="Provides many low-level data structures which are helpful for writing compilers" url="http://sourceforge.net/projects/dict/" -license=("GPL") -arch=(i686 x86_64 'mips64el') -depends=('zlib') +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +depends=('glibc') makedepends=('flex') -source=(http://downloads.sourceforge.net/project/dict/libmaa/libmaa-1.1.1/libmaa-1.1.1.tar.gz) -md5sums=('0f3e1ef0e3dc6c516b8fb0cacef8f628') +options=('!libtool') +source=("http://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz") +md5sums=('04fcb72e8767c0795059bf397f5a0355') build() { - cd $startdir/src/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install } diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD index 1da61da49..0aafb6d11 100644 --- a/community/libmatchbox/PKGBUILD +++ b/community/libmatchbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42735 2011-03-20 08:11:51Z spupykin $ +# $Id: PKGBUILD 58821 2011-11-18 16:44:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> @@ -10,8 +10,8 @@ arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext') options=('!libtool') -url="http://projects.o-hand.com/matchbox" -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +url="http://matchbox-project.org/" +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) md5sums=('9f73e7515cc4679171a5db180dc1343b') build() { diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD index 367f011ac..2ab1f7b20 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' 'mips64el') 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/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD index b062d41ec..860042a5a 100644 --- a/community/libmediainfo/PKGBUILD +++ b/community/libmediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56302 2011-10-05 13:53:49Z spupykin $ +# $Id: PKGBUILD 58331 2011-11-11 18:59:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=libmediainfo -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('libtool' 'automake' 'autoconf') options=(!libtool) source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2 libmediainfo-0.7.50-libmms.patch) -md5sums=('d637d7f1e20b30c1dd1926ad134ee639' +md5sums=('eb377eebb40d64bf980c857f36cc5b51' '2f4b21cc250f663d52b497dedb963e3b') build() { diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index f02bca829..f623ce692 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 56051 2011-09-29 17:22:52Z foutrelis $ +# $Id: PKGBUILD 57420 2011-10-27 12:32:11Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=0.53 +pkgver=1.0.2 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha1sums=('52e0422a8916814b7c416d1671018e9aab50e9cc') +sha1sums=('d992845fe71210e2e93147ba8f29df1fca14e716') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD index 907caec87..37f165f92 100644 --- a/community/libmicrohttpd/PKGBUILD +++ b/community/libmicrohttpd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56030 2011-09-29 09:40:54Z spupykin $ +# $Id: PKGBUILD 59260 2011-11-22 06:42:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Norberto Lopes <shelika@mail.telepac.pt> # Contributor: Kao Dome <kaodome@gmail.com> @@ -6,7 +6,7 @@ # Contributor: Mathias Rohnstock <linksoft@gmx.de> pkgname=libmicrohttpd -pkgver=0.9.15 +pkgver=0.9.17 pkgrel=1 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application." arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') depends=('gnutls' 'libgcrypt') install=libmicrohttpd.install source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz) -md5sums=('fb726a48095cc6b25c245dbc27ea76b0') +md5sums=('d6802049c806e903ef1fa9c5b847e555') build() { cd ${pkgname}-${pkgver} diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD index 1618d4c63..93fc7d85e 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/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD index 0ad46eb8e..84d456e07 100644 --- a/community/libpqxx/PKGBUILD +++ b/community/libpqxx/PKGBUILD @@ -10,13 +10,16 @@ license=('custom') url="http://pqxx.org/development/libpqxx/" depends=('postgresql-libs>=8.4.1') options=('!libtool') -source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('4993a516eb88d8a51125607db30ad2ef') +source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" + build-fix.patch) +md5sums=('4993a516eb88d8a51125607db30ad2ef' + 'e59f5f63e1800406bf494e19cea479a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr --enable-shared - make || return 1 + make make prefix="${pkgdir}/usr" install install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/libpqxx/build-fix.patch b/community/libpqxx/build-fix.patch new file mode 100644 index 000000000..12795e517 --- /dev/null +++ b/community/libpqxx/build-fix.patch @@ -0,0 +1,11 @@ +diff -wbBur libpqxx-3.1/include/pqxx/compiler-internal.hxx libpqxx-3.1.my/include/pqxx/compiler-internal.hxx +--- libpqxx-3.1/include/pqxx/compiler-internal.hxx 2010-02-16 02:21:36.000000000 +0300 ++++ libpqxx-3.1.my/include/pqxx/compiler-internal.hxx 2011-11-21 15:56:00.000000000 +0400 +@@ -18,6 +18,7 @@ + #ifndef PQXX_H_COMPILER_INTERNAL + #define PQXX_H_COMPILER_INTERNAL + ++#include <cstddef> + + // Workarounds & definitions needed to compile libpqxx into a library + #include "pqxx/config-internal-compiler.h" diff --git a/community/libquvi/PKGBUILD b/community/libquvi/PKGBUILD new file mode 100644 index 000000000..1f0d35065 --- /dev/null +++ b/community/libquvi/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 57076 2011-10-20 17:03:18Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> + +pkgname=libquvi +pkgver=0.4.0 +pkgrel=2 +pkgdesc='Library for parsing video download links.' +arch=('i686' 'x86_64') +url='http://quvi.sourceforge.net/' +license=('LGPL') +depends=('libquvi-scripts' 'curl' 'lua') +conflicts=('quvi<0.4.0') +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.gz") +md5sums=('85c47035105b6b523a28793d4f6da9f1') + +build() { + cd "${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 007389ad9..688f8d85a 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 55740 2011-09-18 19:52:04Z bfanella $ +# $Id: PKGBUILD 58470 2011-11-12 22:05:09Z lcarlier $ # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw _pkgbasename=LibRaw -pkgver=0.13.8 -pkgrel=1 +pkgver=0.14.3 +pkgrel=2 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64' 'mips64el') url="http://www.libraw.org/" @@ -14,7 +14,7 @@ license=('CDDL' 'LGPL' 'custom') depends=('lcms') options=('!makeflags') source=(http://www.libraw.org/data/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('62cd5fee94915add0c43a97ec6909bbb') +md5sums=('d8f81a52b0fada9d5bf7e659e21e3a57') build() { cd ${srcdir}/${_pkgbasename}-${pkgver} diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD index 61679f035..3bcfc4abd 100644 --- a/community/librcc/PKGBUILD +++ b/community/librcc/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 49369 2011-06-15 09:26:07Z spupykin $ +# $Id: PKGBUILD 58641 2011-11-16 23:02:02Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=librcc pkgver=0.2.6 @@ -12,10 +11,11 @@ license=('GPL') depends=(aspell enca libxml2 db librcd) makedepends=(patch gtk gtk2) install=librcc.install +options=('!libtool') source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2 - librcc-strnlen.patch) + librcc-strnlen.patch) md5sums=('9bbf248c7312c73c0b6ca19b9c5a2af1' - '040313d1d8f166ccf2b128cea4c05f21') + '040313d1d8f166ccf2b128cea4c05f21') build() { cd ${startdir}/src/$pkgname-${pkgver} @@ -32,10 +32,6 @@ package() { make DESTDIR=$startdir/pkg install - rm -f $startdir/pkg/usr/lib/*.la - rm -f $startdir/pkg/usr/lib/rcc/engines/*.a - rm -f $startdir/pkg/usr/lib/rcc/engines/*.la - make -C examples make -C examples install DESTDIR=$startdir/pkg rm -f $startdir/pkg/usr/bin/example* diff --git a/community/libreplaygain/ChangeLog b/community/libreplaygain/ChangeLog deleted file mode 100644 index e5a5d81dd..000000000 --- a/community/libreplaygain/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2010-02-04 Corrado Primier <bardo@aur.archlinux.org> - - * PKGBUILD: added to [community] diff --git a/community/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD index 7c075ef47..c4b978d51 100644 --- a/community/libreplaygain/PKGBUILD +++ b/community/libreplaygain/PKGBUILD @@ -1,6 +1,9 @@ -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> +# $Id: PKGBUILD 57695 2011-11-01 10:46:06Z andrea $ +# Maintainer: +# Contributor: Corrado Primier <bardo@aur.archlinux.org> + pkgname=libreplaygain -pkgver=453 +pkgver=475 pkgrel=1 pkgdesc="A library to adjust audio gain" arch=('i686' 'x86_64' 'mips64el') @@ -8,19 +11,24 @@ url="http://www.musepack.net/index.php?pg=src" license=('LGPL') depends=('glibc') makedepends=('cmake') -source=(http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz) -md5sums=('1bde8f0319fd2a2b9921b2a2dfc47655') +source=("http://files.musepack.net/source/${pkgname}_r${pkgver}.tar.gz") +md5sums=('e27b3b1249b7fbae92d656d9e3d26633') build() { - mkdir "${srcdir}/${pkgname}_r${pkgver}/build" - cd "${srcdir}/${pkgname}_r${pkgver}/build" + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}_r${pkgver}/ \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make DESTDIR="${pkgdir}/" install +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install - mkdir -p "${pkgdir}/usr/include/replaygain/" - install -Dm644 ${srcdir}/${pkgname}_r${pkgver}/include/replaygain/* \ - ${pkgdir}/usr/include/replaygain/ + install -d "${pkgdir}/usr/include/replaygain/" + install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/replaygain/* \ + "${pkgdir}/usr/include/replaygain/" } - -# vim:set ts=2 sw=2 et: diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD new file mode 100644 index 000000000..dcf5d2bbf --- /dev/null +++ b/community/libuser/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 58190 2011-11-08 15:26:34Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Thomas Dziedzic < gostrc at gmail > + +pkgname=libuser +pkgver=0.57.1 +pkgrel=2 +pkgdesc='A standardized interface for manipulating and administering user and group accounts.' +arch=('i686' 'x86_64') +license=('LGPL') +url='https://fedorahosted.org/libuser/' +depends=('python2' 'glib2' 'popt') +options=('!libtool') +source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz") +md5sums=('be82c6941264d0b4bd04f95fb342ec7d') + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=python2 + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-gtk-doc-html \ + --disable-rpath + sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 8e1348240..13090b7bd 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55818 2011-09-22 13:29:51Z spupykin $ +# $Id: PKGBUILD 58183 2011-11-08 12:06:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') @@ -24,6 +24,7 @@ options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' 'etc/conf.d/libvirtd-guests' 'etc/libvirt/libvirtd.conf' + 'etc/libvirt/libvirt.conf' 'etc/libvirt/qemu.conf' 'etc/sasl2/libvirt.conf') install="libvirt.install" @@ -35,12 +36,12 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" openbsd-netcat-default.patch unixperms.patch yajl-2.x.patch) -md5sums=('b74df374b524d00a22a6c89cfc23099f' +md5sums=('4308b3f4d23f5b0c5196260a9a22a38b' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '6f36bf189ef0e5847038787d13535420' 'bc2971dacdbac967fc3474e50affc345' - '4a2659d0e06a7af742f71a0a36c7cea3' + 'b0be50eb9dfe4d133decf23b60880f7d' 'db95aecdf2ccf3693fef5821cdcb7eba' '5745bb8d0b254abb7a3528c66e03b0f9') diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch index c884d2171..a01b4f14e 100644 --- a/community/libvirt/openbsd-netcat-default.patch +++ b/community/libvirt/openbsd-netcat-default.patch @@ -1,7 +1,7 @@ -diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qemu_migration.c ---- libvirt-0.9.5/src/qemu/qemu_migration.c 2011-09-16 16:37:07.000000000 +0400 -+++ libvirt-0.9.5.my/src/qemu/qemu_migration.c 2011-09-20 20:44:39.000000000 +0400 -@@ -1497,7 +1497,7 @@ +diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c +--- libvirt-0.9.7/src/qemu/qemu_migration.c 2011-10-31 07:46:04.000000000 +0400 ++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c 2011-11-08 15:46:10.000000000 +0400 +@@ -1589,7 +1589,7 @@ spec->dest.unix_socket.file); } else { const char *args[] = { @@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qe }; ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); } -diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote/remote_driver.c ---- libvirt-0.9.5/src/remote/remote_driver.c 2011-09-20 07:00:44.000000000 +0400 -+++ libvirt-0.9.5.my/src/remote/remote_driver.c 2011-09-20 20:44:43.000000000 +0400 -@@ -596,7 +596,7 @@ +diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c +--- libvirt-0.9.7/src/remote/remote_driver.c 2011-11-08 07:53:30.000000000 +0400 ++++ libvirt-0.9.7.my/src/remote/remote_driver.c 2011-11-08 15:46:10.000000000 +0400 +@@ -614,7 +614,7 @@ username, !tty, !verify, @@ -22,15 +22,15 @@ diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote keyfile, sockname))) goto failed; -diff -wbBur libvirt-0.9.5/src/rpc/virnetsocket.c libvirt-0.9.5.my/src/rpc/virnetsocket.c ---- libvirt-0.9.5/src/rpc/virnetsocket.c 2011-09-14 06:11:44.000000000 +0400 -+++ libvirt-0.9.5.my/src/rpc/virnetsocket.c 2011-09-20 20:44:33.000000000 +0400 -@@ -633,7 +633,7 @@ - if (noVerify) +diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c +--- libvirt-0.9.7/src/rpc/virnetsocket.c 2011-11-08 07:53:30.000000000 +0400 ++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c 2011-11-08 15:46:31.000000000 +0400 +@@ -642,7 +642,7 @@ virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - virCommandAddArgList(cmd, nodename, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - "-U", path, NULL); - return virNetSocketNewConnectCommand(cmd, retsock); + if (!netcat) +- netcat = "nc"; ++ netcat = "nc.openbsd"; + + virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); + diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD index fe00f8360..a0d1852ac 100644 --- a/community/libwww/PKGBUILD +++ b/community/libwww/PKGBUILD @@ -1,11 +1,14 @@ +# $Id: PKGBUILD 57429 2011-10-27 16:42:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Buharev Vasilij <buharev.v.p@gmail.com> + pkgname=libwww pkgver=5.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="A general-purpose client side WEB API" arch=('i686' 'x86_64' 'mips64el') url="http://www.w3.org/Library/" -license=('custom') +license=('W3C') depends=() makedepends=('gcc pkgconfig perl zlib openssl') options=('!libtool') @@ -13,13 +16,10 @@ source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz) md5sums=('c3734ca6caa405707e134cc8c6d7e422') build() { - cd "$startdir/src/w3c-$pkgname-$pkgver" - - #export ac_cv_header_appkit_appkit_h=no - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --with-md5 --with-zlib --with-expat --with-regex --with-ssl + cd "$srcdir/w3c-$pkgname-$pkgver" + [ -f Makefile ] || ./configure --prefix=/usr \ + --with-md5 --with-zlib --with-expat --with-regex --with-ssl sed -i 's#Examples##' Library/Makefile - make || return 1 - make DESTDIR="$startdir/pkg" install || return 1 - - install -D -m 0644 COPYRIGHT.html $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT.html + make + make DESTDIR="$pkgdir" install } diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD index 0ef5e80cc..8a1ee0723 100644 --- a/community/libzen/PKGBUILD +++ b/community/libzen/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56229 2011-10-03 15:41:17Z spupykin $ +# $Id: PKGBUILD 58333 2011-11-11 19:01:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: hydro <hydro@freenet.de> pkgname=libzen -pkgver=0.4.22 +pkgver=0.4.23 pkgrel=1 pkgdesc="shared library for libmediainfo and mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs') makedepends=('libtool' 'automake' 'autoconf') options=('!libtool') source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2) -md5sums=('f44a39e783ceafe71cd3e7dde8a81e22') +md5sums=('00e622cf33eeb134a785463fbf49d227') build() { cd $srcdir/ZenLib/Project/GNU/Library diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD index b886299a0..dcb1b6cf7 100644 --- a/community/lightspark/PKGBUILD +++ b/community/lightspark/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=lightspark -pkgver=0.5.1 +pkgver=0.5.2.1 pkgrel=2 pkgdesc='An alternative Flash Player for Linux.' arch=('i686' 'x86_64' 'mips64el') @@ -13,10 +13,16 @@ depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpul 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}.tgz") -md5sums=('aa0daa22646c2a663ec5045074451d45') +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 @@ -26,7 +32,7 @@ build() { -DCOMPILE_PLUGIN=1 \ -DCMAKE_BUILD_TYPE=Release \ -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - .. + ../lightspark-${pkgver} make } diff --git a/community/lightspark/llvm29.diff b/community/lightspark/llvm29.diff new file mode 100644 index 000000000..f859852af --- /dev/null +++ b/community/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/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD index a81c5e802..fe902bd15 100644 --- a/community/linuxtv-dvb-apps/PKGBUILD +++ b/community/linuxtv-dvb-apps/PKGBUILD @@ -1,37 +1,32 @@ -# $Id: PKGBUILD 21619 2010-07-16 20:05:39Z tdziedzic $ +# $Id: PKGBUILD 58911 2011-11-20 05:15:40Z jconder $ +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=linuxtv-dvb-apps -pkgver=1.1.1 -pkgrel=4 -_hgrev=68d20621d93a +pkgver=1452 +pkgrel=1 +_hgrev=d4e8bf5658ce pkgdesc='Viewer programs for DVB cards' arch=('i686' 'x86_64' 'mips64el') url='http://www.linuxtv.org/' license=('GPL') -install=linuxtv-dvb-apps.install -#source=(http://www.linuxtv.org/download/dvb/$pkgname-$pkgver.tar.bz2) -source=("http://linuxtv.org/hg/dvb-apps/archive/${_hgrev}.tar.bz2") -md5sums=('5b43136359d9555a567a76ba28433afc') +source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2") +sha256sums=('c3bb865ea5c8dd97050d7b3a68ee158dadff50a2fb948d955b3a559be3cf31c5') build() { - cd dvb-apps-${_hgrev} - + cd "dvb-apps-$_hgrev" rm -rf include make -C lib - make -C util } package() { - cd dvb-apps-${_hgrev} + cd "dvb-apps-$_hgrev" - make -C lib DESTDIR=${pkgdir} install + make -C lib DESTDIR="$pkgdir" install + make -C util DESTDIR="$pkgdir" install - make -C util DESTDIR=${pkgdir} install - - chmod 755 ${pkgdir}/usr/lib/*.so* + chmod 755 "$pkgdir"/usr/lib/*.so* } - diff --git a/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install b/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install deleted file mode 100644 index a260be22b..000000000 --- a/community/linuxtv-dvb-apps/linuxtv-dvb-apps.install +++ /dev/null @@ -1,8 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - echo ">>> Some initial-tuning-data files have been installed under" - echo ">>> /usr/share/dvb-utils/scan/" - echo ">>> you can use them to generate your channel.conf file" -} - diff --git a/community/listen/PKGBUILD b/community/listen/PKGBUILD deleted file mode 100644 index ddfb63650..000000000 --- a/community/listen/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 55644 2011-09-17 00:51:14Z ebelanger $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Hugo Doria <hugodoria@gmail.com> - -pkgname=listen -pkgver=0.6.5 -pkgrel=8 -pkgdesc="Music player and management for GNOME" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.listen-project.org/" -license=('GPL2') -depends=('python2-egg' 'python2-libgnome' 'mutagen' 'desktop-file-utils' - 'gnome-icon-theme' 'gstreamer0.10-python' 'notification-daemon' 'pyxdg' - 'pywebkitgtk' 'python2-pyinotify' 'gstreamer0.10-good-plugins' 'dbus-python') -makedepends=('intltool' 'docbook2x' 'docbook-xml') -optdepends=('python-musicbrainz2: musicbrainz & cd support' - 'libgpod: iPod support' - 'python-daap: DAAP support' - 'tunepimp: tagging support') -install=listen.install -source=("http://download.listen-project.org/0.6/${pkgname}-${pkgver}.tar.gz") -md5sums=('76cd9ad2fc9c600dbdf4808c15aeccf1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - chmod +x mmkeys/setup.py - - # Fix command name - sed -i 's/docbook2x-man/docbook2man/' Makefile - - # Point Python scripts to the python2 binary - sed -i -e 's/python -/python2 -/' \ - -e 's/PYTHON = python$/\02/' \ - Makefile - sed -i 's/env python$/env python2/' mmkeys/setup.py - sed -i 's|/usr/bin/python|/usr/bin/python2|' src/listen - - make CHECK_DEPENDS=0 PREFIX=/usr -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" PREFIX=/usr install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/lmctl/PKGBUILD b/community/lmctl/PKGBUILD deleted file mode 100644 index a86335c8c..000000000 --- a/community/lmctl/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Jeff Mickey <j@codemac.net> -# Contributor: Shadowhand <woody.gilk@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=lmctl -pkgver=0.3.2 -pkgrel=6 -pkgdesc="Logitech Mouse configuration program" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://www.bedroomlan.org/~alexios/coding_lmctl.html" -depends=('libusb-compat') -source=(http://www.bedroomlan.org/~alexios/files/SOFTWARE/lmctl/${pkgname}\_${pkgver}.tar.gz \ - mx-support-cmdline.patch mx-support-man.patch mx-support.patch \ - lmctl.rc.d lmctl.conf.d) -md5sums=('c2acb088c95adeac68b6de8f05ddc0e4' '431521026fc07b27e21d65124dd1134f' \ - 'cfc222209b9a9d6b203c5a00dafe57dd' '1b943fe045d8273677be43c79bfd1031' - 'a62ad322e93c1cbc931bba33fb0a518c' 'a77682cf2d2c9e3d1a53a6444a74ce66' ) - -build() { - cd ${srcdir}/${pkgname}-0.3.1 - - patch -Np1 < ${srcdir}/mx-support-cmdline.patch - patch -Np1 < ${srcdir}/mx-support-man.patch - patch -Np1 < ${srcdir}/mx-support.patch - - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share - make -} - -package() { - cd ${srcdir}/${pkgname}-0.3.1 - - make DESTDIR=${pkgdir} install - - # install the init scripts - install -D -m755 ${srcdir}/lmctl.rc.d ${pkgdir}/etc/rc.d/lmctl - install -D -m644 ${srcdir}/lmctl.conf.d ${pkgdir}/etc/conf.d/lmctl -} diff --git a/community/lmctl/lmctl.conf.d b/community/lmctl/lmctl.conf.d deleted file mode 100644 index 54e532e25..000000000 --- a/community/lmctl/lmctl.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Parameters to be passed to lmctl -# -# lmctl --help for more info -# -LMCTL_ARGS="--1600 --no-sms" diff --git a/community/lmctl/lmctl.rc.d b/community/lmctl/lmctl.rc.d deleted file mode 100644 index e9eaf7de1..000000000 --- a/community/lmctl/lmctl.rc.d +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -LMCTL_ARGS= -[ -f /etc/conf.d/lmctl ] && . /etc/conf.d/lmctl - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Setting up Logitech Mouse" - /usr/bin/lmctl ${LMCTL_ARGS} &>/dev/null - if [ $? -eq 0 ] ; then - stat_fail - else - stat_done - add_daemon lmctl - fi - ;; - *) - echo "usage: $0 {start}" -esac diff --git a/community/lmctl/mx-support-cmdline.patch b/community/lmctl/mx-support-cmdline.patch deleted file mode 100644 index f2f7cf068..000000000 --- a/community/lmctl/mx-support-cmdline.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- lmctl-org/src/cmdline.c 2004-09-07 22:40:15.000000000 +0000 -+++ lmctl-0.3.1/src/cmdline.c 2005-06-29 13:36:33.000000000 +0000 -@@ -128,6 +128,10 @@ - "Set matching devices to a resolution of 400cpi"}, - { "800", '8', NULL, 0, - "Set matching devices to a resolution of 800cpi"}, -+ { "1200", 'm', NULL, 0, -+ "Set matching devices to a medium resolution of 1200cpi"}, -+ { "1600", 'h', NULL, 0, -+ "Set matching devices to a high resolution of 1600cpi"}, - - { NULL, 0, NULL, 0, _("SmartScroll/Cruise Control (SMS command set)") }, - -@@ -227,13 +231,22 @@ - command = cmd_set; - set_res = (int) (key - '0') * 100; - break; -+ -+ case 'm': -+ command = cmd_set; -+ set_res = (int) (12) * 100; -+ break; -+ case 'h': -+ command = cmd_set; -+ set_res = (int) (16) *100; -+ break; - - case '1': /* set the channel */ - case '2': - command = cmd_set; - set_channel = (int) (key - '0'); - break; -- -+ - case 'u': - command = cmd_set; - set_unlock = 1; diff --git a/community/lmctl/mx-support-man.patch b/community/lmctl/mx-support-man.patch deleted file mode 100644 index 78d4ff023..000000000 --- a/community/lmctl/mx-support-man.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- lmctl-org/src/lmctl.1 2004-09-07 22:32:25.000000000 +0000 -+++ lmctl-0.3.1/src/lmctl.1 2005-06-29 14:02:32.000000000 +0000 -@@ -116,6 +116,14 @@ - .BR -8 ", " --800 - Sets matching devices to a resolution of 800 cpi. Very useful on - certain Logitech mice (the MX500 is one of them) that boot in 400 cpi. -+.TP -+.BR -m ", " --1200 -+Sets matching devices to a resolution of 1200 cpi. Very useful on -+certain Logitech mice (the MX518 is one of them) that boot in 400 cpi. -+.TP -+.BR -h ", " --1600 -+Sets matching devices to a resolution of 1600 cpi. Very useful on -+certain Logitech mice (the MX518 is one of them) that boot in 400 cpi. - .PP - The following settings control SmartScroll/Cruise Control, for mice - that support it (i.e. include the SMS capability). diff --git a/community/lmctl/mx-support.patch b/community/lmctl/mx-support.patch deleted file mode 100644 index 9c09a9c9b..000000000 --- a/community/lmctl/mx-support.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- lmctl-org/src/lmctl.c 2004-09-08 07:59:55.000000000 +0000 -+++ lmctl-0.3.1/src/lmctl.c 2005-06-29 14:03:50.000000000 +0000 -@@ -99,6 +99,8 @@ - {0xc00e, "Wheel Mouse Optical", "M-BJ58", 0, 1, 0, 0}, - {0xc00f, "MouseMan Traveler", "M-BJ79", 0, 1, 0, 0}, - {0xc012, "MouseMan Dual Optical", "M-BL63B", 0, 1, 0, 0}, -+ {0xc01d, "MX510 Optical Mouse", "M-BS81A", 0, 1, 1, 0}, -+ {0xc01e, "MX518 Optical Mouse", "M-BS81A", 0, 1, 0, 0}, - {0xc024, "MX300 Optical Mouse", "M-BP82", 0, 1, 0, 0}, - {0xc025, "MX500 Optical Mouse", "M-BP81A", 0, 1, 1, 0}, - {0xc031, "iFeel Mouse (silver)", "M-UT58A", 0, 1, 0, 0}, -@@ -270,7 +272,7 @@ - exit(1); - } - -- assert ((buf [0] == 3) || (buf [0] == 4)); -+ assert ((buf [0] == 3) || (buf [0] == 4) || (buf [0] == 5) || (buf [0] == 6)); - - printf ("\tResolution (RES): %d cpi\n", (buf [0] - 2) * 400); - } -@@ -355,7 +357,7 @@ - unsigned char buf [80]; - if (!set_res) return; - -- assert ((set_res == 400) || (set_res == 800)); -+ assert ((set_res == 400) || (set_res == 800) || (set_res == 1200) || (set_res == 1600)); - if (usb_control_msg (handle, 0x40, 0x02, 0x000e, (set_res / 400) + 2, - buf, 0, TIMEOUT) != 0) { - perror("Writing to USB device"); diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD index c1827d8ab..fc9280f91 100644 --- a/community/lmms/PKGBUILD +++ b/community/lmms/PKGBUILD @@ -16,7 +16,7 @@ optdepends=('wine: VST support (experimental)' 'stk: STK instruments plugins' 'pulseaudio: PulseAudio output') makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk') -[ $CARCH = i686 ] && makedepends+=('wine') +[[ $CARCH = i686 ]] && makedepends+=('wine') provides=('lmms-extras') conflicts=('lmms-extras') options=('!libtool' '!makeflags') diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD index 9935de200..7949b4cdd 100644 --- a/community/lockdev/PKGBUILD +++ b/community/lockdev/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 21613 2010-07-16 20:02:19Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 57817 2011-11-03 10:01:23Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de> pkgname=lockdev pkgver=1.0.3_1.2 -pkgrel=2 -pkgdesc="Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods" -url="http://packages.qa.debian.org/l/lockdev.html" +_pkgver=1.0.3 +pkgrel=3 +pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.' +url='http://packages.qa.debian.org/l/lockdev.html' license=("GPL") arch=('i686' 'x86_64' 'mips64el') -source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_1.0.3.orig.tar.gz" - "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") +source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz" + "http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz") md5sums=('64b9c1b87b125fc348e892e24625524a' 'afe2995ad3fc6551e107364d66a8e938') build() { - cd ${pkgname}-1.0.3 - - patch -p1 < ../${pkgname}_${pkgver/_/-}.diff + cd "${pkgname}-${_pkgver}" + patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff" sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile make shared - make static } package() { - cd ${pkgname}-1.0.3 - - make basedir=${pkgdir}/usr install + cd "${pkgname}-${_pkgver}" + make basedir="${pkgdir}/usr" install } diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD new file mode 100644 index 000000000..21bfddf37 --- /dev/null +++ b/community/log4cpp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 58314 2011-11-11 08:13:40Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor : Geraud Le Falher <daureg@gmail.com> + +pkgname=log4cpp +pkgver=1.0 +pkgrel=6 +pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." +arch=('i686' 'x86_64') +url="http://log4cpp.hora-obscura.de/" +license=('LGPL') +depends=('gcc-libs') +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc43.patch) +md5sums=('1face50ead0790d1297dfb04bacf273c' + '09a6fd8ab6527a417c97c4db5215e558') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir"/gcc43.patch + ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim: set ft=sh ts=2 sw=2 et: diff --git a/community/log4cpp/gcc43.patch b/community/log4cpp/gcc43.patch new file mode 100644 index 000000000..a60f986e9 --- /dev/null +++ b/community/log4cpp/gcc43.patch @@ -0,0 +1,26 @@ +Index: log4cpp-1.0/src/BasicLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 ++++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 +@@ -15,6 +15,8 @@ + #include <sstream> + #endif + ++#include <memory> ++ + namespace log4cpp { + + BasicLayout::BasicLayout() { +Index: log4cpp-1.0/src/PatternLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 ++++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 +@@ -370,7 +370,7 @@ + literal = ""; + } + if ((minWidth != 0) || (maxWidth != 0)) { +- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); ++ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); + minWidth = maxWidth = 0; + } + _components.push_back(component); diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD new file mode 100644 index 000000000..094547913 --- /dev/null +++ b/community/lomoco/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Jeff Mickey <j@codemac.net> +# Contributor: Shadowhand <woody.gilk@gmail.com> + +pkgname=lomoco +pkgver=1.0 +pkgrel=6 +url="http://www.lomoco.org/" +pkgdesc="Logitech USB mouse configuration program" +license=('GPL') +depends=('libusb-compat') +replaces=('lmctl') +arch=('i686' 'x86_64') +options=(!libtool) +backup=(etc/udev/lomoco_mouse.conf) +source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz + lomoco_mouse.conf + lomoco.sh) +md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d' + '182b10a7e4a1828a93c1d55ef7f81b97' + 'bc92f661641265b33b27895ef24028fd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./autogen.sh --prefix=/usr --mandir=/usr/share/man + make + make udev-rules + make DESTDIR=${pkgdir} install + + # Fix and install udev rules and helpers + sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco + sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules + sed -i 's|SYSFS|ATTR|' udev/lomoco.rules + install -D -m 644 udev/lomoco.rules ${pkgdir}/etc/udev/rules.d/80-lomoco.rules + install -D -m 755 ../lomoco.sh ${pkgdir}/lib/udev/lomoco.sh + install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/ +} diff --git a/community/lomoco/lomoco.sh b/community/lomoco/lomoco.sh new file mode 100644 index 000000000..76e2392da --- /dev/null +++ b/community/lomoco/lomoco.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then + . /etc/udev/lomoco_mouse.conf + + options= + + if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then + options="--$LOGITECH_MOUSE_RESOLUTION" + fi + + case "$LOGITECH_MOUSE_SMS" in + yes) options="$options --sms" ;; + no) options="$options --no-sms" ;; + esac + + if [ -n "$options" ]; then + /usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options + fi + +fi 2>&1 | /usr/bin/logger -t lomoco diff --git a/community/lomoco/lomoco_mouse.conf b/community/lomoco/lomoco_mouse.conf new file mode 100644 index 000000000..b8c534ec2 --- /dev/null +++ b/community/lomoco/lomoco_mouse.conf @@ -0,0 +1,5 @@ +# Possible Resolutions Are: 400 800 1200 1600 2000 +#LOGITECH_MOUSE_RESOLUTION="800" + +# SmartScroll/Cruise Control (SMS command set): yes or no +#LOGITECH_MOUSE_SMS="no" diff --git a/community/lshw/PKGBUILD b/community/lshw/PKGBUILD index 29c2b6d34..fbc59ec44 100644 --- a/community/lshw/PKGBUILD +++ b/community/lshw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 29087 2010-10-10 07:47:30Z spupykin $ +# $Id: PKGBUILD 58989 2011-11-20 19:39:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com> # Contributor: Chuck Yang <Chuck.Yang@gmail.com> @@ -12,19 +12,15 @@ license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('gcc-libs') optdepends=('gtk2') -makedepends=('gcc') -source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz - abi_stdlib.diff) -md5sums=('970bd9eb05fa3ae139a24a417465c54c' - '7adcdd7a2be2feba956a9832cf36abdf') +makedepends=('gcc' 'gtk2' 'sqlite3') +source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz) +md5sums=('970bd9eb05fa3ae139a24a417465c54c') build() { cd $srcdir/$pkgname-$pkgver -# patch -Np1 -i ../abi_stdlib.diff || return 1 - - make || return 1 - make gui || return 1 - make DESTDIR=$pkgdir/ install || return 1 + make + make gui + make DESTDIR=$pkgdir/ install make DESTDIR=$pkgdir/ install-gui } diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD index 231e07f99..fcb9d5451 100644 --- a/community/luasec/PKGBUILD +++ b/community/luasec/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 59126 2011-11-21 11:54:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Dwayne Bent <dbb.1@liqd.org> # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> @@ -14,17 +14,17 @@ depends=('openssl>=0.9.7' 'lua>=5.1' 'luasocket>=2.0.2') source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/$pkgname-$pkgver.tar.gz" 'luasec.patch') md5sums=('712158d60207bdbb6215fc7e07d8db24' - '6f607af3351454754762421b27afe7f6') + '25e48c1115225d9884cdb7f5ca4949a9') build() { - install -d "$pkgdir/usr/share/lua/5.1" || return 1 - install -d "$pkgdir/usr/lib/lua/5.1" || return 1 - install -d "$pkgdir/usr/share/licenses/$pkgname" || return 1 + install -d "$pkgdir/usr/share/lua/5.1" + install -d "$pkgdir/usr/lib/lua/5.1" + install -d "$pkgdir/usr/share/licenses/$pkgname" cd "$srcdir/$pkgname-$pkgver" - patch -p1 Makefile "$startdir/luasec.patch" || return 1 - make linux || return 1 - make DESTDIR=$pkgdir install || return 1 + patch -p1 Makefile "$srcdir/luasec.patch" + make linux + make DESTDIR=$pkgdir install - install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" || return 1 + install -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/luasec/luasec.patch b/community/luasec/luasec.patch index 96035df7a..7b0c9d6cc 100644 --- a/community/luasec/luasec.patch +++ b/community/luasec/luasec.patch @@ -12,7 +12,7 @@ -#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include -#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib +INCDIR=-I/usr/include -I/usr/include/openssl -+LIBDIR=-L/usr/lib -R/usr/lib ++LIBDIR=-L/usr/lib # For Mac OS X: set the system version MACOSX_VERSION=10.4 diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 37b12dd23..b60640e55 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 56345 2011-10-05 19:08:27Z andrea $ +# $Id: PKGBUILD 58474 2011-11-12 22:05:38Z lcarlier $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr pkgver=2.1.0 -pkgrel=2 +pkgrel=5 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64' 'mips64el') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'hicolor-icon-theme' 'libraw' 'libtiff' 'openexr' 'qt') +depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/qtpfsgui/luminance-hdr-${pkgver}.tar.gz) -sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac') +source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz + luminance-hdr-2.1.0-libraw.patch) +sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac' + 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c') build() { cd "${srcdir}/luminance-hdr-${pkgver}" + # stolen from gentoo + patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch + if [ ${CARCH} = i686 ]; then sed -i 's/ -msse2//' project.pro fi diff --git a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch new file mode 100644 index 000000000..8472a7422 --- /dev/null +++ b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch @@ -0,0 +1,10 @@ +--- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig ++++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp +@@ -94,7 +94,6 @@ + RawProcessor.set_progress_handler(cb, callback_data); + int ret; + +- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC; + OUT.output_bps = 16; + + //OUT.gamm[0] = 1/2.4; //sRGB diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index cb10cf454..fa6b8d01b 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55891 2011-09-24 16:49:03Z stephane $ +# $Id: PKGBUILD 57940 2011-11-04 18:08:34Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=luxrays pkgver=0.8 _pkgver=ed424ec77571 -pkgrel=5 +pkgrel=6 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index b0487ad93..46af29ad7 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54540 2011-08-19 22:35:41Z ebelanger $ +# $Id: PKGBUILD 57947 2011-11-04 18:37:21Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> @@ -6,20 +6,22 @@ pkgname=luxrender pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 -_blender=2.59 -pkgrel=8 +_blender=2.60 +pkgrel=9 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64' 'mips64el') url="http://www.luxrender.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('blender: Blender exporter' 'qt: Qt GUI') +optdepends=('blender: Blender exporter' 'qt: Qt GUI' \ + 'nvidia-utils: OpenCL support for nVidia GPUs' \ + 'amdstream: OpenCL support for AMD GPUs' \ + 'intel-opencl-sdk: OpenCL support for Intel CPUs') makedepends=('cmake' 'boost' 'qt' 'luxrays' 'python' 'opencl-headers') -install=luxrender.install source=(ftp://ftp.archlinux.org/other/community/luxrender/lux-"$pkgver".tar.bz2 \ - ftp://ftp.archlinux.org/other/community/luxrender/luxblend-"$pkgver".tar.bz2) + https://bitbucket.org/luxrender/luxblend25/get/v08-2.60.tar.bz2) md5sums=('0f2d856385db72131f51e44a7ee527fa' - '0c3c8d9efba76133f8c687b5dd2bca8a') + '004596f577bbe681358c40507b2583e8') build() { cd "$srcdir"/luxrender-lux-$_pkgver @@ -43,9 +45,9 @@ package() { # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - # install blender exporter + # install the blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxrender-luxblend25-v08-2.60/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons cp -a "$srcdir"/luxrender-lux-$_pkgver/pylux.so "$pkgdir"/usr/share/blender/$_blender/scripts/addons/luxrender/ } diff --git a/community/luxrender/luxrender.install b/community/luxrender/luxrender.install deleted file mode 100644 index 5be530d50..000000000 --- a/community/luxrender/luxrender.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - cat << EOF -To enable OpenCL support you need to install one of the following packages: - * nvidia-utils for nVidia GPUs - * amdstram for AMD GPUs - * intel-opencl-sdk for Intel CPUs -EOF -} - -# vim:set ts=2 sw=2 et: diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 553ae283b..786686d64 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 56900 2011-10-16 07:41:12Z bpiotrowski $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 58107 2011-11-06 17:20:02Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> +# Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=2 +pkgrel=6 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/lxdm/" @@ -13,38 +14,35 @@ groups=('lxde') depends=('gtk2' 'xorg-server' 'consolekit') makedepends=('intltool') install=${pkgname}.install -backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm') # 'etc/lxdm/xinitrc') +backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' + 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' + 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=("http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz" - Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon) + lxdm.patch lxdm-conf.patch lxdm-pam.patch lxdm-daemon) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - '9bdf95adb74d81d4b6b6176fb1142090' 'baed9055e8825a5511712bc095197519' + 'c50dd01b715b0a236407d48066191601' 'b20fe3c8487a039050986d60e45233a9' '705f394052fdd0dec22e95321d170de0') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm + cd "$srcdir/$pkgname-$pkgver" + ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm make patch -Np0 < ../lxdm.patch - patch -Np0 < ../Xsession.patch + patch -Np0 < ../lxdm-conf.patch } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="${pkgdir}" install install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm - - # these files are not in the package, but should be owned by lxdm - taken from Fedora pkg -# touch ${pkgdir}/etc/lxdm/xinitrc - install -d ${pkgdir}/var/{lib,run}/lxdm -# touch ${pkgdir}/var/lib/lxdm/lxdm.conf - + install -d ${pkgdir}/var/{lib,run}/lxdm + # fix the greeter location - # on 0.4.1 this sed have to changed since they changed the default path sed -i -e "s/local\/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf } diff --git a/community/lxdm/Xsession.patch b/community/lxdm/Xsession.patch deleted file mode 100644 index a9ba63233..000000000 --- a/community/lxdm/Xsession.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- data/Xsession.orig 2010-01-31 20:48:08.695677408 -0200 -+++ data/Xsession 2010-01-31 20:47:48.260223292 -0200 -@@ -2,6 +2,11 @@ - - # use bash for "exec -l", howto run login shell by /bin/sh ? - -+[[ -f /etc/profile ]] && . /etc/profile -+[[ -f "$HOME/.profile" ]] && . "$HOME/.profile" -+[[ -f /etc/xprofile ]] && . /etc/xprofile -+[[ -f "$HOME/.xprofile" ]] && . "$HOME/.xprofile" -+ - if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 - else diff --git a/community/lxdm/lxdm-conf.patch b/community/lxdm/lxdm-conf.patch new file mode 100644 index 000000000..1744e557e --- /dev/null +++ b/community/lxdm/lxdm-conf.patch @@ -0,0 +1,11 @@ +--- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 ++++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 +@@ -27,7 +27,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 diff --git a/community/lxdm/lxdm.install b/community/lxdm/lxdm.install index 8d42de90f..522f9e3b1 100644 --- a/community/lxdm/lxdm.install +++ b/community/lxdm/lxdm.install @@ -1,59 +1,17 @@ pkgname=lxdm post_install() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null - -cat << EOF ->>> To make the LXDM as your default DM, ->>> put, 'lxdm' or '@lxdm' (without quotes) on DAEMONS in /etc/rc.conf ->>> ->>> You can also use /etc/inittab, ->>> just add 'x:5:respawn:/usr/sbin/lxdm >& /dev/null' (without quotes) ->>> in the end of the file /etc/inittab ->>> and uncoment the line on the top 'id:5:initdefault:'. -EOF + getent group lxdm > /dev/null 2>&1 || groupadd -g 121 lxdm + getent passwd lxdm > /dev/null 2>&1 || useradd -c 'LXDE Display Manager' -u 121 -g lxdm -d /var/lib/lxdm -s /sbin/nologin lxdm + passwd -l lxdm > /dev/null + chown -R lxdm:lxdm /var/lib/lxdm > /dev/null } post_upgrade() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null + post_install } post_remove() { - # Removing lxdm group+user - getent passwd lxdm >/dev/null 2>&1 && userdel lxdm #|| /bin/true - getent group lxdm >/dev/null 2>&1 && groupdel lxdm #|| /bin/true + getent passwd lxdm > /dev/null 2>&1 && userdel lxdm + getent group lxdm > /dev/null 2>&1 && groupdel lxdm } diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD index f6aa20cab..50bbcc4be 100644 --- a/community/mailutils/PKGBUILD +++ b/community/mailutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54471 2011-08-18 15:08:02Z bluewind $ +# $Id: PKGBUILD 58984 2011-11-20 19:26:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD index a1d5c6cc7..d60c4078e 100644 --- a/community/mashup/PKGBUILD +++ b/community/mashup/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mashup -pkgver=3.1 +pkgver=3.3 pkgrel=1 pkgdesc="Adjusting images on a sheet of paper for printing" url="http://kornelix.squarespace.com/$pkgname" @@ -11,22 +11,18 @@ license=('GPL3') depends=('gtk2') replaces=('printoxx') source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('f6a5afb0a5d410934cbbf4303b3b8a9b') +md5sums=('0d8286747d5cd1a65907c7d70c7a99e5') build() { cd $srcdir/$pkgname-$pkgver sed -i 's+xdg-deskto+#xdg-deskto+' Makefile - make PREFIX=/usr \ - CFLAGS+="-c `pkg-config --cflags gtk+-2.0`" \ - LFLAGS+="`pkg-config --libs gtk+-2.0 gthread-2.0`" - sed -i 's#/local##' data/desktop - sed -i 's+# ++' data/desktop + make PREFIX=/usr } package() { cd $srcdir/$pkgname-$pkgver - install -Dm644 data/desktop \ - $pkgdir/usr/share/applications/$pkgname.desktop - make DESTDIR=$pkgdir PREFIX=/usr install + install -Dm644 desktop $pkgdir/usr/share/applications/$pkgname.desktop + make DESTDIR=$pkgdir install rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop + rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man } diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD index f9ef9a2df..807603bb1 100644 --- a/community/matchbox-desktop/PKGBUILD +++ b/community/matchbox-desktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 21413 2010-07-16 12:00:56Z spupykin $ +# $Id: PKGBUILD 58996 2011-11-20 19:49:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> @@ -9,14 +9,14 @@ pkgdesc="A PDA style application launcher or 'item browser'." arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libmatchbox' 'startup-notification' 'libpng' 'gtk2') -url="http://projects.o-hand.com/matchbox" +url="http://matchbox-project.org/" options=('!libtool') -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) md5sums=('b0a4a47130272e2adab4e9feb43a6c9c') build() { cd $srcdir/$pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/matchbox-keyboard/PKGBUILD b/community/matchbox-keyboard/PKGBUILD index 2446dd81d..771dc1ff5 100644 --- a/community/matchbox-keyboard/PKGBUILD +++ b/community/matchbox-keyboard/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 21416 2010-07-16 12:01:32Z spupykin $ +# $Id: PKGBUILD 58999 2011-11-20 19:51:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -8,14 +8,14 @@ pkgrel=3 pkgdesc="An on screen virtual keyboard" arch=('i686' 'x86_64' 'mips64el') depends=('cairo' 'libfakekey' 'libxft') -url="http://projects.o-hand.com/matchbox" +url="http://matchbox-project.org/" license=('GPL') -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/0.1/$pkgname-$pkgver.tar.gz) +source=(http://matchbox-project.org/sources/$pkgname/0.1/$pkgname-$pkgver.tar.gz) md5sums=('9d1f61e0785f2ac4fc7588fa39b87e6f') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/matchbox-panel/PKGBUILD b/community/matchbox-panel/PKGBUILD index 6d438bb09..14f46d1a9 100644 --- a/community/matchbox-panel/PKGBUILD +++ b/community/matchbox-panel/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59002 2011-11-20 19:52:18Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-panel @@ -7,14 +9,13 @@ pkgdesc="A flexible always present 'window bar' for holding application launcher arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libmatchbox' 'startup-notification' 'libpng') -url="http://projects.o-hand.com/matchbox" -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/0.9/$pkgname-$pkgver.tar.bz2) +url="http://matchbox-project.org/" +source=(http://matchbox-project.org/sources/$pkgname/0.9/$pkgname-$pkgver.tar.bz2) md5sums=('56d1807636f3919e22e51896ab7ccd2e') build() { - cd $startdir/src/$pkgname-$pkgver - + cd $srcdir/$pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr --enable-startup-notification - make || return 1 - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$pkgdir install } diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD index 4c8bb3136..66a07c86e 100644 --- a/community/matchbox-window-manager/PKGBUILD +++ b/community/matchbox-window-manager/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59005 2011-11-20 19:53:19Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com> pkgname=matchbox-window-manager @@ -6,16 +8,16 @@ pkgrel=2 pkgdesc="A pretty much unique X window manager with a classic PDA management policy" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libmatchbox' 'startup-notification' 'libpng') -url="http://projects.o-hand.com/matchbox" -source=(http://projects.o-hand.com/matchbox/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) +depends=('libmatchbox' 'startup-notification' 'libpng' 'libsm') +url="http://matchbox-project.org/" +source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) md5sums=('3e158dcf57823b55c926d95b245500fb') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --sysconfdir=/etc --prefix=/usr \ --enable-startup-notification --enable-session \ --enable-alt-input-wins --enable-expat - make || return 1 - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$pkgdir install } diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index ffedd8d8a..745d5799f 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=mathomatic -pkgver=15.6.5 +pkgver=15.7.1 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64' 'mips64el') @@ -13,9 +13,10 @@ depends=('readline') makedepends=('time') optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'bash: for running a test script' + 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('1dc244232986f98611c8d2723ae3a497') +md5sums=('f8144e9c17edf688cbb296d20efaf808') build() { cd "$srcdir"/$pkgname-$pkgver @@ -35,8 +36,11 @@ build() { package() { cd "$srcdir"/$pkgname-$pkgver - make prefix="$pkgdir"/usr install + make prefix="$pkgdir"/usr m4install + sed -i 's+/build/pkg++' "$pkgdir"/usr/bin/matho + cd "$srcdir"/$pkgname-$pkgver/primes make prefix="$pkgdir"/usr install } +# vim:set ts=2 sw=2 et: diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index 9b7e46910..b6285bd39 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56569 2011-10-08 17:55:12Z schuay $ +# $Id: PKGBUILD 57569 2011-10-30 21:21:44Z bisson $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.7.5.5 -pkgrel=1 +pkgver=4.8.0 +pkgrel=2 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64' 'mips64el') url="http://www.ibiblio.org/mc/" @@ -30,8 +30,8 @@ conflicts=('mc-utf8') replaces=('mc-utf8') options=('!emptydirs' '!makeflags') source=("http://www.midnight-commander.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ef1582651115ca8aa52f8d11e99f7da3') -sha1sums=('be428f4c5f0cb180277eed7387e29e69c042aadc') +md5sums=('592478c3edfa2ad64c8cd165b9bec446') +sha1sums=('2584a681350e07d1e6703b9f7fd77cec45a6e061') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -56,9 +56,6 @@ package() { sed 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ -i "${pkgdir}/usr/lib/mc/extfs.d/uzip" - # Fix FS#18312 - rm "${pkgdir}/usr/lib/mc/extfs.d/u7z" - sed 's#/usr/bin/env python#/usr/bin/python2#' \ -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD index e12dce92d..6f3eeabaa 100644 --- a/community/mcabber/PKGBUILD +++ b/community/mcabber/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 34137 2010-12-03 13:48:45Z ttopper $ +# $Id: PKGBUILD 58853 2011-11-19 00:17:45Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: 3ED <kas1987@o2.pl> @@ -12,7 +12,7 @@ url="http://www.lilotux.net/~mikael/mcabber/" license=('GPL') depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr' 'aspell') makedepends=('pkgconfig') -options=('!libtool' 'force') +options=('!libtool') source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2) md5sums=('fe96beab30f535d5d6270fd1719659b4') diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 2acfd7516..dae948032 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56264 2011-10-04 09:39:17Z spupykin $ +# $Id: PKGBUILD 57954 2011-11-04 21:05:32Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> @@ -10,20 +10,22 @@ pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64') -depends=() options=('docs') -source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" +#source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" +source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz" "${pkgname}.rc") md5sums=('b42f2214de6f4feb992556149edc67fa' 'f039a77d7bde3518d3d695b144816e8a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + mkdir -p $pkgdir/usr/share/doc/mcelog make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 067b2a338..75d1b8c87 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -6,15 +6,15 @@ pkgname=me-tv pkgver=2.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/me-tv" license=('GPL') depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base') makedepends=('intltool') -install=me-tv.install -source=(http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) +install='me-tv.install' +source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") options=('!emptydirs') md5sums=('7cda820b795f2fea522ba3de5e312483') diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD index 824cb1a71..425dada88 100644 --- a/community/mediainfo-gui/PKGBUILD +++ b/community/mediainfo-gui/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56306 2011-10-05 13:55:59Z spupykin $ +# $Id: PKGBUILD 58337 2011-11-11 19:02:47Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo-gui -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="GUI for mediainfo" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libmediainfo>=0.7.35' 'wxgtk') makedepends=('libtool' 'automake' 'autoconf') install=mediainfo-gui.install source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2) -md5sums=('1c647544dde097c5730959515a18481a') +md5sums=('b06dc34481ce2971c28e517b146888e8') build() { cd $srcdir/MediaInfo/Project/GNU/GUI diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD index 2379a0329..e954b259e 100644 --- a/community/mediainfo/PKGBUILD +++ b/community/mediainfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56304 2011-10-05 13:54:48Z spupykin $ +# $Id: PKGBUILD 58335 2011-11-11 19:02:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: hydro <hydro@freenet.de> pkgname=mediainfo -pkgver=0.7.50 +pkgver=0.7.51 pkgrel=1 pkgdesc="supplies technical and tag information about a video or audio file" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libmediainfo>=0.7.35') makedepends=('libtool' 'automake' 'autoconf') source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2) -md5sums=('1c647544dde097c5730959515a18481a') +md5sums=('b06dc34481ce2971c28e517b146888e8') build() { cd $srcdir/MediaInfo/Project/GNU/CLI diff --git a/community/mediatomb/PKGBUILD b/community/mediatomb/PKGBUILD deleted file mode 100644 index a8be8fc8a..000000000 --- a/community/mediatomb/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 51077 2011-07-05 06:51:52Z jconder $ -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Nikhil Bysani <nikron@gmail.com> -# Contributor: Mika Hynnä <igheax@gmail.com> -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> - -pkgname=mediatomb -pkgver=0.12.1 -pkgrel=5 -pkgdesc="Free UPnP/DLNA media server" -arch=('i686' 'x86_64' 'mips64el') -url="http://mediatomb.cc/" -license=('GPL') -depends=('curl' 'ffmpegthumbnailer' 'js' 'libexif' 'libmp4v2' 'sqlite3' 'taglib') -backup=('etc/conf.d/mediatomb') -install=mediatomb.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'mediatomb.rc' - 'mediatomb.conf' - 'gcc46.patch' - 'tonewjs.patch') -md5sums=('e927dd5dc52d3cfcebd8ca1af6f0d3c2' - 'aa1191ec508d8bd4b3b9a5fe48efc079' - 'bec297e4178332a26b42bbde873b94cd' - '0ae34c0d73b76e3d215887834c3c08cf' - 'd9e02a9956eecf5ff645bddf6dac0331') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/gcc46.patch - patch -Np1 -i $srcdir/tonewjs.patch - - ./configure --prefix=/usr \ - --disable-mysql \ - --enable-libmagic \ - --enable-libjs \ - --enable-ffmpeg - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - install -D -m0755 "$srcdir/mediatomb.rc" "$pkgdir/etc/rc.d/mediatomb" - install -D -m0755 "$srcdir/mediatomb.conf" "$pkgdir/etc/conf.d/mediatomb" - install -d "$pkgdir/var/lib/mediatomb" -} diff --git a/community/mediatomb/gcc46.patch b/community/mediatomb/gcc46.patch deleted file mode 100644 index 0f4fe490f..000000000 --- a/community/mediatomb/gcc46.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/zmm/object.h -+++ b/src/zmm/object.h -@@ -33,6 +33,7 @@ - #define __ZMM_OBJECT_H__ - - #include <new> // for size_t -+#include <cstddef> - #include "atomic.h" - - namespace zmm diff --git a/community/mediatomb/mediatomb.conf b/community/mediatomb/mediatomb.conf deleted file mode 100644 index 798018d2a..000000000 --- a/community/mediatomb/mediatomb.conf +++ /dev/null @@ -1,23 +0,0 @@ -# -# Parameters to be passed to mediatomb -# - -# Port to listen on -MT_PORT='50500' - -# User and group to run as -MT_USER='nobody' -MT_GROUP='nobody' - -# Location of the PID file -MT_PIDFILE='/var/run/mediatomb.pid' - -# Location of the log file -MT_LOGFILE='/var/log/mediatomb.log' - -# Location of the config file/database -MT_HOME='/var/lib/mediatomb' -MT_CFGDIR='.mediatomb' - -# User defined command line options -MT_OPTIONS='' diff --git a/community/mediatomb/mediatomb.install b/community/mediatomb/mediatomb.install deleted file mode 100644 index 56f6ef92c..000000000 --- a/community/mediatomb/mediatomb.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo 'Warning: the MediaTomb web interface exposes your filesystem to the network' - echo 'For maximum security, set <ui enabled="no"> in your MediaTomb config file' -} - -post_upgrade() { - # TODO: disable next update - post_install -} diff --git a/community/mediatomb/mediatomb.rc b/community/mediatomb/mediatomb.rc deleted file mode 100644 index 7b93012cd..000000000 --- a/community/mediatomb/mediatomb.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/mediatomb - -MT_OPTIONS="-p $MT_PORT -u $MT_USER -g $MT_GROUP -P $MT_PIDFILE \ - -l $MT_LOGFILE -m $MT_HOME -f $MT_CFGDIR $MT_OPTIONS" - -case "$1" in - start) - stat_busy "Starting Mediatomb UPnP Media Server" - - chown "$MT_USER:$MT_GROUP" "$MT_HOME" - - if ! pidof -o %PPID /usr/bin/mediatomb &> /dev/null; then - rm -f "$MT_PIDFILE" - fi - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -z "$PID" ] && /usr/bin/mediatomb -d $MT_OPTIONS; then - add_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping Mediatomb UPnP Media Server" - - PID="$(cat "$MT_PIDFILE" 2> /dev/null)" - - if [ -n "$PID" ] && kill "$PID" &> /dev/null; then - rm -f "$MT_PIDFILE" - rm_daemon mediatomb - stat_done - else - stat_fail - fi - ;; - - restart) - "$0" stop - sleep 1 - "$0" start - ;; - - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community/mediatomb/tonewjs.patch b/community/mediatomb/tonewjs.patch deleted file mode 100644 index 115968530..000000000 --- a/community/mediatomb/tonewjs.patch +++ /dev/null @@ -1,564 +0,0 @@ -diff -up mediatomb-0.12.1-back/build/Makefile.in.tonewjs mediatomb-0.12.1-back/build/Makefile.in ---- mediatomb-0.12.1-back/build/Makefile.in.tonewjs 2010-04-08 00:40:15.000000000 +0200 -+++ mediatomb-0.12.1-back/build/Makefile.in 2011-04-19 17:17:01.343509944 +0200 -@@ -257,7 +257,7 @@ CURL_LIBS = @CURL_LIBS@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = -fpermissive @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@ - DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@ -diff -up mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/import_script.cc ---- mediatomb-0.12.1-back/src/scripting/import_script.cc.tonewjs 2011-04-18 13:10:48.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/import_script.cc 2011-04-18 13:29:36.000000000 +0200 -@@ -53,8 +53,8 @@ ImportScript::ImportScript(Ref<Runtime> - try - { - load(scriptPath); -- root = JS_NewScriptObject(cx, script); -- JS_AddNamedRoot(cx, &root, "ImportScript"); -+ root = JS_NewObject(cx, NULL, script, NULL); -+ JS_AddNamedObjectRoot(cx, &root, "ImportScript"); - } - catch (Exception ex) - { -@@ -117,7 +117,7 @@ ImportScript::~ImportScript() - #endif - - if (root) -- JS_RemoveRoot(cx, &root); -+ JS_RemoveObjectRoot(cx, &root); - - #ifdef JS_THREADSAFE - JS_EndRequest(cx); -diff -up mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.cc ---- mediatomb-0.12.1-back/src/scripting/js_functions.cc.tonewjs 2011-04-18 13:29:55.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/js_functions.cc 2011-04-19 16:48:04.009229611 +0200 -@@ -49,7 +49,7 @@ using namespace zmm; - extern "C" { - - JSBool --js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_print(JSContext *cx, uintN argc, jsval *argv) - { - uintN i; - JSString *str; -@@ -60,19 +60,21 @@ js_print(JSContext *cx, JSObject *obj, u - if (!str) - return JS_TRUE; - argv[i] = STRING_TO_JSVAL(str); -- log_js("%s\n", JS_GetStringBytes(str)); -+ char * log_str = JS_EncodeString(cx, str); -+ log_js("%s\n", log_str); -+ JS_free(cx, log_str); - } - return JS_TRUE; - } - - JSBool --js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_copyObject(JSContext *cx, uintN argc, jsval *argv) - { - jsval arg; - JSObject *js_cds_obj; - JSObject *js_cds_clone_obj; - -- Script *self = (Script *)JS_GetPrivate(cx, obj); -+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - try - { -@@ -91,7 +93,7 @@ js_copyObject(JSContext *cx, JSObject *o - - self->cdsObject2jsObject(cds_obj, js_cds_clone_obj); - -- *rval = OBJECT_TO_JSVAL(js_cds_clone_obj); -+ JS_SET_RVAL(cx, argv, OBJECT_TO_JSVAL(js_cds_clone_obj)); - - return JS_TRUE; - -@@ -110,7 +112,7 @@ js_copyObject(JSContext *cx, JSObject *o - } - - JSBool --js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_addCdsObject(JSContext *cx, uintN argc, jsval *argv) - { - try - { -@@ -126,7 +128,7 @@ js_addCdsObject(JSContext *cx, JSObject - Ref<StringConverter> p2i; - Ref<StringConverter> i2i; - -- Script *self = (Script *)JS_GetPrivate(cx, obj); -+ Script *self = (Script *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - if (self == NULL) - { -@@ -156,20 +158,20 @@ js_addCdsObject(JSContext *cx, JSObject - if (!str) - path = _("/"); - else -- path = JS_GetStringBytes(str); -+ path = JS_EncodeString(cx, str); - - JSString *cont = JS_ValueToString(cx, argv[2]); - if (cont) - { -- containerclass = JS_GetStringBytes(cont); -+ containerclass = JS_EncodeString(cx, cont); - if (!string_ok(containerclass) || containerclass == "undefined") - containerclass = nil; - } - - if (self->whoami() == S_PLAYLIST) -- js_orig_obj = self->getObjectProperty(obj, _("playlist")); -+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("playlist")); - else if (self->whoami() == S_IMPORT) -- js_orig_obj = self->getObjectProperty(obj, _("orig")); -+ js_orig_obj = self->getObjectProperty(JS_THIS_OBJECT(cx, argv), _("orig")); - - if (js_orig_obj == NULL) - { -@@ -285,8 +287,7 @@ js_addCdsObject(JSContext *cx, JSObject - JSString *str2 = JS_NewStringCopyN(cx, tmp.c_str(), tmp.length()); - if (!str2) - return JS_TRUE; -- *rval = STRING_TO_JSVAL(str2); -- -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); - return JS_TRUE; - } - catch (ServerShutdownException se) -@@ -302,7 +303,7 @@ js_addCdsObject(JSContext *cx, JSObject - return JS_TRUE; - } - --static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval, charset_convert_t chr) -+static JSBool convert_charset_generic(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, charset_convert_t chr) - { - try - { -@@ -321,7 +322,7 @@ static JSBool convert_charset_generic(JS - { - str = JS_ValueToString(cx, argv[0]); - if (str) -- result = JS_GetStringBytes(str); -+ result = JS_EncodeString(cx, str); - } - - if (result != nil) -@@ -330,7 +331,7 @@ static JSBool convert_charset_generic(JS - JSString *str2 = JS_NewStringCopyN(cx, result.c_str(), result.length()); - if (!str2) - return JS_TRUE; -- *rval = STRING_TO_JSVAL(str2); -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(str2)); - } - } - catch (ServerShutdownException se) -@@ -347,24 +348,23 @@ static JSBool convert_charset_generic(JS - } - - --JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, F2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, F2I); - } - --JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, M2I); --} -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, M2I); } - --JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, P2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, P2I); - } - --JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv) - { -- return convert_charset_generic(cx, obj, argc, argv, rval, J2I); -+ return convert_charset_generic(cx, JS_THIS_OBJECT(cx, argv), argc, argv, J2I); - } - - } // extern "C" -diff -up mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs mediatomb-0.12.1-back/src/scripting/js_functions.h ---- mediatomb-0.12.1-back/src/scripting/js_functions.h.tonewjs 2010-03-25 15:58:05.000000000 +0100 -+++ mediatomb-0.12.1-back/src/scripting/js_functions.h 2011-04-18 13:59:29.000000000 +0200 -@@ -40,18 +40,18 @@ - extern "C" { - - /// \brief Log output. --JSBool js_print(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_print(JSContext *cx, uintN argc, jsval *argv); - - /// \brief Adds an object to the database. --JSBool js_addCdsObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_addCdsObject(JSContext *cx, uintN argc, jsval *argv); - - /// \brief Makes a copy of an CDS object. --JSBool js_copyObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_copyObject(JSContext *cx, uintN argc, jsval *argv); - --JSBool js_f2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_m2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_p2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); --JSBool js_j2i(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); -+JSBool js_f2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_m2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_p2i(JSContext *cx, uintN argc, jsval *argv); -+JSBool js_j2i(JSContext *cx, uintN argc, jsval *argv); - - } // extern "C" - -diff -up mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc ---- mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc.tonewjs 2011-04-18 13:34:14.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/playlist_parser_script.cc 2011-04-18 13:51:59.000000000 +0200 -@@ -46,9 +46,9 @@ using namespace zmm; - extern "C" { - - static JSBool --js_readln(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -+js_readln(JSContext *cx, uintN argc, jsval *argv) - { -- PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, obj); -+ PlaylistParserScript *self = (PlaylistParserScript *)JS_GetPrivate(cx, JS_THIS_OBJECT(cx, argv)); - - String line; - -@@ -69,7 +69,7 @@ js_readln(JSContext *cx, JSObject *obj, - - JSString *jsline = JS_NewStringCopyZ(cx, line.c_str()); - -- *rval = STRING_TO_JSVAL(jsline); -+ JS_SET_RVAL(cx, argv, STRING_TO_JSVAL(jsline)); - - return JS_TRUE; - } -@@ -93,8 +93,8 @@ PlaylistParserScript::PlaylistParserScri - - String scriptPath = ConfigManager::getInstance()->getOption(CFG_IMPORT_SCRIPTING_PLAYLIST_SCRIPT); - load(scriptPath); -- root = JS_NewScriptObject(cx, script); -- JS_AddNamedRoot(cx, &root, "PlaylistScript"); -+ root = JS_NewObject(cx, NULL, script, NULL); -+ JS_AddNamedObjectRoot(cx, &root, "PlaylistScript"); - } - catch (Exception ex) - { -@@ -245,7 +245,7 @@ PlaylistParserScript::~PlaylistParserScr - #endif - - if (root) -- JS_RemoveRoot(cx, &root); -+ JS_RemoveObjectRoot(cx, &root); - - #ifdef JS_THREADSAFE - JS_EndRequest(cx); -diff -up mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs mediatomb-0.12.1-back/src/scripting/script.cc ---- mediatomb-0.12.1-back/src/scripting/script.cc.tonewjs 2011-04-18 13:53:07.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/script.cc 2011-04-19 18:26:34.460338804 +0200 -@@ -87,7 +87,7 @@ String Script::getProperty(JSObject *obj - str = JS_ValueToString(cx, val); - if (! str) - return nil; -- return JS_GetStringBytes(str); -+ return JS_EncodeString(cx, str); - } - - int Script::getBoolProperty(JSObject *obj, String name) -@@ -427,14 +427,14 @@ static JSFunctionSpec js_global_function - try - { - common_script = _load(common_scr_path); -- common_root = JS_NewScriptObject(cx, common_script); -- JS_AddNamedRoot(cx, &common_root, "common-script"); -+ common_root = JS_NewObject(cx, NULL, common_script, NULL); -+ JS_AddNamedObjectRoot(cx, &common_root, "common-script"); - _execute(common_script); - } - catch (Exception e) - { - if (common_root) -- JS_RemoveRoot(cx, &common_root); -+ JS_RemoveObjectRoot(cx, &common_root); - - log_js("Unable to load %s: %s\n", common_scr_path.c_str(), - e.getMessage().c_str()); -@@ -460,7 +460,7 @@ Script::~Script() - JS_BeginRequest(cx); - #endif - if (common_root) -- JS_RemoveRoot(cx, &common_root); -+ JS_RemoveObjectRoot(cx, &common_root); - - /* - * scripts are unrooted and will be cleaned up by GC -@@ -504,11 +504,11 @@ void Script::initGlobalObject() - static JSClass global_class = - { - "global", /* name */ -- JSCLASS_HAS_PRIVATE, /* flags */ -+ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS,/* flags */ - JS_PropertyStub, /* add property */ - JS_PropertyStub, /* del property */ - JS_PropertyStub, /* get property */ -- JS_PropertyStub, /* set property */ -+ JS_StrictPropertyStub, /* set property */ - JS_EnumerateStandardClasses, /* enumerate */ - JS_ResolveStub, /* resolve */ - JS_ConvertStub, /* convert */ -@@ -517,7 +517,7 @@ void Script::initGlobalObject() - }; - - /* create the global object here */ -- glob = JS_NewObject(cx, &global_class, NULL, NULL); -+ glob = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL); - if (! glob) - throw _Exception(_("Scripting: could not initialize glboal class")); - -@@ -539,12 +539,12 @@ void Script::defineFunctions(JSFunctionS - throw _Exception(_("Scripting: JS_DefineFunctions failed")); - } - --JSScript *Script::_load(zmm::String scriptPath) -+JSObject *Script::_load(zmm::String scriptPath) - { - if (glob == NULL) - initGlobalObject(); - -- JSScript *scr; -+ JSObject *scr; - - String scriptText = read_text_file(scriptPath); - -@@ -571,14 +571,11 @@ JSScript *Script::_load(zmm::String scri - - void Script::load(zmm::String scriptPath) - { -- if (script) -- JS_DestroyScript(cx, script); -- - script = _load((scriptPath)); - } - - --void Script::_execute(JSScript *scr) -+void Script::_execute(JSObject *scr) - { - jsval ret_val; - -@@ -662,7 +659,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec - JSObject *js_meta = getObjectProperty(js, _("meta")); - if (js_meta) - { -- JS_AddNamedRoot(cx, &js_meta, "meta"); -+ JS_AddNamedObjectRoot(cx, &js_meta, "meta"); - /// \todo: only metadata enumerated in MT_KEYS is taken - for (int i = 0; i < M_MAX; i++) - { -@@ -687,7 +684,7 @@ Ref<CdsObject> Script::jsObject2cdsObjec - } - } - } -- JS_RemoveRoot(cx, &js_meta); -+ JS_RemoveObjectRoot(cx, &js_meta); - } - - // stuff that has not been exported to js -diff -up mediatomb-0.12.1-back/src/scripting/script.h.tonewjs mediatomb-0.12.1-back/src/scripting/script.h ---- mediatomb-0.12.1-back/src/scripting/script.h.tonewjs 2011-04-18 12:56:14.000000000 +0200 -+++ mediatomb-0.12.1-back/src/scripting/script.h 2011-04-18 12:56:51.000000000 +0200 -@@ -66,8 +66,8 @@ public: - JSRuntime *rt; - JSContext *cx; - JSObject *glob; -- JSScript *script; -- JSScript *common_script; -+ JSObject *script; -+ JSObject *common_script; - - public: - Script(zmm::Ref<Runtime> runtime); -@@ -115,8 +115,8 @@ private: - JSObject *common_root; - - void initGlobalObject(); -- JSScript *_load(zmm::String scriptPath); -- void _execute(JSScript *scr); -+ JSObject *_load(zmm::String scriptPath); -+ void _execute(JSObject *scr); - zmm::Ref<StringConverter> _p2i; - zmm::Ref<StringConverter> _j2i; - zmm::Ref<StringConverter> _f2i; ---- mediatomb-0.12.1/configure.tonewjs 2011-07-04 20:20:00.290227110 +1200 -+++ mediatomb-0.12.1/configure 2011-07-04 20:20:28.186894644 +1200 -@@ -23784,14 +23784,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - - else - -- LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS" -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs185 $ADD_PTHREAD_CFLAGS" -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -23835,12 +23835,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -23848,12 +23848,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs" -- MOZLIB=mozjs -+ JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs185" -+ MOZLIB=mozjs185 - - else - -@@ -24020,13 +24020,13 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - else - - unset ac_cv_lib_smjs_JS_NewObject -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24070,12 +24070,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -24083,12 +24083,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- MOZLIB=mozjs -- JS_LIBS="-lmozjs" -+ MOZLIB=mozjs185 -+ JS_LIBS="-lmozjs185" - - else - -@@ -24239,15 +24239,15 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" - - else - -- LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs" -- unset ac_cv_lib_mozjs_JS_NewObject -- { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5 --$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; } --if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then -+ LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs185" -+ unset ac_cv_lib_mozjs185_JS_NewObject -+ { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs185" >&5 -+$as_echo_n "checking for JS_NewObject in -lmozjs185... " >&6; } -+if test "${ac_cv_lib_mozjs185_JS_NewObject+set}" = set; then - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmozjs $LIBS" -+LIBS="-lmozjs185 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -24291,12 +24291,12 @@ $as_echo "$ac_try_echo") >&5 - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then -- ac_cv_lib_mozjs_JS_NewObject=yes -+ ac_cv_lib_mozjs185_JS_NewObject=yes - else - $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_cv_lib_mozjs_JS_NewObject=no -+ ac_cv_lib_mozjs185_JS_NewObject=no - fi - - rm -rf conftest.dSYM -@@ -24304,12 +24304,12 @@ rm -f core conftest.err conftest.$ac_obj - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5 --$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; } --if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then -+{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs185_JS_NewObject" >&5 -+$as_echo "$ac_cv_lib_mozjs185_JS_NewObject" >&6; } -+if test "x$ac_cv_lib_mozjs185_JS_NewObject" = x""yes; then - -- JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs" -- MOZLIB=mozjs -+ JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs185" -+ MOZLIB=mozjs185 - - else - diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD index 787c2c340..5f7a83796 100644 --- a/community/medit/PKGBUILD +++ b/community/medit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56067 2011-09-30 09:08:26Z spupykin $ +# $Id: PKGBUILD 57284 2011-10-25 09:59:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=medit -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="A GTK text editor" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ctags' 'vte: terminal emulator') makedepends=(pkgconfig perlxml intltool gcc-objc) install=medit.install source=(http://downloads.sourceforge.net/mooedit/medit-$pkgver.tar.bz2) -md5sums=('dc3a24e7f23deaa21f59d221fd321131') +md5sums=('ca790a6153eab7e2a47ac965940c0c7d') build() { cd $srcdir/medit-$pkgver diff --git a/community/mercury/PKGBUILD b/community/mercury/PKGBUILD deleted file mode 100644 index 05984636b..000000000 --- a/community/mercury/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -#$Id: PKGBUILD 2282 2009-09-14 07:35:54Z giovanni $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: DaNiMoTh <jjdanimoth@gmail.com> - -pkgname=mercury -pkgver=1.9.5 -pkgrel=2 -pkgdesc="Java Based MSN client." -license=('custom') -arch=('i686' 'x86_64' 'mips64el') -url="http://www.mercury.im" -depends=('java-runtime' 'libxss' 'libxt') -makedepends=('rpmextract') -source=(http://thebachman.info/public/Versions_Ubuntu/${pkgname}-messenger-${pkgver}-2.all.rpm - "license.txt") -md5sums=('7d5835cf1ac7864386efe42b9cf67d6b' - '6ce0e815d63db6ac55a28e8d52c3f8da') - -build() { - cd "$srcdir" - - rpmextract.sh ${pkgname}-messenger-${pkgver}-2.all.rpm - - install -d "$pkgdir/usr/share/java/mercury" - cp -r usr "$pkgdir" - mv "$pkgdir/usr/share/mercury" "$pkgdir/usr/share/java/" - - # FS#16171 - find ${pkgdir} -type f -exec chmod -R 644 {} \; - find ${pkgdir} -type d -exec chmod 755 {} \; - chmod 755 ${pkgdir}/usr/share/java/mercury/startup/startup_linux.sh - - install -D -m644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -rf "$pkgdir/usr/bin/mercury" - ln -s /usr/share/java/mercury/startup/startup_linux.sh "$pkgdir/usr/bin/mercury" -} diff --git a/community/mercury/license.txt b/community/mercury/license.txt deleted file mode 100644 index 43e416eff..000000000 --- a/community/mercury/license.txt +++ /dev/null @@ -1,8 +0,0 @@ -Mercury is Freeware. It is not distributed with source code since it's closed source. - -You are allowed to change the setting files. -You are allowed to redistribute Mercury. - -http://www.mercury.to/index.php?page=Wiki&wikipage=License - - diff --git a/community/mg/PKGBUILD b/community/mg/PKGBUILD index 92ba20d55..5f8fff086 100644 --- a/community/mg/PKGBUILD +++ b/community/mg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39953 2011-02-18 23:29:32Z spupykin $ +# $Id: PKGBUILD 59123 2011-11-21 11:46:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Hannes Rist <hrist@phreeknet.org> @@ -12,15 +12,16 @@ depends=('ncurses') license=('custom') options=(!libtool) source=(http://homepage.boetes.org/software/mg/mg-$pkgver.tar.gz - README) + README + cleanup.patch) md5sums=('f2fa8016a491aa2a9d4c5698c593f31b' - '8cc5195ad4fabcf7c6782764f9617748') + '8cc5195ad4fabcf7c6782764f9617748' + 'e009afe0d249593f3436b2fea110f72e') build() { cd $srcdir/$pkgname-$pkgver - - sed -i 's|KEYMAP\t\*curmap;|KEYMAP *curmap = NULL;|' extend.c - + unset CFLAGS + patch -p1 <$srcdir/cleanup.patch ./configure make prefix=/usr diff --git a/community/mg/cleanup.patch b/community/mg/cleanup.patch new file mode 100644 index 000000000..5a8e761cb --- /dev/null +++ b/community/mg/cleanup.patch @@ -0,0 +1,163 @@ +Only in mg-20110120.my: autoexec.o +Only in mg-20110120.my: basename.o +Only in mg-20110120.my: basic.o +Only in mg-20110120.my: buffer.o +Only in mg-20110120.my: cinfo.o +diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c +--- mg-20110120/cmode.c 2011-01-20 07:36:13.000000000 +0300 ++++ mg-20110120.my/cmode.c 2011-11-21 15:40:11.000000000 +0400 +@@ -158,7 +158,7 @@ + cc_indent(int f, int n) + { + int pi, mi; /* Previous indents */ +- int ci, dci; /* current indent, don't care */ ++ int ci; /* current indent, don't care */ + struct line *lp; + int ret; + +@@ -181,7 +181,7 @@ + /* Strip leading space on current line */ + delleadwhite(FFRAND, 1); + /* current indent is computed only to current position */ +- dci = getindent(curwp->w_dotp, &ci); ++ getindent(curwp->w_dotp, &ci); + + if (pi + ci < 0) + ret = indent(FFOTHARG, 0); +@@ -217,7 +217,6 @@ + { + int lo, co; /* leading space, current offset*/ + int nicol = 0; /* position count */ +- int ccol = 0; /* current column */ + int c = '\0'; /* current char */ + int newind = 0; /* new index value */ + int stringp = FALSE; /* in string? */ +@@ -226,7 +225,6 @@ + int nparen = 0; /* paren count */ + int obrace = 0; /* open brace count */ + int cbrace = 0; /* close brace count */ +- int contp = FALSE; /* Continue? */ + int firstnwsp = FALSE; /* First nonspace encountered? */ + int colonp = FALSE; /* Did we see a colon? */ + int questionp = FALSE; /* Did we see a question mark? */ +@@ -256,13 +254,11 @@ + nicol = 0; + + newind = 0; +- ccol = nicol; /* current column */ + /* Compute modifiers */ + for (co = lo; co < llength(lp); co++) { + c = lgetc(lp, co); + /* We have a non-whitespace char */ + if (!firstnwsp && !isspace(c)) { +- contp = TRUE; + if (c == '#') + cppp = TRUE; + firstnwsp = TRUE; +@@ -285,7 +281,6 @@ + } else if (c == '{') { + obrace++; + firstnwsp = FALSE; +- contp = FALSE; + } else if (c == '}') { + cbrace++; + } else if (c == '?') { +@@ -294,9 +289,6 @@ + /* ignore (foo ? bar : baz) construct */ + if (!questionp) + colonp = TRUE; +- } else if (c == ';') { +- if (nparen > 0) +- contp = FALSE; + } else if (c == '/') { + /* first nonwhitespace? -> indent */ + if (firstnwsp) { +Only in mg-20110120.my: cmode.o +diff -wbBur mg-20110120/config.h mg-20110120.my/config.h +--- mg-20110120/config.h 2011-01-20 07:37:40.000000000 +0300 ++++ mg-20110120.my/config.h 2011-11-21 15:39:43.000000000 +0400 +@@ -7,4 +7,8 @@ + #ifndef MAXLOGNAME + #define MAXLOGNAME LOGIN_NAME_MAX + #endif +-#define HAVE_ARC4RANDOM ++#define HAVE_NOSTRTONUM ++#define HAVE_NOSTRLCPY ++#define HAVE_NOSTRLCAT ++#define HAVE_NOFGETLN ++#define GNU_LS +Only in mg-20110120.my: config.log +Only in mg-20110120.my: dired.o +Only in mg-20110120.my: dirname.o +Only in mg-20110120.my: dir.o +Only in mg-20110120.my: display.o +Only in mg-20110120.my: echo.o +Only in mg-20110120.my: extend.o +Only in mg-20110120.my: fgetln.o +diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c +--- mg-20110120/fileio.c 2008-12-30 19:04:23.000000000 +0300 ++++ mg-20110120.my/fileio.c 2011-11-21 15:43:12.000000000 +0400 +@@ -121,10 +121,8 @@ + * future writes will do the same thing. + */ + if (bp && bp->b_fi.fi_mode) { +- int ret; +- + fchmod(fd, bp->b_fi.fi_mode & 07777); +- ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); ++ (void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); + } + return (FIOSUC); + } +Only in mg-20110120.my: fileio.o +Only in mg-20110120.my: file.o +Only in mg-20110120.my: funmap.o +Only in mg-20110120.my: grep.o +Only in mg-20110120.my: help.o +Only in mg-20110120.my: kbd.o +Only in mg-20110120.my: keymap.o +Only in mg-20110120.my: line.o +Only in mg-20110120.my: macro.o +Only in mg-20110120.my: main.o +Only in mg-20110120.my: Makefile +Only in mg-20110120.my: match.o +Only in mg-20110120.my: mg +Only in mg-20110120.my: modes.o +Only in mg-20110120.my: paragraph.o +Only in mg-20110120.my: random.o +Only in mg-20110120.my: region.o +Only in mg-20110120.my: re_search.o +Only in mg-20110120.my: search.o +Only in mg-20110120.my: spawn.o +Only in mg-20110120.my: strlcat.o +Only in mg-20110120.my: strlcpy.o +Only in mg-20110120.my: strtonum.o +Only in mg-20110120.my: theo.o +Only in mg-20110120.my: ttyio.o +Only in mg-20110120.my: ttykbd.o +Only in mg-20110120.my: tty.o +diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c +--- mg-20110120/undo.c 2011-01-03 01:57:57.000000000 +0300 ++++ mg-20110120.my/undo.c 2011-11-21 15:41:05.000000000 +0400 +@@ -464,14 +464,14 @@ + struct undo_rec *ptr, *nptr; + int done, rval; + struct line *lp; +- int offset, save, dot; ++ int offset, save; + static int nulled = FALSE; + int lineno; + + if (n < 0) + return (FALSE); + +- dot = find_dot(curwp->w_dotp, curwp->w_doto); ++ find_dot(curwp->w_dotp, curwp->w_doto); + + ptr = curbp->b_undoptr; + +Only in mg-20110120.my: undo.o +Only in mg-20110120.my: version.o +Only in mg-20110120.my: window.o +Only in mg-20110120.my: word.o +Only in mg-20110120.my: yank.o diff --git a/community/mimetex/PKGBUILD b/community/mimetex/PKGBUILD index d6a7d73c6..4cdb481e8 100644 --- a/community/mimetex/PKGBUILD +++ b/community/mimetex/PKGBUILD @@ -1,3 +1,6 @@ +# $Id: PKGBUILD 59132 2011-11-21 12:05:32Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + pkgname=mimetex pkgver=1.70 pkgrel=2 @@ -5,13 +8,12 @@ pkgdesc="tex to gif converter" arch=(i686 x86_64 'mips64el') url="http://www.forkosh.com/mimetex.html" license=('GPL') -depends=(glibc) -source=(http://arch.pp.ru/~sergej/dl/mimetex.zip) +depends=() +source=(ftp://ftp.archlinux.org/other/community/mimetex/mimetex.zip) md5sums=('c73b1dde70526edb137daaf72189024b') build() { cd $srcdir - - gcc -DAA mimetex.c gifsave.c -lm -o mimetex.cgi && \ + gcc -DAA mimetex.c gifsave.c -lm -o mimetex.cgi install -D -m0755 mimetex.cgi $pkgdir/usr/bin/mimetex.cgi } diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index 4dccf886b..0e3ea6636 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56192 2011-10-03 10:54:36Z spupykin $ +# $Id: PKGBUILD 59022 2011-11-20 20:22:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> # Contributor: mosra <mosra@centrum.cz> @@ -8,11 +8,11 @@ pkgver=2.21.53 pkgrel=1 _uprel=1 arch=(i686 x86_64 'mips64el') -url="https://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GNU-Binutils/" +url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/" pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)" depends=('glibc' 'zlib') license=(GPL) -source=(https://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GNU-Binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma) +source=(https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma) md5sums=('e7f6602056f594acc9a4a559909d4649') build() { diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index e962d9b25..e3e5433c6 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56384 2011-10-07 07:19:05Z spupykin $ +# $Id: PKGBUILD 59028 2011-11-20 20:24:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -17,9 +17,9 @@ conflicts=(mingw32-gcc) options=(!strip) license=(GPL LGPL) url="http://mingw.sf.net" -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma - http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma + http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz gcc-1-mingw-float.patch) md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' '89e5800096aa334009f98e7c1743d825' diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index 3cb0db859..191026dfa 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56382 2011-10-07 07:18:59Z spupykin $ +# $Id: PKGBUILD 59025 2011-11-20 20:23:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> @@ -13,9 +13,9 @@ depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api replaces=('mingw32-gcc-base') provides=('mingw32-gcc-base') options=(!strip) -url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" +url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" license=(GPL LGPL) -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma +source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma gcc-1-mingw-float.patch) md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e' '2407123c35c0aa92ee5ffc27decca9a7') diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD index 540960168..dffb76d45 100644 --- a/community/minidlna/PKGBUILD +++ b/community/minidlna/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54993 2011-08-29 20:53:40Z spupykin $ +# $Id: PKGBUILD 58407 2011-11-12 17:17:53Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:Biginoz < biginoz AT free point fr> # Contributor: Ignacio Galmarino <igalmarino@gmail.com> @@ -6,7 +6,7 @@ pkgname=minidlna pkgver=1.0.22 -pkgrel=3 +pkgrel=4 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/minidlna/" diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD index 98beee6eb..289ae5564 100644 --- a/community/miredo/PKGBUILD +++ b/community/miredo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 31503 2010-11-01 10:29:17Z spupykin $ +# $Id: PKGBUILD 59154 2011-11-21 12:39:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=miredo @@ -9,7 +9,9 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.remlab.net/miredo/" license=('GPL') depends=(judy iproute2) -backup=('etc/miredo/miredo.conf' 'etc/miredo/miredo-server.conf' 'etc/miredo/isatapd.conf') +backup=('etc/miredo/miredo.conf' + 'etc/miredo/miredo-server.conf' + 'etc/miredo/isatapd.conf') source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.bz2 isatapd.rc.d miredo.install @@ -28,8 +30,8 @@ build() { make make DESTDIR="$pkgdir" install - install -D -m755 $startdir/miredo.rc.d $pkgdir/etc/rc.d/miredo - install -D -m755 $startdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server - install -D -m755 $startdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd + install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo + install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server + install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook } diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index b8855f7f3..2748143b3 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40367 2011-02-23 14:19:01Z lfleischer $ +# $Id: PKGBUILD 58662 2011-11-17 11:26:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com> # Contributor: Ryan Coyner <rcoyner@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=mixxx -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="Free, open source software for digital DJ'ing." arch=('i686' 'x86_64' 'mips64el') @@ -15,14 +15,22 @@ depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio 'qt>=4.5' 'taglib') makedepends=('mesa' 'scons' 'libshout') source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -md5sums=('ea78fc81922e6c7d85d6afffd2e526b1') +md5sums=('f84095951f66b12af5cf45d19200ff82') build() { - cd "${srcdir}/${pkgname}-${pkgver}"\~* + cd "${srcdir}/${pkgname}-${pkgver}" + + # GCC segfault workaround (fixes FS#26716) + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" } package() { - cd "${srcdir}/${pkgname}-${pkgver}"\~* + cd "${srcdir}/${pkgname}-${pkgver}" + + # GCC segfault workaround (fixes FS#26716) + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + scons qtdir=/usr/lib/qt prefix=/usr install_root="${pkgdir}/usr" install } diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD new file mode 100644 index 000000000..2fb3842b7 --- /dev/null +++ b/community/mksh/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 59301 2011-11-22 22:07:16Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: Daniel Hommel <dhommel@gmail.com> + +pkgname=mksh +pkgver=R40c +pkgrel=2 +pkgdesc="The MirOS KornShell - an enhanced version of the public domain ksh" +url="http://mirbsd.de/mksh" +license=("custom") +makedepends=('cpio') +arch=('i686' 'x86_64') +install=mksh.install +source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz" + "https://www.mirbsd.org/TaC-mksh.txt") +md5sums=('43a79f721091833bdab3d00fbfe54a14' + '6baf6a174d89c47cac86118dc9e93faa') + +build() { + cd "$srcdir" + # makepkg can't extract cpio files + cpio -mid < "$pkgname-$pkgver.cpio" + + cd "$srcdir/$pkgname" + sh Build.sh -r -c lto + ./test.sh + gzip mksh.1 +} + +package() { + cd "$srcdir/$pkgname" + install -D -m 755 mksh "$pkgdir/bin/mksh" + install -D -m 644 mksh.1.gz "$pkgdir/usr/share/man/man1/mksh.1.gz" + install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" + install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install new file mode 100644 index 000000000..859fa51c2 --- /dev/null +++ b/community/mksh/mksh.install @@ -0,0 +1,13 @@ +post_install() { + grep -x /bin/mksh /etc/shells >/dev/null || echo /bin/mksh >>/etc/shells +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + sed -i "/\/bin\/mksh/d" /etc/shells +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index eab793997..6e1663b31 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51875 2011-07-17 19:10:00Z spupykin $ +# $Id: PKGBUILD 58409 2011-11-12 17:17:58Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -7,8 +7,8 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') -pkgver=0.7.4 -pkgrel=1.1 +pkgver=0.7.6 +pkgrel=1 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -16,7 +16,7 @@ license=('GPL') makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('d5d1ff686f51131a02b0f6fca0f073da') +md5sums=('105969a63339da2f8ce4ddce1652c9e7') build() { # mlt diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 0a3b38e91..9956f2ab1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.0.0 -pkgrel=1 +pkgver=2.0.1 +pkgrel=2 pkgdesc='A high-performance, open source, schema-free document-oriented database.' arch=('i686' 'x86_64' 'mips64el') url='http://www.mongodb.org' @@ -17,7 +17,7 @@ install="mongodb.install" source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" 'mongodb.rc' 'mongodb.conf') -md5sums=('52763985c13e06d85bc125c7d3eb03d9' +md5sums=('cb8579074b7c9752eb382a2094ac4523' '9c67e00f4626ad761a8f7d4e037a54d7' '4839fe1d638187ca3226e8267b947318') diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 75e53a90c..d421c3f6d 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56616 2011-10-09 07:21:54Z jlichtblau $ +# $Id: PKGBUILD 58923 2011-11-20 11:30:07Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.3 +pkgver=5.3.1 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monitd) -sha256sums=('a336d275ac8176c6cdf50f971d2e42325e74af713ae77afa9f005a29db06981e' +sha256sums=('91a3f15c11a9b9e60e6e3b963f9f4af2acf5ca50ac6dc047d94ce50e966addc6' 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') build() { diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index d9ffcfafe..1481ef5da 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.3.1-1 + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.3-1 diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index 53d95455d..5ae55b635 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44097 2011-04-02 12:06:41Z spupykin $ +# $Id: PKGBUILD 58952 2011-11-20 18:08:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils -pkgver=0.44 +pkgver=0.45 pkgrel=1 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('perl') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) -md5sums=('a3fb0b1393c381aae88d8139400c24dc') +md5sums=('b30306cd7312219551b890fbcbf984c4') build() { cd $srcdir/moreutils diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index c6f5fa422..e12f7ee0c 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 85176 2010-07-09 22:50:45Z eric $ +# $Id: PKGBUILD 58411 2011-11-12 17:18:08Z ibiru $ # Maintainer: pkgname=motion pkgver=3.2.12 -pkgrel=1 +pkgrel=2 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome" -depends=('ffmpeg' 'libjpeg') +depends=('ffmpeg' 'libjpeg' 'v4l-utils') backup=('etc/motion/motion.conf') options=('!makeflags') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion) +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz rc.motion ffmpeg-0.8.patch linux-headers.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' '24b6fbfa586857b72f90cda81410c14f') sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' '06f74131a9d4abc8aa05f531bd19c51a5732023f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ffmpeg-0.8.patch + patch -Np1 -i $srcdir/linux-headers.patch ./configure --prefix=/usr \ --without-pgsql \ --without-mysql \ @@ -31,3 +33,29 @@ package(){ install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion" } +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + '2f422c268337dce583b9dac344005e93') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '7b41c8c273980c147694d82af7c9cb9e51302dd9') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + '5db295d7c2e4c38f36e861a3c4dfdd8d') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '2b12df6d9053d17f6ac1969e3510dd50c6fe6667') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + 'd36687710837d69fbce4608b1345fa34') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '6912448db0711f85322505ee6f8052f8f98ae634') +md5sums=('1ba0065ed50509aaffb171594c689f46' + '24b6fbfa586857b72f90cda81410c14f' + 'd36687710837d69fbce4608b1345fa34' + 'd8c3c4fdded5cfbd729710475559a21d') +sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' + '06f74131a9d4abc8aa05f531bd19c51a5732023f' + '6912448db0711f85322505ee6f8052f8f98ae634' + '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e') diff --git a/community/motion/ffmpeg-0.8.patch b/community/motion/ffmpeg-0.8.patch new file mode 100644 index 000000000..5dcc6e686 --- /dev/null +++ b/community/motion/ffmpeg-0.8.patch @@ -0,0 +1,112 @@ +diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c +--- motion-3.2.12/ffmpeg.c 2010-06-01 08:48:23.000000000 +0200 ++++ motion-3.2.12.new/ffmpeg.c 2011-10-31 17:25:03.000000000 +0100 +@@ -14,7 +14,7 @@ + + #include "ffmpeg.h" + #include "motion.h" +- ++#include <libavformat/avformat.h> + #if LIBAVCODEC_BUILD > 4680 + /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with + * non-standard framerates. Previous builds contained a broken hack +@@ -228,10 +228,12 @@ + mpeg1_file_protocol.url_close = file_protocol.url_close; + + /* Register the append file protocol. */ +-#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8) +- av_register_protocol(&mpeg1_file_protocol); ++#ifdef have_av_register_protocol2 ++ av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol)); ++#elif defined have_av_register_protocol ++ av_register_protocol(&mpeg1_file_protocol); + #else +- register_protocol(&mpeg1_file_protocol); ++# warning av_register_protocolXXX missing + #endif + } + +@@ -244,7 +246,7 @@ + const char *ext; + AVOutputFormat *of = NULL; + +- /* Here, we use guess_format to automatically setup the codec information. ++ /* Here, we use av_guess_format to automatically setup the codec information. + * If we are using msmpeg4, manually set that codec here. + * We also dynamically add the file extension to the filename here. This was + * done to support both mpeg1 and mpeg4 codecs since they have different extensions. +@@ -258,7 +260,7 @@ + /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would + * result in a muxed output file, which isn't appropriate here. + */ +- of = guess_format("mpeg1video", NULL, NULL); ++ of = av_guess_format("mpeg1video", NULL, NULL); + if (of) { + /* But we want the trailer to be correctly written. */ + of->write_trailer = mpeg1_write_trailer; +@@ -270,24 +272,24 @@ + #endif + } else if (strcmp(codec, "mpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + } else if (strcmp(codec, "msmpeg4") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Manually override the codec id. */ + of->video_codec = CODEC_ID_MSMPEG4V2; + } + } else if (strcmp(codec, "swf") == 0) { + ext = ".swf"; +- of = guess_format("swf", NULL, NULL); ++ of = av_guess_format("swf", NULL, NULL); + } else if (strcmp(codec, "flv") == 0) { + ext = ".flv"; +- of = guess_format("flv", NULL, NULL); ++ of = av_guess_format("flv", NULL, NULL); + of->video_codec = CODEC_ID_FLV1; + } else if (strcmp(codec, "ffv1") == 0) { + ext = ".avi"; +- of = guess_format("avi", NULL, NULL); ++ of = av_guess_format("avi", NULL, NULL); + if (of) { + /* Use the FFMPEG Lossless Video codec (experimental!). + Requires strict_std_compliance to be <= -2 */ +@@ -295,7 +297,7 @@ + } + } else if (strcmp(codec, "mov") == 0) { + ext = ".mov"; +- of = guess_format("mov", NULL, NULL); ++ of = av_guess_format("mov", NULL, NULL); + } else { + motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec); + return NULL; +@@ -377,7 +379,7 @@ + + ffmpeg->c = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st); + c->codec_id = ffmpeg->oc->oformat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + is_mpeg1 = c->codec_id == CODEC_ID_MPEG1VIDEO; + + if (strcmp(ffmpeg_video_codec, "ffv1") == 0) +@@ -646,7 +648,7 @@ + if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) { + /* raw video case. The API will change slightly in the near future for that */ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.data = (uint8_t *)pic; + pkt.size = sizeof(AVPicture); + ret = av_write_frame(ffmpeg->oc, &pkt); +@@ -667,7 +669,7 @@ + #ifdef FFMPEG_AVWRITEFRAME_NEWAPI + pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts; + if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.data = ffmpeg->video_outbuf; + pkt.size = out_size; diff --git a/community/motion/linux-headers.patch b/community/motion/linux-headers.patch new file mode 100644 index 000000000..795c8aec5 --- /dev/null +++ b/community/motion/linux-headers.patch @@ -0,0 +1,35 @@ +diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h +--- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700 +@@ -40,7 +40,7 @@ + + #define _LINUX_TIME_H 1 + #if !defined(WITHOUT_V4L) && !defined(BSD) +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #endif + + #include <pthread.h> +diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c +--- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700 +@@ -11,6 +11,7 @@ + #include "motion.h" + + #ifndef WITHOUT_V4L ++#include <linux/videodev2.h> + #include "pwc-ioctl.h" + #endif + +diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h +--- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700 ++++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700 +@@ -12,7 +12,7 @@ + + #define _LINUX_TIME_H 1 + #ifndef WITHOUT_V4L +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <sys/mman.h> + #include "pwc-ioctl.h" + #endif diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index 9500dd9f4..f8caed272 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,44 +1,52 @@ -# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $ +# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> pkgname=mplayer2 -pkgver=2.0 -pkgrel=15 +pkgver=2.0.20111101 +pkgrel=1 pkgdesc="A movie player" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.mplayer2.org/" -depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' - 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' - 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex') -makedepends=('live-media' 'mesa' 'p7zip-libre' 'yasm') +if [ "${CARCH}" = "mips64el" ] ; then + # OpenGL, VDPAU and XVMC don't have efficient implementations on + # the supported mips64el machines. + depends=('ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex') + makedepends=('live-media' 'p7zip-libre' 'gettext') +else + depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2' + 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad' + 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa' 'speex') + makedepends=('live-media' 'mesa' 'p7zip-libre' 'yasm' 'gettext') +fi backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') -source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz - mplayer2-remove-mp3lib.patch - mplayer2-SAMI-subs.patch) -sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' - 'c55128a99406a5e01ab077555b7b24aa7b54110c' - '4059d5d0564004feb55d25b5f62f7f4672e40fb1') +#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d') options=('!emptydirs') -build() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS +# source PKGBUILD && mksource +mksource() { + _gitroot="git://git.mplayer2.org/mplayer2.git" + _gitname="${pkgname}-${pkgver}" - cd "${srcdir}/${pkgname}-${pkgver}" + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + else + git clone "$_gitroot" "$_gitname" + fi - # Drop internal mp3lib (FS#24149) - # Default decoder for mp3 will be mpg123 - rm -fr mp3lib - patch -Np1 -i ../mplayer2-remove-mp3lib.patch + tar -cJvf ${_gitname}.tar.xz ${_gitname} + rm -fr ${_gitname} +} - # SAMI subtitle parsing buffer overflow - # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html - # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf - patch -Np1 -i ../mplayer2-SAMI-subs.patch +build() { + cd "${srcdir}/${pkgname}-${pkgver}" if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ @@ -49,7 +57,9 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ - --enable-xvmc \ + --disable-xvmc \ + --disable-vdpau \ + --disable-gl \ --language=all \ --enable-translation \ --confdir=/etc/mplayer @@ -63,7 +73,6 @@ build() { --disable-musepack \ --disable-esd \ --disable-mga \ - --enable-xvmc \ --language=all \ --enable-translation \ --confdir=/etc/mplayer diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch deleted file mode 100644 index 8238167e2..000000000 --- a/community/mplayer2/mplayer2-SAMI-subs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c ---- mplayer2-2.0.ori/sub/subreader.c 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/sub/subreader.c 2011-10-14 15:04:47.196477670 -0400 -@@ -179,6 +179,8 @@ - break; - - case 3: /* get all text until '<' appears */ -+ if (p - text >= LINE_LEN) -+ sami_add_line(current, text, &p); - if (*s == '\0') break; - else if (!strncasecmp (s, "<br>", 4)) { - sami_add_line(current, text, &p); diff --git a/community/mplayer2/mplayer2-remove-mp3lib.patch b/community/mplayer2/mplayer2-remove-mp3lib.patch deleted file mode 100644 index 057a91295..000000000 --- a/community/mplayer2/mplayer2-remove-mp3lib.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -Naur mplayer2-2.0.ori/configure mplayer2-2.0/configure ---- mplayer2-2.0.ori/configure 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/configure 2011-05-09 14:11:10.717630210 -0400 -@@ -376,7 +376,6 @@ - --disable-mad disable libmad (MPEG audio) support [autodetect] - --enable-xmms enable XMMS input plugin support [disabled] - --enable-libdca enable libdca support [autodetect] -- --disable-mp3lib disable builtin mp3lib [autodetect] - --disable-liba52 disable liba52 [autodetect] - --enable-musepack enable libmpcdec support (deprecated, libavcodec - Musepack decoder is preferred) [disabled] -@@ -610,7 +609,6 @@ - _speex=auto - _theora=auto - _mpg123=auto --_mp3lib=auto - _liba52=auto - _libdca=auto - _faad=auto -@@ -965,8 +963,6 @@ - --disable-theora) _theora=no ;; - --enable-mpg123) _mpg123=yes ;; - --disable-mpg123) _mpg123=no ;; -- --enable-mp3lib) _mp3lib=yes ;; -- --disable-mp3lib) _mp3lib=no ;; - --enable-liba52) _liba52=yes ;; - --disable-liba52) _liba52=no ;; - --enable-libdca) _libdca=yes ;; -@@ -5731,19 +5727,6 @@ - fi - echores "$_theora" - --echocheck "mp3lib support" --if test "$_mp3lib" = auto ; then -- test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes --fi --if test "$_mp3lib" = yes ; then -- def_mp3lib='#define CONFIG_MP3LIB 1' -- codecmodules="mp3lib(internal) $codecmodules" --else -- def_mp3lib='#undef CONFIG_MP3LIB' -- nocodecmodules="mp3lib(internal) $nocodecmodules" --fi --echores "$_mp3lib" -- - # Any version of libmpg123 shall be fine. - echocheck "mpg123 support" - def_mpg123='#undef CONFIG_MPG123' -@@ -6823,7 +6806,6 @@ - MD5SUM = $_md5sum - MGA = $_mga - MNG = $_mng --MP3LIB = $_mp3lib - MPG123 = $_mpg123 - MUSEPACK = $_musepack - NAS = $_nas -@@ -7084,7 +7066,6 @@ - $def_libdca - $def_libdv - $def_mad --$def_mp3lib - $def_mpg123 - $def_musepack - $def_speex -diff -Naur mplayer2-2.0.ori/etc/codecs.conf mplayer2-2.0/etc/codecs.conf ---- mplayer2-2.0.ori/etc/codecs.conf 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/etc/codecs.conf 2011-05-09 14:11:10.717630210 -0400 -@@ -4220,23 +4220,6 @@ - driver ffmpeg - dll "sonic" - --audiocodec mp3 -- ; this is preferred over ffmp2/ffmp3 since it is faster due to using -- ; floating point and there are even broken mkv files where the audio -- ; needs to be parsed, making this codec work more reliably -- info "mp3lib MPEG layer-2, layer-3" -- status working -- comment "Optimized to MMX/SSE/3Dnow!" -- format 0x50 ; layer-1 && layer-2 -- format 0x55 ; layer-3 -- format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) -- format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) -- format 0x55005354 ; broken file -- fourcc ".mp3" ; CBR/VBR MP3 (MOV files) -- fourcc "MP3 " ; used in .nsv files -- fourcc "LAME" ; used in mythtv .nuv files -- driver mp3lib -- - audiocodec mpg123 - ; this is preferred over ffmp2/ffmp3 since it is faster, generally - info "MPEG 1.0/2.0/2.5 layers I, II, III" -diff -Naur mplayer2-2.0.ori/libmpcodecs/ad.c mplayer2-2.0/libmpcodecs/ad.c ---- mplayer2-2.0.ori/libmpcodecs/ad.c 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/libmpcodecs/ad.c 2011-05-09 14:11:10.717630210 -0400 -@@ -32,7 +32,6 @@ - /* Missed vorbis, mad, dshow */ - - extern const ad_functions_t mpcodecs_ad_mpg123; --extern const ad_functions_t mpcodecs_ad_mp3lib; - extern const ad_functions_t mpcodecs_ad_ffmpeg; - extern const ad_functions_t mpcodecs_ad_liba52; - extern const ad_functions_t mpcodecs_ad_hwac3; -@@ -63,9 +62,6 @@ - #ifdef CONFIG_MPG123 - &mpcodecs_ad_mpg123, - #endif --#ifdef CONFIG_MP3LIB -- &mpcodecs_ad_mp3lib, --#endif - #ifdef CONFIG_LIBA52 - &mpcodecs_ad_liba52, - #endif -diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c mplayer2-2.0/libmpcodecs/ad_mp3lib.c ---- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.c 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/libmpcodecs/ad_mp3lib.c 2011-05-09 14:11:10.717630210 -0400 -@@ -1,100 +0,0 @@ --/* -- * This file is part of MPlayer. -- * -- * MPlayer is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * MPlayer is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License along -- * with MPlayer; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- */ -- --#include <stdio.h> --#include <stdlib.h> --#include <unistd.h> -- --#include "config.h" -- --#include "ad_internal.h" --#include "ad_mp3lib.h" -- --static const ad_info_t info = --{ -- "MPEG layer-2, layer-3", -- "mp3lib", -- "Nick Kurshev", -- "mpg123", -- "Optimized to MMX/SSE/3Dnow!" --}; -- --LIBAD_EXTERN(mp3lib) -- --#include "mp3lib/mp3.h" -- --extern int fakemono; -- --static sh_audio_t* dec_audio_sh=NULL; -- --// MP3 decoder buffer callback: --int mplayer_audio_read(char *buf,int size){ -- return demux_read_data(dec_audio_sh->ds,buf,size); --} -- --static int preinit(sh_audio_t *sh) --{ -- sh->audio_out_minsize=32*36*2*2; //4608; -- return 1; --} -- --static int init(sh_audio_t *sh) --{ -- // MPEG Audio: -- dec_audio_sh=sh; // save sh_audio for the callback: --// MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! --#ifdef CONFIG_FAKE_MONO -- MP3_Init(fakemono); --#else -- MP3_Init(); --#endif -- MP3_samplerate=MP3_channels=0; -- sh->a_buffer_len=MP3_DecodeFrame(sh->a_buffer,-1); -- if(!sh->a_buffer_len) return 0; // unsupported layer/format -- sh->channels=2; // hack -- sh->samplesize=2; -- sh->samplerate=MP3_samplerate; -- sh->i_bps=MP3_bitrate*(1000/8); -- MP3_PrintHeader(); -- return 1; --} -- --static void uninit(sh_audio_t *sh) --{ --} -- --static int control(sh_audio_t *sh,int cmd,void* arg, ...) --{ -- switch(cmd) -- { -- case ADCTRL_RESYNC_STREAM: -- MP3_DecodeFrame(NULL,-2); // resync -- MP3_DecodeFrame(NULL,-2); // resync -- MP3_DecodeFrame(NULL,-2); // resync -- return CONTROL_TRUE; -- case ADCTRL_SKIP_FRAME: -- MP3_DecodeFrame(NULL,-2); // skip MPEG frame -- return CONTROL_TRUE; -- } -- return CONTROL_UNKNOWN; --} -- --static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) --{ -- return MP3_DecodeFrame(buf,-1); --} -diff -Naur mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h mplayer2-2.0/libmpcodecs/ad_mp3lib.h ---- mplayer2-2.0.ori/libmpcodecs/ad_mp3lib.h 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/libmpcodecs/ad_mp3lib.h 2011-05-09 14:11:10.717630210 -0400 -@@ -1,24 +0,0 @@ --/* -- * This file is part of MPlayer. -- * -- * MPlayer is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * MPlayer is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License along -- * with MPlayer; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- */ -- --#ifndef MPLAYER_AD_MP3LIB_H --#define MPLAYER_AD_MP3LIB_H -- --int mplayer_audio_read(char *buf, int size); -- --#endif /* MPLAYER_AD_MP3LIB_H */ -diff -Naur mplayer2-2.0.ori/Makefile mplayer2-2.0/Makefile ---- mplayer2-2.0.ori/Makefile 2011-03-24 17:40:29.000000000 -0400 -+++ mplayer2-2.0/Makefile 2011-05-09 14:11:10.714296876 -0400 -@@ -122,21 +122,6 @@ - SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c - SRCS_COMMON-$(MPG123) += libmpcodecs/ad_mpg123.c - --SRCS_MP3LIB-X86-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ -- mp3lib/dct64_3dnow.c --SRCS_MP3LIB-X86-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ -- mp3lib/dct64_k7.c --SRCS_MP3LIB-X86-$(HAVE_MMX) += mp3lib/dct64_mmx.c --SRCS_MP3LIB-$(ARCH_X86_32) += mp3lib/decode_i586.c \ -- $(SRCS_MP3LIB-X86-yes) --SRCS_MP3LIB-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c --SRCS_MP3LIB-$(HAVE_MMX) += mp3lib/decode_mmx.c --SRCS_MP3LIB-$(HAVE_SSE) += mp3lib/dct64_sse.c --SRCS_MP3LIB += mp3lib/sr1.c \ -- $(SRCS_MP3LIB-yes) --SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c \ -- $(SRCS_MP3LIB) -- - SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \ - libmpdemux/demux_mpc.c - SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ -@@ -578,7 +563,6 @@ - loader/dshow \ - loader/dmo \ - loader/wine \ -- mp3lib \ - osdep \ - stream \ - stream/freesdp \ -@@ -675,8 +659,6 @@ - #loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT - loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN) - --mp3lib/decode_i586%: CFLAGS += -fomit-frame-pointer -- - stream/stream_dvdnav%: CFLAGS := $(CFLAGS_LIBDVDNAV) $(CFLAGS) - - -@@ -767,9 +749,7 @@ - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): CFLAGS += -g - loader/qtx/list$(EXESUF) loader/qtx/qtxload$(EXESUF): $(LOADER_TEST_OBJS) - --mp3lib/test$(EXESUF) mp3lib/test2$(EXESUF): $(SRCS_MP3LIB:.c=.o) libvo/aclib.o cpudetect.o $(TEST_OBJS) -- --TESTS = codecs2html codec-cfg-test libvo/aspecttest mp3lib/test mp3lib/test2 -+TESTS = codecs2html codec-cfg-test libvo/aspecttest - - ifdef ARCH_X86 - TESTS += loader/qtx/list loader/qtx/qtxload diff --git a/community/multiget/PKGBUILD b/community/multiget/PKGBUILD index 86f7893b2..d5d80bb5e 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' 'mips64el') -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 113d0ef20..67343286d 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' 'mips64el') 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/musescore/PKGBUILD b/community/musescore/PKGBUILD index 6c79bed54..e55a31ca9 100644 --- a/community/musescore/PKGBUILD +++ b/community/musescore/PKGBUILD @@ -1,21 +1,23 @@ -# Contributor: Cristian Maureira <saint [at] archlinux.cl> -# Previous Contributor: Dr.Egg <rwhite @ archlinux . us> +# $Id: PKGBUILD 58526 2011-11-13 15:57:02Z andrea $ # Maintainer: Stefan Husmann <stefan-husmann@t-online.de +# Contributor: Cristian Maureira <saint [at] archlinux.cl> +# Contributor: Dr.Egg <rwhite @ archlinux . us> pkgname=musescore pkgver=1.1 pkgrel=2 -pkgdesc="A music score editor written in Qt4" +pkgdesc="A music score editor written in Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.musescore.org/en/" license=('GPL') -depends=('qt>=4.5.0' 'libsndfile' 'qtscriptgenerator') +depends=('qt' 'libsndfile' 'qtscriptgenerator') makedepends=('cmake' 'doxygen') optdepends=('portaudio' 'jack') -source=(http://sourceforge.net/projects/mscore/files/mscore/MuseScore-1.1/mscore-1.1.tar.bz2 'paths.patch') +install=musescore.install +source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2" + 'paths.patch') md5sums=('68b43af92093a16f7f074c0eb560a867' 'e5011154d217f633f21b4bb70e589510') -install=musescore.install build() { cd $srcdir/mscore-${pkgver} diff --git a/community/musescore/QtEvent.patch b/community/musescore/QtEvent.patch deleted file mode 100644 index d8aa1562d..000000000 --- a/community/musescore/QtEvent.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp ---- mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp 2010-10-12 22:01:35.000000000 +0200 -+++ mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp 2010-10-12 22:03:11.000000000 +0200 -@@ -214,7 +214,6 @@ - , QEvent::UngrabMouse - , QEvent::GrabKeyboard - , QEvent::UngrabKeyboard -- , QEvent::CocoaRequestModal - , QEvent::User - , QEvent::MaxUser - }; -@@ -362,7 +361,6 @@ - , "UngrabMouse" - , "GrabKeyboard" - , "UngrabKeyboard" -- , "CocoaRequestModal" - , "User" - , "MaxUser" - }; diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install index 6d2e3727f..d6abb5470 100644 --- a/community/musescore/musescore.install +++ b/community/musescore/musescore.install @@ -3,9 +3,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q + post_install } post_remove() { - update-desktop-database -q + post_install } diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD index 9777149b4..5356d74ba 100644 --- a/community/mxml/PKGBUILD +++ b/community/mxml/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 4277 2009-10-19 20:28:23Z giovanni $ +# $Id: PKGBUILD 57065 2011-10-20 07:22:50Z andrea $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: Johannes Sjolund <j.sjolund@gmail.com> pkgname=mxml pkgver=2.6 -pkgrel=1 -pkgdesc="A small XML parsing library " +pkgrel=2 +pkgdesc="A small XML parsing library" arch=('i686' 'x86_64' 'mips64el') url="http://www.minixml.org/" license=('LGPL') -depends=('glibc') -source=(http://ftp.easysw.com/pub/mxml/$pkgver/$pkgname-$pkgver.tar.gz) +source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") md5sums=('68977789ae64985dddbd1a1a1652642e') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DSTROOT=$pkgdir install - chmod -x $pkgdir/usr/lib/libmxml.a + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DSTROOT="$pkgdir" install + chmod -x "$pkgdir/usr/lib/libmxml.a" } diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD index 7dc26edb8..d15a5b7e9 100644 --- a/community/mygui/PKGBUILD +++ b/community/mygui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 53640 2011-08-07 04:39:00Z svenstaro $ +# $Id: PKGBUILD 58226 2011-11-09 02:09:13Z 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=8 +pkgrel=9 pkgdesc="A multilayer and overlappable GUI System for OGRE" arch=('i686' 'x86_64' 'mips64el') url="http://mygui.info/" diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD index 9b38e0a35..3413dceb2 100644 --- a/community/mypaint/PKGBUILD +++ b/community/mypaint/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 51725 2011-07-13 14:26:16Z spupykin $ +# $Id: PKGBUILD 59299 2011-11-22 22:00:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=mypaint -pkgver=0.9.1 -pkgrel=3 +pkgver=1.0.0 +pkgrel=1 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://mypaint.intilinux.com/" @@ -13,7 +13,7 @@ depends=('pygtk' 'python2-numpy' 'protobuf-python' 'python2') makedepends=('scons>=0.97' 'swig>=1.3.39') install=mypaint.install source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('6249a16359a438d6dc658f5765b35515') +md5sums=('dcd43933746a4579e7994f506e097823') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 81422f0a5..d4530b4de 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48169 2011-05-29 12:28:03Z jconder $ +# $Id: PKGBUILD 59400 2011-11-24 09:36:19Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,16 +7,16 @@ pkgname=mythtv pkgver=0.24.1 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64' 'mips64el') url="http://www.mythtv.org/" license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' - 'libxvmc' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' - 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' 'python-lxml' 'qt' - 'wget') + 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' + 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' + 'python-lxml' 'qt' 'wget') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') @@ -24,17 +24,20 @@ install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf' - 'mythtv-v4l2-fix.patch') + 'mythtv-v4l2-fix.patch' + 'build.patch') md5sums=('6870c679619ec58456e76839745411d8' 'feadcc9ad064d93d6dceab1efc0bd9ed' 'bb8e4033d82428d827570fae9ba15e6a' - 'ba5c91df80f0d3f7563a873e71a3725c') + 'ba5c91df80f0d3f7563a873e71a3725c' + '3188962917e98c4e07818dccd64bc423') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch + patch -Np1 -i ${srcdir}/build.patch ARCH="${CARCH/_/-}" ./configure --prefix=/usr --cpu="$ARCH" \ diff --git a/community/mythtv/build.patch b/community/mythtv/build.patch new file mode 100644 index 000000000..35dccd618 --- /dev/null +++ b/community/mythtv/build.patch @@ -0,0 +1,13 @@ +diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp +--- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200 ++++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300 +@@ -2,6 +2,8 @@ + #include "mythrender_opengl.h" + #include "mythxdisplay.h" + ++#include <GL/glu.h> ++ + #define LOC QString("OpenGL: ") + #define LOC_ERR QString("OpenGL Error: ") + +Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD index 61286a6b9..22d82c402 100755 --- a/community/nbtscan/PKGBUILD +++ b/community/nbtscan/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 59205 2011-11-21 15:02:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergio Rubio <rubiojr@biondofu.net> pkgname=nbtscan @@ -8,19 +10,21 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=(glibc) url="http://www.inetcat.net/software/nbtscan.html" -source=(http://www.sourcefiles.org/Networking/Tools/Miscellanenous/nbtscan-1.5.1.tar.gz) -md5sums=('85bb085077c380b82a6ff73e0de0c154') +source=(http://www.sourcefiles.org/Networking/Tools/Miscellanenous/nbtscan-1.5.1.tar.gz + nbtscan.1.gz) +md5sums=('85bb085077c380b82a6ff73e0de0c154' + 'c9b7f61d2be12af5edc120142341c5f7') build() { cd $srcdir/$pkgname-${pkgver}a ./configure --prefix=/usr - make || return 1 + make # Copy the binary mkdir -p $pkgdir/usr/bin cp nbtscan $pkgdir/usr/bin - cd $startdir + cd $srcdir # Include the nbtscan debian man page mkdir -p $pkgdir/usr/share/man/man1 cp nbtscan.1.gz $pkgdir/usr/share/man/man1 diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD index d28851085..24876e435 100644 --- a/community/ncdu/PKGBUILD +++ b/community/ncdu/PKGBUILD @@ -1,21 +1,28 @@ +# $Id: PKGBUILD 59391 2011-11-24 07:32:15Z bisson $ + # Contributor: lp76 <l.peduto@gmail.com> -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> +# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + pkgname=ncdu -pkgver=1.7 +pkgver=1.8 pkgrel=1 -pkgdesc="An NCurses version of the famous old 'du' unix command" -arch=('i686' 'x86_64' 'mips64el') -url="http://dev.yorhel.nl/ncdu/" -license=('MIT') +pkgdesc='Disk usage analyzer with an ncurses interface' +url='http://dev.yorhel.nl/ncdu/' +license=('custom:MIT') depends=('ncurses') -source=(http://dev.yorhel.nl/download/$pkgname-$pkgver.tar.gz) -md5sums=('172047c29d232724cc62e773e82e592a') +arch=('i686' 'x86_64' 'mips64el') +source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") +sha1sums=('3d98e78cf7035e32333d263d301d12e9b4352598') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD new file mode 100644 index 000000000..206db2574 --- /dev/null +++ b/community/ndisc6/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 57422 2011-10-27 13:12:24Z cbrannon $ +# Maintainer: Chris Brannon <chris@the-brannons.com> +# Contributor: Mark Smith <markzzzsmith@yahoo.com.au> +pkgname=ndisc6 +pkgver=1.0.2 +pkgrel=1 +pkgdesc="A collection of IPv6 networking utilities - ndisc6, rdisc6, tcptraceroute6, tracert6, rltraceroute6, tcpspray6" +arch=('i686' 'x86_64') +url="http://www.remlab.net/ndisc6/" +license=("GPL") +depends=('glibc') +makedepends=('glibc' 'gcc') +source=(http://www.remlab.net/files/ndisc6/$pkgname-$pkgver.tar.bz2 + rdnssd.rc.d + rdnssd.confd) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --localstatedir=/var --sysconfdir=/etc --prefix=/usr + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/rdnssd.rc.d" "$pkgdir/etc/rc.d/rdnssd" + install -Dm644 "$srcdir/rdnssd.confd" "$pkgdir/etc/conf.d/rdnssd" + +} + +md5sums=('50cb4c19606cf6ff2b7388e71832f579' + '3421fd731c4da4f9e07fc6b6ff4e5084' + 'f1910902932e2622fc166960819db6c4') diff --git a/community/ndisc6/rdnssd.confd b/community/ndisc6/rdnssd.confd new file mode 100644 index 000000000..306c3d7f6 --- /dev/null +++ b/community/ndisc6/rdnssd.confd @@ -0,0 +1,8 @@ + +# This default merge hook adds IPv6 DNS resolvers +# before the existing IPv4 ones in /etc/resolv.conf. +MERGEHOOK="/etc/rdnssd/merge-hook" + +# User who runs rdnssd. +RUN_AS="nobody" + diff --git a/community/ndisc6/rdnssd.rc.d b/community/ndisc6/rdnssd.rc.d new file mode 100644 index 000000000..3c0a6a53c --- /dev/null +++ b/community/ndisc6/rdnssd.rc.d @@ -0,0 +1,51 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/rdnssd + +PIDFILE="/var/run/rdnssd.pid" +PID=`cat "$PIDFILE" 2>/dev/null` +case "$1" in + start) + stat_busy "Starting RDNSS Daemon" + if [ ! -z "$PID" -a -e "/proc/$PID" ]; then + stat_append "-- Already running" + stat_die + else + /usr/sbin/rdnssd -p "$PIDFILE" \ + ${MERGEHOOK/*/-H} "$MERGEHOOK" \ + ${RUN_AS/*/-u} "$RUN_AS" + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon rdnssd + stat_done + fi + fi + ;; + stop) + stat_busy "Stopping RDNSS Daemon" + if [ -z "$PID" ]; then + stat_append "-- Not running" + stat_die + else + kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD new file mode 100644 index 000000000..aa1c44307 --- /dev/null +++ b/community/nemiver/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 57366 2011-10-26 13:00:32Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: jordz <jordz@archlinux.us> +pkgname=nemiver +pkgver=0.9.0 +pkgrel=3 +pkgdesc="A C/C++ debugger for GNOME" +arch=('x86_64' 'i686') +license=('GPL') +url="http://www.gnome.org/projects/nemiver/" +depends=('gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gconf') +makedepends=('boost' 'intltool' 'gnome-doc-utils') +install=nemiver.install +source=("http://ftp.acc.umu.se/pub/GNOME/sources/${pkgname}/0.9/${pkgname}-${pkgver}.tar.xz") +options=('!libtool' '!emptydirs') +md5sums=('03a2c34d4c04fd69749c01975a97c0c2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-boost --disable-scrollkeeper \ + --enable-symsvis=yes --enable-gio=yes \ + --enable-memoryview=yes + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \ + --domain nemiver ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install new file mode 100644 index 000000000..a14d235b9 --- /dev/null +++ b/community/nemiver/nemiver.install @@ -0,0 +1,21 @@ +pkgname=nemiver + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD index 8d38ad92a..31aa03d18 100644 --- a/community/net6/PKGBUILD +++ b/community/net6/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 54475 2011-08-18 15:08:16Z bluewind $ -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 59157 2011-11-21 12:41:35Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -15,11 +16,11 @@ options=('!libtool') source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('506776416d8aea2b9ea13a81f9145383' - '18ac67590d6bce0a0a4a6a21af8da429') + 'a200e6f132839782e3e5cfdf438e79d3') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Rp1 <$srcdir/build-fix.patch + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr make make DESTDIR=${pkgdir} install diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch index 7e932bce6..cfe79afeb 100644 --- a/community/net6/build-fix.patch +++ b/community/net6/build-fix.patch @@ -1,24 +1,33 @@ -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp net6-1.3.12/inc/encrypt.hpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/inc/encrypt.hpp 2011-08-09 00:19:29.000000000 +0400 -+++ net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/inc/encrypt.hpp net6-1.3.12.my/inc/encrypt.hpp +--- net6-1.3.12/inc/encrypt.hpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/inc/encrypt.hpp 2011-11-21 16:39:32.000000000 +0400 @@ -34,7 +34,7 @@ typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t; typedef gnutls_transport_ptr gnutls_transport_ptr_t; typedef gnutls_dh_params gnutls_dh_params_t; --//typedef gnutls_connection_end gnutls_connection_end_t; -+typedef gnutls_connection_end gnutls_connection_end_t; +-typedef gnutls_connection_end gnutls_connection_end_t; ++//typedef gnutls_connection_end gnutls_connection_end_t; class dh_params: private net6::non_copyable { -diff -wbBur /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp net6-1.3.12/src/encrypt.cpp ---- /mnt/temp/builds/staging-i686/sergej/build/src/net6-1.3.12/src/encrypt.cpp 2011-08-09 00:20:12.000000000 +0400 -+++ net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 +diff -wbBur net6-1.3.12/src/encrypt.cpp net6-1.3.12.my/src/encrypt.cpp +--- net6-1.3.12/src/encrypt.cpp 2009-11-15 16:02:46.000000000 +0300 ++++ net6-1.3.12.my/src/encrypt.cpp 2011-11-21 16:39:49.000000000 +0400 @@ -25,7 +25,7 @@ { const unsigned int DH_BITS = 1024; -- net6::gnutls_session_t create_session(gnutls_connection_end_t end) -+ net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) +- net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end) ++ net6::gnutls_session_t create_session(gnutls_connection_end_t end) { net6::gnutls_session_t session; gnutls_init(&session, end); +@@ -201,8 +201,6 @@ + net6_unix_send_func + ); + #endif +- +- gnutls_transport_set_lowat(session, 0); + } + + net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base() diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD index 9e19abe7b..367a4e688 100644 --- a/community/netsurf/PKGBUILD +++ b/community/netsurf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56237 2011-10-03 16:13:35Z arodseth $ +# $Id: PKGBUILD 58607 2011-11-16 15:29:25Z spupykin $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Georgij Kondratjev <smpuj@bk.ru> @@ -14,7 +14,7 @@ depends=('libmng' 'curl' 'libglade' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'l makedepends=('re2c' 'lcms') provides=('netsurf') conflicts=('netsurf') -install=("${pkgname}.install") +install="${pkgname}.install" source=("${pkgname}.desktop" "${pkgname}.install" "http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png" diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD index 582f103f6..5beed0a69 100644 --- a/community/netwatch/PKGBUILD +++ b/community/netwatch/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17608 2010-05-24 15:34:28Z spupykin $ +# $Id: PKGBUILD 59160 2011-11-21 12:43:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=netwatch @@ -16,10 +16,11 @@ md5sums=('9168c20c1984e9d126d1a0ec1eb0c1d3') build() { cd "$srcdir/$pkgname-$pkgver" + unset CFLAGS ./configure --prefix=/usr - make || return 1 + make - install -D -m0755 netwatch $pkgdir/usr/bin/netwatch && \ - install -D -m0755 netresolv $pkgdir/usr/bin/netresolv && \ + install -D -m0755 netwatch $pkgdir/usr/bin/netwatch + install -D -m0755 netresolv $pkgdir/usr/bin/netresolv install -D -m0644 netwatch.1 $pkgdir/usr/share/man/man1/netwatch.1 } diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index d3502a637..406764ab6 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56357 2011-10-06 09:08:20Z spupykin $ +# $Id: PKGBUILD 58582 2011-11-15 20:13:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -11,8 +11,8 @@ _user=http _group=http pkgname=nginx -pkgver=1.0.8 -pkgrel=2 +pkgver=1.0.10 +pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'zlib' 'openssl') @@ -34,7 +34,7 @@ backup=("etc/nginx/conf/fastcgi.conf" changelog=changelog source=(http://nginx.org/download/nginx-$pkgver.tar.gz nginx) -md5sums=('1049e5fc6e80339f6ba8668fadfb75f9' +md5sums=('930b297b00fa1018fb0a1dd3e6b7e17e' '0e8032d3ba26c3276e8c7c30588d375f') build() { diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD index 6445d99b4..f10f7054c 100644 --- a/community/ngrep/PKGBUILD +++ b/community/ngrep/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 44742 2011-04-11 13:48:14Z lfleischer $ +# $Id: PKGBUILD 59191 2011-11-21 14:35:44Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=ngrep pkgver=1.45 -pkgrel=6 +pkgrel=7 pkgdesc='A grep-like utility that allows you to search for network packets on an interface.' arch=('i686' 'x86_64' 'mips64el') url='http://ngrep.sourceforge.net/' license=('custom') depends=('libpcap>=1.0.0') +# Fix build failure when using "-j" (FS#27091). +options=(!makeflags) source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('bc8150331601f3b869549c94866b4f1c') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 569f92702..773b77bd5 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.4.12 +pkgver=0.6.2 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -15,20 +15,18 @@ license=('MIT') depends=('python2') checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') -source=("http://nodejs.org/dist/node-v${pkgver}.tar.gz") -sha256sums=('c01af05b933ad4d2ca39f63cac057f54f032a4d83cff8711e42650ccee24fce4') +options=('!emptydirs') +source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") +md5sums=('875431b2c2e3d0ebf5a676b3d96bf766') build() { cd node-v${pkgver} - # python2 fix - for file in $(find . -name '*.py' -print) wscript tools/waf-light tools/node-waf - do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' ${file} - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' ${file} - done + msg 'fixing for python2 name' + find -type f -exec sed -e 's_^#!/usr/bin/env python$_&2_' -e 's_^\(#!/usr/bin/python2\).[45]$_\1_' -e 's_^#!/usr/bin/python$_&2_' -i {} \; sed -i "s|cmd_R = 'python |cmd_R = 'python2 |" wscript sed -i "s|python |python2 |" Makefile + find test -type f -exec sed -e 's/python/&2/' -i {} \; ./configure \ --prefix=/usr @@ -39,7 +37,8 @@ build() { check() { cd node-v${pkgver} - make test + # test failures in 0.6.0 are known + make test || true } package() { diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 304d14760..5c6b7b0d6 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55596 2011-09-14 16:51:45Z spupykin $ +# $Id: PKGBUILD 57592 2011-10-31 08:12:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20110914 +pkgver=20111031 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -24,6 +24,7 @@ _gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" "git://notion.git.sourceforge.net/gitroot/notion/contrib") +#source=(https://downloads.sourceforge.net/project/notion/notion-3-2011102900-src.tar.bz2) build() { cd ${srcdir} diff --git a/community/numlockx/PKGBUILD b/community/numlockx/PKGBUILD index d678d4053..dac173233 100644 --- a/community/numlockx/PKGBUILD +++ b/community/numlockx/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 46958 2011-05-13 20:41:25Z andrea $ +# $Id: PKGBUILD 59007 2011-11-20 19:54:44Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=numlockx pkgver=1.2 -pkgrel=1 -pkgdesc="Turns on the numlock key in X11" +pkgrel=2 +pkgdesc='Turns on the numlock key in X11.' arch=('i686' 'x86_64' 'mips64el') license=('MIT') -url="http://ktown.kde.org/~seli/numlockx/" +url='http://home.kde.org/~seli/numlockx/' depends=('libxtst') -source=(http://ktown.kde.org/~seli/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=("http://home.kde.org/~seli/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('be9109370447eae23f6f3f8527bb1a67') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr x_includes=/usr/include/X11 \ - x_libraries=/usr/lib || return 1 - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr x_includes=/usr/include/X11 x_libraries=/usr/lib + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make prefix=${pkgdir}/usr install || return 1 - - # Install the custom MIT license - install -D LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + make prefix="${pkgdir}/usr" install + + # Install the custom MIT license + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 9826d2031..d08ffc87d 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=17.0 +pkgver=17.4 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('af274dc9b7da5713a49c9976e6750b3c') +md5sums=('9d8b33fe0edbc54a6ebc8050dec7d56b') build() { cd ${pkgname}-${pkgver} diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 752b13b19..c6f2c3af8 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,38 +1,47 @@ -# $Id: PKGBUILD 56484 2011-10-07 10:16:01Z spupykin $ +# $Id: PKGBUILD 59404 2011-11-24 12:19:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules -pkgver=2011.09.23 -_pkgsubver=491607 +pkgver=2011.11.20 +_pkgsubver=535097 pkgrel=1 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" +pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" license=('GPL') makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') depends=("linux") install=$pkgname.install -source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") -md5sums=('599342eee8d531b35ca1cc948b61868f') +options=('!strip') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" + "modprobe.conf") +md5sums=('428d803f6fe3424af88768fc2f88f9ae' + 'ac9b8e3cb798f5056ca92767ec705117') build() { + _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` + KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" -# sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \ + --without-x --with-kernel-release=$KERNEL_RELEASE (cd modules && make modules) } package() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - KERNEL_VERSION=`uname -r` + KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` msg "Kernel = $KERNEL_VERSION" cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" - mkdir -p $pkgdir/lib/modules/$KERNEL_VERSION/misc/ + mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ for MOD in `find -type f -name '*.ko'`; do - install -D -m644 $MOD $pkgdir/lib/modules/$KERNEL_VERSION/misc/ + install -Dm644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/ done sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install + gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf } diff --git a/community/open-vm-tools-modules/modprobe.conf b/community/open-vm-tools-modules/modprobe.conf new file mode 100644 index 000000000..b72fcc61a --- /dev/null +++ b/community/open-vm-tools-modules/modprobe.conf @@ -0,0 +1,2 @@ +#VMware net driver +install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 ; /bin/true; diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index 801d2c5b3..187dfb1bb 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -1,17 +1,10 @@ -KERNEL_VERSION='2.6.38-ARCH' +KERNEL_VERSION='3.1.0-4-ARCH' post_install() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;" - VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;" - VMXNET="$VMXNET /bin/true;" - - echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" echo ">>> (this will disable pcnet32 driver)" - sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf - echo - echo ">>>" echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" echo ">>> disable loading of pcnet32 driver" @@ -25,9 +18,6 @@ post_upgrade() { post_remove() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf" - sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf - echo ">>>" echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 3ebc7b806..75fb0e9c7 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56482 2011-10-07 10:14:48Z spupykin $ +# $Id: PKGBUILD 59402 2011-11-24 12:19:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.09.23 -_pkgsubver=491607 +pkgver=2011.11.20 +_pkgsubver=535097 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64' 'mips64el') @@ -24,12 +24,12 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('599342eee8d531b35ca1cc948b61868f' +md5sums=('428d803f6fe3424af88768fc2f88f9ae' '06f7448e274db2a911f582e276088fc9' - 'b183ec265200d68431a5e4eb1b0c8cf5' + '199508b0d3fe6fa9b726d09170bf51f1' '8c333a979578bdc0c3134c1dd6bb7353' '79b0a14d86191fee70a4639da8bd7785' - '67cb83a9e5a4dd016c1a1da2863ca36d' + '136ff53d0d3a303d09266a407fd2d215' 'b55d15e2c4be396aad709aeca91033d3' '73cc1a2665b0dd62427733d62ead8b9a' '75a25d83417e683957321f97a00f8465') @@ -37,7 +37,6 @@ md5sums=('599342eee8d531b35ca1cc948b61868f' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" [ $NOEXTRACT -eq 1 ] || { -# sed -i 's#3.2.7#3.2.8#' configure configure.ac sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac } [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules @@ -52,8 +51,8 @@ package() { chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper cd $pkgdir - patch -Np1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network - patch -Np1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i $srcdir/scripts-network.patch etc/vmware-tools/scripts/vmware/network + patch -p1 -i $srcdir/scripts-network-FS19541.patch etc/vmware-tools/scripts/vmware/network install -D -m 755 $srcdir/open-vm-tools.rc.d $pkgdir/etc/rc.d/open-vm-tools install -D -m 644 $srcdir/open-vm-tools.conf.d $pkgdir/etc/conf.d/open-vm-tools diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d index 0c9221489..555fa1535 100644 --- a/community/open-vm-tools/open-vm-tools.rc.d +++ b/community/open-vm-tools/open-vm-tools.rc.d @@ -13,7 +13,7 @@ case "$1" in if [ "$VM_DRAG_AND_DROP" == "yes" ]; then VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe vmblock + [ -z "$VMBLOCK" ] && modprobe -f vmblock if [ $? -gt 0 ]; then stat_fail exit 1 @@ -36,7 +36,7 @@ case "$1" in for m in vmhgfs vmsync; do VMMOD=`grep -w $m /proc/modules` [ -z "$VMMOD" ] && \ - { modprobe $m + { modprobe -f $m if [ $? -gt 0 ]; then stat_fail exit 1 diff --git a/community/open-vm-tools/scripts-network-FS19541.patch b/community/open-vm-tools/scripts-network-FS19541.patch index 1f65b9824..5fcb33ba8 100644 --- a/community/open-vm-tools/scripts-network-FS19541.patch +++ b/community/open-vm-tools/scripts-network-FS19541.patch @@ -1,5 +1,5 @@ ---- network 2010-04-28 12:30:51.000000000 +0200 -+++ network.bak 2010-05-20 12:12:50.000000000 +0200 +--- network.orig 2011-11-09 18:42:28.000000000 +0400 ++++ network 2011-11-09 18:46:22.000000000 +0400 @@ -76,7 +76,7 @@ else echo `date` "[rescue_nic] activating $nic ..." @@ -9,32 +9,30 @@ exitCode=`expr $exitCode \| $?` fi done < $activeList -@@ -103,7 +103,7 @@ - TranquilizeNetworkManager() { +@@ -105,7 +105,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -133,7 +133,7 @@ - WakeNetworkManager() { + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -154,7 +154,7 @@ # `which' may be a bit noisy, so we'll shush it. dbusSend=`which dbus-send 2>/dev/null` -- if [ $? -eq 0 ]; then -+ if [ $? -eq 0 ] && [ `pidof dbus-daemon` ]; then - # NetworkManager 0.6 - $dbusSend --system --dest=org.freedesktop.NetworkManager \ - /org/freedesktop/NetworkManager \ -@@ -165,8 +165,8 @@ + rc=$? +- if [ $rc = 0 ]; then ++ if [ $rc = 0 ] && [ `pidof dbus-daemon` ]; then + # NetworkManager 0.8.0 + $dbusSend --system --print-reply \ + --dest=org.freedesktop.NetworkManager \ +@@ -203,7 +203,7 @@ # XXX Are these really necessary? If so, we should have seen customer # complaints by now. - which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -- which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." +# which ifup >/dev/null 2>&1 || Panic "ifup not in search path." -+ which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." + which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." case "$1" in - poweron-vm) diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD index 3cb50e07a..0b5371b85 100644 --- a/community/openmotif/PKGBUILD +++ b/community/openmotif/PKGBUILD @@ -1,8 +1,7 @@ -# $Id: PKGBUILD 16932 2010-05-13 22:21:25Z spupykin $ +# $Id: PKGBUILD 59163 2011-11-21 12:54:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Enrico Morelli <morelli@cerm.unifi.it> -_automakever=`pacman -Q automake | cut -f 2 -d \ | cut -f 1 -d -` pkgname=openmotif pkgver=2.3.3 @@ -11,7 +10,7 @@ pkgdesc="Open Motif" arch=('i686' 'x86_64' 'mips64el') url="http://www.motifzone.org/" license=('GPL') -depends=(libxext libxp libxft libxt) +depends=(libxext libxp libxft libxt libxmu libpng libjpeg) makedepends=(xbitmaps xproto printproto xextproto automake) conflicts=(lesstif) options=('!libtool') @@ -19,7 +18,9 @@ source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/op md5sums=('fd27cd3369d6c7d5ef79eccba524f7be') build() { - cd $startdir/src/openmotif-$pkgver +_automakever=`pacman -Q automake | cut -f 2 -d \ | cut -f 1 -d -` + + cd $srcdir/openmotif-$pkgver [ $NOEXTRACT -eq 1 ] || patch -p0 Makefile.in <<EOF --- Makefile.in.org 2007-06-11 09:32:01.000000000 +0400 @@ -31,7 +32,7 @@ build() { - doc \\ - demos + doc - + AUTOMAKE_OPTIONS = 1.4 all: all-recursive EOF @@ -45,15 +46,16 @@ EOF ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh ln -s -f /usr/share/automake-${_automakever}/missing missing ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh + touch NEWS AUTHORS - [ $NOEXTRACT -eq 1 ] || autoreconf -i + [ $NOEXTRACT -eq 1 ] || autoreconf -i; [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr - make -j1 || return 1 + make -j1 - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=$pkgdir install # cleanup - (cd $startdir/pkg/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) + (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3) } diff --git a/community/openmovieeditor/PKGBUILD b/community/openmovieeditor/PKGBUILD index 2ed7aeb39..98716a99b 100644 --- a/community/openmovieeditor/PKGBUILD +++ b/community/openmovieeditor/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 51110 2011-07-05 10:08:30Z spupykin $ +# $Id: PKGBUILD 57799 2011-11-03 09:07:09Z spupykin $ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> # Maintainer: Robert Emil Berge # Maintainer: Mateusz Herych <heniekk@gmail.com> + pkgname=openmovieeditor pkgver=0.0.20090105 -pkgrel=7 +pkgrel=8 pkgdesc="A simple video editor" arch=('i686' 'x86_64' 'mips64el') url="http://openmovieeditor.sourceforge.net/HomePage" license=('GPL') -depends=('libquicktime' 'libsamplerate' 'fltk' 'jack' 'portaudio' 'gmerlin-avdecoder') +depends=('libquicktime' 'libsamplerate' 'fltk' 'jack' + 'portaudio' 'gmerlin-avdecoder' 'libxtst') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('ce4f76c0b3e90aabf9c2d5c8dd31e9b1') @@ -24,7 +26,7 @@ build() { # Fix missing includes sed -e 's|<sstream>|<sstream>\n#include <stdint.h>|' -i src/VideoViewGL.H - sed -e 's|<string>|<string>\n#include <stdint.h>|' -i src/WaveForm.H + sed -e 's|<string>|<string>\n#include <stdint.h>|' -i src/WaveForm.H sed -e 's|<stdint.h>|<stdint.h>\n#include <stdio.h>|' -i src/AddCommand.H sed -e 's|<string>|<stdint.h>\n#include <stdio.h>|' -i src/MediaBrowser.H sed -e 's|<iostream>|<iostream>\n#include <stdio.h>|' -i src/fl_font_browser.h diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index e00c59ba9..dedf985b9 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54658 2011-08-22 14:51:35Z spupykin $ +# $Id: PKGBUILD 58415 2011-11-12 17:18:19Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64' 'mips64el') license=('custom:OSGPL') diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 66a24c3df..848c6e3b5 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -4,7 +4,7 @@ pkgname=openssh-askpass pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64' 'mips64el') url='http://www.phenix.bnl.gov/WWW/publish/hpereira/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=1' @@ -14,8 +14,6 @@ provides=('x11-ssh-askpass') conflicts=('x11-ssh-askpass') source=("http://www.phenix.bnl.gov/WWW/publish/hpereira/software/tgz/$pkgname-$pkgver.tar.gz" "$pkgname.sh") -md5sums=('89ca29f3b21c7ca87829269866dd623b' - '961738244318f3723ba99cdcaac91a21') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,3 +25,6 @@ package() { make DESTDIR="$pkgdir" install install -Dm755 ../$pkgname.sh "$pkgdir/etc/profile.d/$pkgname.sh" } + +md5sums=('f4ed7ed95c727d1c3963007d9d24bdb8' + '961738244318f3723ba99cdcaac91a21') diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index a13722785..73c31acad 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 39226 2011-02-07 17:56:51Z shusmann $ -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# $Id: PKGBUILD 59287 2011-11-22 15:27:27Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=optipng pkgver=0.6.5 -pkgrel=1 -pkgdesc='A PNG optimizer that recompresses image files to a smaller size, without losing any information' +pkgrel=2 +pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64' 'mips64el') url='http://optipng.sourceforge.net/' license=('ZLIB') @@ -15,11 +16,13 @@ md5sums=('9df5fa7bb45ae096ed6c6e0d8dc43dc7') build() { cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr make } package() { cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install - install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/osiris/PKGBUILD b/community/osiris/PKGBUILD index f67b911c7..3447089dd 100644 --- a/community/osiris/PKGBUILD +++ b/community/osiris/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 14260 2010-04-02 09:55:31Z spupykin $ +# $Id: PKGBUILD 59237 2011-11-21 15:30:37Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: jlvsimoes pkgname=osiris @@ -10,31 +11,31 @@ url="http://osiris.shmoo.com/" license=('custom') depends=('openssl' 'readline') install=$pkgname.install -source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz \ - osirismd.init \ +#source=(http://osiris.shmoo.com/data/osiris-$pkgver.tar.gz +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/osiris-$pkgver.tar.gz + osirismd.init osirisd.init) md5sums=('1951c7dc0fe729af9ffaf58910340d12' '44281b8fc30ab3d452c6f35d3539d7ff' 'b859445803e4df59a4f82d7f411e1297') -build() -{ - cd $startdir/src/$pkgname-$pkgver - mkdir -p $startdir/pkg/usr/share/licenses/$pkgname/ - install -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/license.txt - mkdir -p $startdir/pkg/etc/rc.d +build() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/share/licenses/$pkgname/ + install -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/license.txt + mkdir -p $pkgdir/etc/rc.d ./configure --prefix=/usr --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname - make all || return 1 + make all # Arch-ify install locations sed -i "s|^INSTALL_OSIRISM=0|INSTALL_OSIRISM=1|" src/install/install.sh sed -i "s|^INSTALL_OSIRISD=0|INSTALL_OSIRISD=1|" src/install/install.sh sed -i "s|^ROOT_GROUP=wheel|ROOT_GROUP=root|" src/install/install.sh - make DESTDIR=$startdir/pkg install || return 1 + make DESTDIR=$pkgdir install - install -D -m755 $startdir/src/osirismd.init $startdir/pkg/etc/rc.d/osirismd && \ - install -D -m755 $startdir/src/osirisd.init $startdir/pkg/etc/rc.d/osirisd && \ - rm -rf $startdir/pkg/usr/osiris + install -D -m755 $srcdir/osirismd.init $pkgdir/etc/rc.d/osirismd + install -D -m755 $srcdir/osirisd.init $pkgdir/etc/rc.d/osirisd + rm -rf $pkgdir/usr/osiris } diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 339f264f7..21ed7fa99 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 44195 2011-04-04 13:08:48Z spupykin $ +# $Id: PKGBUILD 59176 2011-11-21 13:12:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: v01d <phreakuencies@gmail.com> @@ -20,13 +20,14 @@ build() { cd $srcdir/$pkgname-$pkgver # Fix CFLAGS and other options hardcoded in Makefiles + unset CFLAGS sed -ri "s|^CFLAGS=-Wall( -g)? -O2|CFLAGS=-Wall $CFLAGS|" Makefile ripmime/Makefile ripmime/tnef/Makefile ripmime/ripOLE/Makefile sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile make # Create base dirs, the Makefile assumes they're there - install -d $pkgdir/usr/sbin $startdir/pkg/etc/rc.d $startdir/pkg/usr/man/man8 + install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8 # install with root set on $pkgdir make DESTDIR=$pkgdir install diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 4a6694a29..da943848f 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,28 +1,35 @@ +# $Id: PKGBUILD 58527 2011-11-13 15:58:19Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola <mickele> # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview pkgver=3.10.1 -pkgrel=1 -pkgdesc='Parallel Visualization Application using VTK.' +pkgrel=4 +pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'hdf5' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') +depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5' makedepends=('cmake' 'desktop-file-utils') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz" - "${pkgname}.profile" - "${pkgname}.png" - "${pkgname}.desktop") + 'paraview.png' + 'paraview.desktop' + 'fixkernelversioncheck.diff') md5sums=('d8a9d4a997a720589ffd57568bcdd449' - '534ef49689a7f630c98380f5ab4bf915' 'db623002bc71a257ddfdd0c9c7b14c3f' - '4e4b7172ed18171c37446fd7c4f1e8f5') + '4e4b7172ed18171c37446fd7c4f1e8f5' + '9e137af23701f76fc727222ebac23389') build() { cd ParaView-${pkgver} + # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568 + # remove next pkgver bump + cd VTK + patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + cd .. + sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx @@ -42,7 +49,6 @@ build() { -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_DOCUMENTATION:BOOL=OFF \ -DBUILD_EXAMPLES:BOOL=OFF \ - -DVTK_USE_RPATH:BOOL=OFF \ -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \ -DVTK_USE_SYSTEM_JPEG:BOOL=ON \ -DVTK_USE_SYSTEM_PNG:BOOL=ON \ @@ -69,16 +75,13 @@ package() { make DESTDIR=${pkgdir} install - # Install file to set PATH - install -D ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh - # Install license - install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE # Install desktop shortcuts install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png - desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/${pkgname}.desktop + desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop # Removes VTK plugin for designer - if you need, you can install vtk - rm -rf ${pkgdir}/opt/${pkgname}/plugins + #rm -rf ${pkgdir}/opt/paraview/plugins } diff --git a/community/paraview/fixkernelversioncheck.diff b/community/paraview/fixkernelversioncheck.diff new file mode 100644 index 000000000..165f07366 --- /dev/null +++ b/community/paraview/fixkernelversioncheck.diff @@ -0,0 +1,19 @@ +--- a/Utilities/vtkhdf5/ConfigureChecks.cmake ++++ b/Utilities/vtkhdf5/ConfigureChecks.cmake +@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION) + ENDIF (HDF5_WANT_DCONV_EXCEPTION) + + SET (LINUX_LFS 0) +-IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++IF (CMAKE_SYSTEM MATCHES "Linux") + # Linux Specific flags + ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) + IF (HDF5_ENABLE_LARGE_FILE) + SET (LARGEFILE 1) + ENDIF (HDF5_ENABLE_LARGE_FILE) +-ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") ++ENDIF (CMAKE_SYSTEM MATCHES "Linux") + SET (HDF5_EXTRA_FLAGS) + IF (LINUX_LFS) + SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) diff --git a/community/paraview/paraview.profile b/community/paraview/paraview.profile deleted file mode 100644 index cb4bbde8c..000000000 --- a/community/paraview/paraview.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/opt/paraview/bin diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 027162877..e3bed3e31 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56087 2011-09-30 23:19:11Z spupykin $ +# $Id: PKGBUILD 58586 2011-11-16 05:16:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributer: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=3.8.0 +pkgver=3.10.0 _rel=devel #_rel=stable pkgrel=2 @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=(!emptydirs !makeflags) source=(ftp://ftp.parrot.org/pub/parrot/releases/${_rel}/$pkgver/parrot-$pkgver.tar.gz) -md5sums=('72bac15a47f01bacef5ad28e45fe08b9') +md5sums=('36a839beaef511f178b0607a03f1ff0f') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index 7ebf7fd69..81989a3ae 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -6,7 +6,7 @@ pkgver=3.0.8 pkgrel=1 pkgdlnr=75219 pkgdesc="mod_rails passenger" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" license=('GPL') depends=('apache' 'ruby' 'ruby-rack' 'curl') diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD index be066fc88..7e452bd3b 100644 --- a/community/pawm/PKGBUILD +++ b/community/pawm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 19617 2010-06-26 08:01:18Z spupykin $ +# $Id: PKGBUILD 59172 2011-11-21 13:08:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pawm @@ -8,14 +8,14 @@ pkgdesc="Puto Amo Window Manager is a full featured window manager, but without arch=('i686' 'x86_64' 'mips64el') url="http://www.pleyades.net/pawm/" license=("GPL") -depends=(libxft libxpm libxrandr) +depends=('libxft' 'libxpm' 'libxrandr') +makedepends=('cmake') source=(http://www.pleyades.net/pawm/files/pawm-$pkgver.tar.gz) md5sums=('cc004865f5b5d8118e68154857b913a2') build() { cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 + make make install DESTDIR=$pkgdir } diff --git a/community/pbzip2/PKGBUILD b/community/pbzip2/PKGBUILD index 6c2253b68..8cf2f8700 100644 --- a/community/pbzip2/PKGBUILD +++ b/community/pbzip2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 51901 2011-07-17 21:41:16Z foutrelis $ +# $Id: PKGBUILD 57784 2011-11-02 15:50:11Z foutrelis $ # Contributor: Vasco Costa <vasco dot costa at geekslot dot com> -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=pbzip2 -pkgver=1.1.5 +pkgver=1.1.6 pkgrel=1 pkgdesc="Parallel implementation of the bzip2 block-sorting file compressor" arch=(i686 x86_64 'mips64el') @@ -11,7 +11,7 @@ url="http://compression.ca/pbzip2/" license=('BSD') depends=('bzip2' 'gcc-libs') source=(http://compression.ca/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('62f529d3ef17d775b9e1745f7a458018') +sha256sums=('86bd6d58e5a6c13cf8c709620ebfe186fca423c2724225bb30431fa7a453aee2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pcb/PKGBUILD b/community/pcb/PKGBUILD index abfc1551b..3409bbad0 100644 --- a/community/pcb/PKGBUILD +++ b/community/pcb/PKGBUILD @@ -1,36 +1,43 @@ +# $Id$ + +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jared Casper <jaredcasper@gmail.com> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pcb pkgver=20110918 -pkgrel=1 -pkgdesc="An interactive printed circuit board editor for the X11 window system." -url="http://pcb.gpleda.org/" +pkgrel=2 +pkgdesc='Interactive printed circuit board editor' +url='http://pcb.gpleda.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('tcl' 'gtkglext' 'gd' 'perlxml' 'hicolor-icon-theme' 'desktop-file-utils') -optdepends=('tk: for the graphical QFP footprint builder') -install=$pkgname.install -changelog=Changelog -source=(http://downloads.sourceforge.net/pcb/$pkgname-$pkgver.tar.gz) -md5sums=('54bbc997eeb22b85cf21fed54cb8e181') +depends=('gtkglext' 'gd' 'hicolor-icon-theme') +optdepends=('tk: additional tools' + 'tcl: additional tools' + 'perl: additional tools') +makedepends=('intltool' 'tk') +source=("http://downloads.sourceforge.net/pcb/${pkgname}-${pkgver}.tar.gz") +sha1sums=('53ca27797d4db65a068b56f157e3ea6c5c29051f') + +install=install build() { - cd $srcdir/$pkgname-$pkgver/ - if [ ! -x /usr/bin/wish ]; then - config="env WISH=/usr/bin/true ./configure --enable-dbus" - else - config="./configure --enable-dbus" - fi - $config --prefix=/usr \ - --disable-update-mime-database \ - --disable-update-desktop-database - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --enable-dbus \ + --disable-update-mime-database \ + --disable-update-desktop-database + make } package() { - cd $srcdir/$pkgname-$pkgver/ - make -j1 prefix=$pkgdir/usr install - rm $pkgdir/usr/share/info/dir -} + cd "${srcdir}/${pkgname}-${pkgver}" + make -j1 prefix="${pkgdir}"/usr install + rm "${pkgdir}"/usr/share/info/dir + rm "${pkgdir}"/usr/include/gts.h + rm "${pkgdir}"/usr/lib/libgts.a + rmdir "${pkgdir}"/usr/include + rmdir "${pkgdir}"/usr/lib +} diff --git a/community/pcb/install b/community/pcb/install new file mode 100644 index 000000000..62ce80440 --- /dev/null +++ b/community/pcb/install @@ -0,0 +1,37 @@ +infodir=/usr/share/info +filelist=(pcb.info pcb.info-1 pcb.info-2) + +post_install() { + if [ -x /usr/bin/update-mime-database ]; then + echo Updating mime database... + /usr/bin/update-mime-database /usr/share/mime + fi + if [ -x /usr/bin/update-desktop-database ]; then + echo Updating desktop database.. + /usr/bin/update-desktop-database /usr/share/applications + fi + if [ -x /usr/bin/install-info ]; then + echo Updating info directory... + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done + fi + /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + if [ -x /usr/bin/install-info ]; then + echo Updating info directory... + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done + fi +} + +post_remove() { + /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor +} diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD index 7d2be84e7..1880c5743 100644 --- a/community/pcmanfm/PKGBUILD +++ b/community/pcmanfm/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=pcmanfm -pkgver=0.9.9 +pkgver=0.9.10 pkgrel=1 pkgdesc="File manager of the LXDE Desktop" arch=('i686' 'x86_64' 'mips64el') url="http://pcmanfm.sourceforge.net/" license=('GPL') groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm=0.1.16' 'lxmenu-data') +depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data') makedepends=('intltool' 'pkgconfig') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz) -md5sums=('f31ed6defb600f7046a456220d8efa3a') +md5sums=('d34a3530a6c5dcd674d23021d71c3e95') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index 450fdcbaf..d01bdcb65 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55381 2011-09-10 23:32:12Z dreisner $ +# $Id: PKGBUILD 59244 2011-11-21 19:29:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite -pkgver=1.7.4 -pkgrel=3 +pkgver=1.8.0 +pkgrel=1 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64' 'mips64el') url="https://alioth.debian.org/projects/pcsclite/" @@ -12,9 +12,9 @@ license=('BSD') depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') -source=(https://alioth.debian.org/frs/download.php/3598/pcsc-lite-${pkgver}.tar.bz2 - pcscd) -md5sums=('1caf0b8ca2ecbf82fe3b035b3fff22dd' +source=("https://alioth.debian.org/frs/download.php/3684/pcsc-lite-${pkgver}.tar.bz2" + 'pcscd') +md5sums=('8af937240126a4afdcf235e98a6d861a' 'c97b6bce695222efb0f003d8e8369010') build() { diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 9d4db9737..7e30d453c 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56949 2011-10-17 08:21:01Z ibiru $ +# $Id: PKGBUILD 58479 2011-11-13 13:51:40Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu pkgver=0.7.11 -pkgrel=1 +pkgrel=3 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD index 91f86d37f..47e6293fa 100644 --- a/community/pdfedit/PKGBUILD +++ b/community/pdfedit/PKGBUILD @@ -1,37 +1,40 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Firmicus <firmicus α gmx δ net> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=pdfedit pkgver=0.4.5 -pkgrel=1 +pkgrel=2 pkgdesc='Full featured editor for manipulating PDF documents' arch=('i686' 'x86_64' 'mips64el') url='http://pdfedit.petricek.net/index_e.html' license=('GPL') depends=('qt3' 't1lib' 'gsfonts') makedepends=('boost' 'doxygen') -source=(http://downloads.sourceforge.net/pdfedit/${pkgname}-${pkgver}.tar.bz2 - 'pdfedit.png' 'pdfedit.desktop') +source=("http://downloads.sourceforge.net/pdfedit/${pkgname}-${pkgver}.tar.bz2" + 'pdfedit.png' + 'pdfedit.desktop') md5sums=('80502ee7f08cdfb867ffdaa92d160a23' '70fd938b2ef9da748a093df7e20d1d7d' 'c0572c2dd54065322321718aa49ed6b8') build() { - . /etc/profile.d/qt3.sh - export PATH=$QTDIR/bin:$PATH - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + . /etc/profile.d/qt3.sh + export PATH="$QTDIR/bin:$PATH" + export QMAKESPEC="$QTDIR/mkspecs/linux-g++" - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc || return 1 - ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake - make || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc + ./configure --prefix=/usr --with-qmake=/opt/qt/bin/qmake + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT=${pkgdir} install + make INSTALL_ROOT="${pkgdir}" install - install -D -m644 ../pdfedit.desktop ${pkgdir}/usr/share/applications/pdfedit.desktop - install -D -m644 ../pdfedit.png ${pkgdir}/usr/share/pixmaps/pdfedit.png + install -Dm0644 ../pdfedit.desktop "${pkgdir}/usr/share/applications/pdfedit.desktop" + install -Dm0644 ../pdfedit.png "${pkgdir}/usr/share/pixmaps/pdfedit.png" } diff --git a/community/pdmenu/PKGBUILD b/community/pdmenu/PKGBUILD index 551330631..9b79ad428 100644 --- a/community/pdmenu/PKGBUILD +++ b/community/pdmenu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 46707 2011-05-10 20:39:33Z spupykin $ +# $Id: PKGBUILD 59165 2011-11-21 13:00:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=pdmenu -pkgver=1.3.0 +pkgver=1.3.2 pkgrel=1 pkgdesc="simple full screen menu program" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('gpm' 'slang') optdepends=('perl') source=(http://ftp.debian.org/debian/pool/main/p/pdmenu/pdmenu_$pkgver.tar.gz) -md5sums=('2530237cb0dca94905e03f12a320d78a') +md5sums=('a7d5315119fd18a81cc3d1e578f8d3f8') build() { cd $srcdir/pdmenu diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 721cd0098..c4c9e2f5c 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55893 2011-09-24 16:49:07Z stephane $ +# $Id: PKGBUILD 58417 2011-11-12 17:18:28Z ibiru $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=9 +pkgrel=10 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64' 'mips64el') url="http://performous.org/" @@ -13,19 +13,26 @@ depends=('boost-libs>=1.47' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'l 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo') makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.47') optdepends=('performous-freesongs: free songs for performous') -source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2) -md5sums=('451a759de77984b5a699e91107fe52e2') +source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2 + boost-filesystem-v3.patch + ffmpeg-0.8.patch::"http://performous.git.sourceforge.net/git/gitweb.cgi?p=performous/performous;a=patch;h=18449f6e56451f68b980c8359a4d1dc06f82db1a") +md5sums=('451a759de77984b5a699e91107fe52e2' + '42a8c825d80b0de16bd5752d2a80e585' + 'ff0ffa681dfaa09c4f42133a65309bf0') build() { cd ${srcdir}/Performous-${pkgver}-Source + # fix to built against boost 1.46 and later, upstream (git) now support v3 + patch -Np1 -i ../boost-filesystem-v3.patch + # fix with ffmpeg-0.8 + patch -Np1 -i ../ffmpeg-0.8.patch + mkdir -p build cd build # fix config loading with libxml++ export LDFLAGS=${LDFLAGS/-Wl,--as-needed/} - # fix to built against boost 1.46, upstream (git) now support v3 - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr .. diff --git a/community/performous/boost-filesystem-v3.patch b/community/performous/boost-filesystem-v3.patch new file mode 100644 index 000000000..22dd07213 --- /dev/null +++ b/community/performous/boost-filesystem-v3.patch @@ -0,0 +1,135 @@ +diff --git a/game/backgrounds.cc b/game/backgrounds.cc +index 7fd3cd0..cdedefb 100644 +--- a/game/backgrounds.cc ++++ b/game/backgrounds.cc +@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + { +diff --git a/game/cache.cc b/game/cache.cc +index 69974e2..0f1edd0 100644 +--- a/game/cache.cc ++++ b/game/cache.cc +@@ -9,7 +9,11 @@ namespace cache { + fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){ + fs::path cache_filename; + std::string const lod = (boost::format("%.2f") % factor).str(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png"; ++#else ++ std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png"; ++#endif + + if (isThemeResource(svgfilename)) { + std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s()); +diff --git a/game/filemagic.hh b/game/filemagic.hh +index bf87ded..29e81fe 100644 +--- a/game/filemagic.hh ++++ b/game/filemagic.hh +@@ -71,7 +71,11 @@ namespace filemagic { + // For now, just check the extension an assume it's not lying. + + // Get file extension in lower case ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string ext = filename.extension(); ++#else ++ std::string ext = filename.extension().string(); ++#endif + // somehow this does not convert the extension to lower case: + //std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower)); + std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower ); +diff --git a/game/fs.cc b/game/fs.cc +index e34a784..767a7ab 100644 +--- a/game/fs.cc ++++ b/game/fs.cc +@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) { + + bool isThemeResource(fs::path filename){ + try { ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string themefile = getThemePath(filename.filename()); ++#else ++ std::string themefile = getThemePath(filename.filename().string()); ++#endif + return themefile == filename; + } catch (...) { return false; } + } +diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc +index 38e163b..db15d79 100644 +--- a/game/songparser-ini.cc ++++ b/game/songparser-ini.cc +@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() { + // Search the dir for the music files + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++#endif + if (regex_match(name.c_str(), match, midifile)) { + s.midifilename = name; + } else if (regex_match(name.c_str(), match, audiofile_background)) { +diff --git a/game/songparser.cc b/game/songparser.cc +index 2b7b9b4..ac9f3f6 100644 +--- a/game/songparser.cc ++++ b/game/songparser.cc +@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s): + + for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) { + boost::filesystem::path p = dirIt->path(); ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename ++#else ++ std::string name = p.filename().string(); // File basename ++#endif + if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) { + m_song.cover = name; + } else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) { +diff --git a/game/songs.cc b/game/songs.cc +index 62ab26d..afab383 100644 +--- a/game/songs.cc ++++ b/game/songs.cc +@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) { + for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) { + fs::path p = dirIt->path(); + if (fs::is_directory(p)) { reload_internal(p); continue; } ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string name = p.leaf(); // File basename (notes.txt) + std::string path = p.directory_string(); // Path without filename ++#else ++ std::string name = p.filename().string(); // File basename (notes.txt) ++ std::string path = p.string(); // Path without filename ++#endif + path.erase(path.size() - name.size()); + if (!regex_match(name.c_str(), match, expression)) continue; + try { +diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh +index 58e19dc..8895d94 100644 +--- a/tools/ss_helpers.hh ++++ b/tools/ss_helpers.hh +@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st + void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); } + void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); } + ++#if BOOST_FILESYSTEM_VERSION < 3 + std::string filename(boost::filesystem::path const& p) { return *--p.end(); } ++#else ++std::string filename(boost::filesystem::path const& p) { return p.filename().string(); } ++#endif + + /** Fix Singstar's b0rked XML **/ + std::string xmlFix(std::vector<char> const& data) { +-- +1.7.4.1 + diff --git a/community/perl-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD new file mode 100644 index 000000000..40dd20936 --- /dev/null +++ b/community/perl-package-stash-xs/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57660 2011-11-01 00:16:28Z juster $ + +pkgname=perl-package-stash-xs +pkgver=0.25 +pkgrel=1 +pkgdesc="faster and more correct implementation of the Package::Stash API" +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.8.1') +makedepends=('perl-extutils-makemaker>=6.30') +checkdepends=('perl-test-fatal' 'perl-test-simple') +url=https://metacpan.org/release/Package-Stash-XS +source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOY/Package-Stash-XS-${pkgver}.tar.gz") +md5sums=(52ece18842c46da8fb7a4a14dea910ab) +sha512sums=(2b539d9ba1a68c5ba681e9eabbcde4b396f66dc8dbd3b1e333286ea7ce39b93b97ec4bd97c31681720a925553b128371ce2c48f11254806aebd5de868a22b528) +_distdir="${srcdir}/Package-Stash-XS-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD index 476e3d378..3ad5af1e9 100644 --- a/community/perl-params-classify/PKGBUILD +++ b/community/perl-params-classify/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 56695 2011-10-10 17:08:45Z spupykin $ +# $Id: PKGBUILD 58968 2011-11-20 18:12:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=perl-params-classify -pkgver=0.009 +pkgver=0.013 pkgrel=1 pkgdesc="argument type classification" arch=(i686 x86_64) @@ -11,7 +11,7 @@ url="http://search.cpan.org/~zefram/Params-Classify" options=(!emptydirs) depends=('perl>=5.10.1') source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Params-Classify-$pkgver.tar.gz") -md5sums=('57114b9272df5c4dba1aeb3c4b4d2984') +md5sums=('63d24fbec775472ada49d16bce4a9b1f') build() { cd $srcdir/Params-Classify-$pkgver diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD new file mode 100644 index 000000000..df95826e9 --- /dev/null +++ b/community/perl-params-util/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Justin Davis <jrcd83@gmail.com> +# $Id: PKGBUILD 57661 2011-11-01 00:18:52Z juster $ + +pkgname=perl-params-util +pkgver=1.04 +pkgrel=1 +pkgdesc="Simple, compact and correct param-checking functions" +arch=(i686 x86_64) +license=(PerlArtistic GPL) +options=(!emptydirs) +depends=('perl>=5.5.30' 'perl-scalar-list-utils') +makedepends=('perl-extutils-cbuilder>=0.27' 'perl-extutils-makemaker>=6.52' + 'perl-pathtools') +checkdepends=('perl-test-simple') +url=https://metacpan.org/release/Params-Util +source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-${pkgver}.tar.gz") +md5sums=(84bfb0a16cff67f2077ece0e24408b0f) +sha512sums=(086b6e37ce24a423439e346c4fc7069cbb5bde6af5c259fa765616bf637597105ee379df5edca82fdeb3bb0e44d83c7704ea1fe09170acea389ffb54d77f3d3d) +_distdir="${srcdir}/Params-Util-${pkgver}" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + cd "$_distdir" + make test + ) +} + +package() { + cd "$_distdir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD index 7bd7ae5b5..37b59a9be 100644 --- a/community/php-geoip/PKGBUILD +++ b/community/php-geoip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36134 2010-12-27 13:40:37Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 57315 2011-10-25 17:20:28Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-geoip -pkgver=1.0.7 -pkgrel=2 +pkgver=1.0.8 +pkgrel=1 pkgdesc="GeoIP module for PHP" arch=('i686' 'x86_64' 'mips64el') url="http://pecl.php.net/package/geoip" @@ -11,7 +11,7 @@ license=('PHP') depends=('php' 'geoip') backup=('etc/php/conf.d/geoip.ini') source=(http://pecl.php.net/get/geoip-$pkgver.tgz) -md5sums=('ca5397a1dacb62afd426c2065fc1e106') +sha1sums=('f8d17da3e192002332ab54b9b4ab0f5deeaf9f15') build() { cd "$srcdir/geoip-$pkgver" diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD index 655d032f0..dcc8aba90 100644 --- a/community/picard/PKGBUILD +++ b/community/picard/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 53236 2011-08-02 00:40:12Z bisson $ +# $Id: PKGBUILD 58419 2011-11-12 17:18:36Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: sysrq pkgname=picard -pkgver=0.15.1 -pkgrel=1 +pkgver=0.16 +pkgrel=3 pkgdesc='Official MusicBrainz tagger' url='http://musicbrainz.org/doc/MusicBrainz_Picard' license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('python2-qt' 'mutagen' 'libofa' 'ffmpeg') +depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') optdepends=('libdiscid: CD-Lookup feature') source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('21b51e229c246e2d17b746649bfa370f') +sha1sums=('274071410550ee29051bb0137d72602921a015f9') install=install diff --git a/community/pidgin-fonomobutton/PKGBUILD b/community/pidgin-fonomobutton/PKGBUILD deleted file mode 100644 index 350bfcb5d..000000000 --- a/community/pidgin-fonomobutton/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 5894 2009-11-22 13:10:00Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=pidgin-fonomobutton -pkgver=0.1.6 -pkgrel=1 -pkgdesc="Adds a video-chat button to the the conversation window" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.fonomo.com/software/pidgin.html" -license=('GPL') -depends=('pidgin') -install=pidgin-fonomobutton.install -source=(ftp://ftp.grokthis.net/pub/fonomo/${pkgname}-${pkgver}.tar.bz2 - pidgin-fonomobutton-0.1.6-const.patch) -md5sums=('020673634143b2e5a3c3ea6e76c4cdce' - '33c266437cd6f707e8f02eda3b485406') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/pidgin-fonomobutton-0.1.6-const.patch || return 1 - make all || return 1 - install -Dm755 fonomobutton.so "${pkgdir}/usr/lib/pidgin/fonomobutton.so" - install -Dm644 camera-fonomo.png "${pkgdir}/usr/share/icons/hicolor/22x22/devices/camera-fonomo.png" -} diff --git a/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch b/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch deleted file mode 100644 index e57648840..000000000 --- a/community/pidgin-fonomobutton/pidgin-fonomobutton-0.1.6-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/fonomobutton.c 2008-10-20 01:06:40.000000000 -0700 -+++ b/fonomobutton.c 2009-11-22 10:40:48.000000000 -0800 -@@ -88,7 +88,7 @@ - { - GtkWidget *button, *image, *sep; - GtkIconInfo *icoinfo; -- gchar *iconames[]={"camera-web", "camera-fonomo"}; -+ const gchar *iconames[]={"camera-web", "camera-fonomo"}; - - button = gtk_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD index c590f0af4..058d7b42d 100644 --- a/community/pidgin-musictracker/PKGBUILD +++ b/community/pidgin-musictracker/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 35447 2010-12-20 16:56:30Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor : Ionut Biru <ionut@archlinux.ro> +# $Id: PKGBUILD 57892 2011-11-04 08:42:55Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Ionut Biru <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=pidgin-musictracker pkgver=0.4.22 -pkgrel=1 +pkgrel=2 pkgdesc="A plugin for Pidgin which displays the music track currently playing." url='http://code.google.com/p/pidgin-musictracker' license=('GPL2') depends=('pidgin' 'gtk2' 'dbus-glib') makedepends=('xmms2') arch=('i686' 'x86_64' 'mips64el') -source=(http://pidgin-musictracker.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('8d7225c705484db86b864cab5a536423') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD index e83fffe73..2a01f18f7 100644 --- a/community/pidgin-otr/PKGBUILD +++ b/community/pidgin-otr/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 17934 2010-05-27 08:06:13Z angvp $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# $Id: PKGBUILD 57815 2011-11-03 09:57:10Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Bug <Bug2000@gmail.com> # Contributor: Marcel Wysocki <maci@satgnu.net> pkgname=pidgin-otr pkgver=3.2.0 -pkgrel=2 -pkgdesc="Off-the-Record Messaging plugin for Pidgin" +pkgrel=3 +pkgdesc='Off-the-Record Messaging plugin for Pidgin.' arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.cypherpunks.ca/otr/" +url='http://www.cypherpunks.ca/otr/' depends=('libotr>=3.2.0' 'pidgin' 'perlxml') -source=("http://www.cypherpunks.ca/otr/$pkgname-$pkgver.tar.gz") -md5sums=('8af70b654b7d7c5a5b7785699ff562f9') +source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc}) +md5sums=('8af70b654b7d7c5a5b7785699ff562f9' + '67d711a7a44cef2791f50b319aaf0e0e') build() { - cd $srcdir/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index 2ebc948b7..609531264 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.0.15 +_dcpkgver=2.0.16 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole -pkgver=0.2.4 -pkgrel=2 +pkgver=0.2.5 +pkgrel=1 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.0" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" @@ -20,7 +20,7 @@ conflicts=('dovecot-sieve' 'pigeonhole-hg') source=("http://www.rename-it.nl/dovecot/2.0/dovecot-2.0-$pkgname-$pkgver.tar.gz" "dovecot.conf") options=('!libtool') -md5sums=('11d396b901db774799d07db6e4dd805b' +md5sums=('f50151dd20eb5acbac2b546e586f2d43' '564b771c339f69a477c06babf53e11c2') build() { diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index 046cfcd1e..7b331d3c7 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 56752 2011-10-11 20:37:22Z lcarlier $ +# $Id: PKGBUILD 57378 2011-10-26 15:40:42Z lcarlier $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus -pkgver=0.7.4 -pkgrel=2 +pkgver=0.7.5 +pkgrel=1 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64' 'mips64el') url="http://pingus.seul.org" license=('GPL') depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.47') makedepends=('scons' 'boost>=1.47' 'mesa') -source=(http://pingus.seul.org/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) -md5sums=('82742bc9906cad98338cfd3ea700b396' +source=(http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 pingus.desktop) +md5sums=('68e0bd1327e0eedcaab64d64528540ba' '9eec34047bdcff49e08f41e81764e20c') -sha1sums=('e61e5ffefcecebed83286c25b3626f70ed75d2a5' +sha1sums=('65493f9c9914bb401dbcfe1fe6bf2fad2388b755' '579a1144f161ce89e6e024cea37210149b89c0c0') build() { @@ -25,9 +25,6 @@ build() { package() { cd ${pkgname}-${pkgver} - # fix launcher - sed -i 's/echo/echo -e/g' ./Makefile - make install DESTDIR="${pkgdir}" PREFIX="/usr" install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop" diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD new file mode 100644 index 000000000..22669236d --- /dev/null +++ b/community/pion-net/PKGBUILD @@ -0,0 +1,49 @@ +# $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.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') +license=('custom:Boost') +depends=('boost-libs' 'openssl' 'log4cpp') +makedepends=('boost') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" + "$pkgname-4.0.5-build.patch") +md5sums=('761c8af8dc54102b637f8d91d162f987' + 'd75ea2af90163a81d2bc71fda00f0c00') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + 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 + + ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + + find -name Makefile -print0 | xargs -0 \ + sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + + # override Makefile bug + sed -i "/docs:/ s/doxygen-doc//" Makefile + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" +} diff --git a/community/pion-net/pion-net-4.0.5-build.patch b/community/pion-net/pion-net-4.0.5-build.patch new file mode 100644 index 000000000..25fdca20b --- /dev/null +++ b/community/pion-net/pion-net-4.0.5-build.patch @@ -0,0 +1,12 @@ +diff -ru pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp +--- pion-net-4.0.5/net/include/pion/net/TCPConnection.hpp 2010-12-21 03:07:13.000000000 +0100 ++++ pion-net-4.0.5.fixed/net/include/pion/net/TCPConnection.hpp 2011-07-31 09:01:38.445559768 +0200 +@@ -639,7 +639,7 @@ + + /// returns reference to the io_service used for async operations + inline boost::asio::io_service& getIOService(void) { +- return m_ssl_socket.lowest_layer().io_service(); ++ return m_ssl_socket.lowest_layer().get_io_service(); + } + + /// returns non-const reference to underlying TCP socket object diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD index 846bb358d..441f9bb9f 100644 --- a/community/plan9port/PKGBUILD +++ b/community/plan9port/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55793 2011-09-20 21:39:14Z cbrannon $ +# $Id: PKGBUILD 57586 2011-10-31 07:11:36Z cbrannon $ # Contributor: phrakture <aaronmgriffin--gmail--com> # Contributor: Fazlul Shahriar # Contributor: Chris Brannon <cmbrannon79@gmail.com> pkgname=plan9port -pkgver=20110920 +pkgver=20111026 pkgrel=1 pkgdesc="A port of many programs from Plan 9 to Unix-like operating systems" arch=('i686' 'x86_64' 'mips64el') @@ -48,5 +48,5 @@ build() rm -f $i done } -md5sums=('ce91667f56c0f49849aae9c79a7cb58c' +md5sums=('4aa76e73fcb9f716165dd628d052cd58' '9695eb15a247e23140e8a35ff52a5c20') diff --git a/community/pmtools/PKGBUILD b/community/pmtools/PKGBUILD index 37148e4ce..8acabff31 100644 --- a/community/pmtools/PKGBUILD +++ b/community/pmtools/PKGBUILD @@ -1,6 +1,5 @@ -# $Id: PKGBUILD 33452 2010-11-24 16:48:38Z spupykin $ +# $Id: PKGBUILD 59227 2011-11-21 15:25:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Andrea Scarpino <bash.lnx@gmail.com> # Contributor: Sebastian Pohle <naitsabes@imapmail.org> pkgname=pmtools @@ -11,7 +10,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://acpi.sourceforge.net/dsdt/index.php" license=('GPL2') depends=('perl') -source=(http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/$pkgname-$pkgver.tar.bz2) +#source=(http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/utils/$pkgname-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.bz2) md5sums=('45e62eae9aca4fce84cb102c117f5796') build() { diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD index 2b7fbe2f4..379774e3e 100644 --- a/community/postgis/PKGBUILD +++ b/community/postgis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 51024 2011-07-04 13:40:25Z stephane $ +# $Id: PKGBUILD 57370 2011-10-26 14:27:28Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=postgis pkgver=1.5.3 -pkgrel=1 +pkgrel=2 pkgdesc="Adds support for geographic objects to PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://postgis.refractions.net/" @@ -13,7 +13,7 @@ license=('GPL') depends=('postgresql' 'proj' 'geos') changelog=$pkgname.changelog source=(http://postgis.refractions.net/download/${pkgname}-${pkgver}.tar.gz) -md5sums=('05a61df5e1b78bf51c9ce98bea5526fc') +sha256sums=('a2334f8b229446c0497d48a430a40152a3b71a5da02f414a0340a0a025d416cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog index 86c0b336b..16f9b925d 100644 --- a/community/postgis/postgis.changelog +++ b/community/postgis/postgis.changelog @@ -1,3 +1,6 @@ +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#26159 fix in postgis-1.5.3-2 + 2010-10-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Update to major release 1.5.2 diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD index f1e47b9bf..44bdf517d 100755 --- a/community/pragha/PKGBUILD +++ b/community/pragha/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55279 2011-09-08 15:03:04Z ttopper $ +# $Id: PKGBUILD 58664 2011-11-17 11:39:42Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Alois Nespor <alois.nespor@gmail.com> # Contributor: JerichoKru <jerichokru(AT)htomail.com> pkgname=pragha -pkgver=0.99.0 +pkgver=0.99.1.1 pkgrel=1 pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager." arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,12 @@ license=('GPL3') depends=('libnotify' 'libcdio' 'curl' 'taglib' 'gstreamer0.10' 'hicolor-icon-theme' 'gtk2' 'dbus-glib' 'dbus-core' - 'sqlite3' 'glib2') + 'sqlite3' 'glib2' 'desktop-file-utils') optdepends=('notification-daemon: OSD notification') replaces=('dissonance') install=pragha.install source=(http://dissonance.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -sha1sums=('0791335c29121e6288962f4a7fbe074e4db73c9d') +sha1sums=('25ff36e8a197f45edf7309072f1bd55785d9843d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/prboom/PKGBUILD b/community/prboom/PKGBUILD index b34a8b1b8..94106432e 100644 --- a/community/prboom/PKGBUILD +++ b/community/prboom/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 70418 2010-02-26 19:23:47Z thayer $ -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 57863 2011-11-03 19:29:22Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: dale <dale@archlinux.org> pkgname=prboom pkgver=2.5.0 -pkgrel=4 -pkgdesc="A game engine which provides a program to play Doom levels" -url="http://prboom.sourceforge.net/" +pkgrel=5 +pkgdesc='A game engine which provides a program to play Doom levels.' +url='http://prboom.sourceforge.net/' license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libpng' 'mesa' 'sdl_mixer' 'sdl_net') -source=(http://downloads.sourceforge.net/prboom/$pkgname-$pkgver.tar.gz libpng-1.4.patch) -md5sums=('a8a15f61fa2626ab98051ab2703378c4' 'ba53474db8e747035ca2320a445e4ae0') -sha1sums=('f17dc6ed4e72d07b85429177b00b8709ea36f5a0' 'faf858bc03a246b7f8e939679b2f0db3e4d6bc21') +source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" + 'libpng-1.4.patch') +md5sums=('a8a15f61fa2626ab98051ab2703378c4' + 'ba53474db8e747035ca2320a445e4ae0') build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 < ../libpng-1.4.patch || return 1 - ./configure --prefix=/usr --disable-i386-asm || return 1 - sed -i "s|/games|/bin|g" $srcdir/$pkgname-$pkgver/src/Makefile || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../libpng-1.4.patch + + ./configure --prefix=/usr --disable-i386-asm + sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD index 9336274c2..4b677caf1 100644 --- a/community/prelink/PKGBUILD +++ b/community/prelink/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54150 2011-08-13 19:36:37Z lfleischer $ +# $Id: PKGBUILD 57791 2011-11-02 20:30:29Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Rouslan Solomakhin <rouslan@localnet.com> pkgname=prelink -pkgver=20110622 +pkgver=20111012 pkgrel=1 pkgdesc='ELF prelinking utility to speed up dynamic linking.' arch=('i686' 'x86_64' 'mips64el') @@ -12,10 +12,10 @@ url='http://people.redhat.com/jakub/prelink/' license=('GPL') depends=('elfutils') backup=('etc/prelink.conf') -md5sums=('2863a9c9e68d076916bf9a46ad6bca78' +md5sums=('f5aaf347432d677c293e5e3399ba4fdf' '0793ed49e9b31c125cba4d936c333cf6' 'b347580536e078b34c547742d36a3e9d') -source=("http://pkgs.fedoraproject.org/repo/pkgs/${pkgname}/${pkgname}-${pkgver}.tar.bz2/${md5sums[0]}/${pkgname}-${pkgver}.tar.bz2" +source=("http://people.redhat.com/jakub/prelink/${pkgname}-${pkgver}.tar.bz2" 'prelink.conf' 'arch-x86_64-dynamic_linker.patch') diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 2e360906a..b222d50b4 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 52100 2011-07-20 08:15:14Z lfleischer $ +# $Id: PKGBUILD 59194 2011-11-21 14:53:22Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy -pkgver=3.0.17 -pkgrel=3 +pkgver=3.0.18 +pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://www.privoxy.org' @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src 'privoxy' 'privoxy.logrotate.d' 'privoxy.conf.d') -md5sums=('9d363d738a3f3d73e774d6dfeafdb15f' +md5sums=('baf0b13bb591ec6e1ba15b720ddea65c' '1b4ed8c4e7e5b04b10ef41b597dc3f3b' '79480f311313cc43974f6cbe6b672927' '27830ef79418e277b90c1c1fa933f876') diff --git a/community/procstatd/PKGBUILD b/community/procstatd/PKGBUILD index 05d23fbcb..0123c6a68 100644 --- a/community/procstatd/PKGBUILD +++ b/community/procstatd/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 5270 2009-11-07 13:16:35Z ibiru $ +# $Id: PKGBUILD 58686 2011-11-17 15:41:14Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jason Chu <jason@archlinux.org> @@ -11,15 +12,14 @@ license=('GPL') source=(http://downloads.sourceforge.net/herdtools/$pkgname.tar.gz) md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') url="http://www.phy.duke.edu/brahma/" +md5sums=('1fdeaf05ca6337f5c02e76a76c53c407') build() { -cd $startdir/src/$pkgname -# Get rid of the funky mkae install forever bug -sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile -make || return 1 -make INSTDIR=$startdir/pkg/usr install -mkdir ${pkgdir}/usr/share -mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man -#mkdir -p $startdir/pkg/usr/share/procstatd-extras -#cp -R webwatch $startdir/pkg/usr/share/procstatd-extras/ + cd $srcdir/$pkgname + # Get rid of the funky make install forever bug + sed -i 's/make install/echo/;s/cd watchman/echo/' Makefile + make + make INSTDIR=$pkgdir/usr install + mkdir ${pkgdir}/usr/share + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/man } diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD index 6a2717093..fa9d3d803 100644 --- a/community/puzzles/PKGBUILD +++ b/community/puzzles/PKGBUILD @@ -3,8 +3,8 @@ # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=puzzles -pkgver=9179 -pkgrel=1 +pkgver=9306 +pkgrel=2 pkgdesc="Simon Tatham's Portable Puzzle Collection" arch=('i686' 'x86_64' 'mips64el') url="http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" @@ -12,7 +12,6 @@ license=('MIT') makedepends=('pkgconfig') depends=('gtk2') source=("http://www.chiark.greenend.org.uk/~sgtatham/${pkgname}/${pkgname}-r${pkgver}.tar.gz") -md5sums=('f724413049ff2a3cc00799793190b1d0') build() { cd ${srcdir}/${pkgname}-r${pkgver} @@ -34,3 +33,5 @@ package() { mv ${pkgdir}/usr/bin/cube ${pkgdir}/usr/bin/puzzles-cube mv ${pkgdir}/usr/bin/blackbox ${pkgdir}/usr/bin/puzzles-blackbox } + +md5sums=('317e97dc3bfc7cb901636761747fa4c9') diff --git a/community/pwmanager/PKGBUILD b/community/pwmanager/PKGBUILD index c75d4f16b..e0bafdeb5 100644 --- a/community/pwmanager/PKGBUILD +++ b/community/pwmanager/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 9064 2010-01-23 12:16:49Z foutrelis $ +# $Id: PKGBUILD 58627 2011-11-16 15:52:59Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributors: Pointer <pointer@linux-blog.de>, tmaynard <arch@toddmaynard.com> pkgname=pwmanager pkgver=1.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="With PwManager you can easily manage your passwords" arch=('i686' 'x86_64' 'mips64el') url="http://passwordmanager.sourceforge.net/" license=('GPL') depends=('kdelibs3') -options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/passwordmanager/$pkgname-$pkgver.tar.bz2 \ +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/passwordmanager/$pkgname-$pkgver.tar.bz2 build-fix.patch) md5sums=('e6f720af9b325bc0e7ea20c9c5e6039f' 'bcc412cb855cba4910e51920ae38a326') @@ -19,14 +20,11 @@ md5sums=('e6f720af9b325bc0e7ea20c9c5e6039f' build() { . /etc/profile.d/qt3.sh export PATH=$QTDIR/bin:$PATH - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/opt/kde --without-arts - make || return 1 - make DESTDIR=$startdir/pkg install - - # ugly libtool - rm $startdir/pkg/opt/kde/lib/kde3/kded_pwmanager_kwalletemu.la + make + make DESTDIR=$pkgdir install } diff --git a/community/pylibacl/PKGBUILD b/community/pylibacl/PKGBUILD index f102cb618..4d5cee098 100644 --- a/community/pylibacl/PKGBUILD +++ b/community/pylibacl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 31901 2010-11-07 19:18:54Z lfleischer $ +# $Id: PKGBUILD 57855 2011-11-03 18:43:59Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> pkgname=pylibacl pkgver=0.5.0 -pkgrel=1 -pkgdesc="A python extension module that allows you to manipulate the POSIX.1e ACLs." +pkgrel=2 +pkgdesc='A python extension module that allows you to manipulate the POSIX.1e ACLs.' arch=('i686' 'x86_64' 'mips64el') url='http://pylibacl.sourceforge.net/' license=('GPL') diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD index 78e40ddd4..49f1839a7 100644 --- a/community/pypanel/PKGBUILD +++ b/community/pypanel/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 27121 2010-09-17 15:17:17Z schuay $ -# Maintainer: Jeff Mickey <j@codemac.net> +# $Id: PKGBUILD 57834 2011-11-03 10:22:57Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Jeff Mickey <j@codemac.net> # Contributor: Mr Green # Contributor: Jens Persson <xerxes2@gmail.com> pkgname=pypanel pkgver=2.4 -pkgrel=6 -pkgdesc="A lightweight panel/taskbar for X11 window managers written in python" +pkgrel=7 +pkgdesc='A lightweight panel/taskbar for X11 window managers written in python.' arch=('i686' 'x86_64' 'mips64el') -url="http://pypanel.sourceforge.net/" +url='http://pypanel.sourceforge.net/' license=('GPL') depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft') -source=(http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz") md5sums=('f1f9a2ed80be72ab36e748833618daba') build() { - cd "$srcdir/PyPanel-$pkgver" - python2 setup.py install --root="$pkgdir" + cd "${srcdir}/PyPanel-${pkgver}" + python2 setup.py install --root="${pkgdir}" } diff --git a/community/python-lcms/PKGBUILD b/community/python-lcms/PKGBUILD index 33efa9902..e5cd1d251 100644 --- a/community/python-lcms/PKGBUILD +++ b/community/python-lcms/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 26298 2010-09-14 17:18:19Z schuay $ +# $Id: PKGBUILD 58889 2011-11-19 16:52:42Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> @@ -11,7 +11,7 @@ arch=(i686 x86_64 'mips64el') license=('CUSTOM') depends=('libtiff' 'python2' 'lcms') url="http://www.littlecms.com" -options=('!libtool' 'force') +options=('!libtool') source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) md5sums=('8af94611baf20d9646c7c2c285859818') diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD index acabb15d9..30a7cd923 100644 --- a/community/python-numarray/PKGBUILD +++ b/community/python-numarray/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 34440 2010-12-07 21:07:34Z lfleischer $ +# $Id: PKGBUILD 57888 2011-11-04 08:26:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> pkgname=python-numarray pkgver=1.5.2 -pkgrel=4 +pkgrel=5 pkgdesc='Provides array manipulation and computational capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://numpy.scipy.org/' diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD index 652cfe8c1..7f86ce232 100644 --- a/community/python-openbabel/PKGBUILD +++ b/community/python-openbabel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40381 2011-02-23 18:15:16Z stephane $ -# Maintainer: Andrea Scarpino <bash.lnx@gmail.com> +# $Id: PKGBUILD 57093 2011-10-21 05:48:48Z kchen $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python-openbabel -pkgver=2.3.0 -pkgrel=3 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Python bindings of openbabel library" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Python" @@ -13,7 +13,7 @@ depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen') makedepends=('swig' 'cmake') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('effda01ed4a31d18d8e3d08191799608') +md5sums=('1f029b0add12a3b55582dc2c832b04f8') build() { cd "${srcdir}/openbabel-$pkgver" @@ -23,12 +23,13 @@ build() { # Regenerate interface with the patched swig 2.0.2 cd scripts - swig -I../include/ -python -c++ openbabel-python.i + swig -I../include/ -python -py3 -c++ openbabel-python.i mv openbabel-python_wrap.cxx python/openbabel-python.cpp mv openbabel.py python/ cd python sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py } package() { diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 44959e811..d9ac969d6 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,51 +1,38 @@ -# $Id: PKGBUILD 51728 2011-07-13 14:46:12Z tdziedzic $ -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Ray Rashif <schiv@archlinux.org> +# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> # Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> # Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgbase=python-scipy -_app=scipy pkgname=('python-scipy' 'python2-scipy') -pkgver=0.9.0 -_theapp=$_app-$pkgver -pkgrel=2 +pkgver=0.10.0 +pkgrel=1 pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') url="http://www.scipy.org/" license=('BSD') -depends=('python-numpy') -makedepends=('gcc-fortran' 'python2-numpy') -changelog=$pkgbase.changelog -source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") -md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') +makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') +source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") +md5sums=('e357c08425fd031dce63bc4905789088') build() { unset LDFLAGS unset FFLAGS - # Compatibility symlinks for current stable numpy - # - no need to patch numpy just for this - # see http://projects.scipy.org/numpy/ticket/1749 - ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so - ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so - export LAPACK="$srcdir" - export BLAS="$srcdir" - # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ - $_theapp/$_app/special/cephes/mconf.h + scipy-${pkgver}/scipy/special/cephes/mconf.h # 2 builds - cp -r $_theapp $_theapp-py2 + cp -r scipy-${pkgver} scipy-${pkgver}-py2 # build for python3 - cd $_theapp + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 build # build for python2 - cd ../$_theapp-py2 + cd ../scipy-${pkgver}-py2 for file in $(find . -name '*.py' -print); do sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file @@ -56,28 +43,29 @@ build() { } package_python-scipy() { + depends=('python-numpy') provides=('python3-scipy' 'scipy') - cd "$srcdir/$_theapp" + cd scipy-${pkgver} python setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python-scipy/LICENSE" } package_python2-scipy() { depends=('python2-numpy') conflicts=('python-scipy<0.9.0') - cd "$srcdir/$_theapp-py2" + cd scipy-${pkgver}-py2 python2 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root="$pkgdir" --optimize=1 + --prefix=/usr --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/python-scipy/python-scipy.changelog b/community/python-scipy/python-scipy.changelog deleted file mode 100644 index 76a3e7f35..000000000 --- a/community/python-scipy/python-scipy.changelog +++ /dev/null @@ -1,49 +0,0 @@ -2011-07-13 Thomas Dziedzic < gostrc at gmail > - * 0.9.0-2: - rebuild for python3-numpy to python-numpy rename - also, minor PKGBUILD cleanup - -2011-04-24 Ray Rashif <schiv@archlinux.org> - - * 0.9.0-1: - Couldn't release previous update due to lapack/blas issues - See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html - Hopefully symlink trick from AUR/python3-scipy fixes that - -2011-04-05 Ray Rashif <schiv@archlinux.org> - - * 0.9.0-1: - Upstream release - SciPy now supports Python 3 - Package split for python(3), python2 - PKGBUILD cleanup - -2010-07-29 Angel 'angvp' Velasquez <angvp@archlinux.org> - * Updated to: 0.8.0 -2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated to: 0.7.1 - -2009-02-11 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 0.7 - -2008-12-12 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updating for i686: 0.7.0 beta 1 - -2008-11-07 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated to svn as scipy 0.6 wont work with python 2.6 - -2008-02-21 Eric Belanger <eric@archlinux.org> - - * Added x86_64 arch tag - * Added license - -2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Changed email - * Fixed some problems in the PKGBUILD - * Updated to new release - 0.6.0 - diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD index dc93ecfbe..360825993 100644 --- a/community/python2-ldap/PKGBUILD +++ b/community/python2-ldap/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 32662 2010-11-16 10:18:17Z spupykin $ +# $Id: PKGBUILD 57753 2011-11-02 08:49:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org> pkgname=python2-ldap -pkgver=2.3.12 +pkgver=2.4.4 pkgrel=1 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs" arch=('i686' 'x86_64' 'mips64el') url="http://python-ldap.sourceforge.net" license=('custom') -depends=('python2' 'libldap>=2.4.18') +depends=('python2' 'libldap>=2.4.26') +makedepends=('chrpath') replaces=('python-ldap') source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz) -md5sums=('2dadc521b2c2590d9b033894ba5c6f31') -md5sums=('2dadc521b2c2590d9b033894ba5c6f31') +md5sums=('b7b8d61eed6f03d1ca8914471e2c9724') build() { cd $srcdir/python-ldap-$pkgver @@ -21,4 +21,5 @@ build() { python2 setup.py build python2 setup.py install --root $pkgdir install -D -m644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENSE + chrpath -d $pkgdir/usr/lib/python2.7/site-packages/_ldap.so } diff --git a/community/python2-openbabel/PKGBUILD b/community/python2-openbabel/PKGBUILD index 94d84accc..6ca534313 100644 --- a/community/python2-openbabel/PKGBUILD +++ b/community/python2-openbabel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 32948 2010-11-20 08:38:00Z kchen $ -# Maintainer: -# Contributor: Andrea Scarpino <bash.lnx@gmail.com> +# $Id: PKGBUILD 57091 2011-10-21 05:24:19Z kchen $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Michal Bozon <bozonm@vscht.cz> pkgname=python2-openbabel -pkgver=2.3.0 -pkgrel=2 +pkgver=2.3.1 +pkgrel=1 pkgdesc="Python 2 bindings of openbabel library" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Python" @@ -14,10 +14,11 @@ depends=('python2' 'gcc-libs' "openbabel=${pkgver}" 'eigen') makedepends=('swig') options=('!libtool') source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('effda01ed4a31d18d8e3d08191799608') +md5sums=('1f029b0add12a3b55582dc2c832b04f8') -build() { +package() { cd ${srcdir}/openbabel-$pkgver/scripts/python sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py python2 setup.py install --prefix=/usr --root=${pkgdir} } diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD index 4d33bd215..5a7e907d7 100644 --- a/community/python2-poppler/PKGBUILD +++ b/community/python2-poppler/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56953 2011-10-17 08:21:15Z ibiru $ +# $Id: PKGBUILD 58362 2011-11-12 10:53:03Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org # Contributor: György Balló <ballogy@freestart.hu> pkgname=python2-poppler _realname=pypoppler pkgver=0.12.1 -pkgrel=5 +pkgrel=7 pkgdesc="Python 2.x bindings for Poppler" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/poppler-python" @@ -15,15 +15,20 @@ provides=('pypoppler' 'python-poppler') conflicts=('python-poppler') replaces=('python-poppler') options=(!libtool) -source=(http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz - pypoppler-0.12.1-poppler-0.16.0.patch) +source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz" + 'pypoppler-0.12.1-poppler-0.16.0.patch') md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a' '683c5b67866d56adc2494120cc329dc8') build() { cd "$srcdir/$_realname-$pkgver" - patch -Np0 -i "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + # poppler 0.16 compat + patch -Np0 -i \ + "$srcdir/pypoppler-0.12.1-poppler-0.16.0.patch" + + # poppler 0.18 compat + sed -i "/pixbuf/,/^)/d" poppler.defs ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -36,5 +41,7 @@ build() { package() { cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD index 444494714..b846555a9 100644 --- a/community/qbittorrent/PKGBUILD +++ b/community/qbittorrent/PKGBUILD @@ -1,10 +1,11 @@ +# $Id: PKGBUILD 58528 2011-11-13 15:59:35Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=qbittorrent -pkgver=2.9.0 -pkgrel=1 +pkgver=2.9.2 +pkgrel=3 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" arch=('i686' 'x86_64' 'mips64el') url="http://www.qbittorrent.org/" @@ -15,7 +16,7 @@ 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=('a13e199ebbc3411688683e587814d6aa') +md5sums=('0c2188e0065be57e50c06f5934d5f7a2') build() { cd qbittorrent-${pkgver} 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/qemu-launcher/PKGBUILD b/community/qemu-launcher/PKGBUILD deleted file mode 100644 index 076b51b3d..000000000 --- a/community/qemu-launcher/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: cs-cam <me@camdaniel.com> - -pkgname=qemu-launcher -pkgver=1.7.4 -pkgrel=2 -pkgdesc="GNOME/Gtk front-end for the Qemu x86 PC emulator" -url="http://gna.org/projects/qemulaunch" -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -source=(http://download.gna.org/qemulaunch/1.7.x/${pkgname}_$pkgver.tar.gz) -depends=('qemu' 'gtk2-perl' 'glade-perl' 'perl-locale-gettext' 'xdg-utils') -makedepends=('libxml2') -install=qemu-launcher.install -md5sums=('bd71fd543bd2723c7ea54de81f7ccabf') - -build() { - cd $startdir/src/$pkgname-$pkgver - make PREFIX=/usr DESTDIR=$startdir/pkg install - ln -s qemu-launcher-32x32.xpm $startdir/pkg/usr/share/pixmaps/qemu-launcher.xpm -} diff --git a/community/qemu-launcher/qemu-launcher.install b/community/qemu-launcher/qemu-launcher.install deleted file mode 100644 index c5571196e..000000000 --- a/community/qemu-launcher/qemu-launcher.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index c43e11098..35e45b332 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56621 2011-10-09 07:51:45Z jlichtblau $ +# $Id: PKGBUILD 58530 2011-11-13 16:03:22Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> @@ -16,25 +16,32 @@ optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) + $pkgname-mimetypes.xml + 'fix-glu-header.patch') sha256sums=('3f87667ceffde60a7c533df7e25f375793a093970d89bfa1cd842b3595c58f2c' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + '8e8c6440e1674a87d5a221c978f2be832457fb43980894725044837581625618') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" - install -d ${srcdir}/$pkgname-$pkgver/build - cd ${srcdir}/$pkgname-$pkgver/build + patch -R -p2 -i "${srcdir}"/fix-glu-header.patch - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cd "${srcdir}" + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package(){ - cd ${srcdir}/$pkgname-$pkgver/build + cd "${srcdir}/build" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ - ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml + install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ + "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } diff --git a/community/qlandkartegt/fix-glu-header.patch b/community/qlandkartegt/fix-glu-header.patch new file mode 100644 index 000000000..214ad395d --- /dev/null +++ b/community/qlandkartegt/fix-glu-header.patch @@ -0,0 +1,12 @@ +--- QLandkarteGT/trunk/src/CMap3D.cpp 2011/08/23 16:34:50 2943 ++++ QLandkarteGT/trunk/src/CMap3D.cpp 2011/09/03 07:58:02 2961 +@@ -31,8 +31,8 @@ + #include "CWptDB.h" + #include "WptIcons.h" + +-#include <GL/glu.h> + #include <QtGui> ++#include <QtOpenGL> + #include <math.h> + + #ifndef GL_CLAMP_TO_EDGE diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 1358b0445..b45a08dd0 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 50714 2011-06-29 20:28:47Z spupykin $ +# $Id: PKGBUILD 58650 2011-11-17 09:14:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> +# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.2.b20 +pkgver=0.34 pkgrel=1 -pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME." +pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" license=("GPL") arch=('i686' 'x86_64' 'mips64el') depends=('qt' 'phonon' 'sdl' 'libxmu') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/project/qmc2/qmc2/$pkgver/qmc2-$pkgver.tar.bz2") -md5sums=('e868144815ff44a2146e839c2395c6d1') +md5sums=('3439fb62c95ff702e3c4194c05353169') build() { cd "$srcdir/$pkgname" @@ -23,6 +23,6 @@ build() { package() { cd "$srcdir/$pkgname" make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install - mkdir -p $pkgdir/usr/share/{applications,pixmaps} + install -d $pkgdir/usr/share/{applications,pixmaps} install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps" } diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index d366771fc..e594e316c 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 56625 2011-10-09 08:59:56Z jlichtblau $ +#$Id: PKGBUILD 58421 2011-11-12 17:18:45Z ibiru $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp pkgver=0.5.2 -pkgrel=1 +pkgrel=3 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64' 'mips64el') url="http://qmmp.ylsoftware.com/" diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 31050d69e..379f85cbe 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,7 @@ +2011-11-12 Andrea Scarpino <andrea@archlinux.org> + * qmmp 0.5.2-3 + * rebuild with qt 4.7 + 2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.2-1 diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD index c1726cd86..b98775d66 100644 --- a/community/qmpdclient/PKGBUILD +++ b/community/qmpdclient/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 40012 2011-02-19 13:47:31Z jlichtblau $ +# $Id: PKGBUILD 58444 2011-11-12 18:54:25Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=qmpdclient -pkgver=1.2.1 -pkgrel=1 +pkgver=1.2.2 +pkgrel=2 pkgdesc="A Qt4 client for MPD" arch=('i686' 'x86_64' 'mips64el') url="http://bitcheese.net/wiki/QMPDClient" license=('GPL') -depends=('qt' 'openssl' 'hicolor-icon-theme') +depends=('qt') makedepends=('cmake') install=$pkgname.install changelog=$pkgname.changelog source=(http://dump.bitcheese.net/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('9d57ffbf2985c1dbc9e8856e9c5edf5171e85152d8cf58ad692e85233a9b0773') +sha256sums=('ed65705eaae8fb10fdce34ce20e010757a87423c2874479e1466e4368a866289') build() { cd ${srcdir} - mkdir build cd build - - cmake ../${pkgname} -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr make } package() { cd ${srcdir}/build - make DESTDIR=${pkgdir} install } diff --git a/community/qmpdclient/qmpdclient.changelog b/community/qmpdclient/qmpdclient.changelog index 2dc991d38..788ad2d68 100644 --- a/community/qmpdclient/qmpdclient.changelog +++ b/community/qmpdclient/qmpdclient.changelog @@ -1,3 +1,10 @@ +2011-11-12 Andrea Scarpino <andrea@archlinux.org> + * qmpdclient 1.2.2-2 + * Qt 4.8 downgrade + +2011-10-22 Andrea Scarpino <andrea@archlinux.org> + * qmpdclient 1.2.2-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmpdclient 1.2.1-1 diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 3d99a92f1..23b606691 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56042 2011-09-29 16:07:37Z svenstaro $ +# $Id: PKGBUILD 58532 2011-11-13 16:04:52Z andrea $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD index bfe9d2175..84e1983f7 100644 --- a/community/qtfm/PKGBUILD +++ b/community/qtfm/PKGBUILD @@ -1,27 +1,26 @@ +# $Id: PKGBUILD 57268 2011-10-25 05:38:14Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Wittfella <wittfella@wittfella.com> pkgname=qtfm -pkgver=5.0 +pkgver=5.1 pkgrel=1 pkgdesc="A lightweight file manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.qtfm.org" license=('GPL') depends=('qt') +install=qtfm.install source=(http://www.qtfm.org/$pkgname-$pkgver.tar.gz) -md5sums=('ad8e6d2d1533b2b1327cda557251a35d') +md5sums=('e7e079d2586b46ce80998c52b777cb88') build() { - cd "$startdir/src/$pkgname-$pkgver" - qmake - make + cd "$srcdir/$pkgname-$pkgver" + qmake + make } package() { - cd "$startdir/src/$pkgname-$pkgver" - install -Dm 755 ${startdir}/src/$pkgname-$pkgver/qtfm ${startdir}/pkg/usr/bin/qtfm - install -Dm 644 ${startdir}/src/$pkgname-$pkgver/qtfm.desktop ${startdir}/pkg/usr/share/applications/qtfm.desktop - install -Dm 644 ${startdir}/src/$pkgname-$pkgver/images/qtfm.png ${startdir}/pkg/usr/share/pixmaps/qtfm.png + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install } - diff --git a/community/listen/listen.install b/community/qtfm/qtfm.install index 5e5cfef4d..2eaa60550 100644 --- a/community/listen/listen.install +++ b/community/qtfm/qtfm.install @@ -7,5 +7,5 @@ post_upgrade() { } post_remove() { - update-desktop-database -q + post_install $1 } diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD index 1eb57c63f..9c87260ae 100644 --- a/community/quassel/PKGBUILD +++ b/community/quassel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 52032 2011-07-19 19:58:15Z jlichtblau $ +# $Id: PKGBUILD 57415 2011-10-27 10:22:06Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=quassel -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="QT4 irc client with a separated core" arch=('i686' 'x86_64' 'mips64el') @@ -11,11 +11,11 @@ license=('GPL') depends=('kdelibs' 'oxygen-icons' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4') install=$pkgname.install -backup=(etc/conf.d/quassel.conf) +backup=(etc/conf.d/quassel) source=(http://quassel-irc.org/pub/$pkgname-$pkgver.tar.bz2 rc.$pkgname $pkgname.conf) -sha256sums=('b9e4a094c46715dd68152cd98a4e0778e308a0ec653eb8b5476ec429d128d55c' +sha256sums=('9e78dbc28bfeda2ed66fa3082392951cbd002f851ef1a7f1228988bb18c7c98d' '845e621448a51ec181554e9327bfcc3a3de1501ae8f70410f0b9b8991ac171b0' 'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8') diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD new file mode 100644 index 000000000..a09e3fc73 --- /dev/null +++ b/community/quilt/PKGBUILD @@ -0,0 +1,21 @@ +# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> + +pkgname=quilt +pkgver=0.48 +pkgrel=2 +pkgdesc="Manage a series of patches by keeping track of the changes each patch makes." +arch=('i686' 'x86_64') +url="http://savannah.nongnu.org/projects/quilt" +license=('GPL') +depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'gettext') +source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz) +md5sums=('f77adda60039ffa753f3c584a286f12b') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --mandir=/usr/share/man + make + make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install +} diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 0b95cd2d6..26a78deb0 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 53820 2011-08-08 14:10:47Z lfleischer $ +# $Id: PKGBUILD 57074 2011-10-20 16:44:35Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.19 +pkgver=0.4.0 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64' 'mips64el') url='http://quvi.sourceforge.net/' license=('LGPL') -depends=('curl' 'pcre' 'lua') +depends=('libquvi') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('c96627374377b049ac60e7642eb7f838') +md5sums=('302652f7e3d97051d7250e3a7bc04250') build() { cd "${pkgname}-${pkgver}" diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD new file mode 100644 index 000000000..10afb9759 --- /dev/null +++ b/community/r8168/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 58713 2011-11-17 21:35:20Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.026.00 +pkgrel=3 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' 'linux>=3.1' 'linux<3.2') +makedepends=('linux-headers') +source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$pkgname-$pkgver" + make clean SYSSRC=/usr/src/linux-$_kernver modules +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + install -D -m644 $pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" +} + +md5sums=('cd0b93af17e18eb20cbfb8c5dee40f51') +sha256sums=('e0a58706a956f22f6f44a617d218693888bfc5d3eba7197e61ed6cb75eebb425') diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install new file mode 100644 index 000000000..ff6d6ee42 --- /dev/null +++ b/community/r8168/r8168.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD index c74a82cfc..b348c5c23 100644 --- a/community/rapidsvn/PKGBUILD +++ b/community/rapidsvn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 34181 2010-12-04 13:42:17Z spupykin $ +# $Id: PKGBUILD 59187 2011-11-21 14:15:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: AqD <aquila.deus@gmail.com> @@ -8,11 +8,12 @@ pkgname=rapidsvn pkgver=0.12.0 pkgrel=3 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework." -depends=('subversion' 'wxgtk') url='http://rapidsvn.tigris.org/' arch=('i686' 'x86_64' 'mips64el') license=('GPL') options=('!libtool') +depends=('subversion' 'wxgtk') +makedepends=('python2') source=(http://www.rapidsvn.org/download/release/0.12/rapidsvn-$pkgver-1.tar.gz $pkgname.desktop) md5sums=('8ec54104fca32d81e396a68e25324263' diff --git a/community/raw-thumbnailer/PKGBUILD b/community/raw-thumbnailer/PKGBUILD index 8d4b3422f..275a110ee 100644 --- a/community/raw-thumbnailer/PKGBUILD +++ b/community/raw-thumbnailer/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 22594 2010-07-23 08:17:42Z lcarlier $ -# Maintainer: pressh <pressh at gmail dot com> +# $Id: PKGBUILD 58310 2011-11-10 20:50:33Z rvanharen $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: boromil@gmail.com pkgname=raw-thumbnailer -pkgver=0.2 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="A lightweight and fast raw image thumbnailer that can be used by file managers." url="http://code.google.com/p/raw-thumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('libopenraw') source=(http://raw-thumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('f107575aa32a0d53802cf5beead18bf8') +sha1sums=('f34012062c0b1eaa10525722c36bd027b11ade2e') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/rdiff-backup/ChangeLog b/community/rdiff-backup/ChangeLog deleted file mode 100644 index b6e02ffe2..000000000 --- a/community/rdiff-backup/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2008-09-27 Dragonlord <dragonlord@aur.archlinux.org> - * updated to major release 1.2.1 - -2007-06-28 tardo <tardo@nagi-fanboi.net> - * Built for x86_64 diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD index 0fbb77697..e4f34995e 100644 --- a/community/rdiff-backup/PKGBUILD +++ b/community/rdiff-backup/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 26407 2010-09-15 11:58:40Z schuay $ -# Maintainer: Aaron Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 57837 2011-11-03 10:27:32Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron Schaefer <aaron@elasticdog.com> # Contributor: Erwin Van de Velde <erwin.vandevelde@gmail.com> + pkgname=rdiff-backup pkgver=1.2.8 -pkgrel=4 -pkgdesc='A utility for local/remote mirroring and incremental backups' +pkgrel=5 +pkgdesc='A utility for local/remote mirroring and incremental backups.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/rdiff-backup/' license=('GPL') depends=('python2' 'librsync') optdepends=('pylibacl: access control list support' 'pyxattr: extended attribute support') -source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1a94dc537fcf74d6a3a80bd27808e77b') +source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc}) +md5sums=('1a94dc537fcf74d6a3a80bd27808e77b' + '3b88b18eb43ac85bc70b8dce92e958ba') build() { cd "${srcdir}/${pkgname}-${pkgver}" + python2 setup.py install --root="${pkgdir}" -O1 # Fix for FS#18848 - sed -i 's|python2|python2 -W ignore::DeprecationWarning|' ${pkgdir}/usr/bin/rdiff-backup + sed -i 's|python2|python2 -W ignore::DeprecationWarning|' "${pkgdir}/usr/bin/rdiff-backup" } diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 7831c6c90..a2f563c6c 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56852 2011-10-14 21:13:51Z spupykin $ +# $Id: PKGBUILD 57479 2011-10-28 13:24:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.0 +pkgver=2.4.2 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('efdfa0d40fc7676199005bd0178cf6a9' +md5sums=('c4b0b5e4953a11a503cb54cf6b09670e' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD index 185656574..0927cd990 100644 --- a/community/remind/PKGBUILD +++ b/community/remind/PKGBUILD @@ -1,10 +1,11 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Sebastian Sontberg <ssontberg@h3c.de> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=remind pkgver=3.01.10 -pkgrel=1 +pkgrel=2 pkgdesc='A sophisticated calendar and alarm progam.' arch=('i686' 'x86_64' 'mips64el') url='http://www.roaringpenguin.com/penguin/open_source_remind.php' @@ -15,16 +16,13 @@ options=('!emptydirs') md5sums=('f6f7829d3ac92e0d6d463c59b5e6ce3f') build() { - cd ${pkgname}-0${pkgver} - - ./configure \ - --prefix=/usr + cd "${pkgname}-0${pkgver}" + ./configure --prefix=/usr make } package() { - cd ${pkgname}-0${pkgver} - - make DESTDIR=${pkgdir} install + cd "${pkgname}-0${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD index 5acae8d1c..6c24a6114 100644 --- a/community/rocksndiamonds/PKGBUILD +++ b/community/rocksndiamonds/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 25476 2010-09-05 11:20:27Z spupykin $ +# $Id: PKGBUILD 58930 2011-11-20 13:04:05Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# contributor: Jacek Poplawski <jacekpoplawski@gmail.com> +# Contributor: Jacek Poplawski <jacekpoplawski@gmail.com> pkgname=rocksndiamonds pkgver=3.3.0.1 @@ -11,7 +11,6 @@ url="http://www.artsoft.org/rocksndiamonds/" license=('GPL') depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data') makedepends=('unzip' 'p7zip') -options=(force) source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz) md5sums=('813ced99d54f89db7c593c518d197d18') diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 7a191b9eb..239728d51 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,25 +2,23 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.30.02 +pkgver=5.30.04 pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' license=('LGPL2.1') depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' - 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') + 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme') makedepends=('fftw') install='root.install' source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'root.sh' 'rootd' - 'root.desktop' 'root.xml') -md5sums=('8a5a5451ddaae276abc9d2e263b29b88' +md5sums=('800103f8d5ea5f81c06fda95e057a648' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' - 'ac61b17395d75a2705fefa2ef841a6bf' 'e2cf69b204192b5889ceb5b4dedc66f7') build() { @@ -78,10 +76,20 @@ package() { ${pkgdir}/etc/profile.d/root.sh install -D ${srcdir}/rootd \ ${pkgdir}/etc/rc.d/rootd - install -D -m644 ${srcdir}/root.desktop \ - ${pkgdir}/usr/share/applications/root.desktop install -D -m644 ${srcdir}/root.xml \ ${pkgdir}/usr/share/mime/packages/root.xml + install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \ + ${pkgdir}/usr/share/applications/root-system-bin.desktop + # replace @prefix@ with /usr for the desktop + sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop + + install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \ + ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png + + # use a file that pacman can track instead of adding directly to ld.so.conf + install -d ${pkgdir}/etc/ld.so.conf.d + echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf + rm -rf ${pkgdir}/etc/root/daemons } diff --git a/community/root/root.desktop b/community/root/root.desktop deleted file mode 100644 index ca382111c..000000000 --- a/community/root/root.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Exec=root -Terminal=true -Name=ROOT -Name[de]=ROOT -Comment=An object-oriented data analysis framework -Comment[de]=Ein objektorientiertes Framework zur Datenanalyse -StartupNotify=true -MimeType=application/x-root;text/x-c++src -Categories=Science;Development;Application; diff --git a/community/root/root.install b/community/root/root.install index 457af7314..afabb7aea 100644 --- a/community/root/root.install +++ b/community/root/root.install @@ -1,17 +1,25 @@ post_install() { - if ! [ `grep '/usr/lib/root' etc/ld.so.conf` ]; then - echo "/usr/lib/root" >> etc/ld.so.conf - sbin/ldconfig -r . - fi - update-desktop-database >/dev/null update-mime-database /usr/share/mime >/dev/null + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_remove() { - cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot - mv /tmp/.pacroot etc/ld.so.conf - chmod 644 etc/ld.so.conf - sbin/ldconfig -r . + # leave for pre 5.30.03-3 + if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then + cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot + mv /tmp/.pacroot etc/ld.so.conf + chmod 644 etc/ld.so.conf + sbin/ldconfig -r . + fi +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/community/rsnapshot/ChangeLog b/community/rsnapshot/ChangeLog deleted file mode 100644 index 811f87d4f..000000000 --- a/community/rsnapshot/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD index bca611d90..428c44b09 100644 --- a/community/rsnapshot/PKGBUILD +++ b/community/rsnapshot/PKGBUILD @@ -1,23 +1,35 @@ -# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> +# $Id: PKGBUILD 58364 2011-11-12 11:47:00Z andrea $ +# Maintainer: +# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Thorsten Tasch <tht@thorstentasch.de> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + pkgname=rsnapshot pkgver=1.3.1 -pkgrel=2 +pkgrel=3 pkgdesc="A remote filesystem snapshot utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.rsnapshot.org" license=('GPL') depends=('perl' 'rsync' 'openssh') backup=('etc/rsnapshot.conf') -source=(http://www.rsnapshot.org/downloads/$pkgname-$pkgver.tar.gz rsnapshot) +source=("http://www.rsnapshot.org/downloads/${pkgname}-${pkgver}.tar.gz" + 'rsnapshot') +md5sums=('588f92995dcf60a6ea6df8d94a017e7e' + '4cd16eaa51d58a652cffde945985e91c') + build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man || return 1 - sed -i 's:/usr/bin/pod2man:/usr/bin/perlbin/core/pod2man:' Makefile - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - mv "$pkgdir"/etc/rsnapshot.conf.default "$pkgdir"/etc/rsnapshot.conf + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man + sed -i 's:/usr/bin/pod2man:/usr/bin/core_perl/pod2man:' Makefile + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + mv ${pkgdir}/etc/rsnapshot.conf.default ${pkgdir}/etc/rsnapshot.conf install -Dm644 ${srcdir}/rsnapshot ${pkgdir}/etc/logrotate.d/rsnapshot } -md5sums=('588f92995dcf60a6ea6df8d94a017e7e' '4cd16eaa51d58a652cffde945985e91c') diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD index e7c3039e2..6d3bb3f4c 100644 --- a/community/rsyslog/PKGBUILD +++ b/community/rsyslog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56119 2011-10-02 02:52:32Z ebelanger $ +# $Id: PKGBUILD 58329 2011-11-11 14:26:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=rsyslog -pkgver=5.8.5 -pkgrel=2 +pkgver=5.8.6 +pkgrel=1 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability" url="http://www.rsyslog.com/" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz" 'rsyslog' 'rsyslog.logrotate' 'rsyslog.conf.d') -md5sums=('a73cb577cb4bc5b9c8f0d217eb054ad2' +md5sums=('c46db0496066b82faf735bd4222208d7' 'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da' '8065db4bef3061a4f000ba58779f6829' '1a0cd4530dd5d1439456d5ae230574d9') diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD new file mode 100644 index 000000000..1f8de793d --- /dev/null +++ b/community/rt3562sta/PKGBUILD @@ -0,0 +1,74 @@ +# $Id: PKGBUILD 58717 2011-11-17 21:59:14Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless + +pkgname=rt3562sta +pkgver=2.4.1.1 +pkgrel=1 +pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" +arch=(i686 x86_64) +url="http://www.ralinktech.com/support.php?s=2" +license=('GPL') +depends=('linux>=3.1' 'linux<3.2') +source=( + http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz + $pkgname-$pkgver-config.patch + $pkgname-$pkgver-gcc-warnings-x86_64.patch + $pkgname-$pkgver-WPA-mixed.patch + $pkgname-$pkgver-convert-devicename-to-wlanX.patch + $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch + $pkgname-$pkgver-return_nonvoid.patch + $pkgname-$pkgver-reduce_debug_output.patch + $pkgname-$pkgver-remove_date_time.patch +) +install=$pkgname.install + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" + [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" + patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" + + # clean up this mess of mixing RT2860STA with RT3562STA + # in documentation files + mv RT2860STA.dat RT3562STA.dat + mv RT2860STACard.dat RT3562STACard.dat + sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt + + # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too + sed -i 's|ra0|wlan0|g' *.txt README* *.dat + sed -i 's|ra1|wlan1|g' *.txt README* *.dat + sed -i 's|ra2|wlan2|g' *.txt README* *.dat + + export EXTRA_CFLAGS="-DVERSION=$pkgver" + make +} + +package() { + cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" + + install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" + install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/lib/modules/$_extramodules/$pkgname.ko" + install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" + install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" + + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('a5e9af70abccdb7b86d1ef605bb34491' + '5cff38fb070fd181cf4beb52acc99616' + 'ca40e951c0799d395a74bf274459b950' + '743b45ad2bf60bf757e53439c26edb71' + 'f2d0fbe845415cdb4f31e365876f740e' + '874619383576e38c5c048f0a068c9844' + '466df4e09896836082db417e52f0224e' + 'edc79dd0de1e8fabcec1e4791feb4391' + 'c8e174ea362bf94ce46038f8388439b6') diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch new file mode 100644 index 000000000..caf2b1c6a --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch @@ -0,0 +1,11 @@ +--- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 +@@ -2410,7 +2410,7 @@ + UCHAR PrimaryRsnie; + BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different + UCHAR p_offset; +- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode ++ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode + + rsnielen_cur_p = NULL; + rsnielen_ex_cur_p = NULL; diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch new file mode 100644 index 000000000..dc245e38e --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch @@ -0,0 +1,98 @@ +--- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 +@@ -9,10 +9,10 @@ + + + # Support Wpa_Supplicant +-HAS_WPA_SUPPLICANT=n ++HAS_WPA_SUPPLICANT=y + + # Support Native WpaSupplicant for Network Maganger +-HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n ++HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y + + #Support Net interface block while Tx-Sw queue full + HAS_BLOCK_NET_IF=n +@@ -283,7 +283,7 @@ + endif + + ifeq ($(CHIPSET),3562) +-WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT ++WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 + ifeq ($(HAS_DFS_SUPPORT),y) + WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG + endif +--- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 ++++ Makefile 2010-12-17 19:51:39.000000000 +0100 +@@ -284,26 +284,26 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot + endif + ifeq ($(PLATFORM),INF_AMAZON_SE) +- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net ++# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net + endif + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot + endif + endif + endif +@@ -331,25 +331,25 @@ + endif + + ifeq ($(RT28xx_MODE),AP) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot + endif + rm -f os/linux/rt$(CHIPSET)ap.ko.lzma + /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma + else + ifeq ($(RT28xx_MODE),APSTA) +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot + endif + else +- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot + ifeq ($(OSABL),YES) +- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot +- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot ++# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot + endif + endif + endif diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch new file mode 100644 index 000000000..5ec4d5028 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch @@ -0,0 +1,13 @@ +--- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 +@@ -1451,8 +1451,8 @@ + #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) + #endif // CLIENT_WDS // + +-#define INF_MAIN_DEV_NAME "ra" +-#define INF_MBSSID_DEV_NAME "ra" ++#define INF_MAIN_DEV_NAME "wlan" ++#define INF_MBSSID_DEV_NAME "wlan" + #define INF_WDS_DEV_NAME "wds" + #define INF_APCLI_DEV_NAME "apcli" + #define INF_MESH_DEV_NAME "mesh" diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch new file mode 100644 index 000000000..a53dbde86 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch @@ -0,0 +1,14 @@ +--- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 ++++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 +@@ -479,9 +479,9 @@ + MEM_DBG_PKT_ALLOC_INC(pAd); + + skb_reserve(skb, 2); +- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); ++ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // + skb_put(skb, HdrLen); +- NdisMoveMemory(skb->tail, pData, DataSize); ++ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // + skb_put(skb, DataSize); + skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); + pPacket = OSPKT_TO_RTPKT(skb); diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch new file mode 100644 index 000000000..6754f214d --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch @@ -0,0 +1,15 @@ +--- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 ++++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 +@@ -611,10 +611,10 @@ + + #define DBGPRINT_RAW(Level, Fmt) \ + do{ \ +- if (Level <= RTDebugLevel) \ ++/* if (Level <= RTDebugLevel) \ + { \ + printk Fmt; \ +- } \ ++ }*/ \ + }while(0) + + #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch new file mode 100644 index 000000000..a0d00d6e3 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch @@ -0,0 +1,47 @@ +--- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 ++++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 +@@ -111,10 +111,10 @@ + + #ifdef CONFIG_STA_SUPPORT + #ifdef RTMP_MAC_PCI +-#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" ++#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" + #define STA_DRIVER_VERSION "2.4.1.1" + #ifdef MULTIPLE_CARD_SUPPORT +-#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" ++#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" + #endif // MULTIPLE_CARD_SUPPORT // + #endif // RTMP_MAC_PCI // + +--- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 ++++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 +@@ -90,14 +90,15 @@ + MODULE_VERSION(STA_DRIVER_VERSION); + #endif + #endif // CONFIG_STA_SUPPORT // +- ++MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); ++MODULE_LICENSE("GPL"); + + // + // Our PCI driver structure + // + static struct pci_driver rt2860_driver = + { +- name: "rt2860", ++ name: "rt3562", + id_table: rt2860_pci_tbl, + probe: rt2860_probe, + #if LINUX_VERSION_CODE >= 0x20412 +@@ -317,9 +318,9 @@ + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) +- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; ++ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; + #else +- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; ++ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; + #endif // LINUX_VERSION_CODE // + + if ((rv = pci_request_regions(pci_dev, print_name)) != 0) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch new file mode 100644 index 000000000..b17ba5a12 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch @@ -0,0 +1,11 @@ +--- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 +@@ -1812,7 +1812,7 @@ + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + case SHOW_DRVIER_VERION: +- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); ++ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); + wrq->length = strlen(extra) + 1; // 1: size of '\0' + break; + #ifdef DOT11_N_SUPPORT diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch new file mode 100644 index 000000000..7416a31f9 --- /dev/null +++ b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch @@ -0,0 +1,11 @@ +--- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 ++++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 +@@ -1247,7 +1247,7 @@ + RTMP_OS_TASK *pTask; + + if (pAd->bWriteDat == FALSE) +- return; ++ return 0; + + DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); + diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install new file mode 100644 index 000000000..82ec4d462 --- /dev/null +++ b/community/rt3562sta/rt3562sta.install @@ -0,0 +1,16 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies +} + +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} diff --git a/community/ruby-atk/PKGBUILD b/community/ruby-atk/PKGBUILD deleted file mode 100644 index 781fdfd0c..000000000 --- a/community/ruby-atk/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-atk -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for atk." -arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2') -makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb atk --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/ruby-gdkpixbuf2/PKGBUILD b/community/ruby-gdkpixbuf2/PKGBUILD deleted file mode 100644 index ab085806a..000000000 --- a/community/ruby-gdkpixbuf2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-gdkpixbuf2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for gdkpixbuf2." -arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2' 'gtk2') -makedepends=('ruby-glib2' 'ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb gdk_pixbuf2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - mkdir -p $pkgdir/usr/lib/pkgconfig - make DESTDIR="$pkgdir" install -} diff --git a/community/ruby-gio2/PKGBUILD b/community/ruby-gio2/PKGBUILD deleted file mode 100644 index fe7e250e7..000000000 --- a/community/ruby-gio2/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 31087 2010-10-27 01:37:14Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - -pkgname=ruby-gio2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for gio2." -arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2') -makedepends=('ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb gio2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/ruby-glib2/PKGBUILD b/community/ruby-glib2/PKGBUILD deleted file mode 100644 index 35baa822d..000000000 --- a/community/ruby-glib2/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-glib2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for glib2." -arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby') -makedepends=('ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb glib2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index 040ac0f68..101dd3636 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,28 +1,69 @@ -# $Id: PKGBUILD 53871 2011-08-09 01:21:52Z bfanella $ +# $Id: PKGBUILD 59056 2011-11-21 04:12:47Z ebelanger $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> # Contributor: kritoke <kritoke@nospam.gmail.com> -pkgname=ruby-gtk2 -pkgver=1.0.0 +pkgbase=ruby-gtk2 +pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') +pkgver=1.0.3 pkgrel=1 -pkgdesc="Ruby bindings for gtk2." arch=('i686' 'x86_64' 'mips64el') url="http://ruby-gnome2.sourceforge.jp" license=('LGPL') -depends=('ruby-glib2' 'ruby-pango' 'ruby-atk' 'ruby-gdkpixbuf2') -makedepends=('ruby-pkgconfig' 'ruby-cairo') +makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') +md5sums=('fa1de7fc920de46fb8d8b9f67732c7a3') build() { cd "$srcdir/ruby-gtk2-$pkgver" - - export LANG="en_US.UTF-8" - ruby extconf.rb gtk2 --topdir=$pkgdir + LANG="en_US.UTF-8" ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --topdir=$pkgdir make } -package() { - cd "$srcdir/ruby-gtk2-$pkgver" + +package_ruby-atk() { + pkgdesc="Ruby bindings for atk" + depends=("ruby-glib2=$pkgver" 'atk') + + cd "$srcdir/ruby-gtk2-$pkgver/atk" + make DESTDIR="$pkgdir" install +} + +package_ruby-gdkpixbuf2() { + pkgdesc="Ruby bindings for gdkpixbuf2" + depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') + + cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" + make DESTDIR="$pkgdir" install +} + +package_ruby-gio2() { + pkgdesc="Ruby bindings for gio2" + depends=("ruby-glib2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gio2" + make DESTDIR="$pkgdir" install +} + +package_ruby-glib2() { + pkgdesc="Ruby bindings for glib2" + depends=('glib2' 'ruby') + + cd "$srcdir/ruby-gtk2-$pkgver/glib2" + make DESTDIR="$pkgdir" install +} + +package_ruby-gtk2() { + pkgdesc="Ruby bindings for gtk2" + depends=('gtk2' "ruby-glib2=$pkgver" "ruby-pango=$pkgver" "ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver") + + cd "$srcdir/ruby-gtk2-$pkgver/gtk2" + make DESTDIR="$pkgdir" install +} + +package_ruby-pango() { + pkgdesc="Ruby bindings for pango" + depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') + + cd "$srcdir/ruby-gtk2-$pkgver/pango" make DESTDIR="$pkgdir" install } diff --git a/community/ruby-pango/PKGBUILD b/community/ruby-pango/PKGBUILD deleted file mode 100644 index 577980c5c..000000000 --- a/community/ruby-pango/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-pango -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for pango." -arch=('i686' 'x86_64' 'mips64el') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2' 'ruby-cairo') -makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb pango --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index c71dbff1b..aa3a6c96b 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -4,7 +4,7 @@ # Special thanks to Nareto for moving the compile from the .install to the PKGBUILD pkgname=sage-mathematics -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' @@ -20,7 +20,7 @@ options=('!makeflags') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" 'SAGE-notebook.desktop') -md5sums=('4d82c6719d14a1c2d403024d989faac7' +md5sums=('b3073997e6c7ec00a269f84ff2e54973' 'dc391f12b7d17dd37326343ec0e99bbd') build() { @@ -66,12 +66,14 @@ build() { make } +<< COMMENT check() { cd sage-${pkgver} # uncomment if we want to run all the tests (warning: very long) #make ptestlong } +COMMENT package() { cd sage-${pkgver} diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 6cdf2cc9f..b4522db37 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 52459 2011-07-25 20:06:11Z jelle $ +# $Id: PKGBUILD 59179 2011-11-21 13:59:03Z 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=1 -pkgdesc="Allows users to execute shell commands under different root filesystems. \ - (Successor to dchroot)." +pkgrel=2 +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') @@ -16,62 +15,56 @@ conflicts=('dchroot') replaces=('dchroot') provides=('schroot' 'sbuild' 'dchroot') backup=('etc/schroot/schroot.conf' - 'etc/schroot/script-arch32' - 'etc/schroot/mount-arch32' - 'etc/schroot/copyfiles-arch32') + '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" - 'script-arch32' - 'copyfiles-arch32' - 'mount-arch32') + 'pam.d.schroot.patch' + 'arch32-example' + 'arch32-config' + 'arch32-copyfiles' + 'arch32-mount' + 'arch32-nssdatabases') md5sums=('73873e0fee83a45655ed8efa246a1e26' - '8e86445e188129232e1782d978dfc967' - 'd4558d5691fbdaa46ce669e8f327133b' - 'f0d5d5b5e34a860f6f90b5628c680f46') + '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 + 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 + cd ${pkgname}-${pkgver} + make -k check } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=$pkgdir install - - install -m 644 ${srcdir}/script-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/mount-arch32 ${pkgdir}/etc/schroot - install -m 644 ${srcdir}/copyfiles-arch32 ${pkgdir}/etc/schroot - cat >> $pkgdir/etc/schroot/schroot.conf << EOF - -[Arch32] -description=Arch32 -type=directory -directory=/opt/arch32 -priority=1 -#users=username -groups=users -root-groups=root -script-config=script-arch32 -personality=linux32 -aliases=32,default - -EOF + 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/schroot/arch32-config b/community/schroot/arch32-config new file mode 100644 index 000000000..0ee72d522 --- /dev/null +++ b/community/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/schroot/arch32-copyfiles b/community/schroot/arch32-copyfiles new file mode 100644 index 000000000..88f093ceb --- /dev/null +++ b/community/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/schroot/arch32-example b/community/schroot/arch32-example new file mode 100644 index 000000000..3f059e3c0 --- /dev/null +++ b/community/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/schroot/arch32-mount b/community/schroot/arch32-mount new file mode 100644 index 000000000..075d6e451 --- /dev/null +++ b/community/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/schroot/arch32-nssdatabases b/community/schroot/arch32-nssdatabases new file mode 100644 index 000000000..815ddce3f --- /dev/null +++ b/community/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/schroot/pam.d.schroot.patch b/community/schroot/pam.d.schroot.patch new file mode 100644 index 000000000..528acb5f7 --- /dev/null +++ b/community/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/scite/PKGBUILD b/community/scite/PKGBUILD index 3cdb5d823..37808bbfe 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,21 +1,21 @@ +# $Id: PKGBUILD 59256 2011-11-22 03:57:15Z ebelanger $ # Maintainer: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Jochem Kossen <j.kossen@home.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.29 +pkgver=3.0.1 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64' 'mips64el') url='http://www.scintilla.org/SciTE.html' license=('custom:scite') -depends=('desktop-file-utils' 'gtk2' 'glib2') -backup=(usr/share/scite/SciTEGlobal.properties) +depends=('desktop-file-utils' 'gtk2') +backup=('usr/share/scite/SciTEGlobal.properties') install=scite.install -source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" - 'SciTE.desktop' - 'makefile.patch') +source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") +md5sums=('e2ed3190ebf714f037d05cde7b9591de') build() { sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile @@ -24,24 +24,22 @@ build() { sed "s/CXXFLAGS=-DNDEBUG -Os \$(CXXBASEFLAGS) \$(THREADFLAGS)/CXXFLAGS=-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)/" -i scintilla/gtk/makefile - cd scintilla/gtk + cd "${srcdir}/scintilla/gtk" make - install -Dm644 ../License.txt \ - ${pkgdir}/usr/share/licenses/scintilla/LICENSE - cd ${srcdir}/${pkgname}/gtk + cd "${srcdir}/${pkgname}/gtk" make +} - make DESTDIR=${pkgdir} install +package() { + cd "${srcdir}/${pkgname}/gtk" - install -D -m644 ../License.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + make DESTDIR="${pkgdir}" install - install -D -m644 ${srcdir}/SciTE.desktop \ - ${pkgdir}/usr/share/applications/ + install -D -m644 ../License.txt \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scite" + install -D -m644 "${srcdir}/scintilla/License.txt" \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-scintilla" ln -sf SciTE ${pkgdir}/usr/bin/scite } -md5sums=('55858b96c4ad64b38503682ff49d184e' - '48526532ef677982a4b156ae90f25b6f' - '87005d4c7262a1a698cde0628dc7e2a2') diff --git a/community/scite/scite.install b/community/scite/scite.install index 49135f547..686b22022 100644 --- a/community/scite/scite.install +++ b/community/scite/scite.install @@ -1,11 +1,13 @@ post_install() { - echo "Updating desktop and mime database..." update-desktop-database -q } +post_upgrade() { + post_install $1 +} + post_remove() { - echo "Updating desktop and mime database..." - update-desktop-database -q + post_install $1 } # vim:set ts=2 sw=2 et: diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD index 3ac5ac4ac..ab8a33cd0 100644 --- a/community/scponly/PKGBUILD +++ b/community/scponly/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55546 2011-09-14 08:50:05Z spupykin $ +# $Id: PKGBUILD 59016 2011-11-20 20:06:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Roberto Alsina <ralsina@kde.org> @@ -9,6 +9,7 @@ pkgdesc="A limited shell for ssh/scp" arch=(i686 x86_64 'mips64el') url="http://sublimation.org/scponly/" depends=('glibc') +makedepends=('openssh') license=('custom') options=(docs) source=(http://downloads.sourceforge.net/sourceforge/scponly/scponly-$pkgver.tgz diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD index c757fde51..b00fd1046 100644 --- a/community/scummvm-tools/PKGBUILD +++ b/community/scummvm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48337 2011-05-31 11:29:28Z svenstaro $ +# $Id: PKGBUILD 58732 2011-11-18 08:41:40Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jérémie Dimino <jeremie@dimino.org> # Contributor: Sebastian Hase <sebastian_hase@gmx.de> # Contributor: Joe Davison <joe@thosedamnpeanuts.com> pkgname=scummvm-tools -pkgver=1.3.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="A set of tools that enable you to convert, compress and decode game datafiles for ScummVM" url="http://www.scummvm.org/" @@ -12,7 +12,7 @@ license=('GPL') depends=('libpng' 'wxgtk' 'flac' 'libvorbis') arch=('i686' 'x86_64' 'mips64el') source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.gz) -md5sums=('0239cb022e508f2399d584efa6f177b2') +md5sums=('43cbf9f5c4939876cf4149dd59e68044') build() { cd ${pkgname}-${pkgver} diff --git a/community/sdcv/PKGBUILD b/community/sdcv/PKGBUILD new file mode 100644 index 000000000..dd1d87971 --- /dev/null +++ b/community/sdcv/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 57381 2011-10-26 16:44:58Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=sdcv +pkgver=0.4.2 +pkgrel=6 +pkgdesc="StarDict Console Version" +arch=('i686' 'x86_64') +url="http://sdcv.sourceforge.net/" +license=('GPL') +depends=('glib2' 'readline' 'zlib') +makedepends=('patch') +provides=('stardict') +changelog=$pkgname.changelog +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ + $pkgname-$pkgver-headers.patch) +sha256sums=('a164f079e93986814ea2d39f3a49cf9d1b71b01aad908254457fe3d0ded9deb2' + '4746e32a6aaddf7744f373b539879598b48219a3b35f41ceb839f04c27921eb4') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + patch -Np1 -i ${srcdir}/$pkgname-$pkgver-headers.patch + + ./configure --prefix=/usr --mandir=/usr/share/man + +#quick fix for x86_64 + if [ "${CARCH}" == "x86_64" ]; then + sed -i 's|guint32 page_size|guint64 page_size|' src/lib/lib.cpp + fi + + make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make DESTDIR=${pkgdir} install +} diff --git a/community/sdcv/sdcv-0.4.2-headers.patch b/community/sdcv/sdcv-0.4.2-headers.patch new file mode 100644 index 000000000..9affec151 --- /dev/null +++ b/community/sdcv/sdcv-0.4.2-headers.patch @@ -0,0 +1,46 @@ +diff -ruN sdcv-0.4.2-orig/src/lib/lib.cpp sdcv-0.4.2/src/lib/lib.cpp +--- sdcv-0.4.2-orig/src/lib/lib.cpp 2006-04-24 10:17:27.000000000 +0200 ++++ sdcv-0.4.2/src/lib/lib.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -513,7 +513,7 @@ + { + fseek(idxfile, wordoffset[page_idx], SEEK_SET); + guint32 page_size=wordoffset[page_idx+1]-wordoffset[page_idx]; +- fread(wordentry_buf, std::min(sizeof(wordentry_buf), page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. ++ fread(wordentry_buf, std::min(sizeof(wordentry_buf), (size_t)page_size), 1, idxfile); //TODO: check returned values, deal with word entry that strlen>255. + return wordentry_buf; + } + +diff -ruN sdcv-0.4.2-orig/src/libwrapper.cpp sdcv-0.4.2/src/libwrapper.cpp +--- sdcv-0.4.2-orig/src/libwrapper.cpp 2006-04-24 12:40:29.000000000 +0200 ++++ sdcv-0.4.2/src/libwrapper.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include <glib/gi18n.h> + #include <map> ++#include <cstring> + + #include "utils.hpp" + +diff -ruN sdcv-0.4.2-orig/src/readline.cpp sdcv-0.4.2/src/readline.cpp +--- sdcv-0.4.2-orig/src/readline.cpp 2005-12-07 23:07:23.000000000 +0100 ++++ sdcv-0.4.2/src/readline.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -23,6 +23,7 @@ + #endif + + #include <cstdio> ++#include <cstdlib> + #ifdef WITH_READLINE + # include <readline/readline.h> + # include <readline/history.h> +diff -ruN sdcv-0.4.2-orig/src/utils.cpp sdcv-0.4.2/src/utils.cpp +--- sdcv-0.4.2-orig/src/utils.cpp 2006-04-24 11:03:47.000000000 +0200 ++++ sdcv-0.4.2/src/utils.cpp 2009-12-19 21:15:37.000000000 +0100 +@@ -22,6 +22,8 @@ + # include "config.h" + #endif + ++#include <cstdio> ++#include <cstdlib> + #include <glib.h> + #include <glib/gi18n.h> + diff --git a/community/sdcv/sdcv.changelog b/community/sdcv/sdcv.changelog new file mode 100644 index 000000000..f742d12c7 --- /dev/null +++ b/community/sdcv/sdcv.changelog @@ -0,0 +1,3 @@ +2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * sdcv 0.4.2-6 + * moved to [community] with 206 votes diff --git a/community/shntool/PKGBUILD b/community/shntool/PKGBUILD index 5c45b8c46..51b020f1f 100644 --- a/community/shntool/PKGBUILD +++ b/community/shntool/PKGBUILD @@ -3,7 +3,7 @@ pkgname=shntool pkgver=3.0.10 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-purpose WAVE data processing and reporting utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.etree.org/shnutils/shntool/" @@ -15,13 +15,13 @@ md5sums=('5d41f8f42c3c15e3145a7a43539c3eae') sha1sums=('7a2bc8801e180cf582f0e39775603582e35d50d2') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd ${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } # vim:set ts=2 sw=2 et: diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 13f6fe947..0e965efba 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 56880 2011-10-15 22:25:22Z spupykin $ +# $Id: PKGBUILD 58472 2011-11-12 22:05:25Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.4 -pkgrel=2 +pkgver=0.11.6 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" license=('LGPL2.1') depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'vala') +makedepends=('intltool') +# 'vala' install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2" - "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2") -md5sums=('150899574f8fd96b6a5b87173a6ef3e0' - 'bf35262cc611de447147d01cbac33767') + "http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2" + "fix-with-libraw-0.4.patch") +md5sums=('bbbf2843eb98b6f0ef1dfcfb934e15cf' + 'bf35262cc611de447147d01cbac33767' + '488787b6d2cbc7348bc88348b78b6005') build() { cd "${srcdir}/vala-0.12.1" @@ -27,11 +30,15 @@ build() { export PATH=$srcdir/vala/bin:$PATH cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../fix-with-libraw-0.4.patch + ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ --disable-desktop-update \ --disable-icon-update + make } diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch new file mode 100644 index 000000000..f6f021b61 --- /dev/null +++ b/community/shotwell/fix-with-libraw-0.4.patch @@ -0,0 +1,50 @@ +Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled +diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala +--- shotwell-0.11.5/src/photos/GRaw.vala 2011-09-24 00:52:27.000000000 +0200 ++++ shotwell-0.11.5-fixed/src/photos/GRaw.vala 2011-11-01 00:25:05.976289495 +0100 +@@ -163,9 +163,9 @@ + proc = new LibRaw.Processor(options); + } + +- public void add_masked_borders_to_bitmap() { +- proc.add_masked_borders_to_bitmap(); +- } ++// public void add_masked_borders_to_bitmap() { ++// proc.add_masked_borders_to_bitmap(); ++// } + + public void adjust_sizes_info_only() throws Exception { + throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only()); +@@ -215,9 +215,9 @@ + throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename)); + } + +- public void rotate_fuji_raw() throws Exception { +- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); +- } ++// public void rotate_fuji_raw() throws Exception { ++// throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw()); ++// } + + public void thumb_writer(string filename) throws Exception { + throw_exception("thumb_writer", proc.thumb_writer(filename)); +@@ -262,7 +262,7 @@ + // camera_profile + // bad_pixels + // dark_frame +- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; ++ // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC; + output_params->output_bps = 8; + // output_tiff + output_params->user_flip = GRaw.Flip.FROM_SOURCE; +@@ -303,8 +303,8 @@ + case LibRaw.Result.UNSUPPORTED_THUMBNAIL: + throw new Exception.UNSUPPORTED_THUMBNAIL(msg); + +- case LibRaw.Result.CANNOT_ADDMASK: +- throw new Exception.CANNOT_ADDMASK(msg); ++// case LibRaw.Result.CANNOT_ADDMASK: ++// throw new Exception.CANNOT_ADDMASK(msg); + + case LibRaw.Result.UNSUFFICIENT_MEMORY: + throw new Exception.OUT_OF_MEMORY(msg); diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 8cfabf947..f4af9acf3 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55126 2011-09-02 23:39:52Z giovanni $ +# $Id: PKGBUILD 58533 2011-11-13 16:05:39Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> @@ -18,6 +18,7 @@ md5sums=('ce27976254236f8b11b787fd05be9acb' 'fef6aa492af487ccccd6b133635cee5a') build() { + cd "${srcdir}" mkdir build cd build cmake -G "Unix Makefiles" \ @@ -31,7 +32,7 @@ build() { } package() { - cd build + cd "${srcdir}"/build make install DESTDIR="${pkgdir}" install -d -m 0755 "${pkgdir}"/usr/share/applications diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD index 47fb6260e..900d8683e 100644 --- a/community/simgear/PKGBUILD +++ b/community/simgear/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $ +# $Id: PKGBUILD 59088 2011-11-21 09:41:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> # Contributor: Hans Janssen <hans@janserv.xs4all.nl> @@ -14,20 +14,18 @@ license=("GPL") #url="http://www.simgear.org" url="https://gitorious.org/fg" options=('!makeflags') -source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver" - build-fix.patch) -md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde' - '905a05cc1364c067b3b9574d41cef7fa') +#source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver") +source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2") +md5sums=('31f4ce7254a43229f050a8f86d6966ef') build() { - cd $srcdir/fg-simgear -# patch -p1 <$srcdir/build-fix.patch + cd $srcdir/simgear-$pkgver [ -x configure ] || ./autogen.sh [ -f Makefile ] || ./configure --prefix=/usr make } package() { - cd $srcdir/fg-simgear + cd $srcdir/simgear-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/simh/PKGBUILD b/community/simh/PKGBUILD index 64ec9c90c..e1edd93e9 100644 --- a/community/simh/PKGBUILD +++ b/community/simh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20494 2010-07-08 14:10:57Z spupykin $ +# $Id: PKGBUILD 59085 2011-11-21 09:31:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: waterbear <st92.at.freeshell.org> @@ -13,7 +13,7 @@ license=("BSD") depends=("libpcap" "glibc") makedepends=("unzip") install=simh.install -source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" \ +source=("http://simh.trailing-edge.com/sources/simhv${_pkgver}.zip" "LICENSE") md5sums=('e15f65a82e21ea49e14b438326d93d5c' 'd56eefa5d020ee2b77d21280fef80e3d') @@ -23,7 +23,7 @@ build() { mkdir BIN || true find ./VAX -type f -exec sed -i 's#SIM_INLINE##' {} \; - make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include /usr/lib/libpcap.a -lnl' || exit 1 + make USE_NETWORK=1 NETWORK_OPT='-DUSE_NETWORK -isystem /usr/include -lpcap -lnl' || exit 1 mkdir -p $pkgdir/usr/bin cd BIN diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index da7b195f1..f1c053ce3 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') install=simple-scan.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac') +sha256sums=('10fba94b60cd5159d54d3491f228ac9fe83ac0ab02b983d7cd8390aa26cf2ecc') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/slock/PKGBUILD b/community/slock/PKGBUILD index 9402c6a6d..2d338fabb 100644 --- a/community/slock/PKGBUILD +++ b/community/slock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 59019 2011-11-20 20:12:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian A. Liem <sebastian at liem dot se> @@ -12,9 +12,9 @@ arch=('mips64el' 'i686' 'x86_64') url="http://tools.suckless.org/slock" license=('MIT') depends=('libxext') -#http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz +#source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz") -md5sums=('3776b5a8abd64b97aa4f969f3ad3da31') +md5sums=('7d22a7435324f7c879b6e87054a32309') build() { cd "$srcdir/slock-$_pkgver" @@ -23,7 +23,6 @@ build() { package() { cd "$srcdir/slock-$_pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD index 94c8f7be9..5f6554be9 100644 --- a/community/smbnetfs/PKGBUILD +++ b/community/smbnetfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 38375 2011-01-26 10:26:56Z spupykin $ +# $Id: PKGBUILD 58938 2011-11-20 14:35:52Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -15,12 +15,12 @@ backup=(etc/smbnetfs/.smb/smb.conf \ etc/smbnetfs/.smb/smbnetfs.auth \ etc/smbnetfs/.smb/smbnetfs.host) install=smbnetfs.install -options=(force docs) +options=(docs) source=(http://downloads.sourceforge.net/smbnetfs/$pkgname-$pkgver.tar.bz2 \ rc-smbnetfs \ conf-smbnetfs) md5sums=('66d1477ca981f5a07b4b21c6bdbdc442' - '68c824ba670aa9173382d17eae574e8f' + 'b6cff0ee75cafd739ad44216236b5e28' 'e150c4cd894cc6ade11b94c95cf17ec4') build() { @@ -32,7 +32,7 @@ build() { mv $pkgdir/usr/share/doc/smbnetfs* $pkgdir/usr/share/doc/smbnetfs - mkdir -p $pkgdir/etc/smbnetfs/.smb && \ + mkdir -p $pkgdir/etc/smbnetfs/.smb install -D -m 0644 $srcdir/$pkgname-$pkgver/conf/* $pkgdir/etc/smbnetfs/.smb/ # install -D -m 0644 $srcdir/$pkgname-$pkgver/doc/INSTALL $pkgdir/usr/share/doc/smbnetfs/INSTALL install -D -m 0644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/smbnetfs/README diff --git a/community/smbnetfs/rc-smbnetfs b/community/smbnetfs/rc-smbnetfs index 3b79d6d5f..69c00d120 100644 --- a/community/smbnetfs/rc-smbnetfs +++ b/community/smbnetfs/rc-smbnetfs @@ -33,7 +33,7 @@ case "$1" in ;; stop) - stat_busy "Stopping smbnetfs daemon" + stat_busy "Stopping smbnetfs" fusermount -u $SMBNETFS_MOUNT_POINT &> /dev/null rm -f /var/run/smbnetfs.pid &> /dev/null @@ -47,6 +47,6 @@ case "$1" in $0 start ;; *) - echo "usage: $0 {start|stop|restart}" + echo "usage: $0 {start|stop|restart}" esac exit 0 diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index cd68816cb..b92bcc3cf 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56492 2011-10-07 10:33:31Z lfleischer $ +# $Id: PKGBUILD 57095 2011-10-21 06:30:14Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,7 +6,7 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.1.1 +pkgver=2.9.1.2 pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64' 'mips64el') @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1179' +source=('http://www.snort.org/downloads/1207' 'snort' 'snort.conf.d') -md5sums=('7a245c6e7cdf298cab196f0f69108468' +md5sums=('9e94f20b934566469c239966e1b41eba' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 135bd42d8..fe0e9511f 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 55949 2011-09-26 18:58:53Z schiv $ +# $Id: PKGBUILD 57439 2011-10-27 19:55:33Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> # TODO: # bring in pyalsa, csound, mma -options=('!makeflags') pkgname=solfege -pkgver=3.20.3 +pkgver=3.20.4 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') @@ -15,16 +14,15 @@ url="http://www.solfege.org/" license=('GPL3') depends=('pygtk' 'libgtkhtml') makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' - 'swig' 'texinfo' 'txt2man' 'pkg-config') + 'swig' 'texinfo' 'txt2man') optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'mpg123: or any MP3 player' 'lame: or any WAV-MP3 converter' 'vorbis-tools: or any OGG player & WAV-OGG converter' - #'lilypond: for generating print-outs & score sheets' + 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') -changelog=$pkgname.changelog source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('b6546691d0e34595e3c87c0e38a8ae15') +md5sums=('3a1914158ad218ad5b119ee4f719b567') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog deleted file mode 100644 index b42401c9c..000000000 --- a/community/solfege/solfege.changelog +++ /dev/null @@ -1,95 +0,0 @@ -2011-06-17 Ray Rashif <schiv@archlinux.org> - - * 3.20.0-1: - Upstream release - Added some optional dependencies - Removed install file; - timidity is now the default synthesizer - users should be able to figure stuff out - Removed desktop file; - already included in upstream tarball - -2010-10-02 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.17.0 - workaround managed for build issue - -2010-09-23 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.16.4 - 3.17.0 does not build; upstream issue [1] - rebuilt for python(2) - - [1] http://code.google.com/p/solfege/issues/detail?id=197 - -2010-05-20 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.16.3 - - * solfege.desktop: fixed categories for better fit - -2010-04-20 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.16.1 - - * PKGBUILD: minor changes - - * solfege.install: added to remove any MIDI confusion - -2009-09-08 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.15.2 - - * PKGBUILD: fixed timidity++ dependency - -2009-07-15 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.14.5 - - * PKGBUILD: removed desktop-file-utils dependency since - solfege.desktop does not declare any MimeType entry; added - ghostscript, gnome-doc-utils, librsvg and lilypond makedepends - -2009-04-19 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.14.2 - - * PKGBUILD: removed old sed fix, added optdepends, moved texinfo to - makedepends, added swig and libxslt to makedepends - - * solfege.install: removed - -2008-11-12 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.12.0 - - * PKGBUILD: added txt2man make dependency - -2008-06-15 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.10.4 - - * PKGBUILD: moved from $startdir to $srcdir/$pkgdir - - * solfege.install: removed unnecessary reference to the AUR - -2008-03-24 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.10.3 - - * PKGBUILD: moved desktop-file-utils to depends, added pkgconfig - makedepend, added a sed fix to allow compilation of all files - - * ChangeLog: fixed file format - - * solfege.install: removed post_upgrade(), a few other small changes - -2007-10-20 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 3.8.2 - - * PKGBUILD: added desktop-file-utils to makedepends - - * solfege.install: added - - * solfege.desktop: added diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index 2c47900ca..113f78180 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54953 2011-08-28 23:34:04Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 58635 2011-11-16 22:07:30Z andrea $ # Maintainer: Mateusz Herych <heniekk@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=soundkonverter -pkgver=1.0.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64' 'mips64el') @@ -23,10 +23,9 @@ optdepends=('cdrkit: cdda2wav backend' 'speex: speexenc, speexdec backends' 'vorbisgain: vorbisgain backend' ) -options=('libtool') install=$pkgname.install -source=("https://api.opensuse.org/public/source/home:HessiJames/${pkgname}/"${pkgname}-"${pkgver}.tar.gz") -md5sums=('fc8bab43a27c53e651907489f5ce5032') +source=("https://gitorious.org/soundkonverter/soundkonverter/blobs/raw/180e777aa3d91456ac386868a1e324ca28649e2e/release/${pkgname}-${pkgver}.tar.gz") +md5sums=('e4c4ccf1f7f93f758c3d440f67f61a64') build() { cd "${srcdir}" diff --git a/community/spawn-fcgi/PKGBUILD b/community/spawn-fcgi/PKGBUILD index e4dcaef8f..4bbf779d9 100644 --- a/community/spawn-fcgi/PKGBUILD +++ b/community/spawn-fcgi/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 27971 2010-09-30 23:34:38Z aschaefer $ -# Maintainer: Aaron Bull Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 57827 2011-11-03 10:14:07Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron Bull Schaefer <aaron@elasticdog.com> # Contributor: Felix Hanley <felix@seconddrawer.com.au> pkgname=spawn-fcgi pkgver=1.6.3 -pkgrel=1 +pkgrel=2 pkgdesc='A FastCGI process manager for web applications' arch=('i686' 'x86_64' 'mips64el') url='http://redmine.lighttpd.net/projects/spawn-fcgi/' license=('BSD') depends=('glibc') -source=("http://www.lighttpd.net/download/$pkgname-$pkgver.tar.bz2") +source=("http://www.lighttpd.net/download/${pkgname}-${pkgver}.tar.bz2") md5sums=('787ed2f88d2204bf1fe4fbd6e509d1d7') -sha256sums=('e6721dc0fa59bb00e05f160406815d53c95e81ac28f7e52fbd36497584f846cd') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install - install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + make DESTDIR="${pkgdir}" install + install -Dm0644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 940681ffd..93d546244 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 55901 2011-09-24 16:49:52Z stephane $ +# $Id: PKGBUILD 58224 2011-11-09 01:31:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.82.7.1 -pkgrel=7 +pkgver=0.83.0 +_pkgver=83.0 +pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') url="http://springrts.com/" @@ -14,22 +15,14 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis') makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma - gcc46.patch - awk-java.patch) -md5sums=('378cf0b18a5dd5b840964e5945778503' - 'e9586b611db1ed04fe4f0c5982fda7d2' - 'cd94edf21e49ff6ff7d256442ed9aa3c') +source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) +md5sums=('05f1c625f2dd81b0d7f30269435ab2f7') build() { - bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma + bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma - cd spring_$pkgver + cd spring_${_pkgver} - sed -i '1i\ - #include <list>' rts/lib/lobby/Connection.h - patch -Np1 < $srcdir/gcc46.patch - patch -Np1 < $srcdir/awk-java.patch cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ -DDATADIR=share/spring @@ -37,7 +30,7 @@ build() { } package() { - cd spring_$pkgver + cd spring_${_pkgver} make DESTDIR=$pkgdir install diff --git a/community/spring/awk-java.patch b/community/spring/awk-java.patch deleted file mode 100644 index 36c932924..000000000 --- a/community/spring/awk-java.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk ---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:29:16.623158278 +0200 -+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappCommands.awk 2011-07-26 17:33:00.872921328 +0200 -@@ -341,7 +341,7 @@ - } - - # beginn of struct S*Command --/^\struct S.*Command( \{)?/ { -+/^struct S.*Command( \{)?/ { - - isInsideCmdStruct = 1; - ind_cmdMember = 0; -diff -ru spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk ---- spring_0.82.7.1-old//AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:29:16.623158278 +0200 -+++ spring_0.82.7.1/AI/Interfaces/Java/bin/jna_wrappEvents.awk 2011-07-26 17:32:51.009745026 +0200 -@@ -473,7 +473,7 @@ - } - - # beginn of struct S*Event --/^\struct S.*Event( \{)?/ { -+/^struct S.*Event( \{)?/ { - - isInsideEvtStruct = 1; - ind_evtMember = 0; -diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk ---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:29:16.626491558 +0200 -+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappCommands.awk 2011-07-26 17:30:25.695391913 +0200 -@@ -387,7 +387,7 @@ - } - - # beginn of struct S*Command --/^\struct S.*Command( \{)?/ { -+/^struct S.*Command( \{)?/ { - - isInsideCmdStruct = 1; - ind_cmdMember = 0; -diff -ru spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk ---- spring_0.82.7.1-old//AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:29:16.626491558 +0200 -+++ spring_0.82.7.1/AI/Wrappers/Cpp/bin/wrappEvents.awk 2011-07-26 17:30:13.942245701 +0200 -@@ -366,7 +366,7 @@ - } - - # beginn of struct S*Event --/^\struct S.*Event( \{)?/ { -+/^struct S.*Event( \{)?/ { - - isInsideEvtStruct = 1; - ind_evtMember = 0; diff --git a/community/spring/gcc46.patch b/community/spring/gcc46.patch deleted file mode 100644 index 4f6865cac..000000000 --- a/community/spring/gcc46.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Jan Dittberner <jandd@debian.org> -Subject: Patch for FTBFS with g++ 4.6.0 -Bug-Debian: http://bugs.debian.org/625097 -Bug: http://springrts.com/mantis/view.php?id=2415 ---- a/AI/Skirmish/E323AI/AAStar.h -+++ b/AI/Skirmish/E323AI/AAStar.h -@@ -4,6 +4,7 @@ - #include <queue> - #include <vector> - #include <list> -+#include <cstddef> // for NULL - - class AAStar { - public: ---- a/rts/Rendering/ShadowHandler.cpp -+++ b/rts/Rendering/ShadowHandler.cpp -@@ -318,6 +318,11 @@ - xmid = 1.0f - (sqrt(fabs(x2)) / (sqrt(fabs(x2)) + sqrt(fabs(x1)))); - ymid = 1.0f - (sqrt(fabs(y2)) / (sqrt(fabs(y2)) + sqrt(fabs(y1)))); - -+ shadowParams.x = xmid; -+ shadowParams.y = ymid; -+ shadowParams.z = p17; -+ shadowParams.w = p18; -+ - shadowMatrix[ 0] = cross1.x / maxLengthX; - shadowMatrix[ 4] = cross1.y / maxLengthX; - shadowMatrix[ 8] = cross1.z / maxLengthX; ---- a/rts/Rendering/ShadowHandler.h -+++ b/rts/Rendering/ShadowHandler.h -@@ -38,7 +38,7 @@ - CMatrix44f shadowMatrix; - void CalcMinMaxView(void); - -- const float4 GetShadowParams() const { return float4(xmid, ymid, p17, p18); } -+ const float4& GetShadowParams() const { return shadowParams; } - - enum ShadowGenProgram { - SHADOWGEN_PROGRAM_MODEL = 0, -@@ -76,6 +76,7 @@ - //! to write the (FBO) depth-buffer texture - std::vector<Shader::IProgramObject*> shadowGenProgs; - -+ float4 shadowParams; - float x1, x2, y1, y2; - float xmid, ymid; - float p17, p18; ---- a/rts/Rendering/GLContext.cpp -+++ b/rts/Rendering/GLContext.cpp -@@ -9,6 +9,7 @@ - #include "GLContext.h" - - #include <list> -+#include <cstddef> // for NULL - - - using namespace std; ---- a/rts/System/MemPool.h -+++ b/rts/System/MemPool.h -@@ -4,6 +4,7 @@ - #define _MEM_POOL_H_ - - #include <new> -+#include <cstddef> // for NULL - - const size_t MAX_MEM_SIZE=200; - diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD index 24da0bf9e..d1f7f1194 100644 --- a/community/sqlitebrowser/PKGBUILD +++ b/community/sqlitebrowser/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 24584 2010-08-26 14:46:36Z lcarlier $ +# $Id: PKGBUILD 59079 2011-11-21 09:21:06Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com> # Contributor: Michael Fellinger <m.fellinger@gmail.com> @@ -17,15 +17,14 @@ md5sums=('5ca3d41cca454235b93ce72cd585dfe3') build() { cd $srcdir/trunk/$pkgname - sed -i 's|getline|xgetline|' sqlitebrowser/sqlbrowser_util.c + sed -i 's|: name( 0 ) { }|: name( ) { }|' sqlitebrowser/sqlitedb.h qmake make } package() { cd $srcdir/trunk/$pkgname - mkdir -p $pkgdir/usr/bin cp $pkgname/$pkgname $pkgdir/usr/bin/ } diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD index 04cd74807..83ca34614 100644 --- a/community/sqliteman/PKGBUILD +++ b/community/sqliteman/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 44071 2011-04-01 22:02:53Z spupykin $ +# $Id: PKGBUILD 58342 2011-11-12 08:23:16Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Porizka <artee@beer.cz> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=sqliteman pkgver=1.2.2 -pkgrel=4 +pkgrel=5 pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world" arch=('i686' 'x86_64' 'mips64el') url="http://sqliteman.sf.net" license=('GPL') -depends=('qt' 'qscintilla') +depends=('qscintilla') makedepends=('cmake') +install=sqliteman.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('5ecdf710e23606e1b924f740ea69306d') build() { - cd ${srcdir}/${pkgname}-${pkgver} - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/sqliteman/sqliteman.install b/community/sqliteman/sqliteman.install new file mode 100644 index 000000000..ce8f7514f --- /dev/null +++ b/community/sqliteman/sqliteman.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/community/steghide/PKGBUILD b/community/steghide/PKGBUILD index e273c463a..26e76cdbd 100644 --- a/community/steghide/PKGBUILD +++ b/community/steghide/PKGBUILD @@ -1,31 +1,43 @@ -# $Id: PKGBUILD 9308 2010-01-25 00:27:50Z foutrelis $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Jason Chu <jason@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=steghide pkgver=0.5.1 -pkgrel=4 -pkgdesc="Steghide is a steganography program which embeds a secret message \ - in a cover file by replacing some of the least significant bits" +pkgrel=5 +pkgdesc='Embeds a message in a file by replacing some of the least significant bits.' arch=('i686' 'x86_64' 'mips64el') -url="http://steghide.sourceforge.net" +url='http://steghide.sourceforge.net' license=('GPL') depends=('libmcrypt' 'mhash' 'gcc' 'libjpeg' 'zlib' 'libtool') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz \ - buildsystem.patch gcc-4.2.patch $pkgname-climits.patch) +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'buildsystem.patch' + 'gcc-4.2.patch' + "${pkgname}-climits.patch") md5sums=('5be490e24807d921045780fd8cc446b3' '14f5e054d71c91262bb1140288043df8' 'fd861dc5a0a392c6c94a61e85ad74f29' '897ce18edd008293a3328bc3f88775b3') build() { - cd $startdir/src/$pkgname-$pkgver - patch -p1 < ../buildsystem.patch || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 < ../buildsystem.patch + # this patch courtesy gentoo bug tracker #178134 - patch -Np1 -i ../gcc-4.2.patch || return 1 - patch -Np1 -i ../steghide-climits.patch || return 1 + patch -Np1 -i ../gcc-4.2.patch + patch -Np1 -i ../steghide-climits.patch + + # touch files needed by GNU Autotools + touch NEWS AUTHORS ChangeLog + autoreconf -i ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD index 02fa70f7d..6e0c46a78 100644 --- a/community/stunnel/PKGBUILD +++ b/community/stunnel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55918 2011-09-24 21:57:57Z dreisner $ +# $Id: PKGBUILD 58274 2011-11-09 16:42:13Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=stunnel -pkgver=4.44 +pkgver=4.46 pkgrel=1 pkgdesc="A program that allows you to encrypt arbitrary TCP connections inside SSL" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ options=('!libtool') source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc} 'Makefile.patch' 'stunnel.rc.d') -md5sums=('c9dd51fc02b913ce5bf7b3fc12f9cb4a' - 'e86fc2578e5304ae5a7b586ce170f843' +md5sums=('978030ff42f087ec26eb8a095ab69994' + 'dcd8d51b8591d4d1df50373646a363b8' 'f15398497e10e080c2406d2fc541660c' 'cb647c71ff4cb1e035b6e515d5f13ebf') diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD index 60d53fe11..53211f509 100644 --- a/community/subtle/PKGBUILD +++ b/community/subtle/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54488 2011-08-18 18:11:38Z angvp $ +# $Id: PKGBUILD 58177 2011-11-08 07:15:39Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: unexist <unexist@dorfelite.net> # Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com> pkgname=subtle pkgver=0.10.3008 -pkgrel=1 +pkgrel=2 pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel" arch=("i686" "x86_64" 'mips64el') url="http://subtle.subforge.org" diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD index 1d2ca3fb0..6ea5e45ba 100644 --- a/community/swi-prolog/PKGBUILD +++ b/community/swi-prolog/PKGBUILD @@ -4,7 +4,7 @@ pkgname=swi-prolog pkgver=5.10.5 -pkgrel=1 +pkgrel=2 pkgdesc='Prolog environment' arch=('i686' 'x86_64' 'mips64el') url='http://www.swi-prolog.org/' diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD index 3908c9d5d..3a3659dc6 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/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 98e4f2380..9f4eec24e 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,22 +1,23 @@ +# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=sxiv -pkgver=0.9 +pkgver=1.0 pkgrel=1 pkgdesc='simple x image viewer' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -install=('sxiv.install') +install=sxiv.install url='https://github.com/muennich/sxiv' -depends=('libx11' 'xproto' 'imlib2') +depends=('libx11' 'xproto' 'imlib2' 'desktop-file-utils') source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" 'sxiv.desktop' - 'config.h') -md5sums=('865f1e542669ad6d7932fcd4664fb481' + 'config.h') +md5sums=('c887e0af1e4d5a101b285a46d288c419' '1dda85ff6bed4de337f8fb303075ed11' - '05c3801bf32c2861c3c7b37073664db3') + '78c71ef924095d7d6fb75222047de0bd') build() { cd "sxiv-${pkgver}" diff --git a/community/sxiv/config.h b/community/sxiv/config.h index dd9efe89f..777cb805a 100644 --- a/community/sxiv/config.h +++ b/community/sxiv/config.h @@ -1,119 +1,158 @@ +#ifdef _FEATURE_CONFIG + +/* auto-orientate jpeg files according to their exif tags? + * (requires libexif [-lexif] to be installed) + */ +#define EXIF_SUPPORT 0 +/* load all frames from gif files and support gif animations? + * (requires giflib [-lgif] to be installed) + */ +#define GIF_SUPPORT 0 + +#endif #ifdef _WINDOW_CONFIG -/* default window dimensions (overwritten via -g option): */ -enum { WIN_WIDTH = 800, WIN_HEIGHT = 600 }; +/* default window dimensions (overwritten via -g option): */ +enum { + WIN_WIDTH = 800, + WIN_HEIGHT = 600 +}; -/* default color for window background: * - * (see X(7) "COLOR NAMES" section for valid values) */ +/* default color for window background: */ static const char * const BG_COLOR = "#777777"; -/* default color for thumbnail selection: */ +/* default color for thumbnail selection: */ static const char * const SEL_COLOR = "#DDDDDD"; +/* (see X(7) section "COLOR NAMES" for valid values) */ #endif #ifdef _IMAGE_CONFIG -/* how should images be scaled when they are loaded?: * - * (also controllable via -d/-s/-Z/-z options) * - * SCALE_DOWN: 100%, but fit large images into window, * - * SCALE_FIT: fit all images into window, * - * SCALE_ZOOM: use current zoom level, 100% at startup */ +/* how should images be scaled when they are loaded? + * (also controllable via -d/-s/-Z/-z options) + * SCALE_DOWN: 100%, but fit large images into window, + * SCALE_FIT: fit all images into window, + * SCALE_ZOOM: use current zoom level, 100% at startup + */ static const scalemode_t SCALE_MODE = SCALE_DOWN; -/* levels (percent) to use when zooming via '-' and '+': */ +/* levels (in percent) to use when zooming via '-' and '+': + * (first/last value is used as min/max zoom level) + */ static const float zoom_levels[] = { 12.5, 25.0, 50.0, 75.0, 100.0, 150.0, 200.0, 400.0, 800.0 }; +/* default slideshow delay (in sec, overwritten via -S option): */ +enum { SLIDESHOW_DELAY = 5 }; + +/* default settings for multi-frame gif images: */ +enum { + GIF_DELAY = 100, /* delay time (in ms) */ + GIF_AUTOPLAY = 1, /* autoplay when loaded [0/1] */ + GIF_LOOP = 0 /* endless loop [0/1] */ +}; + #endif #ifdef _THUMBS_CONFIG -/* default dimension of thumbnails (width == height): */ +/* default dimension of thumbnails (width == height): */ enum { THUMB_SIZE = 60 }; #endif #ifdef _MAPPINGS_CONFIG -/* keyboard mappings for image and thumbnail mode: */ +/* keyboard mappings for image and thumbnail mode: */ static const keymap_t keys[] = { - /* ctrl key function argument */ - { False, XK_q, quit, (arg_t) None }, - { False, XK_r, reload, (arg_t) None }, - { False, XK_f, toggle_fullscreen, (arg_t) None }, - { False, XK_a, toggle_antialias, (arg_t) None }, - { False, XK_A, toggle_alpha, (arg_t) None }, - { False, XK_Return, switch_mode, (arg_t) None }, - - { False, XK_g, first, (arg_t) None }, - { False, XK_G, last, (arg_t) None }, - { False, XK_n, navigate, (arg_t) +1 }, - { False, XK_space, navigate, (arg_t) +1 }, - { False, XK_p, navigate, (arg_t) -1 }, - { False, XK_BackSpace, navigate, (arg_t) -1 }, - { False, XK_bracketright, navigate, (arg_t) +10 }, - { False, XK_bracketleft, navigate, (arg_t) -10 }, - - { False, XK_D, remove_image, (arg_t) None }, - - { False, XK_h, move, (arg_t) DIR_LEFT }, - { False, XK_Left, move, (arg_t) DIR_LEFT }, - { False, XK_j, move, (arg_t) DIR_DOWN }, - { False, XK_Down, move, (arg_t) DIR_DOWN }, - { False, XK_k, move, (arg_t) DIR_UP }, - { False, XK_Up, move, (arg_t) DIR_UP }, - { False, XK_l, move, (arg_t) DIR_RIGHT }, - { False, XK_Right, move, (arg_t) DIR_RIGHT }, - - { True, XK_h, pan_screen, (arg_t) DIR_LEFT }, - { True, XK_Left, pan_screen, (arg_t) DIR_LEFT }, - { True, XK_j, pan_screen, (arg_t) DIR_DOWN }, - { True, XK_Down, pan_screen, (arg_t) DIR_DOWN }, - { True, XK_k, pan_screen, (arg_t) DIR_UP }, - { True, XK_Up, pan_screen, (arg_t) DIR_UP }, - { True, XK_l, pan_screen, (arg_t) DIR_RIGHT }, - { True, XK_Right, pan_screen, (arg_t) DIR_RIGHT }, - - { False, XK_H, pan_edge, (arg_t) DIR_LEFT }, - { False, XK_J, pan_edge, (arg_t) DIR_DOWN }, - { False, XK_K, pan_edge, (arg_t) DIR_UP }, - { False, XK_L, pan_edge, (arg_t) DIR_RIGHT }, - - { False, XK_plus, zoom, (arg_t) +1 }, - { False, XK_equal, zoom, (arg_t) +1 }, - { False, XK_KP_Add, zoom, (arg_t) +1 }, - { False, XK_minus, zoom, (arg_t) -1 }, - { False, XK_KP_Subtract, zoom, (arg_t) -1 }, - { False, XK_0, zoom, (arg_t) None }, - { False, XK_KP_0, zoom, (arg_t) None }, - { False, XK_w, fit_to_win, (arg_t) None }, - { False, XK_W, fit_to_img, (arg_t) None }, - - { False, XK_less, rotate, (arg_t) DIR_LEFT }, - { False, XK_greater, rotate, (arg_t) DIR_RIGHT }, - - /* open the current image with given program: */ - { True, XK_g, open_with, (arg_t) "gimp" }, - - /* run shell command line on the current file, - * '#' is replaced by filename: */ - { True, XK_less, run_command, (arg_t) "mogrify -rotate -90 #" }, - { True, XK_greater, run_command, (arg_t) "mogrify -rotate +90 #" }, - { True, XK_comma, run_command, (arg_t) "jpegtran -rotate 270 -copy all -outfile # #" }, - { True, XK_period, run_command, (arg_t) "jpegtran -rotate 90 -copy all -outfile # #" }, + /* ctrl key function argument */ + { false, XK_q, it_quit, (arg_t) None }, + { false, XK_Return, it_switch_mode, (arg_t) None }, + { false, XK_f, it_toggle_fullscreen, (arg_t) None }, + + { false, XK_r, it_reload_image, (arg_t) None }, + { false, XK_D, it_remove_image, (arg_t) None }, + + { false, XK_n, i_navigate, (arg_t) +1 }, + { false, XK_space, i_navigate, (arg_t) +1 }, + { false, XK_p, i_navigate, (arg_t) -1 }, + { false, XK_BackSpace, i_navigate, (arg_t) -1 }, + { false, XK_bracketright, i_navigate, (arg_t) +10 }, + { false, XK_bracketleft, i_navigate, (arg_t) -10 }, + { false, XK_g, it_first, (arg_t) None }, + { false, XK_G, it_n_or_last, (arg_t) None }, + + { true, XK_n, i_navigate_frame, (arg_t) +1 }, + { true, XK_p, i_navigate_frame, (arg_t) -1 }, + { true, XK_space, i_toggle_animation, (arg_t) None }, + + { false, XK_h, it_scroll_move, (arg_t) DIR_LEFT }, + { false, XK_Left, it_scroll_move, (arg_t) DIR_LEFT }, + { false, XK_j, it_scroll_move, (arg_t) DIR_DOWN }, + { false, XK_Down, it_scroll_move, (arg_t) DIR_DOWN }, + { false, XK_k, it_scroll_move, (arg_t) DIR_UP }, + { false, XK_Up, it_scroll_move, (arg_t) DIR_UP }, + { false, XK_l, it_scroll_move, (arg_t) DIR_RIGHT }, + { false, XK_Right, it_scroll_move, (arg_t) DIR_RIGHT }, + + { true, XK_h, it_scroll_screen, (arg_t) DIR_LEFT }, + { true, XK_Left, it_scroll_screen, (arg_t) DIR_LEFT }, + { true, XK_j, it_scroll_screen, (arg_t) DIR_DOWN }, + { true, XK_Down, it_scroll_screen, (arg_t) DIR_DOWN }, + { true, XK_k, it_scroll_screen, (arg_t) DIR_UP }, + { true, XK_Up, it_scroll_screen, (arg_t) DIR_UP }, + { true, XK_l, it_scroll_screen, (arg_t) DIR_RIGHT }, + { true, XK_Right, it_scroll_screen, (arg_t) DIR_RIGHT }, + + { false, XK_H, i_scroll_to_edge, (arg_t) DIR_LEFT }, + { false, XK_J, i_scroll_to_edge, (arg_t) DIR_DOWN }, + { false, XK_K, i_scroll_to_edge, (arg_t) DIR_UP }, + { false, XK_L, i_scroll_to_edge, (arg_t) DIR_RIGHT }, + + { false, XK_plus, i_zoom, (arg_t) +1 }, + { false, XK_KP_Add, i_zoom, (arg_t) +1 }, + { false, XK_minus, i_zoom, (arg_t) -1 }, + { false, XK_KP_Subtract, i_zoom, (arg_t) -1 }, + { false, XK_equal, i_set_zoom, (arg_t) 100 }, + { false, XK_w, i_fit_to_win, (arg_t) None }, + { false, XK_W, i_fit_to_img, (arg_t) None }, + + { false, XK_less, i_rotate, (arg_t) DIR_LEFT }, + { false, XK_greater, i_rotate, (arg_t) DIR_RIGHT }, + + { false, XK_s, i_toggle_slideshow, (arg_t) None }, + { true, XK_plus, i_adjust_slideshow, (arg_t) +1 }, + { true, XK_minus, i_adjust_slideshow, (arg_t) -1 }, + { true, XK_equal, i_reset_slideshow, (arg_t) None }, + + { false, XK_a, i_toggle_antialias, (arg_t) None }, + { false, XK_A, it_toggle_alpha, (arg_t) None }, + + /* open current image with given program: */ + { true, XK_g, it_open_with, (arg_t) "gimp" }, + + /* run shell command line on current file ("$SXIV_IMG"): */ + { true, XK_less, it_shell_cmd, (arg_t) \ + "mogrify -rotate -90 \"$SXIV_IMG\"" }, + { true, XK_greater, it_shell_cmd, (arg_t) \ + "mogrify -rotate +90 \"$SXIV_IMG\"" }, + { true, XK_comma, it_shell_cmd, (arg_t) \ + "jpegtran -rotate 270 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" }, + { true, XK_period, it_shell_cmd, (arg_t) \ + "jpegtran -rotate 90 -copy all -outfile \"$SXIV_IMG\" \"$SXIV_IMG\"" }, }; -/* mouse button mappings for image mode: */ +/* mouse button mappings for image mode: */ static const button_t buttons[] = { - /* ctrl shift button function argument */ - { False, False, Button1, navigate, (arg_t) +1 }, - { False, False, Button3, navigate, (arg_t) -1 }, - { False, False, Button2, drag, (arg_t) None }, - { False, False, Button4, move, (arg_t) DIR_UP }, - { False, False, Button5, move, (arg_t) DIR_DOWN }, - { False, True, Button4, move, (arg_t) DIR_LEFT }, - { False, True, Button5, move, (arg_t) DIR_RIGHT }, - { True, False, Button4, zoom, (arg_t) +1 }, - { True, False, Button5, zoom, (arg_t) -1 }, + /* ctrl shift button function argument */ + { false, false, Button1, i_navigate, (arg_t) +1 }, + { false, false, Button3, i_navigate, (arg_t) -1 }, + { false, false, Button2, i_drag, (arg_t) None }, + { false, false, Button4, it_scroll_move, (arg_t) DIR_UP }, + { false, false, Button5, it_scroll_move, (arg_t) DIR_DOWN }, + { false, true, Button4, it_scroll_move, (arg_t) DIR_LEFT }, + { false, true, Button5, it_scroll_move, (arg_t) DIR_RIGHT }, + { true, false, Button4, i_zoom, (arg_t) +1 }, + { true, false, Button5, i_zoom, (arg_t) -1 }, }; #endif diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install index 410e17b44..c50e26c78 100644 --- a/community/sxiv/sxiv.install +++ b/community/sxiv/sxiv.install @@ -1,4 +1,6 @@ post_install () { + update-desktop-database -q + echo "* Look into config.h to customize sxiv to your needs." echo " Use 'makepkg --skipinteg' to rebuild the package after changing config.h." echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index 11df6bf12..c03f1d511 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Dale Blount <dale@archlinux.org> pkgname=synergy -pkgver=1.3.7 +pkgver=1.3.8 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -36,5 +36,5 @@ package() { install -Dm644 $srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example "${pkgdir}/etc" install -Dm755 $srcdir/${pkgname}s.rc "${pkgdir}/etc/rc.d/${pkgname}s" } -md5sums=('27842f45f8ab6923eb702f9cc4858194' +md5sums=('3534c65ecfa6e47d7899c57975442f03' '8f8c01add9bf6e3ae9f37a36ca6345b6') diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index f6fe18c2e..f47e2bbd7 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $ +# $Id: PKGBUILD 58423 2011-11-12 17:18:54Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.63.02 -pkgrel=1 +pkgrel=2 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" @@ -16,7 +16,7 @@ conflicts=('synfig-core') replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz - build-fix.patch) + build-fix.patch ffmpeg-0.8.patch) md5sums=('4286d5e1887275107d760d1b678aec24' '2de5e74159a38e4b1788c20d4c4b6f68') @@ -24,7 +24,8 @@ build() { cd $srcdir/$pkgname-$pkgver [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; } [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv - patch -p1 <$srcdir/build-fix.patch + patch -p1 -i $srcdir/build-fix.patch + patch -Np1 -i $srcdir/ffmpeg-0.8.patch make } @@ -32,3 +33,9 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'f1f22b1ce2c13e25d5eb51a664a9551f') +md5sums=('4286d5e1887275107d760d1b678aec24' + '2de5e74159a38e4b1788c20d4c4b6f68' + 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfig/ffmpeg-0.8.patch b/community/synfig/ffmpeg-0.8.patch new file mode 100644 index 000000000..4ba40fff2 --- /dev/null +++ b/community/synfig/ffmpeg-0.8.patch @@ -0,0 +1,60 @@ +diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp +--- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp 2011-09-29 10:51:41.000000000 +0200 ++++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp 2011-10-31 16:39:03.000000000 +0100 +@@ -441,7 +441,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + //kluge for raw picture format (they said they'd fix) + if (formatc->oformat->flags & AVFMT_RAWPICTURE) +@@ -463,7 +463,7 @@ + if( context->coded_frame ) + pkt.pts = context->coded_frame->pts; + if( context->coded_frame && context->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + ret = av_write_frame(formatc, &pkt); + +@@ -567,17 +567,17 @@ + if (typestring) + { + //formatptr guess_format(type, filename, MIME type) +- format = guess_format(typestring,NULL,NULL); ++ format = av_guess_format(typestring,NULL,NULL); + } + else + { +- format = guess_format(NULL, filename, NULL); ++ format = av_guess_format(NULL, filename, NULL); + } + + if(!format) + { + synfig::warning("Unable to Guess the output, defaulting to mpeg"); +- format = guess_format("mpeg", NULL, NULL); ++ format = av_guess_format("mpeg", NULL, NULL); + } + + if(!format) +@@ -753,7 +753,7 @@ + + context = st->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_VIDEO; ++ context->codec_type = AVMEDIA_TYPE_VIDEO; + + //PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???) + +@@ -800,7 +800,7 @@ + + context = stream->codec; + context->codec_id = (CodecID)codec_id; +- context->codec_type = CODEC_TYPE_AUDIO; ++ context->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + context->bit_rate = 64000; diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index 33ea277bb..eb7d8b9fc 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56766 2011-10-12 01:06:12Z dreisner $ +# $Id: PKGBUILD 58198 2011-11-08 16:54:47Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=systemd pkgver=37 -pkgrel=1 +pkgrel=2 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -53,13 +53,13 @@ build() { --libdir=/usr/lib \ --localstatedir=/var \ --with-rootdir= \ - --with-rootlibdir=/lib \ - --disable-audit + --with-rootlibdir=/lib make # fix .so links in manpages sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8 + sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 } package() { diff --git a/community/tabbed/PKGBUILD b/community/tabbed/PKGBUILD index c30baf794..142c68a81 100644 --- a/community/tabbed/PKGBUILD +++ b/community/tabbed/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 31139 2010-10-27 11:10:35Z lfleischer $ +# $Id: PKGBUILD 57841 2011-11-03 11:24:18Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: totoloco <totoloco at gmx> pkgname=tabbed pkgver=0.3 -pkgrel=1 -pkgdesc="Simple generic tabbed fronted to xembed aware applications." +pkgrel=2 +pkgdesc='Simple generic tabbed fronted to xembed aware applications.' arch=('i686' 'x86_64' 'mips64el') url='http://tools.suckless.org/tabbed' license=('custom:MIT/X') diff --git a/community/taglib-rcc/PKGBUILD b/community/taglib-rcc/PKGBUILD index ed93be7ab..e34ef6d7a 100644 --- a/community/taglib-rcc/PKGBUILD +++ b/community/taglib-rcc/PKGBUILD @@ -1,27 +1,27 @@ -# $Id: PKGBUILD 17761 2010-05-25 09:16:05Z spupykin $ +# $Id: PKGBUILD 59135 2011-11-21 12:15:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=taglib-rcc -pkgver=1.6.3 +pkgver=1.7 pkgrel=1 pkgdesc="taglib with librcc patch" arch=('i686' 'x86_64' 'mips64el') -url="http://ktown.kde.org/~wheeler/taglib.html" -depends=('gcc-libs' 'zlib' 'bash' libxml2 db librcc) -makedepends=(patch) +url="http://developer.kde.org/~wheeler/taglib.html" +depends=('gcc-libs' 'zlib' 'bash' 'libxml2' 'db' 'librcc') +makedepends=('patch' 'cmake') license=('GPL') provides=("taglib=$pkgver") conflicts=("taglib") options=('!libtool') -source=(http://ktown.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz \ +source=(http://developer.kde.org/~wheeler/files/src/taglib-$pkgver.tar.gz http://downloads.sourceforge.net/rusxmms/taglib-csa6.tar.bz2) -md5sums=('ddf02f4e1d2dc30f76734df806e613eb' +md5sums=('6a7e312668f153fa905a81714aebc257' '0868d633843ecd87526c77d788b3d3b6') build() { cd $srcdir/taglib-$pkgver - [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || return 1 + [ $NOEXTRACT -eq 1 ] || patch -Np1 <$srcdir/taglib/taglib-1.5-ds-rusxmms.patch || true [ $NOEXTRACT -eq 1 ] || sed -i 's|#include <string>|#include <string.h>|' $srcdir/taglib-$pkgver/taglib/toolkit/rccpatch.cpp cd .. @@ -33,6 +33,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DWITH_MP4=ON \ -DWITH_ASF=ON - make VERBOSE=1 || return 1 - make DESTDIR=${pkgdir} install || return 1 + make VERBOSE=1 + make DESTDIR=${pkgdir} install } diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD index 78246e1f2..84d06dd3d 100644 --- a/community/tasks/PKGBUILD +++ b/community/tasks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 56135 2011-10-02 08:11:48Z spupykin $ +# $Id: PKGBUILD 59230 2011-11-21 15:27:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: lp76 <l.peduto@gmail.com> @@ -13,7 +13,8 @@ license=('GPL') depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2') makedepends=('intltool') install=tasks.install -source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) +#source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/$pkgname-$pkgver.tar.gz) md5sums=('0afd969758561599fd782e1effb39c08') build() { diff --git a/community/tcsh/PKGBUILD b/community/tcsh/PKGBUILD index b5ee7ff92..fda586748 100644 --- a/community/tcsh/PKGBUILD +++ b/community/tcsh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 34438 2010-12-07 21:04:26Z lfleischer $ +# $Id: PKGBUILD 57883 2011-11-04 08:18:37Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tcsh pkgver=6.17.00 -pkgrel=3 +pkgrel=4 pkgdesc='Enhanced version of the Berkeley C shell.' arch=('i686' 'x86_64' 'mips64el') url='http://www.tcsh.org/Welcome' diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD index 98335d8ee..66fd9e8f8 100644 --- a/community/tesseract/PKGBUILD +++ b/community/tesseract/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 28735 2010-10-05 05:30:06Z spupykin $ +# $Id: PKGBUILD 59081 2011-11-21 09:28:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Hauser <andy-aur@splashground.de> pkgname=tesseract -pkgver=3.00 -pkgrel=2 +pkgver=3.01 +pkgrel=1 pkgdesc="An OCR programm" arch=(x86_64 i686 'mips64el') url="http://code.google.com/p/tesseract-ocr" license=("APACHE") -depends=(libpng libtiff libjpeg zlib gcc-libs) +depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica) source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz @@ -44,7 +44,7 @@ source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz http://tesseract-ocr.googlecode.com/files/ces.traineddata.gz http://tesseract-ocr.googlecode.com/files/cat.traineddata.gz http://tesseract-ocr.googlecode.com/files/eng.traineddata.gz) -md5sums=('cc812a261088ea0c3d2da735be35d09f' +md5sums=('1ba496e51a42358fb9d3ffe781b2d20a' '06fce5f5c0221286eab591819406d91e' '127e0b742b615d81c3b97a555acd8285' 'f4ae2e5668f693cc51c6e3c3f57a8f1d' @@ -81,10 +81,15 @@ md5sums=('cc812a261088ea0c3d2da735be35d09f' build() { cd $srcdir/$pkgname-$pkgver + [ -f Makefile.in ] || automake + [ -f Makefile ] || ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/tessdata cp $srcdir/*.traineddata $pkgdir/usr/share/tessdata/ - ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install || return 1 find $pkgdir/usr/share/tessdata -type f -exec chmod 0644 {} \; } diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD index 66729ef29..4baa0b4c3 100644 --- a/community/texmaker/PKGBUILD +++ b/community/texmaker/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58537 2011-11-13 16:08:37Z andrea $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: furester <xfurester@hotmail.com> diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD index 8a1fa501e..d8dcee95c 100644 --- a/community/tksystray/PKGBUILD +++ b/community/tksystray/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 9452 2010-01-25 14:27:29Z spupykin $ +# $Id: PKGBUILD 59200 2011-11-21 14:59:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Pavel Borzenkov <pavel.borzenkov@gmail.com> @@ -10,14 +10,14 @@ arch=('i686' 'x86_64' 'mips64el') url="http://tkabber.jabber.ru/tksystray" license=("GPL") depends=(tcl tk imlib) -source=(http://arch.pp.ru/~sergej/dl/tksystray_$pkgver.orig.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/tksystray/tksystray_$pkgver.orig.tar.gz) md5sums=('d1784d2f786304bd6eaa82512fd5cf1c') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --with-tcl=/usr/lib --with-tk=/usr/lib - make || return 1 - mkdir -p $startdir/pkg/usr/lib/$pkgname-$pkgver - cp -rf libtray.so $startdir/pkg/usr/lib/$pkgname-$pkgver - cp -rf pkgIndex.tcl $startdir/pkg/usr/lib/$pkgname-$pkgver + make + mkdir -p $pkgdir/usr/lib/$pkgname-$pkgver + cp -rf libtray.so $pkgdir/usr/lib/$pkgname-$pkgver + cp -rf pkgIndex.tcl $pkgdir/usr/lib/$pkgname-$pkgver } diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD index 051b568b4..c21b75200 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/community/tomoyo-tools/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 56076 2011-09-30 09:42:38Z spupykin $ +# $Id: PKGBUILD 58253 2011-11-09 13:16:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> pkgname=tomoyo-tools -_basever=2.3.0 -_timestamp=20110929 +_basever=2.4.0 +_timestamp=20111025 +_file=52848 pkgver=${_basever}.${_timestamp} pkgrel=1 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0' @@ -15,8 +16,8 @@ license=('GPL') depends=('ncurses') conflicts=('ccs-tools') install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz") -md5sums=('4444feb74a84f2ae50a9a5d8065c3a8e') +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('eeee0afbccae2291e16dbbb64cf85370') build() { cd "${srcdir}/${pkgname}" diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD index db54b5e5c..61d53c4d6 100644 --- a/community/tor/PKGBUILD +++ b/community/tor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55579 2011-09-14 11:12:14Z lfleischer $ +# $Id: PKGBUILD 57572 2011-10-30 21:39:28Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: simo <simo@archlinux.org> pkgname=tor -pkgver=0.2.2.33 +pkgver=0.2.2.34 pkgrel=1 pkgdesc='Anonymizing overlay network.' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz" 'torrc' 'tor' 'tor.conf.d') -md5sums=('ea99aba49694bb982d2fccc57a70d58e' +md5sums=('0f1bbb8e086ea2aba41ff7f898fcf3bd' '56c75d4e8a66f34167d31e38c43793dd' 'f8e6868a389877346e7eebaacd1078bb' '5c7c6834064b3530c442def6079ac3aa') diff --git a/community/tora/PKGBUILD b/community/tora/PKGBUILD index 0bbdada6b..324e4d48c 100644 --- a/community/tora/PKGBUILD +++ b/community/tora/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 44359 2011-04-06 09:51:56Z jelle $ +# $Id: PKGBUILD 58339 2011-11-12 08:18:18Z andrea $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> + pkgname=tora pkgver=2.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL" arch=('i686' 'x86_64' 'mips64el') url="http://tora.sourceforge.net" @@ -13,15 +14,20 @@ license=('GPL') depends=('qscintilla') makedepends=('cmake') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ea4a75a9daeaf58492413e3f7fe40293') build() { - cd $srcdir/$pkgname-$pkgver - cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/ + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release make } + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/community/tora/tora.install b/community/tora/tora.install index 260f3960f..161b21e2b 100644 --- a/community/tora/tora.install +++ b/community/tora/tora.install @@ -1,5 +1,5 @@ # Thanks to: Serge Gielkens (Teld) for this bugfix -infodir=/usr/share/info +infodir=usr/share/info filelist=(tora.info) post_install() { @@ -17,4 +17,3 @@ pre_remove() { install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } - diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD index ea76e1c56..63a03d633 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' 'mips64el') 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/community/transset-df/PKGBUILD b/community/transset-df/PKGBUILD index 19675ea8a..6839abcf0 100644 --- a/community/transset-df/PKGBUILD +++ b/community/transset-df/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 22565 2010-07-22 20:46:50Z lcarlier $ -# Contributer: Aaron Schaefer <aaron@elasticdog.com> +# $Id: PKGBUILD 57820 2011-11-03 10:04:35Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=transset-df pkgver=6 -pkgrel=2 -pkgdesc="A patched version of X.Org's transset with added functionality" +pkgrel=3 +pkgdesc="A patched version of X.Org's transset with added functionality." arch=('i686' 'x86_64' 'mips64el') -url="http://forchheimer.se/transset-df/" +url='http://forchheimer.se/transset-df/' license=('GPL') depends=('libxcomposite' 'libxdamage' 'libxrender') -source=(http://forchheimer.se/$pkgname/$pkgname-$pkgver.tar.gz) +source=("http://forchheimer.se/${pkgname}/${pkgname}-${pkgver}.tar.gz") md5sums=('3375d570adc9d875d7fc476d1a50d5a5') build() { - cd ${srcdir}/$pkgname-$pkgver - + cd "${srcdir}/${pkgname}-${pkgver}" make } package() { - cd ${srcdir}/$pkgname-$pkgver - - install -D -m755 transset-df ${pkgdir}/usr/bin/transset-df + cd "${srcdir}/${pkgname}-${pkgver}" + install -Dm0755 transset-df "${pkgdir}/usr/bin/transset-df" } diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD index b455b089a..feb55fae9 100644 --- a/community/tuxguitar/PKGBUILD +++ b/community/tuxguitar/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 6777 2009-12-21 17:50:48Z spupykin $ +# $Id: PKGBUILD 59148 2011-11-21 12:35:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: |AhIoRoS| < ahioros@gmail.com > pkgname=tuxguitar pkgver=1.2 pkgrel=4 +_jdk=java-7-openjdk pkgdesc="multitrack guitar tablature editor and player" arch=('i686' 'x86_64' 'mips64el') #url="http://www.herac.com.ar/contenidos/tuxguitar.html" url="http://sourceforge.net/projects/tuxguitar" license=('LGPL') depends=('java-runtime' 'swt' 'alsa-lib') -makedepends=('unzip' 'zip' 'apache-ant' 'jack-audio-connection-kit' 'fluidsynth') +makedepends=('unzip' 'zip' 'apache-ant' 'jack' 'fluidsynth' 'java-environment') +optdepends=('fluidsynth') install=tuxguitar.install source=(tuxguitar-src-$pkgver.tar.gz::http://sourceforge.net/projects/tuxguitar/files/TuxGuitar/TuxGuitar-$pkgver/tuxguitar-src-$pkgver.tar.gz/download - tuxguitar.desktop \ + tuxguitar.desktop tuxguitar.xml) md5sums=('f41ed20e77c6c3d8968991a29c71b912' 'eea5247daa70ce6fc15e95b1080af486' @@ -22,80 +24,80 @@ md5sums=('f41ed20e77c6c3d8968991a29c71b912' build() { cd $srcdir/tuxguitar-src-$pkgver - mkdir -p $pkgdir/usr/share/tuxguitar && \ + mkdir -p $pkgdir/usr/share/tuxguitar mkdir -p $pkgdir/usr/bin export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH - (cd TuxGuitar/ && ant) || return 1 - (cd TuxGuitar-alsa/ && ant) || return 1 - (cd TuxGuitar-fluidsynth/ && ant) || return 1 - (cd TuxGuitar-jack/ && ant) || return 1 - (cd TuxGuitar-oss/ && ant) || return 1 - (cd TuxGuitar-compat/ && ant) || return 1 - (cd TuxGuitar-gtp/ && ant) || return 1 - (cd TuxGuitar-ptb/ && ant) || return 1 - (cd TuxGuitar-tef/ && ant) || return 1 - (cd TuxGuitar-midi/ && ant) || return 1 - (cd TuxGuitar-lilypond/ && ant) || return 1 - (cd TuxGuitar-musicxml/ && ant) || return 1 - (cd TuxGuitar-ascii/ && ant) || return 1 - (cd TuxGuitar-converter/ && ant) || return 1 - (cd TuxGuitar-tray/ && ant) || return 1 - (cd TuxGuitar-community/ && ant) || return 1 - (cd TuxGuitar-gervill/ && ant) || return 1 - (cd TuxGuitar-jsa/ && ant) || return 1 + (cd TuxGuitar/ && ant) + (cd TuxGuitar-alsa/ && ant) + (cd TuxGuitar-fluidsynth/ && ant) + (cd TuxGuitar-jack/ && ant) + (cd TuxGuitar-oss/ && ant) + (cd TuxGuitar-compat/ && ant) + (cd TuxGuitar-gtp/ && ant) + (cd TuxGuitar-ptb/ && ant) + (cd TuxGuitar-tef/ && ant) + (cd TuxGuitar-midi/ && ant) + (cd TuxGuitar-lilypond/ && ant) + (cd TuxGuitar-musicxml/ && ant) + (cd TuxGuitar-ascii/ && ant) + (cd TuxGuitar-converter/ && ant) + (cd TuxGuitar-tray/ && ant) + (cd TuxGuitar-community/ && ant) + (cd TuxGuitar-gervill/ && ant) + (cd TuxGuitar-jsa/ && ant) - cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/ && \ - find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \; && \ - mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/ && \ - cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/ || return 1 + cp -r TuxGuitar/share $pkgdir/usr/share/tuxguitar/ + find -name \*.jar -exec sh -c 'cp {} '$pkgdir'/usr/share/tuxguitar/share/plugins/`basename {}`' \; + mv $pkgdir/usr/share/tuxguitar/share/plugins/tuxguitar.jar $pkgdir/usr/share/tuxguitar/ + cp TuxGuitar/tuxguitar $pkgdir/usr/share/tuxguitar/ # alsa pushd TuxGuitar-alsa/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o \ - org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c && \ - gcc -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound && \ - install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c + gcc -shared -o libtuxguitar-alsa-jni.so org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o -L/usr/lib -lasound + install -D -m0755 libtuxguitar-alsa-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-alsa-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-alsa-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-alsa-jni.so popd # oss pushd TuxGuitar-oss/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o \ - org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c && \ - gcc -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib && \ - install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c + gcc -shared -o libtuxguitar-oss-jni.so org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o -L/usr/lib + install -D -m0755 libtuxguitar-oss-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-oss-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-oss-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-oss-jni.so popd # jack pushd TuxGuitar-jack/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_jack_JackClient.o \ - org_herac_tuxguitar_jack_JackClient.c && \ - gcc -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack && \ - install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so || return 1 + org_herac_tuxguitar_jack_JackClient.c + gcc -shared -o libtuxguitar-jack-jni.so org_herac_tuxguitar_jack_JackClient.o -L/usr/lib -ljack + install -D -m0755 libtuxguitar-jack-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-jack-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-jack-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-jack-jni.so popd # fluidsynth pushd TuxGuitar-fluidsynth/jni - gcc -I/usr/lib/jvm/java-6-openjdk/include -I/usr/lib/jvm/java-6-openjdk/include/linux -fPIC \ + gcc -I/usr/lib/jvm/${_jdk}/include -I/usr/lib/jvm/${_jdk}/include/linux -fPIC \ -c -o org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o \ - org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c && \ - gcc -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth && \ - install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so && \ - mkdir -p $pkgdir/usr/share/tuxguitar/lib && \ - ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so || return 1 + org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c + gcc -shared -o libtuxguitar-fluidsynth-jni.so org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o -L/usr/lib -lfluidsynth + install -D -m0755 libtuxguitar-fluidsynth-jni.so $pkgdir/usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so + mkdir -p $pkgdir/usr/share/tuxguitar/lib + ln -s /usr/lib/tuxguitar/libtuxguitar-fluidsynth-jni.so $pkgdir/usr/share/tuxguitar/lib/libtuxguitar-fluidsynth-jni.so popd - cd $startdir/pkg/usr/bin + cd $pkgdir/usr/bin cat >tuxguitar << EOF #!/bin/sh export CLASSPATH=/usr/share/java/swt.jar:$CLASSPATH @@ -104,8 +106,7 @@ cd /usr/share/$pkgname exec /usr/share/$pkgname/tuxguitar "\$1" "\$2" "\$3" "\$4" "\$5" "\$6" "\$7" "\$8" "\$9" EOF - chmod 755 tuxguitar && \ - install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml && \ + chmod 755 tuxguitar + install -D -m0644 $srcdir/tuxguitar.xml $pkgdir/usr/share/mime/packages/tuxguitar.xml install -D -m0644 $srcdir/tuxguitar.desktop $pkgdir/usr/share/applications/tuxguitar.desktop } - diff --git a/community/tvtime/PKGBUILD b/community/tvtime/PKGBUILD index 4ebef581a..e54707192 100644 --- a/community/tvtime/PKGBUILD +++ b/community/tvtime/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 59091 2011-11-21 09:46:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer:thefatprecious <marty@loomar.com> @@ -9,20 +9,25 @@ pkgdesc="A high quality television application for use with video capture cards" arch=('i686' 'x86_64' 'mips64el') url='http://tvtime.sourceforge.net/' license=('GPL' 'LGPL') -depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' 'libsm' 'libxxf86vm') -makedepends=('libxt') -source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz \ - tvtime-1.0.2+linux-headers-2.6.18.patch tvtime-1.0.2-gcc41.patch tvtime-1.0.2-locale_t.patch) -md5sums=('4b3d03afe61be239b08b5e522cd8afed' '29b0aefd80fddae68613854b627e044a'\ - 'c782789825dfa664e1f6fcc96ac7246c' '1069dc5b47bba8456cbf48e34cb5c0b6') +depends=('gcc-libs' 'libpng' 'libxml2' 'freetype2' 'libxtst' 'libxinerama' 'libxv' + 'libsm' 'libxxf86vm') +makedepends=('libxt' 'v4l-utils') +source=(http://downloads.sourceforge.net/sourceforge/tvtime/$pkgname-$pkgver.tar.gz + tvtime-1.0.2+linux-headers-2.6.18.patch + tvtime-1.0.2-gcc41.patch + tvtime-1.0.2-locale_t.patch) +md5sums=('4b3d03afe61be239b08b5e522cd8afed' + 'e956821745686b5b3a784f7471996ade' + 'c782789825dfa664e1f6fcc96ac7246c' + '1069dc5b47bba8456cbf48e34cb5c0b6') build() { cd $srcdir/$pkgname-$pkgver - patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch || return 1 - patch -p1 < ../tvtime-1.0.2-gcc41.patch || return 1 - patch -p1 < ../tvtime-1.0.2-locale_t.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 - install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml || return 1 + patch -p1 < ../tvtime-1.0.2+linux-headers-2.6.18.patch + patch -p1 < ../tvtime-1.0.2-gcc41.patch + patch -p1 < ../tvtime-1.0.2-locale_t.patch + [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var --sysconfdir=/etc + make + make DESTDIR=$pkgdir install + install -D -m644 docs/html/default.tvtime.xml $pkgdir/usr/share/tvtime/default.tvtime.xml } diff --git a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch index b1cfd49f1..d0772783d 100644 --- a/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch +++ b/community/tvtime/tvtime-1.0.2+linux-headers-2.6.18.patch @@ -2,14 +2,15 @@ Index: tvtime-1.0.2/src/videoinput.c =================================================================== --- tvtime-1.0.2.orig/src/videoinput.c +++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,8 @@ +@@ -35,8 +35,9 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include "videodev.h" -#include "videodev2.h" -+#include <linux/videodev.h> ++#include <libv4l1-videodev.h> +#include <linux/videodev2.h> ++#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ #include "videoinput.h" #include "mixer.h" diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD index 53d5e7541..03aa1ae09 100644 --- a/community/twin/PKGBUILD +++ b/community/twin/PKGBUILD @@ -1,4 +1,7 @@ +# $Id: PKGBUILD 59233 2011-11-21 15:28:15Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> + pkgname=twin pkgver=0.6.2 pkgrel=1 @@ -9,17 +12,15 @@ license=('GPL' 'LGPL') depends=('ncurses' 'gpm' 'zlib' 'libtool' 'libxpm') optdepends=('gtk') #source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -source=(http://linuz.sns.it/~max/twin/twin-$pkgver.tar.gz) +source=(http://arch.p5n.pp.ru/~sergej/dl/2011/twin-$pkgver.tar.gz) md5sums=('6211c8b2e655003eb96b1fc5dc37e7d9') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver LDFLAGS="-lX11" ./configure --prefix=/usr \ --enable-tt=yes \ --enable-tt-hw-twin=yes --enable-tt-hw-twin-tunnel=yes --enable-tt-hw-twin-detunnel=yes \ - --enable-tt-hw-xml=yes \ - || return 1 - - make -j1 || return 1 - make DESTDIR=$startdir/pkg install || return 1 + --enable-tt-hw-xml=yes + make -j1 + make DESTDIR=$pkgdir install } diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD deleted file mode 100644 index 8f10db3a5..000000000 --- a/community/unetbootin/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 56275 2011-10-04 15:12:06Z arodseth $ -# Contributor: Det <nimetonmaili at gmail a-dot com> -# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com> -pkgname=unetbootin -pkgver=555 -pkgrel=1 -pkgdesc="Lets you create bootable Live USB drives" -url="http://unetbootin.sourceforge.net/" -license=('GPL') -arch=('x86_64' 'i686') -depends=('syslinux' 'p7zip' 'qt' 'mtools') -optdepends=('gksu: for graphically requesting the root password' - 'kdebase-runtime: for graphically requesting the root password') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/project/${pkgname}/UNetbootin/${pkgver}/${pkgname}-source-${pkgver}.tar.gz) -sha1sums=('52adee7c2bf05834d59231e6a06ff8522203f4de') - -build() { - lupdate ${pkgname}.pro - lrelease ${pkgname}.pro - qmake - make -} - -package() { - install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}" - mkdir -p "${pkgdir}/usr/share/${pkgname}" - install -m644 ${pkgname}_*.qm "${pkgdir}/usr/share/${pkgname}/" - install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -D ${pkgname}_${i/x*/}.png "${pkgdir}/usr/share/icons/hicolor/${i}/apps/${pkgname}.png" - done -} diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index e445fa1d8..697bd84b7 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 54970 2011-08-29 09:48:35Z spupykin $ +# $Id: PKGBUILD 58295 2011-11-10 13:02:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd -pkgver=3.2.8.1 -pkgrel=8 +pkgver=3.2.9 +pkgrel=1 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64' 'mips64el') url="http://unrealircd.com" license=('GPL2') -depends=(openssl curl) -conflicts=(ircd) -provides=(ircd) +depends=('openssl' 'curl') +makedepends=('c-ares') +conflicts=('ircd') +provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc arch-fixes.patch) -md5sums=('7b741e94e867c0a7370553fd01506c66' +md5sums=('bde023695347969f545ce5f2a9ac9aed' '0d728240132a97a2cef61be9558750b1' '77807313c4578f2c30286b9f9e3fb21c') @@ -37,7 +38,8 @@ build() { --enable-dynamic-linking \ --enable-ziplinks \ --enable-ssl \ - --enable-libcurl=/usr + --enable-libcurl=/usr \ + --with-system-cares make make IRCDDIR=$pkgdir/etc/unrealircd BINDIR=$pkgdir/usr/bin install diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD index 87ec6b821..44bd457cd 100644 --- a/community/uptimed/PKGBUILD +++ b/community/uptimed/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 17435 2010-05-24 10:30:22Z spupykin $ +# $Id: PKGBUILD 58644 2011-11-16 23:03:01Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom Killian <tomk@runbox.com> +# Contributor: Tom Killian <tomk@runbox.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=uptimed @@ -8,22 +8,23 @@ pkgver=0.3.16 pkgrel=3 pkgdesc="A system uptime record daemon" arch=(i686 x86_64 'mips64el') -install=$pkgname.install url="http://podgorny.cz/uptimed/" license=('GPL') -depends=('glibc') +depends=('glibc' 'bash') backup=(etc/uptimed.conf) +options=('!libtool') +install=$pkgname.install source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - uptimed) + uptimed) md5sums=('f87ec2cc39039239004afa542cf99c59' '4ae90bee9fc78014a889a5072effb735') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver # Change log path to Arch standard for M in `ls M*`; do - sed -i "s|/var/spool/uptimed|$startdir/pkg/var/log/uptimed|" $M + sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M done sed -i 's|spool|log|' libuptimed/urec.h @@ -31,12 +32,13 @@ build() { libtoolize --force ./configure --prefix=/usr --sysconfdir=/etc + make +} - make || return 1 - make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc install +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install - mv $startdir/pkg/etc/uptimed.conf-dist \ - $startdir/pkg/etc/uptimed.conf - install -D ../uptimed $startdir/pkg/etc/rc.d/uptimed - find $startdir/pkg -name '*.la' -exec rm {} \; + mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf + install -D $srcdir/uptimed $pkgdir/etc/rc.d/uptimed } diff --git a/community/upx/PKGBUILD b/community/upx/PKGBUILD index e12787daf..e3d172960 100644 --- a/community/upx/PKGBUILD +++ b/community/upx/PKGBUILD @@ -1,10 +1,11 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: bekks <eduard.warkentin@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=upx pkgver=3.07 -pkgrel=1 +pkgrel=2 pkgdesc='Ultimate executable compressor.' arch=('i686' 'x86_64' 'mips64el') url='http://upx.sourceforge.net/' @@ -17,17 +18,13 @@ md5sums=('8186ab103288242f7e8ecad1acd4af03' '29d5ffd03a5a3e51aef6a74e9eafb759') build() { - cd ${pkgname}-${pkgver}-src - - make UPX_LZMA_VERSION=0x465 UPX_LZMADIR=${srcdir} all + cd "${pkgname}-${pkgver}-src" + make UPX_LZMA_VERSION=0x465 UPX_LZMADIR="${srcdir}" all } package() { - cd ${pkgname}-${pkgver}-src - - install -D src/upx.out \ - ${pkgdir}/usr/bin/upx + cd "${pkgname}-${pkgver}-src" - install -D -m644 doc/upx.1 \ - ${pkgdir}/usr/share/man/man1/upx.1 + install -Dm0755 src/upx.out "${pkgdir}/usr/bin/upx" + install -Dm0644 doc/upx.1 "${pkgdir}/usr/share/man/man1/upx.1" } diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD index 1d8defbb9..73bef5e46 100644 --- a/community/uriparser/PKGBUILD +++ b/community/uriparser/PKGBUILD @@ -1,21 +1,25 @@ +# $Id: PKGBUILD 59139 2011-11-21 12:26:27Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> - pkgname=uriparser - pkgver=0.7.5 - pkgrel=1 - pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" - url="http://sourceforge.net/projects/uriparser/" - depends=(glibc) - makedepends=(doxygen) - source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) - md5sums=('4f4349085fe5de33bcae8d0f26649593') - arch=('i686' 'x86_64') - license="CUSTOM" - build() { - cd ${srcdir}/$pkgname-$pkgver - ./configure --prefix=/usr --disable-test - ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 - install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1 -} -
\ No newline at end of file + +pkgname=uriparser +pkgver=0.7.5 +pkgrel=1 +pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode" +url="http://sourceforge.net/projects/uriparser/" +depends=(glibc) +makedepends=(doxygen) +arch=('i686' 'x86_64') +license=("custom") +source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2) +md5sums=('4f4349085fe5de33bcae8d0f26649593') + +build() { + cd ${srcdir}/$pkgname-$pkgver + [ -f Makefile ] || ./configure --prefix=/usr --disable-test + ln -s ${srcdir}/$pkgname-$pkgver/doc/Doxyfile.in ${srcdir}/$pkgname-$pkgver/doc/Doxyfile + sed -i 's|{css,gif,html,png}|{css,html,png}|' doc/Makefile + make + make DESTDIR=$pkgdir install + install -D -m644 "${srcdir}/$pkgname-$pkgver/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 64112fe90..f1fd5c300 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55016 2011-08-31 09:35:31Z spupykin $ +# $Id: PKGBUILD 58972 2011-11-20 18:14:02Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.1.9 +pkgver=1.2.0 pkgrel=1 -_pkgdata=20110805 +_pkgdata=20111023 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64' 'mips64el') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('76f6978f18cac41f269a346a5d0f1052' - '0ed8a28f8efd3177a128ecd46fc8bf9f' - 'e8e39e52e3cf7a38e483e7a80d382927') +md5sums=('1932ab96d6e3c5e0a6bdfac863338627' + '6e7cb67d0428bda241600b038ba11aeb' + '1378c0319520c817d49c7e9457c7d6e3') build() { cd $srcdir/usb-modeswitch-$pkgver/ diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD index 8252ba9c9..522bd1b1f 100644 --- a/community/ushare/PKGBUILD +++ b/community/ushare/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54798 2011-08-26 08:53:52Z spupykin $ +# $Id: PKGBUILD 58584 2011-11-15 20:14:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=ushare pkgver=1.1a -pkgrel=15 +pkgrel=16 pkgdesc="A free UPnP A/V Media Server for Linux" url="http://ushare.geexbox.org" license=('GPL2') diff --git a/community/ushare/ushare.install b/community/ushare/ushare.install index c58209616..38d710156 100644 --- a/community/ushare/ushare.install +++ b/community/ushare/ushare.install @@ -13,4 +13,5 @@ post_upgrade() { post_remove() { userdel ushare + groupdel ushare } diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index 5a9160e09..97439f4f2 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 55905 2011-09-24 16:50:06Z stephane $ +# $Id: PKGBUILD 57538 2011-10-30 16:10:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift -pkgver=2011.09.01 -pkgrel=3 +pkgver=2011.10.22 +pkgrel=1 pkgdesc="An open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64' 'mips64el') url="http://vdrift.net/" license=('GPL') depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-src-${pkgver//./-}.tar.bz2 - $pkgname.desktop) -md5sums=('a4099acacca3d4f0799b012cd168f1c0' - '8bb429f37bcb4aed5e7ab1d80c5a4f93') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) +md5sums=('6f8806ab1be303e9e1e47522c9eee890') build() { - cd "$srcdir"/$pkgname-src-${pkgver//./-} + cd "$srcdir"/$pkgname-${pkgver//./-} # select arch if [ `uname -m` = "x86_64" ]; then @@ -27,8 +25,8 @@ build() { _sconsarch="686" fi - sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp - sed -i '/types.h/d' src/http.h + #sed -i 's/glGenerateMipmap/glGenerateMipmapEXT/g' src/texture.cpp + #sed -i '/types.h/d' src/http.h # build and install scons \ @@ -37,16 +35,26 @@ build() { "release"=1 \ "force_feedback"=1 \ "prefix"=/usr \ - "datadir"=share/$pkgname/ + "datadir"=share/$pkgname/ \ + "extbullet"=1 } package() { - cd "$srcdir"/$pkgname-src-${pkgver//./-} + cd "$srcdir"/$pkgname-${pkgver//./-} scons install # install .desktop file - install -Dm644 ../$pkgname.desktop \ - "$pkgdir"/usr/share/applications/$pkgname.desktop + install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop + + # install icons + install -Dm644 data/textures/icons/vdrift-16x16.png \ + "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-32x32.png \ + "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png + install -Dm644 data/textures/icons/vdrift-64x64.png \ + "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png + + rm -r $pkgdir/usr/share/vdrift } # vim: sw=2:ts=2 et: diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index e463b65c9..0fbc59ffe 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 53809 2011-08-08 10:37:58Z jelle $ +# $Id: PKGBUILD 58264 2011-11-09 15:50:55Z jelle $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> pkgname=vhba-module -pkgver=20110416 -_kernver='3.0-ARCH' +pkgver=20110915 +#_kernver='3.1.0-ARCH' +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version)" pkgrel=2 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" license=('GPL2') -depends=('linux>=3.0' 'linux<3.1') -makedepends=('linux-headers>=3.0') +depends=('linux>=3.1' 'linux<3.2') +makedepends=('linux-headers>=3.1') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz) -md5sums=('2f91dd4ee8648da92d625221d4275b60') +md5sums=('fb90cd8fc4cd74d08c92e8235f99f1f4') build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,6 +25,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" - sed -i "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" + install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko" + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/vhba-module.install" } diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index edb9e8d2b..eca9bb285 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,8 +1,8 @@ post_install() { echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.39-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } post_upgrade() { @@ -10,7 +10,7 @@ post_upgrade() { } post_remove() { - KERNEL_VERSION='2.6.39-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox/60-vboxguest.rules b/community/virtualbox-modules/60-vboxguest.rules index 6285f7249..6285f7249 100644 --- a/community/virtualbox/60-vboxguest.rules +++ b/community/virtualbox-modules/60-vboxguest.rules diff --git a/community/virtualbox-modules/LocalConfig.kmk b/community/virtualbox-modules/LocalConfig.kmk new file mode 100644 index 000000000..af79f90cd --- /dev/null +++ b/community/virtualbox-modules/LocalConfig.kmk @@ -0,0 +1,19 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD new file mode 100644 index 000000000..85e9ab987 --- /dev/null +++ b/community/virtualbox-modules/PKGBUILD @@ -0,0 +1,101 @@ +# $Id: PKGBUILD 58216 2011-11-08 22:41:23Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=virtualbox-modules +pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules') +pkgver=4.1.6 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 + LocalConfig.kmk 60-vboxguest.rules) +md5sums=('89b979d1b817242c7cdcb489898f166a' + '4c88bd122677a35f68abd76eb01b378b' + 'ed1341881437455d9735875ddf455fbe') + +_extramodules=extramodules-3.1-ARCH +_kernver="$(cat /lib/modules/${_extramodules}/version || true)" + +export KERN_DIR=/lib/modules/${_kernver}/build +export KERN_INCL=/usr/src/linux-${_kernver}/include/ + +build() { + cd "$srcdir/VirtualBox-${pkgver}_OSE" + + cp "$srcdir/LocalConfig.kmk" . + + ./configure \ + --with-linux=/usr/src/linux-${_kernver} \ + --disable-java \ + --disable-docs \ + --disable-xpcom \ + --disable-python \ + --disable-sdl-ttf \ + --disable-alsa \ + --disable-pulse \ + --disable-dbus \ + --disable-opengl \ + --build-headless \ + --nofatal + source ./env.sh + kmk all + + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" +} + +package_virtualbox-archlinux-modules(){ + pkgdesc="Additions only for Arch Linux guests (kernel modules)" + license=('GPL') + install=virtualbox-archlinux-modules.install + depends=('linux>=3.1' 'linux<3.2') + replaces=('virtualbox-guest-modules') + conflicts=('virtualbox-guest-modules') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + + for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do + install -D -m644 ${module} \ + "$pkgdir/lib/modules/${_extramodules}/${module}" + done + + install -D -m 0644 "$srcdir/60-vboxguest.rules" \ + "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install" +} + +package_virtualbox-modules(){ + pkgdesc="Kernel modules for VirtualBox" + license=('GPL') + install=virtualbox-modules.install + depends=('linux>=3.1' 'linux<3.2') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + + install -D -m644 vboxdrv.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" + + install -D -m644 vboxnetadp.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" + + install -D -m644 vboxnetflt.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" + + install -D -m644 vboxpci.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" +} diff --git a/community/virtualbox-modules/virtualbox-archlinux-modules.install b/community/virtualbox-modules/virtualbox-archlinux-modules.install new file mode 100644 index 000000000..39a0e4063 --- /dev/null +++ b/community/virtualbox-modules/virtualbox-archlinux-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtualbox-modules/virtualbox-modules.install b/community/virtualbox-modules/virtualbox-modules.install new file mode 100644 index 000000000..ec29d3a87 --- /dev/null +++ b/community/virtualbox-modules/virtualbox-modules.install @@ -0,0 +1,19 @@ +post_install() { +/bin/cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/community/virtualbox/18-system-xorg.patch b/community/virtualbox/18-system-xorg.patch deleted file mode 100644 index 4a28b93b6..000000000 --- a/community/virtualbox/18-system-xorg.patch +++ /dev/null @@ -1,277 +0,0 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de> - -diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -40,8 +40,8 @@ LIBRARIES += \ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -+# LIBRARIES += \ -+# VBoxGuestR3LibXFree86 - endif - endif - LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 -diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ -- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ -- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ -- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ -- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ -- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_MESA_INCS) \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ /usr/include/drm \ -+ /usr/include/libdrm - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - -diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk ---- a/src/VBox/Additions/x11/Makefile.kmk -+++ b/src/VBox/Additions/x11/Makefile.kmk -@@ -17,6 +17,10 @@ - SUB_DEPTH = ../../../.. - include $(KBUILD_PATH)/subheader.kmk - -+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) -+ XSERVER_VERSION := 17 -+endif -+ - # Include sub-makefiles. - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk -diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxmouse_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxmouse_drv - vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxmouse_drv_DEFS.linux = linux - vboxmouse_drv_DEFS.x86 += __i386__ -@@ -59,7 +58,6 @@ endif - # - # vboxmouse_drv_70 - # --DLLS += vboxmouse_drv_70 - vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_70_DEFS = \ - XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE -@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ - # - # vboxmouse_drv_71 - # --DLLS += vboxmouse_drv_71 - vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) - vboxmouse_drv_71_INCS := \ -@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ - # - # vboxmouse_drv_13 - # --DLLS += vboxmouse_drv_13 - vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_13_INCS := \ -@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ - # - # vboxmouse_drv_14 - # --DLLS += vboxmouse_drv_14 - vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_14_INCS := \ -@@ -126,7 +121,6 @@ endif - # - # vboxmouse_drv_15 - # --DLLS += vboxmouse_drv_15 - vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_15_INCS := \ -@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ - # - # vboxmouse_drv_16 - # --DLLS += vboxmouse_drv_16 - vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_16_INCS := \ -@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ - # - # vboxmouse_drv_17 - # --DLLS += vboxmouse_drv_17 - vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ - # - # vboxmouse_drv_18 - # --DLLS += vboxmouse_drv_18 - vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ - # - # vboxmouse_drv_19 - # --DLLS += vboxmouse_drv_19 - vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ - # - # vboxmouse_drv_110 - # --DLLS += vboxmouse_drv_110 - vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ - vboxmouse_15.c - - -+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv -+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 -+DLLS += vboxmouse_drv_$(XSERVER_VERSION) -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES -diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxvideo_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxvideo_drv - endif # target linux - vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxvideo_drv_DEFS.linux = linux -@@ -89,7 +88,6 @@ endif # target linux - # base keywords instead of using .solaris or .linux. - # Also it is *important* to use := and not = when deriving a property. - # --DLLS += vboxvideo_drv_70 - vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - if1of ($(KBUILD_TARGET), linux) - vboxvideo_drv_70_CFLAGS += \ -@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_71 - # --DLLS += vboxvideo_drv_71 - vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) -@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_13 - # --DLLS += vboxvideo_drv_13 - vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 -@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ - # - # vboxvideo_drv_14 - # --DLLS += vboxvideo_drv_14 - vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) -@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) - # - # vboxvideo_drv_15 - # --DLLS += vboxvideo_drv_15 - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ -@@ -192,7 +186,6 @@ endif - # - # vboxvideo_drv_16 - # --DLLS += vboxvideo_drv_16 - vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_17 - # --DLLS += vboxvideo_drv_17 - vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_18 - # --DLLS += vboxvideo_drv_18 - vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_19 - # --DLLS += vboxvideo_drv_19 - vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_110 - # --DLLS += vboxvideo_drv_110 - vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ - vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) - - -+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv -+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/xorg \ -+ /usr/include/x11 \ -+ /usr/include/pixman-1 \ -+ /usr/include/X11/dri \ -+ /usr/include/drm \ -+ /usr/include/libdrm -+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include -+DLLS += vboxvideo_drv_$(XSERVER_VERSION) -+ -+# required for lenny backports -+ifeq ($(XSERVER_VERSION),14) -+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg -+endif -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 57ceb8c7f..b06c7ea16 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $ +# $Id: PKGBUILD 58251 2011-11-09 12:36:02Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') -pkgver=4.1.4 -pkgrel=2 +pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source') +pkgver=4.1.6 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2' -'xorg-server-devel' 'xf86driproto' 'libxcomposite') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') +#'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf - virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild change_default_driver_dir.patch vbox-service.conf vbox-service.rc) -_kernver=3.0-LIBRE + +_extramodules=extramodules-3.1-LIBRE +_kernver="$(cat /lib/modules/${_extramodules}/version || true)" build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" - patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" - patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" @@ -31,23 +30,23 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ + --enable-vnc \ + --nofatal \ --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all - - export KERN_DIR=/usr/src/linux-${_kernver} - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" } package_virtualbox() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make') + depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: developer kit') + 'virtualbox-sdk: developer kit' + 'virtualbox-source: host kernel source modules for non-stock kernels') + backup=('etc/vbox/vbox.cfg') replaces=('virtualbox-ose') conflicts=('virtualbox-ose') install=virtualbox.install @@ -109,6 +108,20 @@ package_virtualbox() { "$pkgdir/usr/share/licenses/virtualbox/LICENSE" install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" +} + +package_virtualbox-source() { + pkgdesc="VirtualBox kernel modules source" + depends=(gcc make) + provides=(virtualbox-modules) + optdepends=('linux-headers' + 'kernel26-lts-headers') + install=virtualbox-source.install + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + mkdir -p $pkgdir/usr/lib/virtualbox + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" #sources for modules cp -r src ${pkgdir}/usr/lib/virtualbox @@ -117,7 +130,7 @@ package_virtualbox() { } package_virtualbox-sdk() { - pkgdesc=" VirtualBox Software Developer Kit (SDK)" + pkgdesc="VirtualBox Software Developer Kit (SDK)" depends=('python2') mkdir -p "$pkgdir/usr/lib/virtualbox" @@ -165,42 +178,12 @@ package_virtualbox-archlinux-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } - -package_virtualbox-archlinux-modules(){ - pkgdesc="Additions only for Arch Linux guests (kernel modules)" - license=('GPL') - install=virtualbox-archlinux-modules.install - depends=('linux-libre>=3.0' 'linux-libre<3.1') - replaces=('virtualbox-guest-modules') - conflicts=('virtualbox-guest-modules') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - install -D -m644 vboxguest.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - - install -D -m644 vboxsf.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - - install -D -m644 vboxvideo.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install" -} -md5sums=('dc6e6801b3823332b6ca2e9915221aae' - 'bc048d1e58d84ece4a186199ee48d4c8' - '44efb3c4be214daa453a317d527f1f30' - '32a232b43852b9a08cb11a7bcd64b347' +md5sums=('89b979d1b817242c7cdcb489898f166a' + 'af534f713993eb077df26ff9a44fb080' '5f85710e0b8606de967716ded7b2d351' - 'ed1341881437455d9735875ddf455fbe' - 'cc3f278bc273011aa95277500a76f677' + '6ab2455c391d8cc005e2f4461ae26a3b' '78ffa67ff131680f1d2b6f06d4325c5b' - 'dda3811f7d94ac55f12b4de707a7c2c2' + 'bb9f83f91349437825edc7bc9a294aee' '97e193f050574dd272a38e5ee5ebe62b' '3c08ad30b89add47d3f45121200a5360' - '778d865e56e31cc592fbfa257fdcfce7') + 'e7416331d0bc331f3b5aae3e5d104642') diff --git a/community/virtualbox/vbox-service.rc b/community/virtualbox/vbox-service.rc index c1af2134d..6f1b8d892 100755 --- a/community/virtualbox/vbox-service.rc +++ b/community/virtualbox/vbox-service.rc @@ -11,13 +11,13 @@ case "$1" in start) stat_busy "Starting $name service" [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon $name; stat_done; } \ + && { add_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name service" [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ + && { rm_daemon vbox-service; stat_done; } \ || { stat_fail; exit 1; } ;; restart) diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild index 1058744c5..fdfbe712f 100755 --- a/community/virtualbox/vboxbuild +++ b/community/virtualbox/vboxbuild @@ -29,7 +29,7 @@ if (( ${#MODLIST[*]} )); then modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail fi -for kdir in /lib/modules/*; do +for kdir in /lib/modules/[2-3]*; do if [[ ! -d $kdir/kernel ]]; then # found a stale kernel mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*) @@ -59,13 +59,18 @@ for kernver; do fi stat_busy "Recompiling VirtualBox kernel modules ($kernver)" - for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do + if ! $BUILDVBOXDRV \ + --save-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + stat_fail + fi + for build in BUILDVBOX{NETFLT,NETADP,PCI}; do if ! ${!build} \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ + --use-module-symvers /tmp/vboxdrv-Module.symvers \ --no-print-directory install >> $LOG 2>&1; then echo "Look at $LOG to find out what went wrong" stat_fail - continue fi done stat_done diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch index c310dbc8d..710e2e511 100644 --- a/community/virtualbox/vboxdrv-reference.patch +++ b/community/virtualbox/vboxdrv-reference.patch @@ -1,45 +1,57 @@ -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000 -@@ -75,9 +75,8 @@ +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 +@@ -75,10 +75,9 @@ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" -+ "as root. This package keeps track of Linux kernel changes and" - "recompiles the vboxdrv kernel module if necessary." +- "as root. If it is available in your distribution, you should install the " +- "DKMS package first. This package keeps track of Linux kernel changes and " +- "recompiles the vboxdrv kernel module if necessary." ++ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>" ++ "as root. If you don't use our stock kernel, install virtualbox-source and" ++ "execute /usr/bin/vboxbuild ." ); -@@ -92,7 +91,7 @@ + QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( +@@ -90,11 +89,8 @@ + + QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing<br/><br/>" +- "VirtualBox. The installation of VirtualBox was apparently not " +- "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" +- "may correct this. Make sure that you do not mix the " +- "OSE version and the PUEL version of VirtualBox." ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " + " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." ); -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000 -@@ -34,7 +34,7 @@ + + QString g_QStrHintOtherNoDriver = QApplication::tr( +diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 ++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 +@@ -32,17 +32,18 @@ + cat << EOF + WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by +- load. Please recompile the kernel module and install it by ++ load. Please reinstall the kernel module virtualbox-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo /usr/bin/vboxbuild You will not be able to start VMs until this problem is fixed. EOF -@@ -42,7 +42,7 @@ + elif [ ! -c /dev/vboxdrv ]; then cat << EOF - WARNING: The character device /dev/vboxdrv does not exist. Try +-WARNING: The character device /dev/vboxdrv does not exist. Try ++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module - sudo /etc/init.d/vboxdrv restart -+ sudo /usr/bin/vboxbuild ++ sudo modprobe vboxdrv and if that is not successful, try to re-install the package. diff --git a/community/virtualbox/virtualbox-4-makeself-check.patch b/community/virtualbox/virtualbox-4-makeself-check.patch deleted file mode 100644 index e1fcb8c2f..000000000 --- a/community/virtualbox/virtualbox-4-makeself-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2527,7 +2527,6 @@ - check_compiler_h - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit - # tools/common/makeself* -- [ $OSE -ge 1 ] && check_makeself - fi - - [ -n "$SETUP_WINE" ] && setup_wine diff --git a/community/virtualbox/virtualbox-4-mkisofs-check.patch b/community/virtualbox/virtualbox-4-mkisofs-check.patch deleted file mode 100644 index 8b0d59123..000000000 --- a/community/virtualbox/virtualbox-4-mkisofs-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2499,7 +2499,6 @@ - # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs - # [ "$OS" != "darwin" ] && check_yasm - [ "$OS" != "darwin" ] && check_xsltproc --[ "$OS" != "darwin" ] && check_mkisofs - - # the libraries - [ "$OS" != "darwin" ] && check_pthread diff --git a/community/virtualbox/virtualbox-archlinux-modules.install b/community/virtualbox/virtualbox-archlinux-modules.install deleted file mode 100644 index 40e979b05..000000000 --- a/community/virtualbox/virtualbox-archlinux-modules.install +++ /dev/null @@ -1,24 +0,0 @@ -KERNEL_VERSION='3.0-ARCH' - -post_install() { - cat << EOM - -===> virtualbox-archlinux-modules post-install message: -===> -===> You may want to load vboxguest, vboxsf and vboxvideo -===> -===> To load them automatically, add them -===> to the MODULES array in /etc/rc.conf. - -EOM - - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_remove() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_upgrade() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} diff --git a/community/virtualbox/virtualbox-source.install b/community/virtualbox/virtualbox-source.install new file mode 100644 index 000000000..24d90b1c2 --- /dev/null +++ b/community/virtualbox/virtualbox-source.install @@ -0,0 +1,12 @@ +post_install() { +/bin/cat << EOF +===> To compile the modules do /usr/bin/vboxbuild +EOF + +} + +post_upgrade() { +/bin/cat << EOF +===> To recompile the modules do /usr/bin/vboxbuild +EOF +} diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install index 0eac014f2..c794b857d 100644 --- a/community/virtualbox/virtualbox.install +++ b/community/virtualbox/virtualbox.install @@ -14,35 +14,18 @@ utils() { post_install() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF - -===> In order to run VirtualBox, you have to be in the 'vboxusers' group. -===> -===> If you want to be able to install guest additions, you have to install -===> 'virtualbox-additions' package. -===> -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> For networking you must load vboxnetflt or vboxnetadp. -===> -===> For PCI passthrough support load vboxpci module. -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To compile the modules do /usr/bin/vboxbuild *** - -EOF - utils + utils } post_upgrade() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF -*** To recompile the modules do /usr/bin/vboxbuild *** + utils + if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then +/bin/cat << EOF +===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. +===> Use virtualbox-source package if you don't use our stock linux package. EOF - utils + fi } post_remove() { diff --git a/community/vlock/PKGBUILD b/community/vlock/PKGBUILD index 2d525ad83..7beb1f60e 100644 --- a/community/vlock/PKGBUILD +++ b/community/vlock/PKGBUILD @@ -1,23 +1,32 @@ -# $Id: PKGBUILD 22255 2010-07-20 05:18:40Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 58034 2011-11-05 17:24:10Z ttopper $ +# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=vlock -pkgver=2.2.2 -pkgrel=2 +pkgver=2.2.3 +pkgrel=1 pkgdesc="A small console locking program" url="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') depends=('pam') install=vlock.install -source=(http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0b26703c0aa3a9ae67bb90b9373a3b88') +source=("http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$pkgname-$pkgver.tar.bz2") +md5sums=('2dd5677c97f2707db62532ae24f58433') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr - make || return 1 - make DESTDIR=${pkgdir} install + make } + +package() { + cd "$srcdir/$pkgname-$pkgver" + + # vlock gid is 129 + make DESTDIR="$pkgdir" VLOCK_GROUP=129 install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD index 776106028..8b1b223de 100644 --- a/community/vmoviedb/PKGBUILD +++ b/community/vmoviedb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20044 2010-07-02 09:21:29Z spupykin $ +# $Id: PKGBUILD 59169 2011-11-21 13:06:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> @@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el') url="http://vmoviedb.sourceforge.net" license=('GPL') depends=('libgnomeui' 'gconf>=2.18.0.1-4' 'desktop-file-utils') -makedepends=('gnome-doc-utils>=0.11.2') +makedepends=('gnome-doc-utils>=0.11.2' 'intltool') install=$pkgname.install options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) @@ -20,8 +20,8 @@ md5sums=('7bfc10573bb890f3924755f2446dd3b6') build() { cd $srcdir/vmoviedb-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install || return 1 + make + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/gconf/schemas gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas \ diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 371bf4a83..6f896a7c9 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 58425 2011-11-12 17:19:02Z ibiru $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> @@ -8,7 +9,7 @@ pkgname=vtk pkgver=5.8.0 -pkgrel=2 +pkgrel=6 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64' 'mips64el') url='http://www.vtk.org' @@ -22,10 +23,12 @@ optdepends=('python2: python bindings' 'graphviz: drawing tools') source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz" "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz" - 'fixkernelversioncheck.diff') + 'fixkernelversioncheck.diff' + 'ffmpeg-0.8.diff') md5sums=('37b7297d02d647cc6ca95b38174cb41f' 'a05295b81930e894fc0e31866f399151' - '9e137af23701f76fc727222ebac23389') + '9e137af23701f76fc727222ebac23389' + 'e992321c9d1def6034d0fa6607b40c5a') build() { cd VTK @@ -34,6 +37,10 @@ build() { # remove next pkgver bump patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff + # fix compilation error: + # remove next pkgver bump + patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + cd ${srcdir} rm -rf build diff --git a/community/vtk/ffmpeg-0.8.diff b/community/vtk/ffmpeg-0.8.diff new file mode 100644 index 000000000..523919d6f --- /dev/null +++ b/community/vtk/ffmpeg-0.8.diff @@ -0,0 +1,66 @@ +Description: Upstream changes introduced in version 5.6.1-6.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + vtk (5.6.1-6.1) unstable; urgency=low + . + [ Michael Schutte ] + * Non-maintainer upload. + * Remove absolute paths to required libraries from + /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes: + #506992. Due to the multiarch transition, the original behavior + frequently causes reverse build-deps to FTBFS. This change should + probably be reverted once all required libraries are multiarched. + . + [ Steve M. Robbins ] + * Override lintian diagnostic about embedded libraries ftgl and sqlite. + * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav + 0.7. + . + The person named in the Author field signed this changelog entry. +Author: Steve M. Robbins <smr@debian.org> +Bug-Debian: http://bugs.debian.org/506992 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx ++++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx +@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start() + } + + //choose avi media file format +- this->avOutputFormat = guess_format("avi", NULL, NULL); ++ this->avOutputFormat = av_guess_format("avi", NULL, NULL); + if (!this->avOutputFormat) + { + vtkGenericWarningMacro (<< "Could not open the avi media file format."); +@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start() + //Set up the codec. + AVCodecContext *c = this->avStream->codec; + c->codec_id = (CodecID)this->avOutputFormat->video_codec; +- c->codec_type = CODEC_TYPE_VIDEO; ++ c->codec_type = AVMEDIA_TYPE_VIDEO; + c->width = this->Dim[0]; + c->height = this->Dim[1]; + c->pix_fmt = PIX_FMT_YUVJ420P; +@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm + pkt.stream_index = this->avStream->index; + if (cc->coded_frame->key_frame) //treat keyframes well + { +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + pkt.duration = 0; //presentation duration in time_base units or 0 if NA + pkt.pos = -1; //byte position in stream or -1 if NA diff --git a/community/w3cam/PKGBUILD b/community/w3cam/PKGBUILD index 27aa67235..59d6aa56d 100644 --- a/community/w3cam/PKGBUILD +++ b/community/w3cam/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 9021 2010-01-23 03:31:31Z dgriffiths $ +# $Id: PKGBUILD 59116 2011-11-21 11:03:42Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Christian Schmidt <mucknert@gmx.net> @@ -9,18 +9,24 @@ pkgdesc="a small and fast CGI program to retrieve images from a video4linux devi arch=('i686' 'x86_64' 'mips64el') url="http://mpx.freeshell.net/" license=('GPL') -depends=(libpng libjpeg) +depends=('libpng' 'libjpeg') +makedepends=('v4l-utils') source=(http://mpx.freeshell.net/$pkgname-$pkgver.tar.gz) md5sums=('eec0b301b32bc8e9f65a4e54248c9868') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver + sed -i 's|#include <linux/videodev.h>|#include <libv4l1-videodev.h>|' v4l.c vidcat.c w3cam.c w3camd/w3v4l.c ./configure --prefix=/usr --with-device=/dev/video0 --with-ttf-inc=/usr/include/freetype - make || return 1 - mkdir -p $startdir/pkg/usr/cgi-bin $startdir/pkg/usr/bin $startdir/pkg/usr/man/man1 $startdir/pkg/usr/share/ - make prefix=$startdir/pkg/usr/ install && \ - mkdir -p $startdir/pkg/usr/lib/w3cam/ && \ - mv $startdir/pkg/usr/cgi-bin/* $startdir/pkg/usr/lib/w3cam/ && \ - mv $startdir/pkg/usr/man $startdir/pkg/usr/share/man || return 1 - rm -rf $startdir/pkg/usr/cgi-bin + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + mkdir -p $pkgdir/usr/cgi-bin $pkgdir/usr/bin $pkgdir/usr/man/man1 $pkgdir/usr/share/ + make prefix=$pkgdir/usr/ install + mkdir -p $pkgdir/usr/lib/w3cam/ + mv $pkgdir/usr/cgi-bin/* $pkgdir/usr/lib/w3cam/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + rm -rf $pkgdir/usr/cgi-bin } diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 40c07c280..ea04d4520 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 48138 2011-05-28 22:59:33Z lcarlier $ +# $Id: PKGBUILD 57212 2011-10-24 14:41:07Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.8 +pkgver=2.3.9 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'mesa' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') +depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') +makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'mesa') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('612306c1b6a9d38b632ea3168b824f5e') +md5sums=('7185090a089c9c0e0eca7535a8f25dca') build() { cd ${pkgname}-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr --with-distributor="Arch linux" make } diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index fd9cf1416..b06dbf980 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 55907 2011-09-24 16:50:18Z stephane $ +# $Id: PKGBUILD 57518 2011-10-29 21:39:24Z lcarlier $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,13 +6,12 @@ pkgname=widelands pkgver=16 _realver=build16 -pkgrel=3 +pkgrel=4 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64' 'mips64el') url="http://widelands.org/" license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') -makedepends=('cmake' 'boost') +makedepends=('cmake' 'boost' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 $pkgname.desktop $pkgname.png @@ -36,10 +35,14 @@ build() { } package() { + depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2' 'widelands-data>=16') + cd $srcdir/$pkgname-$_realver-src/build/compile make DESTDIR="$pkgdir" install + rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds} + # Install bin, icon and desktop file #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD index f868fcfa9..8a8198de4 100644 --- a/community/wine/PKGBUILD +++ b/community/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 56091 2011-09-30 23:44:20Z svenstaro $ +# $Id: PKGBUILD 58857 2011-11-19 02:52:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.29 -pkgrel=2 +pkgver=1.3.33 +pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('6c4159ef53c81faf5e52f29211ac50de') +md5sums=('24807ef7d9a5e8c2635541880672db7b') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -25,9 +25,7 @@ depends=( libxcursor lib32-libxcursor libxrandr lib32-libxrandr libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga libxi lib32-libxi - alsa-lib lib32-alsa-lib desktop-file-utils ) @@ -47,8 +45,8 @@ makedepends=(autoconf ncurses bison perl fontforge flex prelink mpg123 lib32-mpg123 openal lib32-openal libcups lib32-libcups - gnutls lib32-gnutls v4l-utils lib32-v4l-utils + alsa-lib lib32-alsa-lib oss ) @@ -61,9 +59,10 @@ optdepends=( mpg123 lib32-mpg123 openal lib32-openal libcups lib32-libcups - gnutls lib32-gnutls v4l-utils lib32-v4l-utils libpulse lib32-libpulse + alsa-plugins lib32-alsa-plugins + alsa-lib lib32-alsa-lib oss ) diff --git a/community/wine/wine.install b/community/wine/wine.install index f71262186..0548b7ffd 100644 --- a/community/wine/wine.install +++ b/community/wine/wine.install @@ -1,10 +1,10 @@ post_install() { update-desktop-database -q - echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - echo "If you are on x86_64, the default WINEARCH will be win64." - echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - echo "See the Arch wiki on wine for more information." + #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + #echo "If you are on x86_64, the default WINEARCH will be win64." + #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + #echo "See the Arch wiki on wine for more information." } post_remove() { diff --git a/community/wkhtmltopdf/PKGBUILD b/community/wkhtmltopdf/PKGBUILD index 94fa7ee98..79b021c93 100644 --- a/community/wkhtmltopdf/PKGBUILD +++ b/community/wkhtmltopdf/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 19347 2010-06-22 14:11:07Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 58535 2011-11-13 16:06:48Z andrea $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=wkhtmltopdf pkgver=0.9.9 @@ -17,12 +17,14 @@ build() { cd "$srcdir/$pkgname-$pkgver" qmake wkhtmltopdf.pro - make || return 1 - make INSTALL_ROOT="$pkgdir/usr" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir/usr" install # Generate and install man page install -d "$pkgdir/usr/share/man/man1" ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1" } - -# vim:set ts=2 sw=2 et: diff --git a/community/wmctrl/PKGBUILD b/community/wmctrl/PKGBUILD index a55c065f5..a4a8a9af6 100644 --- a/community/wmctrl/PKGBUILD +++ b/community/wmctrl/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 37711 2011-01-16 22:48:09Z andrea $ +# $Id: PKGBUILD 59113 2011-11-21 10:53:55Z spupykin $ # Maintainer: # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Dalius <dagis@takas.lt> pkgname=wmctrl pkgver=1.07 -pkgrel=2 +pkgrel=3 pkgdesc="Control your EWMH compliant window manager from command line" url="http://sweb.cz/tripie/utils/wmctrl/" arch=('i686' 'mips64el') license=('GPL') depends=(libxmu glib2) -source=(http://sweb.cz/tripie/utils/wmctrl/dist/$pkgname-$pkgver.tar.gz) -md5sums=('1fe3c7a2caa6071e071ba34f587e1555') +source=(http://sweb.cz/tripie/utils/wmctrl/dist/$pkgname-$pkgver.tar.gz + http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_$pkgver-6.diff.gz) +md5sums=('1fe3c7a2caa6071e071ba34f587e1555' + '7ddf2aadc48f4300c16160b3c9a7e141') build() { cd "$srcdir/$pkgname-$pkgver" - + patch -p1 -i "$srcdir/wmctrl_$pkgver-6.diff" ./configure --prefix=/usr --mandir=$pkgdir/usr/share/man make } diff --git a/community/wol/PKGBUILD b/community/wol/PKGBUILD index 1bb774627..b5d778ac6 100644 --- a/community/wol/PKGBUILD +++ b/community/wol/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 17446 2010-05-24 10:42:15Z spupykin $ +# $Id: PKGBUILD 58676 2011-11-17 14:54:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Anders Bergh <anders1@gmail.com> # Contributor: Markus Volkmann <mcfock@counterstrike.de> pkgname=wol pkgver=0.7.1 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') -pkgdesc="wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant." +pkgdesc="Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant" license=("GPL") -depends=(sh) +depends=() url="http://ahh.sourceforge.net/wol/" install=wol.install source=(http://downloads.sourceforge.net/ahh/wol-$pkgver.tar.gz) md5sums=('c2fa9d7e771134ac8c89d56b8197d4ca') build() { - cd $startdir/src/$pkgname-$pkgver - ./configure --prefix=/usr - make || return 1 - make prefix=$startdir/pkg/usr install || return 1 + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info + make +} - mv $pkgdir/usr/man $pkgdir/usr/share/ && \ - mv $pkgdir/usr/info $pkgdir/usr/share/ && \ +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install rm $pkgdir/usr/share/info/dir } diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD index aa9d379e1..078cba68e 100644 --- a/community/wxsvg/PKGBUILD +++ b/community/wxsvg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55754 2011-09-19 05:09:05Z ebelanger $ +# $Id: PKGBUILD 58427 2011-11-12 17:19:10Z ibiru $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=wxsvg pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="C++ library to create, manipulate and render SVG files" arch=('i686' 'x86_64' 'mips64el') url="http://wxsvg.sourceforge.net/" diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD index 8adc1c076..30e04b55f 100644 --- a/community/wyrd/PKGBUILD +++ b/community/wyrd/PKGBUILD @@ -1,27 +1,27 @@ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Jeff Mickey <jeff@archlinux.org> -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=wyrd pkgver=1.4.5 -pkgrel=1 -pkgdesc="A text-based front-end to Remind." +pkgrel=3 +pkgdesc='A text-based front-end to Remind.' arch=('i686' 'x86_64' 'mips64el') -url="http://pessimization.com/software/wyrd/" +url='http://pessimization.com/software/wyrd/' license=('GPL') depends=('remind' 'ncurses') makedepends=('ocaml') -source=(http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz) +source=("http://pessimization.com/software/wyrd/${pkgname}-${pkgver}.tar.gz") md5sums=('3f39fa83a54d2d890823094aba9ca3cc') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --enable-utf8 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/xautomation/PKGBUILD b/community/xautomation/PKGBUILD new file mode 100644 index 000000000..1fc7aff75 --- /dev/null +++ b/community/xautomation/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 57187 2011-10-23 16:31:38Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> +# Contributor: raubkopierer <mail[dot]sensenmann[at]gmail[dot]com> + +pkgname=xautomation +pkgver=1.05 +pkgrel=1 +pkgdesc='Controls X from the command line and does "visual scraping".' +url='http://hoopajoo.net/projects/xautomation.html' +arch=('i686' 'x86_64') +license=('GPL') +depends=('libpng' 'libxtst') +source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz") +md5sums=('4526ea5085a680a3ae8629af1731e5fa') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index 94776599e..92afa25ab 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 38810 2011-02-01 11:14:57Z spupykin $ +# $Id: PKGBUILD 58605 2011-11-16 15:28:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Tom Killian <tomk@runbox.com> @@ -13,7 +13,7 @@ license=('GPL') url="http://spuriousinterrupt.org/projects/xfmedia/" depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') makedepends=('intltool' 'libxt') -install=(xfmedia.install) +install=xfmedia.install source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 xfmedia-dbus-0.6-support.patch xfmedia-empty-prev-next-fix.patch diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD index 3598a6611..c3d44e678 100644 --- a/community/xkbsel/PKGBUILD +++ b/community/xkbsel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 19405 2010-06-23 09:07:11Z spupykin $ +# $Id: PKGBUILD 58985 2011-11-20 19:27:14Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -10,8 +10,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.meduna.org/sw_xkbsel_en.html" license=('GPL') depends=('gdbm' 'libxaw') -makedepends=('patch') -source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz \ +makedepends=('patch' 'xkeyboard-config') +source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz build-fix.patch) md5sums=('c82196344ef920a072f413df85b9dc00' 'dee0f7de8618d9eff073942f0e08f030') @@ -26,6 +26,6 @@ build() { ./configure --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc/xkbsel \ --build=`uname -m` --host=`uname -m` --target=`uname -m` \ --mandir=/usr/share/man - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install } diff --git a/community/xkeycaps/PKGBUILD b/community/xkeycaps/PKGBUILD index a9aa83962..ef84d353b 100644 --- a/community/xkeycaps/PKGBUILD +++ b/community/xkeycaps/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 20050 2010-07-02 09:22:39Z spupykin $ +# $Id: PKGBUILD 59110 2011-11-21 10:43:20Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> @@ -11,7 +11,7 @@ pkgdesc="XKeyCaps is a graphical front-end to xmodmap." url="http://www.jwz.org/xkeycaps/" license=('custom') depends=('libxaw') -makedepends=('imake') +makedepends=('imake' 'xbitmaps') source=(http://www.jwz.org/$pkgname/$pkgname-$pkgver.tar.Z license.txt) md5sums=('6792f828db6538f44f7696a8783b44ac' @@ -19,10 +19,10 @@ md5sums=('6792f828db6538f44f7696a8783b44ac' build() { cd $srcdir/$pkgname-$pkgver - xmkmf || return 1 - make MANPATH=/usr/share/man || return 1 - make DESTDIR=$pkgdir install || return 1 - make DESTDIR=$pkgdir MANPATH=/usr/share/man install.man || return 1 + xmkmf + make MANPATH=/usr/share/man + make DESTDIR=$pkgdir install + make DESTDIR=$pkgdir MANPATH=/usr/share/man install.man install -Dm644 ../license.txt \ $pkgdir/usr/share/licenses/$pkgname/license.txt } diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD index 091609005..0d1cc9b3f 100644 --- a/community/xloadimage/PKGBUILD +++ b/community/xloadimage/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39571 2011-02-11 16:14:42Z spupykin $ +# $Id: PKGBUILD 59105 2011-11-21 10:35:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Eric Belanger <belanger@astro.umontreal.ca> # Contributor: Link Dupont <link@subpop.net> @@ -12,13 +12,13 @@ arch=(i686 x86_64 'mips64el') url="http://sioseis.ucsd.edu/xloadimage.html" license=("MIT") depends=('libtiff' 'libpng' 'libx11' 'libxext') -makedepends=('patch') +makedepends=('patch' 'imake') source=(http://archlinux-stuff.googlecode.com/files/xloadimage.$pkgver-1.tar.gz license.txt enable-image-types.patch) md5sums=('86b42b1b628a9c00008b7deec21e1175' 'cc16a51aeb5083b8ff07939dfe244130' - '33eadf10ce627cc1bf0db351a49e6cca') + '3a2703925011276fd2d2bd139b676487') build() { cd $srcdir/$pkgname.$pkgver diff --git a/community/xloadimage/enable-image-types.patch b/community/xloadimage/enable-image-types.patch index c720c7dd1..b61e36b87 100644 --- a/community/xloadimage/enable-image-types.patch +++ b/community/xloadimage/enable-image-types.patch @@ -61,3 +61,14 @@ diff -wbBur xloadimage.4.1/png.c xloadimage.4.1.my/png.c #include "image.h" /* xloadimage declarations */ #ifdef HAVE_LIBPNG +diff -wbBur xloadimage.4.1/jpeg.c xloadimage.4.1.my/jpeg.c +--- xloadimage.4.1/jpeg.c 2011-02-11 14:47:37.000000000 +0300 ++++ xloadimage.4.1.my/jpeg.c 2011-11-21 14:32:30.000000000 +0400 +@@ -319,6 +319,7 @@ + if (verbose) + printf(" Using arithmetic coding.\n"); + cinfo->arith_code = TRUE; ++ } + #else + fprintf(stderr, "jpegDump: sorry, arithmetic coding not supported\n"); + } diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD index a9a182228..74f912e37 100644 --- a/community/xlockmore/PKGBUILD +++ b/community/xlockmore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 55400 2011-09-11 21:18:11Z spupykin $ +# $Id: PKGBUILD 58588 2011-11-16 05:16:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=xlockmore -pkgver=5.34 +pkgver=5.35 pkgrel=1 pkgdesc="screen saver / locker for the X Window System" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html" options=('!makeflags') source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 \ LICENSE) -md5sums=('ed464197e8684a243e56aab7919a52d8' +md5sums=('fdd7b876aac46f9a86497858b70e17b2' 'a64afab4283f53972a6702c2e59850d7') build() { diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD index 035286bd9..b2d59a5e6 100644 --- a/community/xmms2/PKGBUILD +++ b/community/xmms2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 52111 2011-07-20 09:27:48Z spupykin $ +# $Id: PKGBUILD 58429 2011-11-12 17:19:30Z ibiru $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xmms2 -pkgver=0.7DrNo -pkgrel=9 +pkgver=0.8DrO_o +pkgrel=2 pkgdesc="complete rewrite of the popular music player" arch=('i686' 'x86_64' 'mips64el') url="http://xmms2.org/" license=('LGPL') backup=('etc/conf.d/xmms2d.conf') depends=('sqlite3' 'libmad') -makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' # avahi +makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib' 'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout' 'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex' - 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') + 'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug') # avahi optdepends=('alsa-lib: ALSA audio output' 'avahi: announce xmms2d via bonjour/mDNS/zeroconf' 'boost: C++ language bindings' @@ -38,12 +38,12 @@ optdepends=('alsa-lib: ALSA audio output' 'pulseaudio: PulseAudio audio output' 'pyrex: Python language bindings' 'ruby: Ruby language bindings' -# 'sidplay: to play a Commodore 64 music files AKA zaks' -# we do not have sidplay 2 series in repos; also it's -# somehow connected with resid i guess(not in repos also) 'smbclient: direct CIFS/SMB access' 'speex: Speex support' 'wavpack: WavPack support') +# 'sidplay: to play a Commodore 64 music files AKA zaks' +# we do not have sidplay 2 series in repos; also it's +# somehow connected with resid i guess(not in repos also) conflicts=('xmms2-devel') install=xmms2.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 @@ -51,7 +51,7 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 xmms2d.rc xmms2-helpers.patch vorbis-albumart.patch) -md5sums=('60e50b591078acb6a85cd83de0f2b077' +md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3' 'af13c937bf3c86b77ae6820107aab9b8' '9d8e3e1a434f271423bdd228a1e9bd7c' 'eddb800ebcc495b8574044a110a34add' @@ -60,14 +60,14 @@ md5sums=('60e50b591078acb6a85cd83de0f2b077' build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 < ${srcdir}/xmms2-helpers.patch - patch -p1 <$srcdir/vorbis-albumart.patch +# patch -Np1 < ${srcdir}/xmms2-helpers.patch +# patch -p1 <$srcdir/vorbis-albumart.patch # python2 fix sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf ./waf configure --prefix=/usr \ - --with-optionals=python,cli,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli + --with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli ./waf build ./waf --destdir=${pkgdir} install diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index d20980573..37c2d5bdf 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 49972 2011-06-22 19:52:11Z vegai $ +# $Id: PKGBUILD 59039 2011-11-20 21:26:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.9.2 -pkgrel=2.1 +pkgrel=3 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') depends=('ghc=7.0.3-2' 'xmonad=0.9.2-2.1' 'sh' 'haskell-x11=1.5.0.0' - 'haskell-x11-xft=0.3' 'haskell-utf8-string=0.3.6') + 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.6') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('616cbc632bbde5cd4cdb643ee47e74d2') diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 8eec6369d..3f13d611e 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -4,17 +4,17 @@ # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto -pkgver=0.5.7 +pkgver=0.5.8 pkgrel=1 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64' 'mips64el') url="http://xmoto.tuxfamily.org" license=('GPL') depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11.1' 'curl' - 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir') + 'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'libxdg-basedir' 'libxml++') install=xmoto.install source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz") -sha1sums=('e781b42480a96187b5aca4126d17ecf0610ca5ac') +sha1sums=('a5197e10f0c37cfefbab55723c8d0760234fb4ce') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community/xnc/PKGBUILD b/community/xnc/PKGBUILD index edb37f897..43cb3b476 100644 --- a/community/xnc/PKGBUILD +++ b/community/xnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 8981 2010-01-23 01:17:11Z foutrelis $ +# $Id: PKGBUILD 58678 2011-11-17 15:02:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xnc pkgver=5.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="X nortern captain file manager" arch=(i686 x86_64 'mips64el') url="http://xnc.jinr.ru/" @@ -12,12 +12,13 @@ depends=('gcc-libs' 'libpng' 'libtiff' 'libsm' 'libxext' 'libjpeg>=7') makedepends=('libxt') options=('!makeflags') source=(http://xnc.jinr.ru/src-5/xnc-$pkgver.src.tar.gz xnc-gcc44.patch) -md5sums=('62446cdfdf5730f125fb351a658c0bd3' '60673809f2db3a8d9939e9f38ade59d2') +md5sums=('62446cdfdf5730f125fb351a658c0bd3' + 'c0037a081824bca691e59a4ec68b6686') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p0 < ../xnc-gcc44.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + patch -p1 <$srcdir/xnc-gcc44.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir" install } diff --git a/community/xnc/xnc-gcc44.patch b/community/xnc/xnc-gcc44.patch index 5ce977850..120d9d467 100644 --- a/community/xnc/xnc-gcc44.patch +++ b/community/xnc/xnc-gcc44.patch @@ -1,5 +1,18 @@ ---- src/lib/tool/commonfuncs.cxx.orig 2009-07-15 21:19:42.000000000 -0400 -+++ src/lib/tool/commonfuncs.cxx 2009-07-15 21:23:58.000000000 -0400 +diff -wbBur xnc-5.0.4/src/include/commonfuncs.h xnc-5.0.4.my/src/include/commonfuncs.h +--- xnc-5.0.4/src/include/commonfuncs.h 2002-10-16 10:44:17.000000000 +0400 ++++ xnc-5.0.4.my/src/include/commonfuncs.h 2011-11-17 18:59:19.000000000 +0400 +@@ -15,7 +15,7 @@ + extern int path_to_fullpath(char* dest, char *srcdir); + extern void add_path_content(char *curdir, const char *cont, int vms_host=0); + extern void upper_path(char *curdir, int vms_host=0); +-extern char* get_first_content(const char *curdir, char *cont); ++extern const char* get_first_content(const char *curdir, char *cont); + extern void get_last_content(char *curdir, char *cont); + extern void get_last_and_rest_content(char* curdir, char* last, char* rest); + extern void str_swap(char *str1, char *str2); +diff -wbBur xnc-5.0.4/src/lib/tool/commonfuncs.cxx xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx +--- xnc-5.0.4/src/lib/tool/commonfuncs.cxx 2002-10-16 10:44:20.000000000 +0400 ++++ xnc-5.0.4.my/src/lib/tool/commonfuncs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -117,9 +117,9 @@ } @@ -12,19 +25,9 @@ if(b) { strncpy(cont,curdir,b-curdir); ---- src/include/commonfuncs.h.orig 2009-07-15 21:24:37.000000000 -0400 -+++ src/include/commonfuncs.h 2009-07-15 21:25:04.000000000 -0400 -@@ -15,7 +15,7 @@ - extern int path_to_fullpath(char* dest, char *srcdir); - extern void add_path_content(char *curdir, const char *cont, int vms_host=0); - extern void upper_path(char *curdir, int vms_host=0); --extern char* get_first_content(const char *curdir, char *cont); -+extern const char* get_first_content(const char *curdir, char *cont); - extern void get_last_content(char *curdir, char *cont); - extern void get_last_and_rest_content(char* curdir, char* last, char* rest); - extern void str_swap(char *str1, char *str2); ---- src/lib/vfs/afs.cxx.orig 2009-07-15 21:47:44.000000000 -0400 -+++ src/lib/vfs/afs.cxx 2009-07-15 21:50:02.000000000 -0400 +diff -wbBur xnc-5.0.4/src/lib/vfs/afs.cxx xnc-5.0.4.my/src/lib/vfs/afs.cxx +--- xnc-5.0.4/src/lib/vfs/afs.cxx 2003-11-27 18:36:43.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/afs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -29,7 +29,7 @@ // The return value is static, so copy it before using the // method again! @@ -43,8 +46,9 @@ if(*s) { do ---- src/lib/vfs/ftpfs.cxx.orig 2009-07-15 21:50:48.000000000 -0400 -+++ src/lib/vfs/ftpfs.cxx 2009-07-15 21:54:26.000000000 -0400 +diff -wbBur xnc-5.0.4/src/lib/vfs/ftpfs.cxx xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx +--- xnc-5.0.4/src/lib/vfs/ftpfs.cxx 2002-10-30 15:47:38.000000000 +0300 ++++ xnc-5.0.4.my/src/lib/vfs/ftpfs.cxx 2011-11-17 18:59:19.000000000 +0400 @@ -1413,7 +1413,7 @@ return; if(strcmp(dir,"/")) @@ -54,3 +58,15 @@ if(*s=='/') //Skip leading '/' s++; do +diff -wbBur xnc-5.0.4/src/man_page.cxx xnc-5.0.4.my/src/man_page.cxx +--- xnc-5.0.4/src/man_page.cxx 2002-10-02 16:54:33.000000000 +0400 ++++ xnc-5.0.4.my/src/man_page.cxx 2011-11-17 18:59:00.000000000 +0400 +@@ -81,7 +81,7 @@ + buf[j] = 0; + manf->size = j; + delete buf; +- fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC); ++ fp = open(tmps, O_WRONLY | O_CREAT | O_TRUNC, 0600); + write(fp, buf2, j); + close(fp); + delete manf; diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD index 6cb1a84d9..22e762c7d 100644 --- a/community/xpad/PKGBUILD +++ b/community/xpad/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 15560 2010-04-12 15:32:43Z spupykin $ +# $Id: PKGBUILD 59076 2011-11-21 09:10:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Ben <contrasutra@myrealbox.com> @@ -9,6 +9,7 @@ pkgrel=5 pkgdesc="Stickies-like notes program" arch=(i686 x86_64 'mips64el') depends=('gtk2' 'libsm' 'librsvg') +makedepends=('intltool') url="http://mterry.name/xpad/" license=('GPL') install=xpad.install @@ -18,9 +19,9 @@ md5sums=('a77bbabb4917c7da9b5d097d9a4e59a7' '6a3d2952b469d65ec333714991ba8284') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/xpad-gtk-2.20.patch ./configure --prefix=/usr - /usr/bin/make || return 1 - /usr/bin/make DESTDIR=$startdir/pkg install + /usr/bin/make + /usr/bin/make DESTDIR=$pkgdir install } diff --git a/community/xrestop/PKGBUILD b/community/xrestop/PKGBUILD index 429b33ba6..5820da5df 100644 --- a/community/xrestop/PKGBUILD +++ b/community/xrestop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 23510 2010-08-11 21:54:23Z lcarlier $ +# $Id: PKGBUILD 58682 2011-11-17 15:15:17Z spupykin $ # Contributor: William Rea <sillywilly@gmail.com> pkgname=xrestop @@ -9,19 +9,16 @@ arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/xrestop" license=('GPL') depends=('libxres' 'ncurses') -source=(http://projects.o-hand.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) +source=(ftp://ftp.archlinux.org/other/community/xrestop/xrestop-$pkgver.tar.gz) md5sums=('d8a54596cbaf037e62b80c4585a3ca9b') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir/xrestop-$pkgver" ./configure --prefix=/usr --mandir=/usr/share/man make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir/xrestop-$pkgver" make DESTDIR="$pkgdir" install } - diff --git a/community/xsel/PKGBUILD b/community/xsel/PKGBUILD index ed24d97c3..f3bcc8b08 100644 --- a/community/xsel/PKGBUILD +++ b/community/xsel/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 44722 2011-04-11 12:24:43Z spupykin $ +# $Id: PKGBUILD 59067 2011-11-21 08:59:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=xsel pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="XSel is a command-line program for getting and setting the contents of the X selection" arch=(i686 x86_64 'mips64el') url="http://www.vergenet.net/~conrad/software/xsel/" license=("custom") -depends=(libx11) +depends=('libx11') +makedepends=('libxt') source=(http://www.vergenet.net/~conrad/software/xsel/download/$pkgname-$pkgver.tar.gz) md5sums=('75983f143ce83dc259796c6eaf85c8f5') @@ -19,14 +20,5 @@ build() { make make DESTDIR=$pkgdir install mkdir -p $pkgdir/usr/share/licenses/xsel/ - cat >$pkgdir/usr/share/licenses/xsel/LICENSE <<EOF -Copyright (C) 2001 Conrad Parker <conrad@vergenet.net> - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation. No -representations are made about the suitability of this software for any purpose. -It is provided "as is" without express or implied warranty. -EOF + install -D -m0644 COPYING $pkgdir/usr/share/licenses/xsel/COPYING } diff --git a/community/xsensors/PKGBUILD b/community/xsensors/PKGBUILD index 277d3ea6b..c061523d2 100644 --- a/community/xsensors/PKGBUILD +++ b/community/xsensors/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 21366 2010-07-16 09:09:09Z lcarlier $ +# $Id: PKGBUILD 59264 2011-11-22 07:31:16Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Ray Rashif <schivmeister@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=xsensors pkgver=0.70 -pkgrel=2 +pkgrel=3 pkgdesc="X11 interface to lm_sensors" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxhardware.org/xsensors/" @@ -14,16 +14,20 @@ license=('GPL') depends=('gtk2' 'lm_sensors') changelog=$pkgname.changelog source=(http://www.linuxhardware.org/xsensors/$pkgname-$pkgver.tar.gz - fix-deprecated-GTK_WIDGET_STATE-call.diff + remove-unused-variables.patch + replace-deprecated-gtk.patch xsensors.desktop) md5sums=('4f8fb83cfd03c0cc34967a73c6021531' - 'e5ac8e58f0dd27501234692587c01b76' + '8ca558b7f7e4a5f83f63498668c4ad8f' + 'd9ee6799d45adc7c62273f32085bec5f' 'fe1369d2b61eed1a25002e2247617357') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ${srcdir}/fix-deprecated-GTK_WIDGET_STATE-call.diff + # patches from debian + patch -Np1 -i ${srcdir}/remove-unused-variables.patch + patch -Np1 -i ${srcdir}/replace-deprecated-gtk.patch ./configure --prefix=/usr make diff --git a/community/xsensors/remove-unused-variables.patch b/community/xsensors/remove-unused-variables.patch new file mode 100644 index 000000000..7da97a0e5 --- /dev/null +++ b/community/xsensors/remove-unused-variables.patch @@ -0,0 +1,39 @@ +Author: Nanley Chery <nanleychery@gmail.com> +From: Jean Delvare <khali@linux-fr.org> +Subject: Remove declared, but unused variables +Bug-Debian: http://bugs.debian.org/625435 +--- +--- a/src/gui.c ++++ b/src/gui.c +@@ -257,10 +257,9 @@ + + /* Start the sensor info update timer. */ + gint start_timer( GtkWidget *widget, gpointer data ) { +- gint timer; + + /* Setup timer for updates. */ +- timer = g_timeout_add( update_time * 1000, ++ g_timeout_add( update_time * 1000, + (GtkFunction) update_sensor_data, + (gpointer) data ); + +@@ -287,7 +286,7 @@ + + /* feature data */ + updates *head = NULL; +- updates *current = NULL, *prev = NULL; ++ updates *current = NULL; + + const sensors_feature *feature; + +@@ -347,10 +346,8 @@ + new_node->pbar = featpbar; + + if ( head == NULL ) { +- prev = head; + head = current = new_node; + } else { +- prev = current; + current = current->next = new_node; + } + diff --git a/community/xsensors/replace-deprecated-gtk.patch b/community/xsensors/replace-deprecated-gtk.patch new file mode 100644 index 000000000..fed4c7dc4 --- /dev/null +++ b/community/xsensors/replace-deprecated-gtk.patch @@ -0,0 +1,168 @@ +Author: Nanley Chery <nanleychery@gmail.com> +Subject: Update deprecated gtk casts and replace deprecated function calls with their analogous cairo counterparts. +Bug-Debian: http://bugs.debian.org/622005 +Bug-Debian: http://bugs.debian.org/610321 +--- +--- a/src/gui.c ++++ b/src/gui.c +@@ -27,10 +27,10 @@ + GtkWidget *mainwindow = NULL; + + GdkColor colorWhite = { 0, 0xFFFF, 0xFFFF, 0xFFFF }; +- +-GdkColormap *cmap = NULL; + +-GdkPixmap *theme = NULL; ++GdkPixbuf *theme = NULL; ++ ++cairo_surface_t *surface = NULL; + + /* Destroy the main window. */ + gint destroy_gui( GtkWidget *widget, gpointer data ) { +@@ -76,17 +76,16 @@ + } + } + +-static void draw_digits( GtkWidget *widget, const gchar *digits, int highLow ) ++static void draw_digits( GtkWidget *widget, cairo_t *cr, const gchar *digits, int highLow ) + { + const gchar *digit = digits; + int pos = 0, x = 0, y = 0, w = 0; + + while ( *digit ) { + get_pm_location( *digit, &x, &y, &w ); +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, x, y + highLow, +- pos, 0, w, 30 ); ++ cairo_set_source_surface (cr, surface, pos-x, 0-(y + highLow)); ++ cairo_rectangle(cr, pos, 0, w, 30); ++ cairo_fill(cr); + pos += w; + digit++; + } +@@ -102,6 +101,8 @@ + + gchar result[7]; + ++ cairo_t *cr = gdk_cairo_create(widget->window); ++ + #ifdef DEBUG_XSENSORS + printf( "area.width = %d, area.height = %d\n", event->area.width, + event->area.height ); +@@ -117,13 +118,11 @@ + + /* Display the digits */ + if ( g_snprintf( result, 6, "%5.0f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display RPM */ +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, 0, 120 + highLow, +- 90, 0, 57, 30 ); ++ cairo_set_source_surface (cr, surface, 90-0, 0-(120 + highLow)); ++ cairo_rectangle(cr, 90, 0, 57, 30); + break; + case TEMP: + if ( current->curvalue > current->curmax ) +@@ -134,17 +133,15 @@ + + /* Display the digits */ + if ( g_snprintf( result, 7, "%6.1f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display degree symbol */ + if ( tf == FALSE ) + x = 0; + else + x = 57; +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, x, 60 + highLow, +- 96, 0, 57, 30 ); ++ cairo_set_source_surface (cr, surface, 96-x, 0-(60 + highLow)); ++ cairo_rectangle(cr, 96, 0, 57, 30); + + break; + case VOLT: +@@ -154,20 +151,17 @@ + + /* Display the digits */ + if ( g_snprintf( result, 7, "%6.2f", current->curvalue ) >= 0 ) +- draw_digits( widget, result, highLow ); ++ draw_digits( widget, cr, result, highLow ); + + /* Display V */ +- gdk_draw_drawable( widget->window, +- widget->style->fg_gc[ GTK_WIDGET_STATE +- (widget) ], theme, 114, 60 + highLow, +- 96, 0, 57, 30 ); +- +- ++ cairo_set_source_surface (cr, surface, 96-114, 0-(60 + highLow)); ++ cairo_rectangle(cr, 96, 0, 57, 30); + break; + default: + break; + } +- ++ cairo_fill(cr); ++ cairo_destroy(cr); + return TRUE; + } + +@@ -260,7 +254,7 @@ + + /* Setup timer for updates. */ + g_timeout_add( update_time * 1000, +- (GtkFunction) update_sensor_data, ++ (GSourceFunc) update_sensor_data, + (gpointer) data ); + + return SUCCESS; +@@ -460,8 +454,6 @@ + g_signal_connect( G_OBJECT (mainwindow), "delete_event", + G_CALLBACK (destroy_gui), NULL ); + +- /* Graphics needed for drawing info. */ +- cmap = gtk_widget_get_colormap( mainwindow ); + + /* Set up the image file used for displaying characters. */ + if ( imagefile == NULL ) { +@@ -481,12 +473,10 @@ + "Image file not found in either location! Exiting!\n" ); + exit( 1 ); + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, "./images/default.xpm" ); ++ theme = gdk_pixbuf_new_from_file("./images/default.xpm", NULL ); + } + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, imagefile ); ++ theme = gdk_pixbuf_new_from_file(imagefile, NULL ); + } + } else { + if ( stat( imagefile, &sbuf ) != 0 ) { +@@ -495,11 +485,15 @@ + "Image file not found in specified location! Exiting!\n" ); + exit( 1 ); + } else { +- theme = gdk_pixmap_colormap_create_from_xpm( NULL, cmap, +- NULL, NULL, imagefile ); ++ theme = gdk_pixbuf_new_from_file(imagefile, NULL ); + } + } +- ++ surface = cairo_image_surface_create_for_data(gdk_pixbuf_get_pixels(theme), ++ CAIRO_FORMAT_RGB24, ++ gdk_pixbuf_get_width(theme), ++ gdk_pixbuf_get_height(theme), ++ gdk_pixbuf_get_rowstride(theme)); ++ + /* Create notebook for sensors. */ + notebook = gtk_notebook_new( ); + gtk_widget_modify_bg( notebook, GTK_STATE_NORMAL, &colorWhite ); diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD index ed7f66be9..23786f30f 100644 --- a/community/xsettings-client/PKGBUILD +++ b/community/xsettings-client/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 17719 2010-05-24 20:48:07Z spupykin $ +# $Id: PKGBUILD 59102 2011-11-21 10:29:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alois Belaska <lloyd@centrum.cz> @@ -8,15 +8,15 @@ pkgrel=5 pkgdesc="Provides cross toolkit configuration settings such as theme parameters" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://projects.o-hand.com/matchbox/sources" -depends=(glibc) +url="http://matchbox-project.org" +depends=('libx11') options=('!libtool') -source=(http://projects.o-hand.com/matchbox/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz) +source=(http://matchbox-project.org/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz) md5sums=('c14aa9db6c097e0306dac97fb7da1add') build() { cd $srcdir/Xsettings-client-$pkgver ./configure --prefix=/usr - make || return 1 + make make DESTDIR=$pkgdir install } diff --git a/community/xvidcap/PKGBUILD b/community/xvidcap/PKGBUILD index f2ed215bb..52f8f4622 100644 --- a/community/xvidcap/PKGBUILD +++ b/community/xvidcap/PKGBUILD @@ -6,7 +6,7 @@ pkgname=xvidcap pkgver=1.1.7 -pkgrel=3 +pkgrel=4 pkgdesc="A small tool to capture things going on on an X-Windows display to either individual frames or an MPEG video" arch=("i686" "x86_64" 'mips64el') license=('GPL') @@ -15,7 +15,8 @@ depends=('dbus-glib' 'lame' 'libxmu' 'libglade' 'ffmpeg' 'dbus') makedepends=('perlxml' 'rarian') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'xextproto-7.1.1.patch' - 'xvidcap-ffmpeg.patch') + 'xvidcap-ffmpeg.patch' + 'ffmpeg-0.8.patch') md5sums=('b39a682d3ef9fcbf424af771936780e2' 'fbde2b076c5ea05723883b87f3ef2a65' 'f18817da1c0dada05fa791ae53193b2c') @@ -24,14 +25,26 @@ build() { cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i ${srcdir}/xextproto-7.1.1.patch - patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch || return 1 + patch -Np0 -i ${srcdir}/xvidcap-ffmpeg.patch + patch -Np1 -i ${srcdir}/ffmpeg-0.8.patch ./configure --prefix=/usr \ --with-x \ --with-gtk2 \ --enable-libmp3lame \ --without-forced-embedded-ffmpeg - make || return 1 - make prefix=${pkgdir}/usr install || return 1 + make } +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make prefix=${pkgdir}/usr install +} +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '36ead5f0345ae776601d49c1c90cb101') +md5sums=('b39a682d3ef9fcbf424af771936780e2' + 'fbde2b076c5ea05723883b87f3ef2a65' + 'f18817da1c0dada05fa791ae53193b2c' + '6e4dfab56b877362757092f55ad6b337') diff --git a/community/xvidcap/ffmpeg-0.8.patch b/community/xvidcap/ffmpeg-0.8.patch new file mode 100644 index 000000000..511333a0f --- /dev/null +++ b/community/xvidcap/ffmpeg-0.8.patch @@ -0,0 +1,82 @@ +diff -aur xvidcap-1.1.7/src/xtoffmpeg.c xvidcap-1.1.7.new/src/xtoffmpeg.c +--- xvidcap-1.1.7/src/xtoffmpeg.c 2008-05-25 22:01:54.000000000 +0000 ++++ xvidcap-1.1.7.new/src/xtoffmpeg.c 2011-10-31 20:41:08.259171263 +0000 +@@ -361,7 +361,7 @@ + } + // put sample parameters + au_c->codec_id = xvc_audio_codecs[job->au_targetCodec].ffmpeg_id; +- au_c->codec_type = CODEC_TYPE_AUDIO; ++ au_c->codec_type = AVMEDIA_TYPE_AUDIO; + au_c->bit_rate = target->sndsize; + au_c->sample_rate = target->sndrate; + au_c->channels = target->sndchannels; +@@ -567,7 +567,7 @@ + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ost->st->index; + + pkt.data = audio_out; +@@ -627,7 +627,7 @@ + pkt.pts = + av_rescale_q (enc->coded_frame->pts, enc->time_base, + ost->st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + av_interleaved_write_frame (s, &pkt); + } + +@@ -681,7 +681,7 @@ + if (ret <= 0) { + ret = avcodec_encode_audio (enc, bit_buffer, bit_buffer_size, NULL); + } +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + + if (samples) { + av_free (samples); +@@ -905,7 +905,7 @@ + ost->time_base); + } + if (enc->coded_frame->key_frame) +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + } + + pkt.stream_index = ost->index; +@@ -1157,7 +1157,7 @@ + } + + st->codec->codec_id = codec_id; +- st->codec->codec_type = CODEC_TYPE_VIDEO; ++ st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + + // find the video encoder + codec = avcodec_find_encoder (st->codec->codec_id); +@@ -1439,13 +1439,13 @@ + // guess AVOutputFormat + if (job->target >= CAP_MF) + file_oformat = +- guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); ++ av_guess_format (xvc_formats[job->target].ffmpeg_name, NULL, NULL); + else { + char tmp_fn[30]; + + snprintf (tmp_fn, 29, "test-%%d.%s", + xvc_formats[job->target].extensions[0]); +- file_oformat = guess_format (NULL, tmp_fn, NULL); ++ file_oformat = av_guess_format (NULL, tmp_fn, NULL); + } + if (!file_oformat) { + fprintf (stderr, +@@ -1466,7 +1466,7 @@ + #endif // DEBUG + + // prepare AVFormatContext +- output_file = av_alloc_format_context (); ++ output_file = avformat_alloc_context(); + if (!output_file) { + fprintf (stderr, + _ diff --git a/community/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD index 31c8feced..76db0fc76 100644 --- a/community/xvkbd/PKGBUILD +++ b/community/xvkbd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 21233 2010-07-15 11:20:17Z spupykin $ +# $Id: PKGBUILD 58680 2011-11-17 15:09:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Benjamin Andresen <benny@klapmuetz.org> # Contributor: Mikko Seppдlд <t-r-a-y@mbnet.fi> pkgname=xvkbd pkgver=3.2 -pkgrel=1 +pkgrel=2 pkgdesc="virtual (graphical) keyboard program for X Window System" arch=('i686' 'x86_64' 'mips64el') url="http://homepage3.nifty.com/tsato/xvkbd/" @@ -17,22 +17,17 @@ md5sums=('1bce8d6c27e6e7df92ec09b414f82dad') build() { cd "$srcdir/$pkgname-$pkgver" - -# patch xvkbd.c <<EOF -#diff xvkbd-2.8/xvkbd.c xvkbd-2.8.my/xvkbd.c -#45a46 -#> #include <X11/extensions/XKB.h> -#1988a1990 -#> XkbLockGroup(dpy, XkbUseCoreKbd, (shift_state & altgr_mask) ? 1 : 0); -#EOF - xmkmf - make || return 1 - make DESTDIR=$pkgdir install || return 1 + sed -i 's|#include <X11/Xaw/|#include <X11/Xaw3d/|' xvkbd.c + make +} +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR=$pkgdir install # fix - rm -f $pkgdir/usr/lib/X11/app-defaults && \ - mkdir -p $pkgdir/usr/lib/X11 && \ - mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ && \ + rm -f $pkgdir/usr/lib/X11/app-defaults + mkdir -p $pkgdir/usr/lib/X11 + mv $pkgdir/etc/X11/app-defaults $pkgdir/usr/lib/X11/ rm -rf $pkgdir/etc/ } diff --git a/community/xylib/PKGBUILD b/community/xylib/PKGBUILD index 6c599bd66..dc0c87ea1 100644 --- a/community/xylib/PKGBUILD +++ b/community/xylib/PKGBUILD @@ -2,7 +2,7 @@ pkgname=xylib pkgver=0.8 -pkgrel=1 +pkgrel=2 pkgdesc='xylib is a portable C++ library for reading files that contain x-y data from powder diffraction, spectroscopy or other experimental methods.' arch=('i686' 'x86_64' 'mips64el') url='http://www.unipress.waw.pl/fityk/xylib/' diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index ddca45200..e259d5e58 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 54990 2011-08-29 13:12:11Z spupykin $ +# $Id: PKGBUILD 59071 2011-11-21 09:04:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> @@ -14,7 +14,7 @@ optdepends=('xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('a05635b4d50058b18891dbb5b3ff09ab') +md5sums=('e77716d1d96a6c120b340539af448195') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD new file mode 100644 index 000000000..940a9cadb --- /dev/null +++ b/community/yaml-cpp/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Markus Martin <markus@archwyrm.net> +pkgname=yaml-cpp +pkgver=0.2.7 +pkgrel=1 +pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec" +url="http://code.google.com/p/yaml-cpp/" +arch=('i686' 'x86_64') +license=('MIT') +makedepends=('cmake') +source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz) +md5sums=('6878e14bad90c69a8f2caca273eb24c2') + +build() { + cd $srcdir/$pkgname-$pkgver + + cmake . -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_SHARED_LIBS=ON + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install +} diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 454912614..ebe4ad1f6 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 56955 2011-10-17 08:21:21Z ibiru $ +# $Id: PKGBUILD 58277 2011-11-09 16:52:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura -pkgver=0.0.8.4 +pkgver=0.0.8.5 pkgrel=4 pkgdesc="a PDF viewer" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ install=zathura.install DLAGENTS=('http::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u') source=(https://pwmt.org/download/zathura-$pkgver.tar.gz) -md5sums=('e3a7f82401059e591ed549d615f53ddd') +md5sums=('52e0c3b3917c7feaecba98cff8435b90') build() { cd $srcdir/zathura-$pkgver diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 6e2469e5a..ac9aa8b6c 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129828 2011-06-29 04:14:18Z 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=1 pkgdesc="The GNU Bourne Again shell" @@ -16,7 +16,7 @@ backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout}) depends=('readline>=6.1' 'glibc') provides=('sh') install=bash.install -source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz +source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bashrc dot.bash_profile dot.bash_logout @@ -24,16 +24,15 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz system.bash_logout) if [ $_patchlevel -gt 000 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p)) + source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) done fi build() { cd ${srcdir}/${pkgname}-$_basever - for p in ../bash${_basever//./}-*; do - [[ -e "$p" ]] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\' @@ -74,18 +73,49 @@ package() { } md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' + '8d37a3f97a48c1e56e1a4ded877ed944' '027d6bd8f5f6a06b75bb7698cb478089' '2902e0fee7a9168f3a4fd2ccd60ff047' '42f4400ed2314bd7519c020d0187edc5' 'fe5d3a367f7d5f754214dc05e3d958ab' '472f536d7c9e8250dc4568ec4cfaf294' '1100bc1dda2cdc06ac44d7e5d17864a3' + 'a7184b76eb4a079f10174a0a8f574819' '30e7948079921d3261efcc6a40722135' + 'c4d45307f7e69fe508ce347c4cec1955' '9ea06decec43a198f3d7cf29acc602f8' + '74bddae6eeb9227a04a467d42597a34d' 'fb48f6134d7b013135929476aa0c250c' + '3e6a18226b16c773229246abd07a1f5e' 'e70e45de33426b38153b390be0dbbcd4' + 'e667dc9348ebc3e0e14bfdd87f4b6ff2' 'ce4e5c484993705b27daa151eca242c2' + '41cbd8e57589bc081a546a014ddb12f8' '88d1f96db29461767602e2546803bda7' + 'b8b781520f4c7493a2a1ac3010a44a44' '24c574bf6d6a581e300823d9c1276af6' + '354a0899a7c4b446454c52546562b55b' '4c5835f2fbab36c4292bb334977e5b6d' - '0a51602b535ef661ee707be6c8bdb373') + 'ff4547ca7b508d52101729d61f5b77b6' + '0a51602b535ef661ee707be6c8bdb373' + '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/bin86/PKGBUILD b/core/bin86/PKGBUILD deleted file mode 100644 index c3865a24e..000000000 --- a/core/bin86/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 119692 2011-04-13 17:22:23Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=bin86 -pkgver=0.16.18 -pkgrel=1 -pkgdesc="A complete 8086 assembler and loader" -arch=(i686 x86_64) -license=('GPL') -url="http://www.debath.co.uk/" -depends=('glibc') -source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz - bin86-0.16.17-x86_64-1.patch) -md5sums=('914068fb649b93642d1cf21857b75699' - '92bdce7b0655cd2e9f83c83fc56d128e') - -build() { - cd $srcdir/$pkgname-$pkgver - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch - fi - make PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install -} diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 186070323..f81ad0e10 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -5,7 +5,7 @@ pkgname=binutils pkgver=2.21.1 -pkgrel=2.1 +pkgrel=2.2 _date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 9eaf6a155..6c43b3a39 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124065 2011-05-16 12:02:28Z allan $ +# $Id: PKGBUILD 142169 2011-11-05 11:41:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison pkgver=2.5 -pkgrel=1 +pkgrel=2.1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -12,8 +12,9 @@ url="http://www.gnu.org/software/bison/bison.html" depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9dba20116b13fc61a0846b0058fbe004') +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('9dba20116b13fc61a0846b0058fbe004' + '610b73db67bd4760209458efe7554ca3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/btrfs-progs-unstable/PKGBUILD b/core/btrfs-progs-unstable/PKGBUILD index 151a74ef0..54abc43eb 100644 --- a/core/btrfs-progs-unstable/PKGBUILD +++ b/core/btrfs-progs-unstable/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 107578 2011-01-26 20:59:54Z tpowa $ +# $Id: PKGBUILD 142300 2011-11-08 06:06:06Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs-unstable pkgver=0.19.20101006 -pkgrel=1 +pkgrel=2 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 'mips64el') depends=('glibc' 'e2fsprogs') diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD index fe80a4831..0f5a0ed6b 100644 --- a/core/bzip2/PKGBUILD +++ b/core/bzip2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138504 2011-09-25 17:23:16Z dan $ -# Maintainer: +# $Id: PKGBUILD 142378 2011-11-08 22:04:46Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd <jvinet@zeroflux.org> pkgname=bzip2 pkgver=1.0.6 -pkgrel=2 +pkgrel=3.1 pkgdesc="A high-quality data compression program" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -13,8 +13,8 @@ groups=('base') depends=('glibc') source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz bzip2-1.0.4-bzip2recover.patch) -md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b' - '8a8bca02bdeaf2fd8913aeb549577e7e') +sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002' + '85ce76fdb67f52f152bba368c1de81132dcdbdb5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index a7d830e1e..8190cf341 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -4,7 +4,7 @@ pkgname=coreutils pkgver=8.14 -pkgrel=1 +pkgrel=1.1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index fbf548e76..8b0eec86c 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106685 2011-01-17 20:46:24Z tpowa $ +# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib pkgver=2.8.18 -pkgrel=1 +pkgrel=2.1 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -20,6 +20,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/core/crda/PKGBUILD b/core/crda/PKGBUILD index 16d4111ed..09861db53 100644 --- a/core/crda/PKGBUILD +++ b/core/crda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117670 2011-04-04 15:42:36Z stephane $ +# $Id: PKGBUILD 141968 2011-11-03 18:52:56Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=crda -pkgver=1.1.1 -pkgrel=3 +pkgver=1.1.2 +pkgrel=1 pkgdesc="Central Regulatory Domain Agent for wireless networks" arch=(i686 x86_64 'mips64el') url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -13,7 +13,7 @@ makedepends=('python-m2crypto' 'pkg-config') install=crda.install source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 crda.rc) -md5sums=('5fc77af68b3e21736b8ef2f8b061c810' +md5sums=('5226f65aebacf94baaf820f8b4e06df4' '014eef3f8655e9a130064ec6891317fc') build() { diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index cee08955b..a96ea1c4a 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129976 2011-06-30 17:57:50Z thomas $ +# $Id: PKGBUILD 142292 2011-11-08 00:30:49Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.3.1 +pkgver=1.4.0 pkgrel=2 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://code.google.com/p/cryptsetup/" @@ -13,24 +13,26 @@ conflicts=('mkinitcpio<0.7') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 encrypt_hook - encrypt_install) -sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - 'b8269d358363eb8d67d1ffa1469068e454a89154636283bcc3edc6486b7fff4e' - 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573') - + encrypt_install + cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch) +sha256sums=('96d682853c8019cfeae0b21250cd2d00af42e46251807e8dbda2ff8427c2e9ed' + '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757' + 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573' + '6fa1d3172014ba3ba96f7a67acbcae7f26b24a61abb84b3917f526a54f81dd87') build() { - cd $srcdir/$pkgname-${pkgver} + cd "${srcdir}"/$pkgname-${pkgver} + patch -p0 -i "${srcdir}"/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib make } package() { - cd $srcdir/$pkgname-${pkgver} - make DESTDIR=$pkgdir install + cd "${srcdir}"/$pkgname-${pkgver} + make DESTDIR="${pkgdir}" install # install hook - install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt - install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt + install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt # Fix pkgconfig location - install -d -m755 $pkgdir/usr/lib - mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ + install -d -m755 "${pkgdir}"/usr/lib + mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/ } diff --git a/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch b/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch new file mode 100644 index 000000000..f35226122 --- /dev/null +++ b/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch @@ -0,0 +1,94 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog (Revision 664) ++++ ChangeLog (Revision 665) +@@ -1,3 +1,6 @@ ++2011-10-27 Milan Broz <mbroz@redhat.com> ++ * Fix crypt_get_volume_key_size() for plain device. ++ + 2011-10-25 Milan Broz <mbroz@redhat.com> + * Print informative message in isLuks only in verbose mode. + * Version 1.4.0. +Index: tests/api-test.c +=================================================================== +--- tests/api-test.c (Revision 664) ++++ tests/api-test.c (Revision 665) +@@ -660,6 +660,11 @@ + + FAIL_(crypt_init_by_name_and_header(&cd, CDEVICE_1, H_DEVICE),"can't init plain device by header device"); + OK_(crypt_init_by_name(&cd, CDEVICE_1)); ++ OK_(strcmp(cipher_mode,crypt_get_cipher_mode(cd))); ++ OK_(strcmp(cipher,crypt_get_cipher(cd))); ++ EQ_((int)key_size, crypt_get_volume_key_size(cd)); ++ EQ_(params.skip, crypt_get_iv_offset(cd)); ++ EQ_(params.offset, crypt_get_data_offset(cd)); + OK_(crypt_deactivate(cd, CDEVICE_1)); + crypt_free(cd); + +Index: lib/setup.c +=================================================================== +--- lib/setup.c (Revision 664) ++++ lib/setup.c (Revision 665) +@@ -56,6 +56,7 @@ + char *plain_cipher; + char *plain_cipher_mode; + char *plain_uuid; ++ unsigned int plain_key_size; + + /* used in CRYPT_LOOPAES */ + struct crypt_params_loopaes loopaes_hdr; +@@ -677,6 +678,7 @@ + (*cd)->plain_hdr.hash = NULL; /* no way to get this */ + (*cd)->plain_hdr.offset = dmd.offset; + (*cd)->plain_hdr.skip = dmd.iv_offset; ++ (*cd)->plain_key_size = dmd.vk->keylength; + + r = crypt_parse_name_and_mode(dmd.cipher, cipher, NULL, cipher_mode); + if (!r) { +@@ -754,6 +756,7 @@ + return -EINVAL; + } + ++ cd->plain_key_size = volume_key_size; + cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL); + if (!cd->volume_key) + return -ENOMEM; +@@ -1516,7 +1519,7 @@ + } + + r = process_key(cd, cd->plain_hdr.hash, +- cd->volume_key->keylength, ++ cd->plain_key_size, + passphrase, passphrase_size, &vk); + if (r < 0) + goto out; +@@ -1586,7 +1589,7 @@ + goto out; + + r = process_key(cd, cd->plain_hdr.hash, +- cd->volume_key->keylength, ++ cd->plain_key_size, + passphrase_read, passphrase_size_read, &vk); + if (r < 0) + goto out; +@@ -1658,8 +1661,7 @@ + if (!name) + return -EINVAL; + +- if (!volume_key || !volume_key_size || !cd->volume_key || +- volume_key_size != cd->volume_key->keylength) { ++ if (!volume_key || !volume_key_size || volume_key_size != cd->plain_key_size) { + log_err(cd, _("Incorrect volume key specified for plain device.\n")); + return -EINVAL; + } +@@ -1976,8 +1978,8 @@ + + int crypt_get_volume_key_size(struct crypt_device *cd) + { +- if (isPLAIN(cd->type) && cd->volume_key) +- return cd->volume_key->keylength; ++ if (isPLAIN(cd->type)) ++ return cd->plain_key_size; + + if (isLUKS(cd->type)) + return cd->hdr.keyBytes; diff --git a/core/cryptsetup/encrypt_hook b/core/cryptsetup/encrypt_hook index 54aaa2236..956b18023 100644 --- a/core/cryptsetup/encrypt_hook +++ b/core/cryptsetup/encrypt_hook @@ -41,6 +41,7 @@ run_hook () DEPRECATED_CRYPT=0 cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)" else DEPRECATED_CRYPT=1 cryptdev="${root}" @@ -52,13 +53,28 @@ run_hook () echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." } + OLDIFS="${IFS}" + IFS="," + for cryptopt in ${cryptoptions}; do + case ${cryptopt} in + allow-discards) + echo "Enabling TRIM/discard support." + cryptargs="${cryptargs} --allow-discards" + ;; + *) + echo "Encryption option '${cryptopt}' not known, ignoring." >&2 + ;; + esac + done + IFS="${OLDIFS}" + if poll_device "${cryptdev}" ${rootdelay}; then if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated dopassphrase=1 # If keyfile exists, try to use that if [ -f ${ckeyfile} ]; then - if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then dopassphrase=0 else echo "Invalid keyfile. Reverting to passphrase." @@ -70,7 +86,7 @@ run_hook () echo "A password is required to access the ${cryptname} volume:" #loop until we get a real password - while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do sleep 2; done fi @@ -90,7 +106,7 @@ run_hook () err "Non-LUKS decryption not attempted..." return 1 fi - exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}" tmp=$(echo "${crypto}" | cut -d: -f1) [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" tmp=$(echo "${crypto}" | cut -d: -f2) diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 7a58d6791..eb142196f 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138015 2011-09-14 11:16:01Z dreisner $ +# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,25 +6,28 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.22.0 -pkgrel=1 +pkgver=7.23.1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') +depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + fix-J-with-O-regression.patch curlbuild.h) -md5sums=('e8c36126d21c893f085aca233906b5cc' - '1b061c348b63ea3e90c3f2c3af6a08d6' +md5sums=('8e23151f569fb54afef093ac0695077d' + '5d8eb7e2e38be0fb00a043f714f6d49f' + 'aa4539ec4f4a2dad1663dc22dd3ab0a1' '751bd433ede935c8fae727377625a8ae') - -case $(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') in +ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') +case $ptrsize in 8) _curlbuild=curlbuild-64.h ;; 4) _curlbuild=curlbuild-32.h ;; - *) error "unsupported architecture: %s" "$CARCH" + *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" exit 1 ;; esac @@ -32,19 +35,23 @@ esac build() { cd "$srcdir/$pkgname-$pkgver" + # upstream bugfix + # http://curl.haxx.se/mail/archive-2011-11/0030.html + patch -Np1 < "$srcdir/fix-J-with-O-regression.patch" + ./configure \ - --with-random=/dev/urandom \ --prefix=/usr \ --mandir=/usr/share/man \ --disable-dependency-tracking \ - --enable-ipv6 \ - --disable-ldaps \ --disable-ldap \ + --disable-ldaps \ + --enable-ipv6 \ --enable-manual \ --enable-versioned-symbols \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --enable-threaded-resolver \ --without-libidn \ - --enable-threaded-resolver + --with-random=/dev/urandom \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt make } @@ -53,7 +60,10 @@ package() { make DESTDIR="$pkgdir" install + # license install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + + # devel install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" diff --git a/core/curl/fix-J-with-O-regression.patch b/core/curl/fix-J-with-O-regression.patch new file mode 100644 index 000000000..4b7de1a23 --- /dev/null +++ b/core/curl/fix-J-with-O-regression.patch @@ -0,0 +1,142 @@ +From c532604b137cae2e2814280778f914e4cd0460d1 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <daniel@haxx.se> +Date: Sun, 20 Nov 2011 23:33:46 +0100 +Subject: [PATCH] -J -O: use -O name if no Content-Disposition header comes! + +A regression between 7.22.0 and 7.23.0 -- downloading a file with the +flags -O and -J results in the content being written to stdout if and +only if there was no Content-Disposition header in the http response. If +there is a C-D header with a filename attribute, the output is correctly +written. + +Reported by: Dave Reisner +Bug: http://curl.haxx.se/mail/archive-2011-11/0030.html +--- + src/tool_cb_hdr.c | 3 +- + src/tool_operate.c | 59 ++++++++++++++++++++++---------------------- + src/tool_operhlp.c | 18 +++++++++++++ + tests/data/Makefile.am | 2 +- + tests/data/test1210 | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 112 insertions(+), 33 deletions(-) + create mode 100644 tests/data/test1210 + +diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c +index fb24b45..dea7338 100644 +--- a/src/tool_cb_hdr.c ++++ b/src/tool_cb_hdr.c +@@ -66,8 +66,7 @@ size_t tool_header_cb(void *ptr, size_t size, size_t nmemb, void *userdata) + } + #endif + +- if(!outs->filename && (cb > 20) && +- checkprefix("Content-disposition:", str)) { ++ if((cb > 20) && checkprefix("Content-disposition:", str)) { + const char *p = str + 20; + + /* look for the 'filename=' parameter +diff --git a/src/tool_operate.c b/src/tool_operate.c +index 7ab815f..1e88120 100644 +--- a/src/tool_operate.c ++++ b/src/tool_operate.c +@@ -576,41 +576,40 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) + + if((urlnode->flags & GETOUT_USEREMOTE) + && config->content_disposition) { +- /* Our header callback sets the filename */ ++ /* Our header callback MIGHT set the filename */ + DEBUGASSERT(!outs.filename); + } +- else { +- if(config->resume_from_current) { +- /* We're told to continue from where we are now. Get the size +- of the file as it is now and open it for append instead */ +- struct_stat fileinfo; +- /* VMS -- Danger, the filesize is only valid for stream files */ +- if(0 == stat(outfile, &fileinfo)) +- /* set offset to current file size: */ +- config->resume_from = fileinfo.st_size; +- else +- /* let offset be 0 */ +- config->resume_from = 0; +- } + +- if(config->resume_from) { +- /* open file for output: */ +- FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); +- if(!file) { +- helpf(config->errors, "Can't open '%s'!\n", outfile); +- res = CURLE_WRITE_ERROR; +- goto quit_urls; +- } +- outs.fopened = TRUE; +- outs.stream = file; +- outs.init = config->resume_from; +- } +- else { +- outs.stream = NULL; /* open when needed */ ++ if(config->resume_from_current) { ++ /* We're told to continue from where we are now. Get the size ++ of the file as it is now and open it for append instead */ ++ struct_stat fileinfo; ++ /* VMS -- Danger, the filesize is only valid for stream files */ ++ if(0 == stat(outfile, &fileinfo)) ++ /* set offset to current file size: */ ++ config->resume_from = fileinfo.st_size; ++ else ++ /* let offset be 0 */ ++ config->resume_from = 0; ++ } ++ ++ if(config->resume_from) { ++ /* open file for output: */ ++ FILE *file = fopen(outfile, config->resume_from?"ab":"wb"); ++ if(!file) { ++ helpf(config->errors, "Can't open '%s'!\n", outfile); ++ res = CURLE_WRITE_ERROR; ++ goto quit_urls; + } +- outs.filename = outfile; +- outs.s_isreg = TRUE; ++ outs.fopened = TRUE; ++ outs.stream = file; ++ outs.init = config->resume_from; ++ } ++ else { ++ outs.stream = NULL; /* open when needed */ + } ++ outs.filename = outfile; ++ outs.s_isreg = TRUE; + } + + if(uploadfile && !stdin_upload(uploadfile)) { +diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c +index 808d2d5..4c1697b 100644 +--- a/src/tool_operhlp.c ++++ b/src/tool_operhlp.c +@@ -178,6 +178,24 @@ CURLcode get_url_file_name(char **filename, const char *url) + return CURLE_OUT_OF_MEMORY; + } + } ++ ++ /* in case we built debug enabled, we allow an environment variable ++ * named CURL_TESTDIR to prefix the given file name to put it into a ++ * specific directory ++ */ ++#ifdef DEBUGBUILD ++ { ++ char *tdir = curlx_getenv("CURL_TESTDIR"); ++ if(tdir) { ++ char buffer[512]; /* suitably large */ ++ snprintf(buffer, sizeof(buffer), "%s/%s", tdir, *filename); ++ Curl_safefree(*filename); ++ *filename = strdup(buffer); /* clone the buffer */ ++ curl_free(tdir); ++ } ++ } ++#endif ++ + return CURLE_OK; + } + +-- +1.7.7.3 diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD index f53a78dbd..50a11313d 100644 --- a/core/db/PKGBUILD +++ b/core/db/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138809 2011-09-28 12:19:46Z stephane $ +# $Id: PKGBUILD 142177 2011-11-05 16:31:54Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=db pkgver=5.2.36 -pkgrel=1 +pkgrel=2.1 pkgdesc="The Berkeley DB embedded database system" arch=('i686' 'x86_64' 'mips64el') url="http://www.oracle.com/technology/software/products/berkeley-db/index.html" diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 5d82719ae..854a17c40 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -4,7 +4,7 @@ # pkgname=dbus-core pkgver=1.4.16 -pkgrel=1 +pkgrel=1.1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64 'mips64el') diff --git a/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch new file mode 100644 index 000000000..4420d0b63 --- /dev/null +++ b/core/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Sun, 19 Jun 2011 16:04:25 -0500 +Subject: [PATCH] Set hostname via /proc if file is available + +On Linux, the hostname can be set via this file if available, precluding +the need for a `hostname` binary. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + dhcpcd-hooks/30-hostname | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname +index 65d1a13..af94262 100644 +--- a/dhcpcd-hooks/30-hostname ++++ b/dhcpcd-hooks/30-hostname +@@ -21,7 +21,11 @@ need_hostname() + try_hostname() + { + if valid_domainname "$1"; then +- hostname "$1" ++ if [ -w /proc/sys/kernel/hostname ]; then ++ echo "$1" > /proc/sys/kernel/hostname ++ else ++ hostname "$1" ++ fi + else + syslog err "Invalid hostname: $1" + fi +-- +1.7.5.4 + diff --git a/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch new file mode 100644 index 000000000..7e78ecd0d --- /dev/null +++ b/core/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Tue, 21 Jun 2011 09:32:47 -0400 +Subject: [PATCH] set MTU via sysfs if file is available + +On Linux, a network interface's MTU can be set by writing to +/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. + +Signed-off-by: Dave Reisner <d@falconindy.com> +--- + dhcpcd-hooks/10-mtu | 4 ++-- + dhcpcd-run-hooks.in | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu +index 639697c..8763930 100644 +--- a/dhcpcd-hooks/10-mtu ++++ b/dhcpcd-hooks/10-mtu +@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if set_mtu "$interface" "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ set_mtu "$interface" "$mtu" + rm "$mtu_dir/$interface" + fi + fi +diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in +index 0e60338..843f3ca 100644 +--- a/dhcpcd-run-hooks.in ++++ b/dhcpcd-run-hooks.in +@@ -215,6 +215,17 @@ service_condcommand() + service_exists $1 && service_status $1 && service_cmd $1 $2 + } + ++# Set MTU for an interface ++set_mtu() { ++ local interface=$1 mtu=$2 ++ ++ if [ -e /sys/class/net/$interface/mtu ]; then ++ echo "$mtu" > /sys/class/net/$interface/mtu ++ else ++ ifconfig "$interface" mtu "$mtu" ++ fi ++} ++ + # We source each script into this one so that scripts run earlier can + # remove variables from the environment so later scripts don't see them. + # Thus, the user can create their dhcpcd.enter/exit-hook script to configure +-- +1.7.5.4 + diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index ab53755ab..75477bfeb 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 118799 2011-04-07 19:53:44Z ronald $ +# $Id: PKGBUILD 142553 2011-11-12 07:19:26Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd pkgver=5.2.12 -pkgrel=1 +pkgrel=4 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" arch=('i686' 'x86_64' 'mips64el') @@ -15,13 +15,20 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d') + 'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \ + '0001-set-MTU-via-sysfs-if-file-is-available.patch') sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0') + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + 'ee85adac972a8172a9d9b3a1bdd46e0430301582' + 'afbed18dc5544f7d0b81e2266b322ca12becf9a4') build() { cd ${srcdir}/${pkgname}-${pkgver} + # remove net-tools dep + patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch + patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch + # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd diff --git a/core/dhcpcd/remove_ifconfig.patch b/core/dhcpcd/remove_ifconfig.patch new file mode 100644 index 000000000..5bcc4a68f --- /dev/null +++ b/core/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD index e7d35ff14..d02a25b4e 100644 --- a/core/dialog/PKGBUILD +++ b/core/dialog/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 133064 2011-07-27 11:49:01Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 142187 2011-11-06 02:25:41Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=dialog -pkgver=1.1_20110707 +pkgver=1.1_20111020 pkgrel=1 pkgdesc="A tool to display dialog boxes from shell scripts" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +12,7 @@ url="http://invisible-island.net/dialog/" license=('LGPL2.1') depends=('ncurses') source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz) -md5sums=('34d01aaacbb2932b77774e6c1eec8d2a') -sha1sums=('31e0e3c40cd51629cc802d7ee0b1a4e1ada90f00') +sha1sums=('ddabc0950275db4e9cef382a862ff3b20746e843') build() { cd "${srcdir}/$pkgname-${pkgver/_/-}" diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 793ca8850..e17d3d963 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137098 2011-09-06 08:10:05Z bisson $ +# $Id: PKGBUILD 142197 2011-11-06 05:47:32Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -8,14 +8,14 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. pkgver=9.8.1 _pkgver=9.8.1 -pkgrel=1 +pkgrel=2 pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' license=('custom:ISC') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'idnkit') options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' @@ -52,5 +52,4 @@ package() { cd bin make DESTDIR="${pkgdir}" install - } diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index f1683011e..3f7526340 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104009 2010-12-25 10:42:37Z allan $ +# $Id: PKGBUILD 142380 2011-11-08 22:04:59Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs pkgver=1.41.14 -pkgrel=1 +pkgrel=2.1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'MIT') diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index acce94227..f02d49f08 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,32 +1,42 @@ -# $Id: PKGBUILD 108145 2011-01-30 11:04:13Z andyrtr $ +# $Id: PKGBUILD 142294 2011-11-08 00:38:03Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed pkgver=1.5 -pkgrel=2 -pkgdesc="A POSIX-compliant line editor" +pkgrel=4 +pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" -install=ed.install depends=('glibc' 'sh') options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) md5sums=('e66c03d7e4c67b025d5b6093ec678267') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/ \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" - make || return 1 + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + "CFLAGS=$CFLAGS" \ + "LDFLAGS=$LDFLAGS" + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + + make check } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make "DESTDIR=$pkgdir" install - cd ${pkgdir}/usr/share/info - ln ed.info red.info + # nuke info pages + rm -r "$pkgdir/usr/share/info" } diff --git a/core/eglibc/glibc-2.10-bz4781.patch b/core/eglibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/core/eglibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/core/eglibc/glibc-2.10-dont-build-timezone.patch b/core/eglibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/core/eglibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch b/core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/core/eglibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/core/eglibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/core/eglibc/glibc-2.13-futex.patch b/core/eglibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/core/eglibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/core/eglibc/glibc-__i686.patch b/core/eglibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/core/eglibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/core/eventlog/ChangeLog b/core/eventlog/ChangeLog index d90a881d4..1c139bdf5 100644 --- a/core/eventlog/ChangeLog +++ b/core/eventlog/ChangeLog @@ -1,3 +1,7 @@ +2011-11-02 Andrea Scarpino <andrea@archlinux.org> + + * Sign package + 2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> * Rebuild of old package diff --git a/core/eventlog/PKGBUILD b/core/eventlog/PKGBUILD index f8ddb12dc..92abd7bcc 100644 --- a/core/eventlog/PKGBUILD +++ b/core/eventlog/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 118142 2011-04-05 15:32:10Z stephane $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 142815 2011-11-15 17:24:10Z andrea $ +# Maintainer: +# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=eventlog pkgver=0.2.12 -pkgrel=2 +pkgrel=3 pkgdesc="API to format and send structured log messages" arch=('i686' 'x86_64' 'mips64el') url="http://www.balabit.com/support/community/products/" @@ -12,18 +13,20 @@ license=('BSD') depends=('glibc') options=('!libtool') changelog=ChangeLog -source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) -md5sums=('3d6ebda8a161d36cb40d09328f78786b') +source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz") sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + install -D -m644 COPYING \ + "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD index ed1f35b48..1864a6a2a 100644 --- a/core/expat/PKGBUILD +++ b/core/expat/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 102953 2010-12-13 13:44:48Z stephane $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 142209 2011-11-06 08:56:53Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=expat pkgver=2.0.1 -pkgrel=6 +pkgrel=7.1 pkgdesc="An XML parser library" arch=('i686' 'x86_64' 'mips64el') -url="http://expat.sourceforge.net" +url="http://expat.sourceforge.net/" license=('custom') depends=('glibc') options=('!libtool') @@ -19,15 +19,20 @@ md5sums=('ee8b492592568805593f81f8cdf2a04c' 'f3eeb796f28945899216b815e5901996') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} patch -Np1 -i $srcdir/CVE-2009-3560.patch patch -Np1 -i $srcdir/CVE-2009-3720.patch ./configure --prefix=/usr --mandir=/usr/share/man make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD index 1bcd2b39c..e392f774a 100644 --- a/core/fakeroot/PKGBUILD +++ b/core/fakeroot/PKGBUILD @@ -4,7 +4,7 @@ pkgname=fakeroot pkgver=1.18.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD index 673dbe87e..54dd26005 100644 --- a/core/findutils/PKGBUILD +++ b/core/findutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100218 2010-11-21 23:38:22Z stephane $ +# $Id: PKGBUILD 142108 2011-11-05 10:13:34Z tpowa $ # Maintainer: pkgname=findutils pkgver=4.4.2 -pkgrel=3 +pkgrel=4.1 pkgdesc="GNU utilities to locate files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -25,6 +25,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=$pkgdir install diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD index 24d25b67a..62a73bbfc 100644 --- a/core/flex/PKGBUILD +++ b/core/flex/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129833 2011-06-29 04:16:41Z allan $ +# $Id: PKGBUILD 142183 2011-11-05 22:42:53Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=flex pkgver=2.5.35 -pkgrel=4 +pkgrel=5.1 pkgdesc="A tool for generating text-scanning programs" arch=('i686' 'x86_64' 'mips64el') url="http://flex.sourceforge.net" diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD index 6782d02f1..9a7414798 100644 --- a/core/gawk/PKGBUILD +++ b/core/gawk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 130241 2011-07-04 15:07:06Z allan $ +# $Id: PKGBUILD 142110 2011-11-05 10:13:55Z tpowa $ # Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=gawk pkgver=4.0.0 -pkgrel=1 +pkgrel=2.1 pkgdesc="GNU version of awk" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/directory/GNU/gawk.html" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 0dd465937..5776d723d 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136345 2011-08-26 22:10:56Z allan $ +# $Id: PKGBUILD 141368 2011-10-30 06:46:42Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -9,9 +9,9 @@ if [[ "${CARCH}" != "mips64el" ]]; then else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi -pkgver=4.6.1 -pkgrel=4 -_snapshot=4.6-20110819 +pkgver=4.6.2 +pkgrel=1 +#_snapshot=4.6-20110819 _libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -24,14 +24,16 @@ else fi checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch + gcc_mips64el_lib.patch gcc-hash-style-both.patch) -md5sums=('b14d22730f9085eab7fd927039e68d28' +md5sums=('028115c4fbfb6cfd75d6369f4a90d87e' 'ce920d2550ff7e042b9f091d27764d8f' '4030ee1c08dd1e843c0225b772360e76' + '67e337993d821d72fccacbed52d48c34' '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then @@ -51,6 +53,8 @@ build() { if [ "${CARCH}" = "x86_64" ]; then patch -Np1 -i ${srcdir}/gcc_pure64.patch + elif [ "${CARCH}" = "mips64el" ]; then + patch -Np0 -i ${srcdir}/gcc_mips64el_lib.patch fi patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install index 23553b8f0..a880434ae 100644 --- a/core/gcc/gcc-libs.install +++ b/core/gcc/gcc-libs.install @@ -4,13 +4,13 @@ filelist=(libgomp.info libquadmath.info) post_upgrade() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + [ -f $infodir/$file.gz ] && install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + [ -f $infodir/$file.gz ] && install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } diff --git a/core/gcc/gcc_mips64el_lib.patch b/core/gcc/gcc_mips64el_lib.patch new file mode 100644 index 000000000..425758e88 --- /dev/null +++ b/core/gcc/gcc_mips64el_lib.patch @@ -0,0 +1,25 @@ +--- gcc/config/mips/t-linux64.orig 2011-04-09 20:28:51.729723495 -0300 ++++ gcc/config/mips/t-linux64 2011-04-09 20:29:06.913724013 -0300 +@@ -18,7 +18,7 @@ + + MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 + MULTILIB_DIRNAMES = n32 32 64 +-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 ++MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64 + + EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o + +--- gcc/config/mips/linux64.h.orig 2011-04-09 20:27:06.909723735 -0300 ++++ gcc/config/mips/linux64.h 2011-04-09 20:28:16.033723803 -0300 +@@ -35,9 +35,9 @@ + %{!shared: \ + %{profile:-lc_p} %{!profile:-lc}}" + +-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" +-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" ++#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define LINUX_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD index 362e8966e..633a7b177 100644 --- a/core/gdbm/PKGBUILD +++ b/core/gdbm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105198 2011-01-07 13:58:42Z stephane $ +# $Id: PKGBUILD 142193 2011-11-06 02:28:38Z stephane $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gdbm pkgver=1.8.3 -pkgrel=8 +pkgrel=9 pkgdesc="GNU database library" url="http://www.gnu.org/software/gdbm/gdbm.html" license=('GPL') diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD index 1beb44222..7e8af9342 100644 --- a/core/gettext/PKGBUILD +++ b/core/gettext/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112865 2011-03-07 11:27:12Z stephane $ +# $Id: PKGBUILD 142112 2011-11-05 10:14:09Z tpowa $ # Maintainer: pkgname=gettext @@ -11,7 +11,7 @@ license=('GPL') groups=('base') depends=('gcc-libs' 'acl' 'sh' 'glib2') optdepends=('cvs: for autopoint tool') -options=(!libtool) +options=(!libtool !docs) install=gettext.install source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz) md5sums=('3dd55b952826d2b32f51308f2f91aa89') @@ -23,6 +23,11 @@ build() { make } +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make check +#} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 58314f6ab..075b45073 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140113 2011-10-07 08:18:56Z ibiru $ +# $Id: PKGBUILD 142720 2011-11-13 20:52:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 -pkgver=2.30.0 +pkgver=2.30.2 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -15,7 +15,7 @@ options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz glib2.sh glib2.csh) -sha256sums=('d64c00b43409eabb89aad78501fcb1a992b002b314a4414a9bd069585cb7cdc1' +sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 98fdb5107..6af3811e8 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,13 +1,15 @@ -# $Id: PKGBUILD 137789 2011-09-11 01:47:05Z allan $ +# $Id: PKGBUILD 141374 2011-10-30 06:48:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each new glibc version +# NOTE: valgrind requires rebuilt with each major glibc version pkgname=glibc -pkgver=2.14 -pkgrel=6.1 -_glibcdate=20110908 +pkgver=2.14.1 +pkgrel=1 +_glibcdate=20111025 +_glibcportsver=2.14 +_glibcportsdate=20110908 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -21,37 +23,20 @@ backup=(etc/gai.conf options=('!strip') install=glibc.install source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - http://repo.parabolagnulinux.org/other/glibc-ports-${pkgver}_${_glibcdate}.tar.xz + http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch glibc-__i686.patch glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch - glibc-2.13-dlclose-search-reset.patch glibc-2.14-libdl-crash.patch - glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch nscd locale.gen.txt locale-gen) -md5sums=('069069eb9100cc7affd7ad884cb3c3e9' - '46569182a7ac0b94c0b1d643ab277dfa' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - '22d09c58718fb3d1d31c3a6c14ca6886' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '13728807283f111e5d9d38cf38e0a461' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') mksource() { @@ -95,17 +80,16 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - # https://bugzilla.redhat.com/show_bug.cgi?id=593675 - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # Revert commit causing issues with crappy DNS servers... + # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! + # Note that both these patches do not fix the issue completely: # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) @@ -144,7 +128,7 @@ build() { --with-tls --with-__thread \ --enable-bind-now --without-gd \ --without-cvs --disable-profile \ - --disable-multi-arch + --enable-multi-arch # build libraries with hardening disabled echo "build-programs=no" >> configparms @@ -221,3 +205,18 @@ package() { lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } +md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1' + '46569182a7ac0b94c0b1d643ab277dfa' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'a3ac6f318d680347bb6e2805d42b73b2' + 'b042647ea7d6f22ad319e12e796bd13e' + '7d0154b7e17ea218c9fa953599d24cc4' + '6970bcfeb3bf88913436d5112d16f588' + '7da8c554a3b591c7401d7023b1928afc' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') diff --git a/core/glibc/glibc-2.13-dlclose-search-reset.patch b/core/glibc/glibc-2.13-dlclose-search-reset.patch deleted file mode 100644 index 3ad8b418a..000000000 --- a/core/glibc/glibc-2.13-dlclose-search-reset.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Wed, 26 May 2010 18:28:59 +0200 -Subject: [PATCH] Fix scope handling during dl_close - ---- - ChangeLog | 12 ++++++++++++ - elf/Makefile | 10 +++++++++- - elf/dl-close.c | 7 +++++++ - elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ - elf/unload8mod1.c | 7 +++++++ - elf/unload8mod1x.c | 1 + - elf/unload8mod2.c | 7 +++++++ - elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ - 8 files changed, 103 insertions(+), 1 deletions(-) - create mode 100644 elf/unload8.c - create mode 100644 elf/unload8mod1.c - create mode 100644 elf/unload8mod1x.c - create mode 100644 elf/unload8mod2.c - create mode 100644 elf/unload8mod3.c - -diff --git a/elf/Makefile b/elf/Makefile -index 59e835f..65b6deb 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -89,6 +89,7 @@ distribute := rtld-Rules \ - unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ - unload6mod1.c unload6mod2.c unload6mod3.c \ - unload7mod1.c unload7mod2.c \ -+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ - tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ - tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ - tst-auditmod4a.c tst-auditmod4b.c \ -@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ - tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ - tst-dlmodcount tst-dlopenrpath tst-deep1 \ - tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ -- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ -+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ - tst-audit1 tst-audit2 \ - tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 -@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ - unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ - unload6mod1 unload6mod2 unload6mod3 \ - unload7mod1 unload7mod2 \ -+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ - order2mod1 order2mod2 order2mod3 order2mod4 \ - tst-unique1mod1 tst-unique1mod2 \ - tst-unique2mod1 tst-unique2mod2 -@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) - $(objpfx)unload6mod3.so: $(libdl) - $(objpfx)unload7mod1.so: $(libdl) - $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so -+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so -+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so -+$(objpfx)unload8mod3.so: $(libdl) - $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so - $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so - $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) - $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so - unload7-ENV = MALLOC_PERTURB_=85 - -+$(objpfx)unload8: $(libdl) -+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -+ - ifdef libdl - $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a - $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 700e765..f47d5f8 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) - - imap->l_scope_max = new_size; - } -+ else if (new_list != NULL) -+ { -+ /* We didn't change the scope array, so reset the search -+ list. */ -+ imap->l_searchlist.r_list = NULL; -+ imap->l_searchlist.r_nlist = 0; -+ } - - /* The loader is gone, so mark the object as not having one. - Note: l_idx != IDX_STILL_USED -> object will be removed. */ -diff --git a/elf/unload8.c b/elf/unload8.c -new file mode 100644 -index 0000000..f984a38 ---- /dev/null -+++ b/elf/unload8.c -@@ -0,0 +1,33 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+ -+int -+main (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod1.so failed"); -+ return 1; -+ } -+ -+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); -+ if (h2 == NULL) -+ { -+ puts ("dlopen unload8mod1x.so failed"); -+ return 1; -+ } -+ dlclose (h2); -+ -+ int (*mod1) (void) = dlsym (h, "mod1"); -+ if (mod1 == NULL) -+ { -+ puts ("dlsym failed"); -+ return 1; -+ } -+ -+ mod1 (); -+ dlclose (h); -+ -+ return 0; -+} -diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c -new file mode 100644 -index 0000000..fe7e81c ---- /dev/null -+++ b/elf/unload8mod1.c -@@ -0,0 +1,7 @@ -+extern void mod2 (void); -+ -+void -+mod1 (void) -+{ -+ mod2 (); -+} -diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c -new file mode 100644 -index 0000000..835b634 ---- /dev/null -+++ b/elf/unload8mod1x.c -@@ -0,0 +1 @@ -+int mod1x; -diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c -new file mode 100644 -index 0000000..2fd8b67 ---- /dev/null -+++ b/elf/unload8mod2.c -@@ -0,0 +1,7 @@ -+extern void mod3 (void); -+ -+void -+mod2 (void) -+{ -+ mod3 (); -+} -diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c -new file mode 100644 -index 0000000..d49e22b ---- /dev/null -+++ b/elf/unload8mod3.c -@@ -0,0 +1,27 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+void -+mod3_fini2 (void) -+{ -+} -+ -+void -+mod3_fini (void) -+{ -+ mod3_fini2 (); -+} -+ -+void -+mod3 (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod2.so failed"); -+ exit (1); -+ } -+ -+ atexit (mod3_fini); -+} --- -1.7.3.4 - diff --git a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch deleted file mode 100644 index ef91116e5..000000000 --- a/core/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 1 Sep 2011 10:46:14 +0200 -Subject: [PATCH] Avoid assertion failure when first DNS answer was empty - ---- - ChangeLog | 4 ++++ - resolv/res_query.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/resolv/res_query.c b/resolv/res_query.c -index 2f7cfaa..2ded9fb 100644 ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, - && *resplen2 > (int) sizeof (HEADER)) - { - /* Special case of partial answer. */ -- assert (hp != hp2); -+ assert (n == 0 || hp != hp2); - hp = hp2; - } - else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) --- -1.7.3.4 - diff --git a/core/glibc/glibc-2.14-libdl-crash.patch b/core/glibc/glibc-2.14-libdl-crash.patch index ee29f8c20..6c9d2718e 100644 --- a/core/glibc/glibc-2.14-libdl-crash.patch +++ b/core/glibc/glibc-2.14-libdl-crash.patch @@ -55,7 +55,7 @@ index 9e30594..3890d00 100644 if (old_l_initfini != NULL) - map->l_orig_initfini = old_l_initfini; + _dl_scope_free (old_l_initfini); - } + diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 7be9483..a13fce3 100644 --- a/elf/dl-libc.c diff --git a/core/glibc/glibc-2.14-revert-4768ae77.patch b/core/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/core/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index aa147eaff..70aa978f1 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100083 2010-11-20 08:19:49Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 142351 2011-11-08 18:37:43Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gpm pkgver=1.20.6 -pkgrel=6 +pkgrel=7 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64' 'mips64el') url="http://www.nico.schottelius.org/software/gpm/" @@ -14,10 +14,10 @@ options=('!makeflags') install=gpm.install source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \ gpm gpm.conf.d gpm.sh) -md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\ - 'f436a1277571f2ae8bfa9bf2ef32f7a5' 'e391fe4599ce102615f9cd449c380d41') -sha1sums=('f3bb9272878b7934968381c8b25edab359114150' '19e1feb1493373512a77801699df012d186336ea'\ - '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9') +sha1sums=('f3bb9272878b7934968381c8b25edab359114150' + '19e1feb1493373512a77801699df012d186336ea' + '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' + '88fe5ff10916c68a87abc8418a56eb0073f69fa9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index b8ebbe79c..5cd2533f6 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128670 2011-06-25 12:20:55Z 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 +pkgver=2.10 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,9 @@ groups=('base') depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('25e41b2aa201104354740961ef36005a') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) +md5sums=('709915434d09f5db655e5ebd7fd6bb7f' + '9ad5c390a6ad7f566c58db28ddb06aed') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD index 9cd958e8c..f9661d3f4 100644 --- a/core/groff/PKGBUILD +++ b/core/groff/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 104541 2011-01-03 22:33:16Z tpowa $ +# $Id: PKGBUILD 142313 2011-11-08 10:57:28Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=groff pkgver=1.21 -pkgrel=1 +pkgrel=2 pkgdesc="GNU troff text-formatting system" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/groff/groff.html" @@ -13,7 +13,7 @@ optdepends=('netpbm: for use together with man -H command interaction in browser 'psutils: for use together with man -H command interaction in browsers') source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz site.tmac) -options=('!makeflags') +options=(!makeflags !docs) install=groff.install md5sums=('8b8cd29385b97616a0f0d96d0951c5bf' 'a1fedafd7863b37968d32ad9ae1d8c13') @@ -25,6 +25,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make prefix=$pkgdir/usr install diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index 94b597eda..d6ce70c31 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137785 2011-09-11 01:35:04Z allan $ +# $Id: PKGBUILD 142064 2011-11-04 23:35:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.4 -pkgrel=3 +pkgrel=4.1 pkgdesc="GNU compression utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/gzip/" @@ -13,8 +13,9 @@ groups=('base') depends=('glibc' 'bash') makedepends=('patch') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz) -md5sums=('e381b8506210c794278f5527cba0e765') +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.gz{,.sig}) +md5sums=('e381b8506210c794278f5527cba0e765' + '3b11d485d1638f2d16f7494a0486a6e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -38,6 +39,5 @@ package() { make prefix=${pkgdir}/usr install install -dm755 ${pkgdir}/bin - mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ - cd $pkgdir/bin + mv ${pkgdir}/usr/bin/{gunzip,gzip,uncompress,zcat} ${pkgdir}/bin/ } diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD index bc305d6cc..662e6e13b 100644 --- a/core/hdparm/PKGBUILD +++ b/core/hdparm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111559 2011-02-27 18:01:17Z tpowa $ +# $Id: PKGBUILD 142539 2011-11-11 21:16:42Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=hdparm pkgver=9.37 -pkgrel=1 +pkgrel=2 pkgdesc="A shell utility for manipulating Linux IDE drive/driver parameters" arch=(i686 x86_64 'mips64el') depends=('glibc') diff --git a/core/heirloom-mailx/PKGBUILD b/core/heirloom-mailx/PKGBUILD index b43230449..e08a0246e 100644 --- a/core/heirloom-mailx/PKGBUILD +++ b/core/heirloom-mailx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 132725 2011-07-25 13:08:32Z stephane $ +# $Id: PKGBUILD 142842 2011-11-16 20:25:47Z dan $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> +# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com> +# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de> pkgname=heirloom-mailx pkgver=12.5 -pkgrel=2 +pkgrel=3 pkgdesc="A commandline utility for sending and receiving email" arch=('i686' 'x86_64' 'mips64el') url="http://heirloom.sourceforge.net/mailx.html" diff --git a/core/idnkit/PKGBUILD b/core/idnkit/PKGBUILD index ad97b1283..74b1cb6b5 100644 --- a/core/idnkit/PKGBUILD +++ b/core/idnkit/PKGBUILD @@ -1,13 +1,15 @@ +# $Id: PKGBUILD 142702 2011-11-13 10:10:08Z bisson $ # Contributor: Igor Nemilentsev <trezorg@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=idnkit pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc='Provides functionalities about Internationalized Domain Name processing' -arch=('i686' 'x86_64' 'mips64el') url='http://www.nic.ad.jp/ja/idn/idnkit/download/' license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') +depends=('glibc') options=('!makeflags' '!libtool') source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz") sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048') @@ -27,8 +29,14 @@ build() { make } +check() { + cd "${srcdir}/idnkit-${pkgver}-src" + make check +} + package() { cd "${srcdir}/idnkit-${pkgver}-src" make DESTDIR="${pkgdir}" install install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm "${pkgdir}"/etc/*.sample } diff --git a/core/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD index 767fddecf..b5e4897a9 100644 --- a/core/ifenslave/PKGBUILD +++ b/core/ifenslave/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 108480 2011-01-31 14:27:02Z dan $ +# $Id: PKGBUILD 142704 2011-11-13 10:10:10Z bisson $ # Maintainer: # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=ifenslave pkgver=1.1.0 -pkgrel=6 -pkgdesc="Utility for bonding ethernet interfaces" +pkgrel=7 +pkgdesc='Utility for bonding ethernet interfaces' arch=('i686' 'x86_64' 'mips64el') -url="http://www.linuxfoundation.org/en/Net:Bonding" +url='http://www.linuxfoundation.org/en/Net:Bonding' license=('GPL2') depends=('glibc') makedepends=('linux-api-headers') backup=('etc/conf.d/bonding') -source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=2bac96' - bonding.conf.d) -md5sums=('41a23dc9ac3522ac2af23396ba70bcc4' - '397fccbf574d5082c7a3c8d3793dc000') +source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=65968fbf' + 'bonding.conf.d') +sha1sums=('c657d9e6b8acb983bb8ef856f8f7f25ee6bf4f73' + '6843971c0254768868b556af33289d7d32d6208d') build() { - cd $srcdir - gcc -Wall -Wstrict-prototypes $CFLAGS $LDFLAGS ifenslave.c -o ifenslave + cd "${srcdir}" + gcc -Wall -Wstrict-prototypes ${CFLAGS} ${LDFLAGS} ifenslave.c -o ifenslave } package() { - cd $srcdir - install -Dm755 ifenslave $pkgdir/sbin/ifenslave - install -Dm644 bonding.conf.d $pkgdir/etc/conf.d/bonding + cd "${srcdir}" + install -Dm755 ifenslave "${pkgdir}"/sbin/ifenslave + install -Dm644 bonding.conf.d "${pkgdir}"/etc/conf.d/bonding } +sha1sums=('627333f410809971409023fda6a8b1de419146ba' + '6843971c0254768868b556af33289d7d32d6208d') diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index 2831344f4..9bb18c831 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -3,7 +3,7 @@ pkgname=inetutils pkgver=1.8 -pkgrel=6 +pkgrel=6.1 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/inetutils/" diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 2eabc228d..3b0996dd0 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131999 2011-07-18 20:47:01Z ronald $ +# $Id: PKGBUILD 142382 2011-11-08 22:05:14Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 pkgver=2.6.39 -pkgrel=1 +pkgrel=2.1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index d1243e382..3e924c555 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $ +# $Id: PKGBUILD 142199 2011-11-06 05:47:47Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables pkgver=1.4.12.1 -pkgrel=1 -pkgdesc="A Linux kernel packet control tool" +pkgrel=2 +pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -url="http://www.netfilter.org/projects/iptables/index.html" +url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') makedepends=('linux-api-headers') options=('!libtool') -source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2 +source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" iptables ip6tables empty.rules @@ -35,6 +35,7 @@ sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,7 +44,7 @@ build() { sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in # FS#25358: libxt_statistic.so undefined symbol: lround - export LDFLAGS="-lm" + export LDFLAGS='-lm' ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ @@ -64,6 +65,6 @@ package() { install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables - mkdir -p "${pkgdir}/var/lib/iptables" - install -m644 empty-{filter,mangle,nat,raw,security}.rules ${pkgdir}/var/lib/iptables/ + mkdir -p "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables } diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD index 7c9351502..bf24c3a6e 100644 --- a/core/iputils/PKGBUILD +++ b/core/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 107536 2011-01-26 17:38:04Z stephane $ +# $Id: PKGBUILD 142315 2011-11-08 10:57:52Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils pkgver=20101006 _traceroutever=1.4a12 -pkgrel=1 +pkgrel=2.1 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/isdn4k-utils/PKGBUILD b/core/isdn4k-utils/PKGBUILD deleted file mode 100644 index 731138125..000000000 --- a/core/isdn4k-utils/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 102060 2010-12-04 10:48:14Z allan $ -# Contributor: Dennis "Gyroplast" Herbrich <dennis@archlinux.org> -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=isdn4k-utils -pkgver=3.2p1 -pkgrel=6 -pkgdesc="User space administration programs and tools for ISDN" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.isdn4linux.de/" -license=('GPL') -depends=('ncurses') -backup=(etc/isdn/{callerid.conf,isdn.conf,rate.conf,isdnlog.isdnctrl0.options}) -options=('!makeflags') -source=(ftp://ftp.isdn4linux.de/pub/isdn4linux/utils/${pkgname}.v${pkgver}.tar.bz2 - isdn4k-utils-3.2p1-build.patch - config) -md5sums=('d347afa462e46eccfd1284aebae227b6' - '7f056ddac093c77d8be4e076d0e9421c' - '3429894039f33c114fef5ef9f866920e') - -build() { - cd $srcdir/$pkgname - patch -Np1 -i $srcdir/isdn4k-utils-3.2p1-build.patch - cp $srcdir/config ./.config - make subconfig - make -} - -package() { - cd $srcdir/$pkgname - install -dm755 $pkgdir/sbin - make DESTDIR=$pkgdir install -} diff --git a/core/isdn4k-utils/config b/core/isdn4k-utils/config deleted file mode 100644 index fe0810209..000000000 --- a/core/isdn4k-utils/config +++ /dev/null @@ -1,100 +0,0 @@ -# -# Automatically generated by make menuconfig: don't edit -# - -# -# Code maturity level options -# -# CONFIG_EXPERIMENTAL is not set - -# -# General configuration -# -# CONFIG_BUILDX11 is not set -CONFIG_KERNELDIR='/usr/src/linux' -CONFIG_BINDIR='/usr/bin' -CONFIG_SBINDIR='/sbin' -CONFIG_MANDIR='/usr/share/man' -CONFIG_RUNDIR='/var/run' -CONFIG_LOCKDIR='/var/lock' -CONFIG_LOCKFILE='LCK..' -CONFIG_I4LCONFDIR='/etc/isdn' -CONFIG_CONFFILE='isdn.conf' -CONFIG_CALLERIDFILE='callerid.conf' -CONFIG_USERCONFFILE='~/.isdn' -CONFIG_COUNTRYCODE='49' -CONFIG_AREACODE='' -CONFIG_COUNTRY_PREFIX='+' -CONFIG_AREA_PREFIX='0' -CONFIG_DATADIR='/usr/lib/isdn' - -# -# Runtime configuration tools -# -CONFIG_ISDNCTRL=y -CONFIG_ISDNCTRL_CONF=y -# CONFIG_ISDNCTRL_TIMRU is not set -# CONFIG_IPROFD is not set -# CONFIG_DIVERTCTRL is not set - -# -# Card configuration tools -# -CONFIG_HISAXCTRL=y -CONFIG_ICNCTRL=y -# CONFIG_ICNCTRL_DEBUG is not set -CONFIG_PCBITCTL=y -# CONFIG_AVMCAPICTRL is not set -# CONFIG_EICONCTRL is not set - -# -# Tools for monitoring activity -# -CONFIG_IMON=y -CONFIG_IMONTTY=y -CONFIG_ISDNLOG=y - -# -# Options for isdnlog package -# -CONFIG_ISDNLOG_SERV_PORT=20011 -CONFIG_ISDNLOG_USERFILE='isdnlog.users' -CONFIG_ISDNLOG_CHARGEFILE='charge.dat' -CONFIG_ISDNLOG_LOGFILE='/var/log/isdn.log' -CONFIG_ISDNLOG_RELOADCMD='reload' -CONFIG_ISDNLOG_STOPCMD='stop' -CONFIG_ISDNLOG_REBOOTCMD='/sbin/reboot' -CONFIG_ISDNLOG_OLDI4LCONFDIR='/etc/isdnlog' -CONFIG_ISDNLOG_OLDI4LCONFFILE='isdnlog.conf' -# CONFIG_ISDNLOG_POSTGRES is not set -# CONFIG_ISDNLOG_MYSQLDB is not set -# CONFIG_ISDNLOG_ORACLE is not set -CONFIG_ISDN_LOG_DE=y -CONFIG_ISDN_LOG_CC_DE=y -CONFIG_ISDN_LOG_DEST_DE=y -CONFIG_ISDN_LOG_DEST_AT=y -CONFIG_ISDN_LOG_DEST_NL=y -CONFIG_ISDN_LOG_DEST_CH=y -CONFIG_IPPPSTATS=y -# CONFIG_XISDNLOAD is not set -# CONFIG_XMONISDN is not set - -# -# Applications -# -# CONFIG_VBOX is not set -CONFIG_IPPPD=y - -# -# Options for ipppd -# -# CONFIG_IPPPD_MSCHAP is not set -# CONFIG_IPPPD_RADIUS is not set -# CONFIG_RADIUS_WTMP_LOGGING is not set -RADIUS_CLIENT_CONFIG_FILE='' - -# -# Documentation -# -CONFIG_GENMAN=y -# CONFIG_FAQ is not set diff --git a/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch b/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch deleted file mode 100644 index 63239fcad..000000000 --- a/core/isdn4k-utils/isdn4k-utils-3.2p1-build.patch +++ /dev/null @@ -1,2028 +0,0 @@ -diff -Naur isdn4k-utils-orig//eicon/eiconctrl.c isdn4k-utils/eicon/eiconctrl.c ---- isdn4k-utils-orig//eicon/eiconctrl.c 2001-06-22 02:34:45.000000000 +1000 -+++ isdn4k-utils/eicon/eiconctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1970,7 +1970,7 @@ - val = strtol(p, &q, 16); - p = q; - val = strtol(p, &q, 16); -- (unsigned short) *buffer = (unsigned short) val; -+ *buffer = (unsigned short) val; - pos = 2; - while ((p != q) && (*q != 0)) { - p = q; -diff -Naur isdn4k-utils-orig//hisax/hisaxctrl.c isdn4k-utils/hisax/hisaxctrl.c ---- isdn4k-utils-orig//hisax/hisaxctrl.c 2000-06-30 19:37:38.000000000 +1000 -+++ isdn4k-utils/hisax/hisaxctrl.c 2010-12-04 20:44:11.093338893 +1000 -@@ -43,7 +43,8 @@ - fprintf(stderr, "cannot open file %s\n", fname); - exit(-1); - } -- p = (int *) buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ buffer = (unsigned char *) malloc(MAX_SIZE+4); -+ p = (int *) buffer; - if (!buffer) { - fprintf(stderr, "cannot get %d byte memory\n", MAX_SIZE+4); - exit(-1); -diff -Naur isdn4k-utils-orig//hisax/Makefile.in isdn4k-utils/hisax/Makefile.in ---- isdn4k-utils-orig//hisax/Makefile.in 2002-07-20 05:03:51.000000000 +1000 -+++ isdn4k-utils/hisax/Makefile.in 2010-12-04 20:44:03.726672225 +1000 -@@ -30,7 +30,7 @@ - #.SUFFIXES: - #.SUFFIXES: .c .o - --%.8: %.man -+%.8: %.man.in - cp $< $@ - - all: $(PROGRAMS) $(MANPAGES) -diff -Naur isdn4k-utils-orig//ipppd/main.c isdn4k-utils/ipppd/main.c ---- isdn4k-utils-orig//ipppd/main.c 2002-07-18 10:06:21.000000000 +1000 -+++ isdn4k-utils/ipppd/main.c 2010-12-04 20:44:11.093338893 +1000 -@@ -1041,9 +1041,14 @@ - static char line[256]; /* line to be logged accumulated here */ - static char *linep; - -+#ifdef __STDC__ -+static void pr_log(void *arg, char *fmt, ...); -+#else /* __STDC__ */ -+static void pr_log(arg, fmt, va_alist); -+#endif -+ - void log_packet(u_char *p,int len,char *prefix,int linkunit) - { -- static void pr_log __P((void *, char *, ...)); - - int i, n; - u_short proto; -diff -Naur isdn4k-utils-orig//ipppd/options.c isdn4k-utils/ipppd/options.c ---- isdn4k-utils-orig//ipppd/options.c 2002-07-06 10:34:08.000000000 +1000 -+++ isdn4k-utils/ipppd/options.c 2010-12-04 20:43:57.890005560 +1000 -@@ -479,26 +479,24 @@ - #define IMPLEMENTATION "" - #endif - --static char *usage_string = "\ --ipppd version %s patch level %d%s\n\ --Usage: %s [ options ], where options are:\n\ --\t<device> Communicate over the named device\n\ -+static char *usage_string = "ipppd version %s patch level %d%s\n" -+"Usage: %s [ options ], where options are:\n" -+"\t<device> Communicate over the named device\n" - #ifdef INCLUDE_OBSOLETE_FEATURES --\tcrtscts Use hardware RTS/CTS flow control\n\ --\t<speed> Set the baud rate to <speed>\n\ --\tmodem Use modem control lines\n\ -+"\tcrtscts Use hardware RTS/CTS flow control\n" -+"\t<speed> Set the baud rate to <speed>\n" -+"\tmodem Use modem control lines\n" - #endif --\t<loc>:<rem> Set the local and/or remote interface IP\n\ --\t\taddresses. (you also may use the option 'useifip' to get IPs).\n\ --\tasyncmap <n> Set the desired async map to hex <n>\n\ --\tauth Require authentication from peer\n\ --\tconnect <p> Invoke shell command <p> to set up the serial line\n\ --\tdefaultroute Add default route through interface\n\ --\tfile <f> Take options from file <f>\n\ --\tmru <n> Set MRU value to <n> for negotiation\n\ --\tnetmask <n> Set interface netmask to <n>\n\ --See ipppd(8) for more options.\n\ --"; -+"\t<loc>:<rem> Set the local and/or remote interface IP\n" -+"\t\t\taddresses. (you also may use the option 'useifip' to get IPs).\n" -+"\tasyncmap <n> Set the desired async map to hex <n>\n" -+"\tauth Require authentication from peer\n" -+"\tconnect <p> Invoke shell command <p> to set up the serial line\n" -+"\tdefaultroute Add default route through interface\n" -+"\tfile <f> Take options from file <f>\n" -+"\tmru <n> Set MRU value to <n> for negotiation\n" -+"\tnetmask <n> Set interface netmask to <n>\n" -+"See ipppd(8) for more options.\n"; - - static char *current_option; /* the name of the option being parsed */ - -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h isdn4k-utils/isdnlog/isdnlog/isdnlog.h ---- isdn4k-utils-orig//isdnlog/isdnlog/isdnlog.h 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/isdnlog.h 2010-12-04 20:44:03.780005559 +1000 -@@ -460,7 +460,7 @@ - - _EXTERN void dotrace(void); - _EXTERN int morectrl(int card); --_EXTERN void moreinfo(void); -+extern void moreinfo(void); - _EXTERN void morekbd(void); - _EXTERN void processcint(void); - _EXTERN void processflow(void); -diff -Naur isdn4k-utils-orig//isdnlog/isdnlog/processor.c isdn4k-utils/isdnlog/isdnlog/processor.c ---- isdn4k-utils-orig//isdnlog/isdnlog/processor.c 2002-04-02 04:06:10.000000000 +1000 -+++ isdn4k-utils/isdnlog/isdnlog/processor.c 2010-12-04 20:44:03.783338893 +1000 -@@ -5293,7 +5293,7 @@ - tei = BROADCAST; /* Wenn nach einer tei-Zeile keine hex:-Zeile kommt, tei ungueltig machen! */ - - if ((type == SETUP) && !replay) { /* fetch additional info from "/dev/isdninfo" */ -- static void moreinfo(); /* soviel zu Objektorientiertem Denken ;-) */ -+ /*static void moreinfo(); */ /* soviel zu Objektorientiertem Denken ;-) */ - moreinfo(); - } /* if */ - -diff -Naur isdn4k-utils-orig//isdnlog/Makefile.in isdn4k-utils/isdnlog/Makefile.in ---- isdn4k-utils-orig//isdnlog/Makefile.in 2002-07-20 05:03:55.000000000 +1000 -+++ isdn4k-utils/isdnlog/Makefile.in 2010-12-04 20:44:03.730005560 +1000 -@@ -1842,9 +1842,6 @@ - $(INSTALL_DATA) $$f $(DESTDIR)$(DATADIR); \ - echo Installing $(DESTDIR)$(DATADIR)/$$f; \ - done -- @(grep isdnlog $(SERVICEFILE) >/dev/null) || \ -- (echo "";echo "";echo "Add a line to the file $(SERVICEFILE)" ;echo "";echo ""; \ -- echo "isdnlog $(SERV_PORT)/tcp isdnlog" >> $(SERVICEFILE)) - - install-strip: - $(MAKE) INSTALL_BIN='$(INSTALL_BIN) -s' \ -diff -Naur isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c isdn4k-utils/isdnlog/tools/cdb/cdbmake.c ---- isdn4k-utils-orig//isdnlog/tools/cdb/cdbmake.c 2002-02-22 21:10:25.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/cdb/cdbmake.c 2010-12-04 20:44:03.786672226 +1000 -@@ -3,8 +3,6 @@ - #include "freecdbmake.h" - #include <unistd.h> - --extern char *malloc(); -- - void diesys(why) char *why; { perror(why); exit(111); } - - void writeerror() { diesys("cdbmake: fatal: unable to write"); } -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c isdn4k-utils/isdnlog/tools/isdnrate.c ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c 2001-06-22 02:34:56.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c 2010-12-04 20:44:11.096672226 +1000 -@@ -304,7 +304,7 @@ - - static void print_header(void); - --static char *myname, *myshortname; -+char *myname, *myshortname; - static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; - static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; - -@@ -313,7 +313,7 @@ - static int usestat = 0; - static int duration = LCR_DURATION; - static time_t start; --static int day, month, year, hour, min, sec; -+int day, month, year, hour, min, sec; - static char ignore[MAXPROVIDER]; - static char *fromarea = 0; - static char wanted_day; -diff -Naur isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig isdn4k-utils/isdnlog/tools/isdnrate.c.orig ---- isdn4k-utils-orig//isdnlog/tools/isdnrate.c.orig 1970-01-01 10:00:00.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/isdnrate.c.orig 2001-06-22 02:34:56.000000000 +1000 -@@ -0,0 +1,1806 @@ -+/* $Id: isdnrate.c,v 1.38 2001/03/01 14:59:16 paul Exp $ -+ -+ * ISDN accounting for isdn4linux. (rate evaluation) -+ * -+ * Copyright 1995 .. 2000 by Andreas Kool (akool@isdn4linux.de) -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * $Log: isdnrate.c,v $ -+ * Revision 1.38 2001/03/01 14:59:16 paul -+ * Various patches to fix errors when using the newest glibc, -+ * replaced use of insecure tempnam() function -+ * and to remove warnings etc. -+ * -+ * Revision 1.37 2000/07/17 16:34:23 akool -+ * isdnlog-4.32 -+ * - added new Prefixes 0160 (D1) and 0162 (D2) to "country-de.dat" -+ * - corrected all german mobil phone numbers (many thank's to -+ * Tobias Becker <i4l-projects@talypso.de> for the tool "fix_rates.pl") -+ * - isdnlog/tools/rate.c ... New R:-tag -+ * - isdnlog/tools/isdnrate.c ... print warnings from getRate if verbose -+ * - isdnlog/tools/rate-files.man ... New R:-tag -+ * - isdnlog/tools/NEWS ... New R:-tag -+ * - isdnlog/README ... New R:-tag -+ * - isdnlog/samples/rtest.dat ... example rate-file for testing R: -+ * -+ * Revision 1.36 2000/03/09 18:50:03 akool -+ * isdnlog-4.16 -+ * - isdnlog/samples/isdn.conf.no ... changed VBN -+ * - isdnlog/isdnlog/isdnlog.c .. ciInterval -+ * - isdnlog/isdnlog/processor.c .. ciInterval -+ * - isdnlog/tools/tools.h .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnconf.c .. ciInterval, abclcr conf option -+ * - isdnlog/tools/isdnrate.c .. removed a warning -+ * - isdnlog/NEWS ... updated -+ * - isdnlog/README ... updated -+ * - isdnlog/isdnlog/isdnlog.8.in ... updated -+ * - isdnlog/isdnlog/isdnlog.5.in ... updated -+ * - isdnlog/samples/provider ... NEW -+ * -+ * ==> Please run a make clean, and be sure to read isdnlog/NEWS for changes -+ * ==> and new features. -+ * -+ * Revision 1.35 2000/03/06 07:03:21 akool -+ * isdnlog-4.15 -+ * - isdnlog/tools/tools.h ... moved one_call, sum_calls to isdnrep.h -+ * ==> DO A 'make clean' PLEASE -+ * - isdnlog/tools/telnum.c ... fixed a small typo -+ * - isdnlog/isdnrep/rep_main.c ... incl. dest.h -+ * - isdnlog/isdnrep/isdnrep.c ... fixed %l, %L -+ * - isdnlog/isdnrep/isdnrep.h ... struct one_call, sum_calls are now here -+ * -+ * Support for Norway added. Many thanks to Tore Ferner <torfer@pvv.org> -+ * - isdnlog/rate-no.dat ... NEW -+ * - isdnlog/holiday-no.dat ... NEW -+ * - isdnlog/samples/isdn.conf.no ... NEW -+ * - isdnlog/samples/rate.conf.no ... NEW -+ * -+ * Revision 1.34 2000/02/28 19:53:56 akool -+ * isdnlog-4.14 -+ * - Patch from Roland Rosenfeld <roland@spinnaker.de> fix for isdnrep -+ * - isdnlog/tools/rate.c ... epnum -+ * - isdnlog/tools/rate-at.c ... new rates -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate-files.man ... %.3f -+ * - doc/Configure.help ... unknown cc -+ * - isdnlog/configure.in ... unknown cc -+ * - isdnlog/.Config.in ... unknown cc -+ * - isdnlog/Makefile.in ... unknown cc -+ * - isdnlog/tools/dest/Makefile.in ... LANG => DEST_LANG -+ * - isdnlog/samples/rate.conf.pl ... NEW -+ * - isdnlog/samples/isdn.conf.pl ... NEW -+ * - isdnlog/rate-pl.dat ... NEW -+ * - isdnlog/tools/isdnrate.c ... fixed -P pid_dir, restarts on HUP now -+ * - isdnlog/tools/isdnrate.man ... SIGHUP documented -+ * -+ * Revision 1.33 2000/02/12 16:40:24 akool -+ * isdnlog-4.11 -+ * - isdnlog/Makefile.in ... sep install-targets, installs samples, no isdnconf -+ * - isdnlog/samples/rate.conf.{lu,nl} ... NEW -+ * - isdnlog/samples/isdn.conf.lu ... chg provider -+ * - isdnlog/samples/stop ... chg \d,\d => \d.\d -+ * - isdnlog/samples/isdnlog.isdnctrl0.options ... NEW -+ * - isdnlog/samples/isdnlog.users ... NEW -+ * - isdnlog/country-de.dat ... _DEMF again -+ * - isdnlog/isdnlog/processor.c ... LCR -+ * - isdnlog/tools/isdnrate.c ... fmt of s -+ * -+ * Old config is not installed anymore, to acomplish this do -+ * -+ * make install-old-conf -+ * make install -+ * -+ * A running isdnlog is now HUP-ed not KILL-ed -+ * -+ * Revision 1.32 2000/02/03 18:24:51 akool -+ * isdnlog-4.08 -+ * isdnlog/tools/rate.c ... LCR patch again -+ * isdnlog/tools/isdnrate.c ... LCR patch again -+ * isdnbill enhanced/fixed -+ * DTAG AktivPlus fixed -+ * -+ * Revision 1.31 1999/12/31 13:57:20 akool -+ * isdnlog-4.00 (Millenium-Edition) -+ * - Oracle support added by Jan Bolt (Jan.Bolt@t-online.de) -+ * - resolved *any* warnings against rate-de.dat -+ * - Many new rates -+ * - CREDITS file added -+ * -+ * Revision 1.30 1999/12/24 14:17:05 akool -+ * isdnlog-3.81 -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/telrate/info.html.in ... bugfix -+ * - isdnlog/tools/telrate/telrate.cgi.in ... new Service query -+ * - isdnlog/tools/telrate/Makefile.in ... moved tmp below telrate -+ * - isdnlog/samples/rate.conf.at ... fixed -+ * - isdnlog/tools/rate-at.c ... some changes -+ * - isdnlog/rate-at.dat ... ditto -+ * - isdnlog/tools/Makefile ... added path to pp_rate -+ * - isdnlog/tools/rate.{c,h} ... getServiceNames, Date-Range in T:-Tag -+ * - isdnlog/tools/isdnrate.c ... fixed sorting of services, -X52 rets service names -+ * - isdnlog/tools/rate-files.man ... Date-Range in T:-Tag, moved from doc -+ * - isdnlog/tools/isdnrate.man ... moved from doc -+ * - doc/Makefile.in ... moved man's from doc to tools -+ * - isdnlog/Makefile.in ... man's, install isdn.conf.5 -+ * - isdnlog/configure{,.in} ... sed, awk for man's -+ * - isdnlog/tools/zone/Makefile.in ... dataclean -+ * - isdnlog/tools/dest/Makefile.in ... dataclean -+ * - isdnlog/isdnlog/isdnlog.8.in ... upd -+ * - isdnlog/isdnlog/isdn.conf.5.in ... upd -+ * -+ * Revision 1.29 1999/12/17 22:51:55 akool -+ * isdnlog-3.79 -+ * - isdnlog/isdnrep/isdnrep.{c,h} ... error -handling, print_msg -+ * - isdnlog/isdnrep/rep_main.c -+ * - isdnlog/isdnrep/isdnrep.1.in -+ * - isdnlog/tools/rate.c ... dupl entry in rate.conf -+ * - isdnlog/tools/NEWS -+ * - isdnlog/tools/isdnrate.c -+ * - isdnlog/tools/dest/configure{,.in} -+ * - isdnlog/tools/zone/configure{,.in} -+ * -+ * Revision 1.28 1999/12/16 23:08:28 akool -+ * isdnlog-3.78 -+ * - isdnlog/tools/isdnrate.c ... new sOcket option -+ * - isdnlog/tools/NEWS ... new sOcket option -+ * - doc/isdnrate.man ... ditto -+ * - isdnlog/tools/telrate/config.in ... ditto -+ * - isdnlog/tools/telrate/telrate.cgi.in ... ditto -+ * - isdnlog/tools/telrate/README-telrate ditto -+ * -+ * Revision 1.27 1999/12/02 19:28:02 akool -+ * isdnlog-3.73 -+ * - isdnlog/tools/telrate/telrate.cgi.in faster -+ * - doc/isdnrate.man ... -P -+ * - isdnlog/tools/isdnrate.c ... -P -+ * - isdnlog/tools/NEWS ... -P -+ * - isdnlog/tools/rate-at.c ... 194040 -+ * - isdnlog/rate-at.dat -+ * - isdnlog/tools/rate.c ... SIGSEGV -+ * -+ * Revision 1.26 1999/12/01 21:47:25 akool -+ * isdnlog-3.72 -+ * - new rates for 01051 -+ * - next version of isdnbill -+ * -+ * - isdnlog/tools/telnum.c ... cleanup -+ * - isdnlog/tools/isdnrate.c ... -s Service -+ * - isdnlog/tools/rate.{c,h} ... -s -+ * - isdnlog/tools/NEWS ... -s -+ * - doc/isdnrate.man .. updated -o, -s -+ * - doc/rate-files.man ... updated -+ * - isdnlog/tools/dest/README.makedest ... updt. -+ * - isdnlog/isdnlog/isdnlog.8.in .. updt. -+ * -+ * Telrate -+ * - isdnlog/tools/telrate/README-telrate -+ * - isdnlog/tools/telrate/config.in NEW -+ * - isdnlog/tools/telrate/configure NEW -+ * - isdnlog/tools/telrate/Makefile.in NEW -+ * - isdnlog/tools/telrate/index.html.in was index.html -+ * - isdnlog/tools/telrate/info.html.in was info.html -+ * - isdnlog/tools/telrate/telrate.cgi.in was telrate.cgi -+ * - isdnlog/tools/telrate/leo.sample NEW sample config -+ * - isdnlog/tools/telrate/alex.sample NEW sample config -+ * -+ * Revision 1.25 1999/11/08 21:09:41 akool -+ * isdnlog-3.65 -+ * - added "B:" Tag to "rate-xx.dat" -+ * -+ * Revision 1.24 1999/11/07 13:29:28 akool -+ * isdnlog-3.64 -+ * - new "Sonderrufnummern" handling -+ * -+ * Revision 1.22 1999/10/26 18:17:14 akool -+ * isdnlog-3.62 -+ * - many new rates -+ * - next try to fix "Sonderrufnummern" -+ * -+ * isdnlog-3.58 -+ * - big cleanup ( > 1.3 Mb removed!) -+ * - v0.02 of destination support - better, but not perfect -+ * (does't work with gcc-2.7.2.3 yet - use egcs!) -+ * -+ * Revision 1.21 1999/10/25 18:30:03 akool -+ * isdnlog-3.57 -+ * WARNING: Experimental version! -+ * Please use isdnlog-3.56 for production systems! -+ * -+ * Revision 1.20 1999/09/19 14:16:27 akool -+ * isdnlog-3.53 -+ * -+ * Revision 1.19 1999/09/16 20:27:21 akool -+ * isdnlog-3.52 -+ * -+ * Revision 1.18 1999/09/13 09:09:44 akool -+ * isdnlog-3.51 -+ * - changed getProvider() to not return NULL on unknown providers -+ * many thanks to Matthias Eder <mateder@netway.at> -+ * - corrected zone-processing when doing a internal -> world call -+ * -+ * Revision 1.17 1999/09/09 11:21:05 akool -+ * isdnlog-3.49 -+ * -+ * Revision 1.16 1999/08/04 23:06:52 akool -+ * Better codeall for .at -+ * -+ * Revision 1.15 1999/07/31 09:25:36 akool -+ * getRate() speedup -+ * -+ * Revision 1.14 1999/07/26 16:28:41 akool -+ * getRate() speedup from Leo -+ * -+ * Revision 1.13 1999/07/25 15:57:46 akool -+ * isdnlog-3.43 -+ * added "telnum" module -+ * -+ * Revision 1.12 1999/07/24 08:45:17 akool -+ * isdnlog-3.42 -+ * rate-de.dat 1.02-Germany [18-Jul-1999 10:44:21] -+ * better Support for Ackermann Euracom -+ * WEB-Interface for isdnrate -+ * many small fixes -+ * -+ * Revision 1.11 1999/07/15 16:42:04 akool -+ * small enhancement's and fixes -+ * -+ * Revision 1.10 1999/07/07 19:44:07 akool -+ * patches from Michael and Leo -+ * -+ * Revision 1.9 1999/07/04 20:47:05 akool -+ * rate-de.dat V:1.02-Germany [04-Jul-1999 22:56:37] -+ * -+ * Revision 1.8 1999/07/03 10:24:14 akool -+ * fixed Makefile -+ * -+ * Revision 1.7 1999/07/02 19:18:00 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 21:27:20] -+ * -+ * Revision 1.6 1999/07/02 18:20:50 akool -+ * rate-de.dat V:1.02-Germany [02-Jul-1999 20:29:21] -+ * country-de.dat V:1.02-Germany [02-Jul-1999 19:13:54] -+ * -+ * Revision 1.5 1999/07/01 20:40:07 akool -+ * isdnrate optimized -+ * -+ * Revision 1.4 1999/06/30 20:53:28 akool -+ * added "-t" option to "isdnrate" -+ * -+ * Revision 1.3 1999/06/30 17:17:37 akool -+ * isdnlog Version 3.39 -+ * -+ * Revision 1.2 1999/06/29 20:11:25 akool -+ * now compiles with ndbm -+ * (many thanks to Nima <nima_ghasseminejad@public.uni-hamburg.de>) -+ * -+ * Revision 1.1 1999/06/28 19:16:33 akool -+ * isdnlog Version 3.38 -+ * - new utility "isdnrate" started -+ * -+ */ -+ -+#include "isdnlog.h" -+#include "tools/zone.h" -+#include <unistd.h> -+#include "dest.h" -+ -+#define WIDTH 19 -+#define _MAXLAST 20 /* the real max */ -+#define MAXLAST ((best>=_MAXLAST||best<=2)?5:best) -+ -+ -+static void print_header(void); -+ -+static char *myname, *myshortname; -+static char options[] = "ab:d:f:h:l:op:st:v::x:CD::G:HLNP:O:S:TUVX::Z"; -+static char usage[] = "%s: usage: %s [ -%s ] Destination ...\n"; -+ -+static int header = 0, best = MAXPROVIDER, table = 0, explain = 0; -+int verbose = 0; -+static int usestat = 0; -+static int duration = LCR_DURATION; -+static time_t start; -+static int day, month, year, hour, min, sec; -+static char ignore[MAXPROVIDER]; -+static char *fromarea = 0; -+static char wanted_day; -+static int list = 0; -+static char *comment; -+static char **providers = 0; /* incl these */ -+static int n_providers = 0; -+static int business = 0; -+static char **xproviders = 0; /* excl these */ -+static int nx_providers = 0; -+static int xbusiness = 0; -+static int all = 0; -+static int booked = 0; -+static int service = 0; -+ -+#define SOCKNAME "/tmp/isdnrate" -+static int is_daemon = 0; -+static int is_client = 0; -+static int we_are_daemon = 0; -+static int takt = 99999; -+static char sortby; -+static int need_dest; -+static int h_param = 0; -+static int lcr = 0; -+static TELNUM srcnum, destnum; -+static char *pid_dir = 0; -+static char *pid_file = 0; -+static char *socket_file = 0; -+static char **hup_argv; /* args to restart with */ -+ -+typedef struct { -+ int prefix; -+ double rate; -+ char *name; -+ char *explain; -+} SORT; -+ -+typedef struct { -+ int weight; -+ int index; -+} SORT2; -+ -+static SORT sort[MAXPROVIDER]; -+ -+#undef MAXPROVIDER -+#define MAXPROVIDER getNProvider() -+ -+#undef BUFSIZ /* sorry but 8192 is too much for me */ -+#define BUFSIZ 256 -+ -+int print_msg(int Level, const char *fmt,...) -+{ -+ auto va_list ap; -+ auto char String[BUFSIZ * 3]; -+ -+ if ((Level > PRT_ERR && !verbose) || (Level > PRT_WARN && verbose < 2)) -+ return (1); -+ -+ va_start(ap, fmt); -+ (void) vsnprintf(String, BUFSIZ * 3, fmt, ap); -+ va_end(ap); -+ -+ fprintf(stderr, "%s", String); -+ -+ return (0); -+} /* print_msg */ -+ -+ -+static void init() -+{ -+ auto char *version, **message; -+ -+ if (readconfig(myshortname) < 0) -+ exit(1); -+ -+ if (verbose) -+ message = &version; -+ else -+ message = NULL; -+ -+ initHoliday(holifile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ initDest(destfile, message); -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+ initRate(rateconf, ratefile, zonefile, message); -+ -+ if (verbose && *version) -+ print_msg(PRT_V, "%s\n", version); -+ -+} /* init */ -+ -+#if 0 -+static void deinit(void) -+{ -+ exitRate(); -+ exitDest(); -+ exitHoliday(); -+} -+#endif -+ -+/* calc a day/time W | E | H */ -+static void get_day(char d) -+{ -+ struct tm *tm; -+ bitfield mask; -+ int what = 0; -+ -+ tm = localtime(&start); /* now */ -+ switch (d) { -+ case 'W': /* we need a normal weekday, so we take -+ today and inc. day if today is -+ holiday */ -+ what = WORKDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ case 'N': -+ what = WORKDAY; -+ if (!h_param) -+ hour = 23; -+ break; -+ case 'E': -+ what = SUNDAY; -+ if (!h_param) -+ hour = 10; -+ break; -+ } -+ mask = 1 << what; -+ while (isDay(tm, mask, 0) != what) { -+ tm->tm_mday++; -+ } -+ min = sec = 0; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} -+ -+static void post_init() -+{ -+ -+ clearNum(&srcnum); -+ if (fromarea) { -+ Strncpy(srcnum.area, fromarea, TN_MAX_AREA_LEN); -+ free(fromarea); -+ fromarea = 0; -+ } -+ initNum(&srcnum); -+ -+ if (wanted_day) -+ get_day(wanted_day); -+} /* post_init */ -+ -+static int opts(int argc, char *argv[]) -+{ -+ register int c; -+ register char *p; -+ int x; -+ -+ h_param = 0; -+ -+ optind = 0; /* make it repeatable */ -+ need_dest = 1; -+ while ((c = getopt(argc, argv, options)) != EOF) { -+ switch (c) { -+ case 'a': /* all rates old/newer */ -+ all++; -+ break; -+ case 'b': -+ best = strtol(optarg, NIL, 0); -+ break; -+ -+/* case 'c': country */ -+ break; -+ -+ case 'd': -+ for (p = optarg; *p && isspace(*p); p++) ; -+ if (isdigit(*p)) { -+ wanted_day = '\0'; -+ day = atoi(optarg); -+ if ((p = strchr(optarg, '.'))) { -+ month = atoi(p + 1); -+ if ((p = strchr(p + 1, '.'))) { -+ year = atoi(p + 1); -+ if (year < 50) -+ year += 2000; -+ else if (year < 100) -+ year += 1900; -+ } -+ } -+ } /* isdigit */ -+ else { -+ wanted_day = *p; -+ } -+ break; -+ -+ case 'f': -+ if (optarg) { /* from */ -+ for (p = optarg; (isspace(*p) || *p == '0') && *p; p++) ; -+ fromarea = strdup(p); -+ } -+ break; -+ -+ case 'h': -+ hour = atoi(optarg); -+ h_param++; -+ sec = 0; -+ if ((p = strchr(optarg + 1, ':'))) { -+ min = atoi(p + 1); -+ if ((p = strchr(p + 1, ':'))) -+ sec = atoi(p + 1); -+ } -+ else -+ min = 0; -+ break; -+ -+ case 'l': -+ duration = strtol(optarg, NIL, 0); /* l wie lt */ -+ break; -+ -+ case 'o': /* booked only */ -+ booked++; -+ break; -+ -+ case 's': /* service */ -+ service++; -+ break; -+ -+ case 't': -+ x = strtol(optarg, NIL, 0); -+ if (x > 0) -+ takt = x; -+ break; -+ -+ case 'x': /* eXclude Poviders */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ xbusiness = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ xproviders = realloc(xproviders, (nx_providers + 1) * sizeof(char *)); -+ -+ xproviders[nx_providers] = strdup(p); -+ p = strtok(0, ","); -+ nx_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'p': /* Providers ... */ -+ { -+ char *arg = strdup(optarg); -+ -+ p = strtok(arg, ","); -+ while (p) { -+ if (*p == 'B') { /* Business Provider */ -+ business = 1; -+ p = strtok(0, ","); -+ continue; -+ } -+ providers = realloc(providers, (n_providers + 1) * sizeof(char *)); -+ -+ providers[n_providers] = strdup(p); -+ p = strtok(0, ","); -+ n_providers++; -+ } -+ free(arg); -+ } -+ break; -+ -+ case 'v': -+ verbose++; -+ if (optarg && (x = atoi(optarg))) -+ verbose = x; -+ break; -+/* Uppercase options are for output format */ -+ -+ case 'C': -+ is_client = 1; -+ break; -+ -+ case 'D': -+ is_daemon = 1; -+ need_dest = 0; -+ if (optarg) { -+ x = atoi(optarg); -+ is_daemon = x; -+ if (we_are_daemon && x == 3) { -+ kill(getppid(), SIGTERM); -+ exit(EXIT_SUCCESS); -+ } -+ } -+ break; -+ -+ case 'G': -+ explain = atoi(optarg); -+ break; -+ case 'H': -+ header++; -+ break; -+ case 'L': -+ list++; -+ explain = 9; -+ break; -+ case 'N': -+ explain = 55; -+ break; -+ case 'P': -+ pid_dir = strdup(optarg); -+ break; -+ case 'O': -+ free(socket_file); -+ socket_file = strdup(optarg); -+ break; -+ case 'S': -+ sortby = *optarg; -+ break; -+ case 'T': -+ table++; -+ break; -+/* Fixme: check/warn illegal kombinations of options */ -+ case 'U': -+ usestat++; -+ break; -+ -+ case 'V': -+ print_version(myshortname); -+ exit(0); -+ -+ case 'X': -+ if (explain == 0) { -+ explain++; -+ if (optarg && isdigit(*optarg) && (x = atoi(optarg))) { -+ explain = x; -+ if (x == 50 || x == 51 || x == 52) -+ need_dest = 0; -+ } -+ else if (optarg) { -+ comment = strdup(optarg); -+ explain = 8; -+ need_dest = 0; -+ } -+ break; -+ } -+ /* fallthrough */ -+ case '?': -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ break; -+ -+ case 'Z': -+ lcr++; -+ break; -+ } /* switch */ -+ } /* while */ -+ if (is_client && is_daemon != 3 && is_daemon) { -+ is_daemon = 0; -+ print_msg(PRT_V, "Conflicting options, -D disabled\n"); -+ } -+ if (list && table) { -+ table = 0; -+ print_msg(PRT_V, "Conflicting options, -T disabled\n"); -+ } -+ if (usestat && !table) -+ print_msg(PRT_V, "Conflicting options, -U ignored\n"); -+ if ((list || table) && explain >= 10) { -+ list = table = 0; -+ print_msg(PRT_V, "Conflicting options, -T, -L disabled\n"); -+ } -+ if (best < 1) { -+ best = MAXPROVIDER; -+ print_msg(PRT_V, "Illegal options, -b ignored\n"); -+ } -+ if ((explain == 50 || explain == 51 || explain == 52) && header) { -+ print_msg(PRT_V, "Conflicting options, -H ignored\n"); -+ } -+ if (explain >= 10 && service) { -+ print_msg(PRT_V, "Conflicting options, -s ignored\n"); -+ service = 0; -+ } -+ if (argc > optind) -+ return (optind); -+ else -+ return (0); -+} /* opts */ -+ -+ -+static int (*compare_func) (const void *s1, const void *s2); -+static int compare(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->rate > ((SORT *) s2)->rate); -+} /* compare */ -+static int compare_vbn(const void *s1, const void *s2) -+{ -+ return (((SORT *) s1)->prefix > ((SORT *) s2)->prefix); -+} -+static int compare_name(const void *s1, const void *s2) -+{ -+ return strcasecmp(((SORT *) s1)->name, ((SORT *) s2)->name); -+} -+ -+static int compare2(const void *s1, const void *s2) -+{ -+ return (((SORT2 *) s1)->weight < ((SORT2 *) s2)->weight); -+} /* compare2 */ -+ -+char *short_explainRate(RATE * Rate) -+{ -+ -+ static char buffer[BUFSIZ]; -+ char *p = buffer; -+ -+ if (service && Rate->dst[1] && *Rate->dst[1]) -+ p += sprintf(p, "%s, ", Rate->dst[1]); -+ -+ if (Rate->Zone && *Rate->Zone) -+ p += sprintf(p, "%s", Rate->Zone); -+ else -+ p += sprintf(p, "Zone %d", Rate->zone); -+ -+ if (!Rate->domestic && Rate->Country && *Rate->Country) -+ p += sprintf(p, " (%s)", Rate->Country); -+ -+ if (Rate->Day && *Rate->Day) -+ p += sprintf(p, ", %s", Rate->Day); -+ -+ if (Rate->Hour && *Rate->Hour) -+ p += sprintf(p, ", %s", Rate->Hour); -+ -+ return buffer; -+} -+ -+static char *printrate(RATE * Rate) -+{ -+ static char message[BUFSIZ]; -+ -+ if (Rate->Basic > 0) -+ sprintf(message, "%s + %s/%.1fs = %s + %s/Min (%s)", -+ printRate(Rate->Basic), -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(Rate->Basic), -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ else -+ sprintf(message, "%s/%.1fs = %s/Min (%s)", -+ printRate(Rate->Price), -+ Rate->Duration, -+ printRate(60 * Rate->Price / Rate->Duration), -+ short_explainRate(Rate)); -+ -+ return (message); -+} /* printrate */ -+ -+ -+static void buildtime() -+{ -+ auto struct tm tm; -+ -+ tm.tm_sec = sec; -+ tm.tm_min = min; -+ tm.tm_hour = hour; -+ tm.tm_mday = day; -+ tm.tm_mon = month - 1; -+ tm.tm_year = year - 1900; /* ja, ja, ich wei ;-) */ -+ tm.tm_isdst = -1; -+ -+ start = mktime(&tm); -+} /* buildtime */ -+ -+ -+static void splittime() -+{ -+ auto struct tm *tm; -+ -+ tm = localtime(&start); -+ sec = tm->tm_sec; -+ min = tm->tm_min; -+ hour = tm->tm_hour; -+ day = tm->tm_mday; -+ month = tm->tm_mon + 1; -+ year = tm->tm_year + 1900; -+} /* splittime */ -+ -+static char *Provider(int prefix) -+{ -+ register char *p, *p1; -+ register int l; -+ static char s[BUFSIZ]; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ -+ if (prefix == UNKNOWN) -+ return ("?"); -+ -+ p = getProvider(prefix); -+ -+ l = max(WIDTH, strlen(p)) - strlen(p); -+ -+ p1 = prefix2provider_variant(prefix, prov); -+ -+ l += (8 - strlen(p1)); -+ -+ sprintf(s, "%s:%s%*s", p1, p, l, ""); -+ -+ return (s); -+} /* Provider */ -+ -+static char *takt_str(RATE * Rate) -+{ -+ static char s[BUFSIZ]; -+ -+ if (floor(Rate->Rhythm[0]) == Rate->Rhythm[0]) -+ sprintf(s, "%.0f/", Rate->Rhythm[0]); -+ else -+ sprintf(s, "%.3f/", Rate->Rhythm[0]); -+ if (floor(Rate->Rhythm[1]) == Rate->Rhythm[1]) -+ sprintf(s + strlen(s), "%.0f", Rate->Rhythm[1]); -+ else -+ sprintf(s + strlen(s), "%.3f", Rate->Rhythm[1]); -+ return s; -+} -+ -+static inline char *P_EMPTY(char *s) -+{ -+ char *p = s; -+ -+ return p ? p : ""; -+} -+ -+#define DEL ';' -+static int compute(char *num) -+{ -+ register int i, n = 0; -+ register int low = 0, high = MAXPROVIDER - 1; -+ auto RATE Rate; -+ auto char s[BUFSIZ]; -+ struct tm *tm; -+ char prov[TN_MAX_PROVIDER_LEN]; -+ int first = 1; -+ static char BUSINESS[] = "Business"; /* in C:GT:Tag */ -+ -+ if (destnum.nprovider != UNKNOWN) { -+ low = high = destnum.nprovider; -+ } /* if */ -+ compare_func = compare; -+ switch (sortby) { -+ case 'v': -+ compare_func = compare_vbn; -+ break; -+ case 'n': -+ compare_func = compare_name; -+ break; -+ } -+ -+ buildtime(); -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche */ -+ tm = localtime(&start); -+ tm->tm_hour = 0; -+ tm->tm_min = 1; -+ tm->tm_sec = 0; -+ start = mktime(tm); -+ if (explain == 98) { -+ while (tm->tm_wday) { /* find last monday */ -+ start -= (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ start += (60 * 60 * 24); -+ } -+ } -+ if (service) { -+ num = getServiceNum(num); -+ if (!num || !*num) { -+ return 0; -+ } -+ } -+ do { -+ for (i = low; i <= high; i++) { -+ int found, p; -+ char *t; -+ -+ if (ignore[i]) /* Fixme: */ -+ continue; -+ if (booked && !isProviderBooked(i)) -+ continue; -+ if (!all && !isProviderValid(i, start)) -+ continue; -+ t = getProvider(i); -+ if (!t || t[strlen(t) - 1] == '?') /* UNKNOWN Provider */ -+ continue; -+ -+ t = getComment(i, "GT"); /* get Geb. Text comment */ -+ if (business) { /* only business wanted */ -+ if (t == 0) -+ continue; -+ else if (strstr(t, BUSINESS) == 0) -+ continue; -+ } -+ if (xbusiness) { /* no business wanted */ -+ if (t && strstr(t, BUSINESS) > 0) -+ continue; -+ } -+ found = 0; -+ if (n_providers) { -+ for (p = 0; p < n_providers; p++) -+ if (pnum2prefix_variant(providers[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (!found) -+ continue; -+ } -+ if (nx_providers) { -+ for (p = 0; p < nx_providers; p++) -+ if (pnum2prefix_variant(xproviders[p], start) == i) { -+ found = 1; -+ break; -+ } -+ if (found) -+ continue; -+ } -+ clearRate(&Rate); -+ Rate.src[0] = srcnum.country; -+ Rate.src[1] = srcnum.area; -+ Rate.src[2] = ""; -+ -+ destnum.nprovider = i; -+ Strncpy(destnum.provider, getProvider(i), TN_MAX_PROVIDER_LEN); -+ if (normalizeNumber(num, &destnum, TN_ALL) == UNKNOWN) { -+ continue; -+ } -+ -+ Rate.dst[0] = destnum.country; -+ Rate.dst[1] = destnum.area; -+ Rate.dst[2] = destnum.msn; -+ /* Rate.Service = "Internet by call"; */ -+ -+ Rate.prefix = i; -+ -+ Rate.start = start; -+ Rate.now = start + duration - 1; -+ if (explain == 99) { -+ int j; -+ double oldCharge = -1.0; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ Rate.now = start + 1; -+ for (j = 1; j < duration; j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ if (Rate.Charge != oldCharge || j == duration - 1) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ oldCharge = Rate.Charge; -+ } -+ } -+ else -+ break; -+ Rate.now++; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ if (explain == 98 || explain == 97) { /* Minutenpreis fuer -+ diese Woche/Tag */ -+ int j; -+ -+ if (first && header) -+ print_header(); -+ first = 0; -+ printf("@ %s\n", prefix2provider_variant(Rate.prefix, prov)); -+ for (j = 0; j < (explain == 98 ? 7 * 24 : 24); j++) { -+ if (!getRate(&Rate, NULL) && (Rate.Price != 99.99)) { -+ printf("%d %.4f\n", j, Rate.Charge); -+ } -+ else -+ break; -+ Rate.now += 3600; -+ Rate.start += 3600; -+ } -+ if (Rate.Duration <= takt) -+ printf("@----- %s %s\n", currency, Rate.Provider); -+ } -+ else if (explain == 50 || explain == 51) { -+ int fi = 1; -+ -+ while (getZoneRate(&Rate, explain - 50, fi) == 0) { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ fi = 0; -+ if (Rate.Price != 99.99) -+ printf("%s%c%s%c%s%c%.2f%c%.2f%c%s\n", prefix2provider(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, currency, DEL, Rate.Charge, DEL, cpm, DEL, -+ P_EMPTY(Rate.Country)); -+ free(Rate.Country); -+ } -+ } -+ else { -+ /* kludge to suppress "impossible" Rates */ -+ char **message, *msg; -+ if(verbose) -+ message = &msg; -+ else -+ message = NULL; -+ if (!getRate(&Rate, message) && (Rate.Price != 99.99)) { -+ if (!(Rate.Duration <= takt)) -+ continue; -+ sort[n].prefix = Rate.prefix; -+ sort[n].rate = Rate.Charge; -+ sort[n].name = Rate.Provider; -+ switch (explain) { -+ case 1: -+ if (service) -+ sprintf(s, " (%s, %s)", P_EMPTY(Rate.dst[1]), Rate.Zone); -+ else -+ sprintf(s, " (%s)", Rate.Zone); -+ sort[n].explain = strdup(s); -+ break; -+ case 2: -+ sprintf(s, " (%s)", printrate(&Rate)); -+ sort[n].explain = strdup(s); -+ break; -+ case 8: -+ sort[n].explain = strdup(P_EMPTY(getComment(i, comment))); -+ break; -+ case 9: /* used by list */ -+ { -+ double cpm = Rate.Duration > 0 ? 60 * Rate.Price / Rate.Duration : 99.99; -+ -+ if (Rate.Price == 0) -+ cpm = Rate.Basic; -+ -+ sprintf(s, "%s%c" -+ "%s%c%s%c%s%c%s%c" -+ "%s%c" -+ "%.3f%c%.4f%c%.4f%c%.2f%c%.3f%c" -+ "%s%c%.2f", -+ prefix2provider_variant(Rate.prefix, prov), DEL, -+ Rate.Provider, DEL, P_EMPTY(Rate.Zone), DEL, P_EMPTY(Rate.Day), DEL, P_EMPTY(Rate.Hour), DEL, -+ currency, DEL, /* Fixme: global or per -+ Provider?? wg. EURO */ -+ Rate.Charge, DEL, Rate.Basic, DEL, Rate.Price, DEL, Rate.Duration, DEL, cpm, DEL, -+ takt_str(&Rate), DEL, Rate.Sales); -+ sort[n].explain = strdup(s); -+ } -+ break; -+ default: -+ sort[n].explain = strdup(""); -+ break; -+ } -+ -+ n++; -+ } /* if */ -+ else if(verbose && *msg) -+ print_msg(PRT_V, "%s\n", msg); -+ -+ } /* else 99 */ -+ } /* for i */ -+ if (service) -+ num = getServiceNum(0); /* get next service num */ -+ else -+ num = 0; -+ } while (num && *num); -+ if (explain < 10) { -+ qsort((void *) sort, n, sizeof(SORT), compare_func); -+ if (lcr && n) { -+ RATE Cheap; -+ int res = getLeastCost(&Rate, &Cheap, booked, -1); -+ -+ if (res != UNKNOWN) { -+ sort[n].prefix = Cheap.prefix; -+ sort[n].rate = Cheap.Charge; -+ sort[n].name = Cheap.Provider; -+ sprintf(s, "(Cheapest: %s %s %s %s)", Cheap.dst[0], Cheap.dst[1], Cheap.dst[2], P_EMPTY(Cheap.Zone)); -+ sort[n].explain = strdup(s); -+ n++; -+ } /* res */ -+ } /* lcr */ -+ } /* explain */ -+ return (n); -+} /* compute */ -+ -+static void print_header(void) -+{ -+ printf("Eine %d Sekunden lange Verbindung von %s nach %s kostet am %s\n", -+ duration, formatNumber("%F", &srcnum), formatNumber("%F", &destnum), -+ ctime(&start)); -+} -+ -+static void printList(int n) -+{ -+ int i; -+ -+ if (header) -+ print_header(); -+ if (n > best) -+ n = best; -+ -+ for (i = 0; i < n; i++) -+ printf("%s\n", sort[i].explain); -+} -+ -+static void result(int n) -+{ -+ -+ register int i; -+ -+ if (header) -+ print_header(); -+ -+ if (n > best) -+ n = best; -+ for (i = 0; i < n; i++) -+ printf("%s %s %8.3f %s\n", -+ Provider(sort[i].prefix), currency, sort[i].rate, sort[i].explain); -+} /* result */ -+ -+ -+static void purge(int n) -+{ -+ register int i; -+ -+ for (i = 0; i < n; i++) -+ if (sort[i].explain) -+ free(sort[i].explain); -+} /* purge */ -+ -+/* -+ Werktag -+ Wochenende -+ Ortszone -+ Regionalzone -+ Fernzone -+ Handy -+ Internet -+ 0..23 Uhr -+ */ -+ -+#define STARTHOUR 8 -+ -+static void printTable(char *num) -+{ -+ register int n, d, i, h, lasthour; -+ auto struct tm *tm; -+ auto SORT last[_MAXLAST]; -+ auto int used[MAXPROVIDER]; -+ auto int hours[MAXPROVIDER]; -+ auto int weight[MAXPROVIDER]; -+ auto int useds = 0, maxhour; -+ auto SORT2 wsort[MAXPROVIDER]; -+ static int firsttime = 1; -+ int first; -+ int prefix; -+ -+ memset(used, 0, sizeof(used)); -+ memset(hours, 0, sizeof(hours)); -+ memset(weight, 0, sizeof(weight)); -+ -+ for (d = 0; d < 3; d++) { /* Werktag, Samstag, Sonntag */ -+ last[0].prefix = UNKNOWN; -+ lasthour = UNKNOWN; -+ -+ buildtime(); -+ tm = localtime(&start); -+ -+ if (!d) { /* first time */ -+ while (tm->tm_wday != 5) { /* find next Friday */ -+ start += (60 * 60 * 24); -+ tm = localtime(&start); -+ } /* while */ -+ } -+ else /* erst Samstag, dann */ -+ start += (60 * 60 * 24); /* Sonntag */ -+ -+ splittime(); -+ buildtime(); -+ -+ hour = STARTHOUR; -+ min = 0; -+ -+ first = 1; -+ -+ while (1) { -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ n = compute(num); -+ -+ if (header && first && d == 0 && firsttime) -+ print_header(); -+ -+ if (header && first) { -+ switch (d) { -+ case 0 : printf("\nWerktag:\n"); break; -+ case 1 : printf("\nSamstag:\n"); break; -+ case 2 : printf("\nSonntag:\n"); break; -+ } /* switch */ -+ -+ first = 0; -+ } /* if */ -+ -+ if (last[0].prefix == UNKNOWN) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ if (sort[i].prefix) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* if */ -+ } /* for */ -+ } /* if */ -+ -+ if (lasthour == UNKNOWN) -+ lasthour = hour; -+ -+ if (sort[0].prefix != last[0].prefix) { -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ last[i].prefix = sort[i].prefix; -+ last[i].rate = sort[i].rate; -+ last[i].explain = strdup(sort[i].explain); -+ } /* for */ -+ -+ lasthour = hour; -+ } /* if */ -+ -+ purge(n); -+ -+ hour++; -+ -+ if (hour == 24) -+ hour = 0; -+ else if (hour == STARTHOUR) -+ break; -+ } /* while */ -+ -+ for (i = 0; i < min(n, MAXLAST); i++) { -+ -+ if (!i) { -+ if ((lasthour == STARTHOUR) && (hour == STARTHOUR)) -+ printf(" immer %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ else -+ printf(" %02d:00 .. %02d:59 %s = %s %s%s\n", -+ lasthour, hour - 1, Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } -+ else -+ printf(" %s = %s %s%s\n", -+ Provider(last[i].prefix), -+ currency, -+ double2str(last[i].rate, 5, 3, DEB), -+ last[i].explain); -+ } /* for */ -+ -+ used[last[0].prefix]++; -+ -+ if (lasthour >= hour) -+ h = ((24 - lasthour) + hour); -+ else -+ h = hour - lasthour; -+ -+ hours[last[0].prefix] += h; -+ -+ if ((lasthour > 8) && (lasthour < 21)) -+ h *= 2; -+ -+ weight[last[0].prefix] += h * (d ? 1 : 5); -+ -+ } /* for */ -+ -+ if (usestat) { -+ printf("\nProvider(s) used:\n"); -+ -+ maxhour = 9999999; -+ useds = 0; -+ -+ for (i = 0; i < MAXPROVIDER; i++) -+ if (used[i]) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(i), used[i], hours[i], weight[i]); -+ -+ wsort[useds].weight = weight[i]; -+ wsort[useds].index = i; -+ -+ useds++; -+ -+ if (hours[i] < maxhour) -+ maxhour = hours[i]; -+ } /* if */ -+ -+ if ((best < MAXPROVIDER) && (best < useds)) { -+ printf("Retrying with only %d provider(s), eliminating %d provider(s)\n", best, useds - best); -+ -+ qsort((void *) wsort, useds, sizeof(SORT2), compare2); -+ -+ for (i = 0; i < useds; i++) { -+ printf("%s %d times, %d hours, weight = %d\n", -+ Provider(wsort[i].index), used[wsort[i].index], hours[wsort[i].index], weight[wsort[i].index]); -+ -+ if (i == best - 1) -+ printf("\n"); -+ -+ if (i >= best - 1) -+ ignore[wsort[i].index]++; -+ } /* for */ -+ -+ if (firsttime) -+ printTable(num); -+ -+ firsttime = 0; -+ -+ } /* if */ -+ } /* if */ -+} /* printTable */ -+ -+ -+static void clean_up() -+{ -+ if (providers) -+ free(providers); -+ providers = 0; -+ fromarea = 0; -+ table = list = header = explain = 0; -+ usestat = 0; -+ duration = LCR_DURATION; -+ wanted_day = '\0'; -+ takt = 99999; -+ if (comment) -+ free(comment); -+ comment = 0; -+ sortby = 0; -+ need_dest = 1; -+} -+ -+static char * sub_sp(char *p) -+{ -+ char *o = p; -+ int allupper=1; -+ for (; *p; p++) -+ if(!isupper(*p) && *p != '_' && !isdigit(*p)) { /* e.g. _DEMD1 */ -+ allupper = 0; -+ break; -+ } -+ if (!allupper) -+ for (p = o; *p; p++) -+ if(*p == '_') -+ *p = ' '; -+ return o; -+} -+static void doit(int i, int argc, char *argv[]) -+{ -+ int n; -+ int prefix; -+ char *num; -+ -+ post_init(); -+ memset(ignore, 0, sizeof(ignore)); -+ if (!need_dest && i == 0) { -+ i = 0; -+ argc = 1; -+ argv[0] = "2345"; -+ } -+ while (i < argc) { -+ num = sub_sp(argv[i]); -+ if (explain == 55) { -+ if (n_providers) { -+ destnum.nprovider = pnum2prefix_variant(providers[0], 0); -+ Strncpy(destnum.provider, getProvider(destnum.nprovider), TN_MAX_PROVIDER_LEN); -+ normalizeNumber(num, &destnum, TN_NO_PROVIDER); -+ } -+ else -+ normalizeNumber(num, &destnum, TN_ALL); -+ printf("%s => %s \n", num, formatNumber("%l - %p", &destnum)); -+ i++; -+ continue; -+ } -+ else if (explain == 52) { // enum Servce names -+ -+ int first = 1; -+ char *p; -+ -+ do { -+ p = getServiceNames(first); -+ if (p) -+ printf("%s\n", p); -+ first = 0; -+ } -+ while (p); -+ return; -+ } -+ destnum.nprovider = UNKNOWN; -+ if (provider2prefix(num, &prefix)) /* set provider if it is in -+ number */ -+ normalizeNumber(num, &destnum, TN_PROVIDER); -+ if (table) -+ printTable(num); -+ else { -+ n = compute(num); -+ if (list) -+ printList(n); -+ else if (explain < 10) -+ result(n); -+ purge(n); -+ } -+ i++; -+ } /* while */ -+ clean_up(); -+} -+ -+static void err(char *s) -+{ -+ print_msg(PRT_A, "%s - '%s'\n", s, strerror(errno)); -+ if (is_daemon == 2) -+ kill(getppid(), SIGTERM); -+ exit(2); -+} -+ -+static int handle_client(int fd) -+{ -+ char buffer[BUFSIZ]; -+ int argc, n, i; -+ char **argv; -+ char *p; -+ -+ if ((n = read(fd, buffer, BUFSIZ)) < 0) -+ err("Read"); -+ if (n) { -+ argv = calloc(sizeof(char *), 20); -+ -+ buffer[n] = '\0'; -+ if (verbose) -+ fprintf(stderr, "got '%s'\n", buffer); -+ argc = 0; -+ argv[argc++] = strdup(myname); -+ p = strtok(buffer, "\t\n "); -+ while (p) { -+ argv[argc++] = strdup(p); -+ p = strtok(0, "\t\n "); -+ if (argc >= 20) -+ break; -+ } -+ time(&start); /* set time of call */ -+ splittime(); /* date time my be overridden by opts */ -+ we_are_daemon = 1; -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (shutdown(fd, 0) < 0) /* no read any more */ -+ err("shutdown"); -+ if (dup2(fd, STDOUT_FILENO) < 0) /* stdout to sock */ -+ err("dup"); -+ doit(i, argc, argv); -+ fflush(stdout); -+ fclose(stdout); -+ } -+ for (i = 0; i < argc; i++) -+ free(argv[i]); -+ free(argv); -+ } -+ return n == 0 ? -1 : 0; -+} -+ -+void catch_sig(int sig) -+{ -+ print_msg(PRT_A, "Signal %d\n", sig); -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ err("Sig"); -+} -+ -+static void del_sock(void) -+{ -+ if (getppid() > 0) { -+ unlink(socket_file); -+ if (pid_dir) -+ unlink(pid_file); -+ } -+} -+ -+static volatile sig_atomic_t stopped = 0; -+static volatile sig_atomic_t reinit = 0; -+ -+static void catch_term(int sig) -+{ -+ stopped = 1; -+} -+ -+static void catch_hup(int sig) -+{ -+ print_msg(PRT_A, "Signal %d restarting %s\n", sig, myname); -+ del_sock(); -+ execvp(myname, hup_argv); -+ print_msg(PRT_A, "- failed\n"); -+} -+ -+static void do_reinit(void) -+{ -+ /* deinit(), init() doesn't */ -+ reinit=0; -+} -+ -+/* thank's to Jochen Erwied for this: */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) \ -+ -+#endif -+ -+static void setup_daemon() -+{ -+ int sock; -+ struct sockaddr_un sa; -+ struct sockaddr_in client; -+ fd_set active_fd_set, read_fd_set; -+ char *sock_name = socket_file; -+ socklen_t size; -+ struct stat stat_buf; -+ int i; -+ pid_t pid; -+ char pidname[] = "isdnrate.pid"; -+ FILE *fp; -+ -+ if (verbose) -+ fprintf(stderr, "Setup sockets\n"); -+ signal(SIGTERM, catch_term); -+ signal(SIGINT, catch_sig); -+ signal(SIGHUP, catch_hup); -+ -+ if (is_daemon == 2) { /* go background */ -+ -+ fprintf(stderr, "Going background\n"); -+ verbose = 0; -+ pid = fork(); -+ if (pid < 0) -+ err("Going bg failed"); -+ else if (pid > 0) { -+ exit(EXIT_SUCCESS); -+ } -+ } -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (bind(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't bind sock"); -+ -+ stat(sock_name, &stat_buf); -+ chmod(sock_name, stat_buf.st_mode | S_IWOTH | S_IWGRP); -+/* should better have perm wwwrun.nogroup */ -+ -+ if (listen(sock, SOMAXCONN) < 0) -+ err("Can't listen"); -+ if (pid_dir) { -+ pid_file = malloc(strlen(pid_dir) + strlen(pidname) + 2); -+ strcpy(pid_file, pid_dir); -+ if (pid_file[strlen(pid_file) - 1] != '/') -+ strcat(pid_file, "/"); -+ strcat(pid_file, pidname); -+ if ((fp = fopen(pid_file, "w")) == 0) -+ fprintf(stderr, "Can't write %s\n", pid_file); -+ else { -+ fprintf(fp, "%d\n", getpid()); -+ fclose(fp); -+ } -+ } -+ atexit(del_sock); -+ FD_ZERO(&active_fd_set); -+ FD_SET(sock, &active_fd_set); -+ while (!stopped) { -+ if (reinit) -+ do_reinit(); -+ read_fd_set = active_fd_set; -+ if (TEMP_FAILURE_RETRY(select(FD_SETSIZE, &read_fd_set, 0, 0, 0)) < 0) -+ err("select"); -+ for (i = 0; i < FD_SETSIZE; i++) -+ if (FD_ISSET(i, &read_fd_set)) { -+ if (i == sock) { /* request on orig */ -+ int new; -+ -+ size = sizeof(client); -+ if ((new = accept(sock, (struct sockaddr *) &client, &size)) < 0) -+ err("accept"); -+ if (verbose) -+ fprintf(stderr, "Accepted %d\n", new); -+ FD_SET(new, &active_fd_set); -+ } -+ else { /* already connected */ -+ pid_t pid; -+ int status; -+ -+ if (verbose) -+ fprintf(stderr, "Handle client %d\n", i); -+ pid = fork(); -+ if (pid == 0) { -+ handle_client(i); -+ _exit(EXIT_SUCCESS); -+ } -+ else if (pid < 0) -+ err("fork"); -+ else { -+ if (waitpid(pid, &status, 0) != pid) -+ err("waitpid"); -+ close(i); -+ FD_CLR(i, &active_fd_set); -+ } -+ } /* if i */ -+ } /* if ISSET */ -+ } /* while */ -+ del_sock(); -+ exit(EXIT_SUCCESS); -+} -+ -+static int connect_2_daemon(int argc, char *argv[]) -+{ -+ int sock; -+ struct sockaddr_un sa; -+ char *sock_name = socket_file; -+ size_t size; -+ int i, c, len; -+ char *p, *q, buffer[BUFSIZ]; -+ -+ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) -+ err("Can't open socket"); -+ sa.sun_family = AF_UNIX; -+ strcpy(sa.sun_path, sock_name); -+ size = offsetof(struct sockaddr_un, sun_path) + strlen(sa.sun_path) + 1; -+ -+ if (connect(sock, (struct sockaddr *) &sa, size) < 0) -+ err("Can't connect sock"); -+ p = buffer; -+ optind = 0; /* reinit */ -+ len = 0; -+ while ((c = getopt(argc, argv, options)) != EOF && len < BUFSIZ - 10) { -+ switch (c) { -+ case '?': -+ case 'C': -+ break; -+ case 'D': -+ if (optarg && atoi(optarg) == 3) ; /* goon, kill a running -+ daemon */ -+ else -+ break; -+ default: -+ *p++ = '-'; -+ *p++ = c; -+ len += 3; -+ if (optarg) -+ for (q = optarg; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ break; -+ } -+ } -+ for (i = optind; i < argc; i++) { -+ for (q = argv[i]; *q && len < BUFSIZ - 10; len++) -+ *p++ = *q++; -+ *p++ = ' '; -+ len++; -+ } -+ *--p = '\x0'; -+ i = write(sock, buffer, strlen(buffer) + 1); -+ if (i < 0) -+ err("Write sock"); -+ while ((i = read(sock, buffer, BUFSIZ)) > 0) -+ write(1, buffer, i); -+ close(sock); -+ return EXIT_SUCCESS; -+} -+ -+ -+int main(int argc, char *argv[], char *envp[]) -+{ -+ register int i; -+ sigset_t unblock_set; -+ -+ myname = argv[0]; -+ myshortname = basename(myname); -+ -+ time(&start); -+ splittime(); -+ socket_file = strdup(SOCKNAME); -+ /* borrowed from isdnlog.c, thanks */ -+ hup_argv = argv; -+ sigemptyset(&unblock_set); -+ sigaddset(&unblock_set, SIGHUP); -+ sigprocmask(SIG_UNBLOCK, &unblock_set, NULL); -+ -+ if ((i = opts(argc, argv)) || need_dest == 0) { -+ if (is_client) -+ exit(connect_2_daemon(argc, argv)); -+ else -+ init(); -+ if (is_daemon) { -+ clean_up(); -+ setup_daemon(); -+ } -+ else -+ doit(i, argc, argv); -+ } -+ else { -+ print_msg(PRT_A, usage, myshortname, myshortname, options); -+ print_msg(PRT_A, "\n"); -+ print_msg(PRT_A, "\t-a \tall=show old and newer rates (default actual only)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-b best\tshow only the first <best> provider(s) (default %d)\n", MAXPROVIDER); -+ print_msg(PRT_A, "\t-d d[.m[.y]] | {W|N|E}\tstart date of call (default now)\n"); -+ print_msg(PRT_A, "\t-f areacode\tyou are calling from <areacode>\n"); -+ print_msg(PRT_A, "\t-h h[:m[:s]]\tstart time of call (default now)\n"); -+ print_msg(PRT_A, "\t-l duration\tduration of call in seconds (default %d seconds)\n", LCR_DURATION); -+ print_msg(PRT_A, "\t-o \t show only booked providers\n"); -+ print_msg(PRT_A, "\t-p prov|B[,prov...]\t show only these providers\n"); -+ print_msg(PRT_A, "\t-s \t consider 'Destination' as a service name\n"); -+ print_msg(PRT_A, "\t-t takt\t\tshow providers if chargeduration<=takt\n"); -+ print_msg(PRT_A, "\t-v [level]\tverbose\n"); -+ print_msg(PRT_A, "\t-x prov|B[,prov...]\t exclude these providers\n"); -+ -+ print_msg(PRT_A, "\tOutput and run options\n"); -+ print_msg(PRT_A, "\t-C\trun as client, connecting to a running daemon\n"); -+ print_msg(PRT_A, "\t-CD3\tkill a running daemon\n"); -+ print_msg(PRT_A, "\t-D\trun as daemon\n"); -+ print_msg(PRT_A, "\t-D2\trun as daemon & go background\n"); -+ print_msg(PRT_A, "\t-G which\tshow raw data\n"); -+ print_msg(PRT_A, "\t-H\tshow a header\n"); -+ print_msg(PRT_A, "\t-L\tshow a detailed list\n"); -+ print_msg(PRT_A, "\t-O sOcket-path\twrite socket to this file (def:tmp/isdnrate)\n"); -+ print_msg(PRT_A, "\t-P pid-dir\twrite own PID to pid-dir/isdnrate.pid\n"); -+ print_msg(PRT_A, "\t-N\tparse the given telefon numbers\n"); -+ print_msg(PRT_A, "\t-S[v|n]\tsort by v=VBN, n=Name, default=Charge\n"); -+ print_msg(PRT_A, "\t-T\tshow a table of day/night week/weekend\n"); -+ print_msg(PRT_A, "\t-U\tshow usage stats for table\n"); -+ print_msg(PRT_A, "\t-V\tshow version info\n"); -+ print_msg(PRT_A, "\t-X\texplain each rate\n"); -+ print_msg(PRT_A, "\t-X2\texplain more\n"); -+ print_msg(PRT_A, "\t-X comment\tprint <comment> from C:tag\n"); -+ print_msg(PRT_A, "\t-Z show entry from getLeastCost\n"); -+ print_msg(PRT_A, "\n\te.g.\t%s -b5 -f30 -TH -t1 Zaire\n", myshortname); -+ } /* else */ -+/* deinit(); Fixme: this SIGSEGVs in exitHoliday */ -+ return (0); -+} /* isdnrate */ -diff -Naur isdn4k-utils-orig//isdnlog/tools/rate.c isdn4k-utils/isdnlog/tools/rate.c ---- isdn4k-utils-orig//isdnlog/tools/rate.c 2002-07-06 09:22:33.000000000 +1000 -+++ isdn4k-utils/isdnlog/tools/rate.c 2010-12-04 20:44:03.786672226 +1000 -@@ -1773,6 +1773,7 @@ - number=realloc(number, numbers*sizeof(int)); - number[numbers-1]=i; - skip: -+ ; - } - - while (isblank(*s)) s++; -@@ -2344,6 +2345,7 @@ - } - return UNKNOWN; - done: -+ ; - } - } - } -diff -Naur isdn4k-utils-orig//lib/libtools.c isdn4k-utils/lib/libtools.c ---- isdn4k-utils-orig//lib/libtools.c 1999-11-04 02:13:36.000000000 +1000 -+++ isdn4k-utils/lib/libtools.c 2010-12-04 20:44:03.786672226 +1000 -@@ -711,6 +711,7 @@ - case 'r': _mode |= R_OK; - break; - default : -+ ; - } - } - -diff -Naur isdn4k-utils-orig//Makefile isdn4k-utils/Makefile ---- isdn4k-utils-orig//Makefile 2002-07-20 05:03:49.000000000 +1000 -+++ isdn4k-utils/Makefile 2010-12-04 20:43:57.890005560 +1000 -@@ -132,12 +132,6 @@ - - install: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i install; done -- @if [ -c $(DESTDIR)/dev/isdnctrl0 ] && ls -l $(DESTDIR)/dev/isdnctrl0 | egrep "[[:space:]]45,[[:space:]]+64[[:space:]]" > /dev/null; \ -- then \ -- /bin/echo -e '(some) ISDN devices already exist, not creating them.\nUse scripts/makedev.sh manually if necessary.'; \ -- else \ -- sh scripts/makedev.sh $(DESTDIR) ; \ -- fi - - uninstall: rootperm - set -e; for i in `echo $(SUBDIRS)`; do $(MAKE) -C $$i uninstall; done diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD index a96f6b8c5..8ed938017 100644 --- a/core/jfsutils/PKGBUILD +++ b/core/jfsutils/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $ +# $Id: PKGBUILD 142848 2011-11-17 00:38:27Z bisson $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> + pkgname=jfsutils pkgver=1.1.15 -pkgrel=2 -pkgdesc="JFS filesystem utilities" -arch=(i686 x86_64 'mips64el') -url="http://jfs.sourceforge.net" +pkgrel=3 +pkgdesc='JFS filesystem utilities' +arch=('i686' 'x86_64' 'mips64el') +url='http://jfs.sourceforge.net' license=('GPL') groups=('base') depends=('util-linux-ng') -source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz) -md5sums=('8809465cd48a202895bc2a12e1923b5d') +source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz") +sha1sums=('291e8bd9d615cf3d27e4000117c81a3602484a50') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --sbindir=/sbin - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --sbindir=/sbin + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index e44659732..23d04ad5c 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 123997 2011-05-15 19:12:02Z tpowa $ +# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kbd pkgver=1.15.3 -pkgrel=1 +pkgrel=2.1 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" @@ -11,7 +11,8 @@ license=('GPL') depends=('glibc') source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz fix-es.po.patch) -md5sums=('8143e179a0f3c25646ce5085e8777200') +md5sums=('8143e179a0f3c25646ce5085e8777200' + '4ded3edb50fb7a3277bae6a870cee812') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -25,6 +26,7 @@ build() { mv data/keymaps/i386/olpc/pt{,-olpc}.map mv data/keymaps/i386/dvorak/no{,-dvorak}.map mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map + mv data/keymaps/i386/colemak/{en-latin9,colemak}.map ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes @@ -40,5 +42,3 @@ package() { mkdir ${pkgdir}/bin ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } -md5sums=('8143e179a0f3c25646ce5085e8777200' - '4ded3edb50fb7a3277bae6a870cee812') diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD index fe3fc5845..691cc0add 100644 --- a/core/keyutils/PKGBUILD +++ b/core/keyutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 133067 2011-07-27 11:57:16Z stephane $ +# $Id: PKGBUILD 142277 2011-11-07 20:10:07Z stephane $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=keyutils pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Key Management Utilities" arch=(i686 x86_64 'mips64el') url="http://www.kernel.org" diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD index 741c8c390..ddc548bbc 100644 --- a/core/krb5/PKGBUILD +++ b/core/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139635 2011-10-03 23:42:42Z stephane $ +# $Id: PKGBUILD 142223 2011-11-06 13:03:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 -pkgver=1.9.1 -pkgrel=4 +pkgver=1.9.2 +pkgrel=1.1 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64' 'mips64el') url="http://web.mit.edu/kerberos/" @@ -17,13 +17,13 @@ backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar krb5-kadmind krb5-kdc - krb5-1.9.1-config-script.patch - krb5-1.9.1-canonicalize-fallback.patch) -sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' + krb5-kpropd + krb5-1.9.1-config-script.patch) +sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7342410760cf44bfa01bb99bb4c49e12496cb46f' - '238c268fa6cb42fc7324ab54db9abda5cd77f833') + '7f402078fa65bb9ff1beb6cbbbb017450df78560' + '7342410760cf44bfa01bb99bb4c49e12496cb46f') options=('!emptydirs') build() { @@ -41,9 +41,6 @@ build() { # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch - # FS#25515 - patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch - # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 @@ -75,8 +72,9 @@ package() { install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d install -dm 755 "${pkgdir}"/usr/share/aclocal install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal diff --git a/testing/krb5/krb5-1.9.1-2011-006.patch b/core/krb5/krb5-1.9.1-2011-006.patch index 05a22caf5..05a22caf5 100644 --- a/testing/krb5/krb5-1.9.1-2011-006.patch +++ b/core/krb5/krb5-1.9.1-2011-006.patch diff --git a/testing/krb5/krb5-kdc b/core/krb5/krb5-kpropd index 05a03411e..a0077d68e 100644 --- a/testing/krb5/krb5-kdc +++ b/core/krb5/krb5-kpropd @@ -4,27 +4,27 @@ . /etc/rc.conf . /etc/rc.d/functions -PID=`pidof -o %PPID /usr/sbin/krb5kdc` +PID=`pidof -o %PPID /usr/sbin/kpropd` case "$1" in start) - stat_busy "Starting Kerberos Authentication" + stat_busy "Starting Kerberos Database Propagation Daemon" if [ -z "$PID" ]; then - /usr/sbin/krb5kdc + /usr/sbin/kpropd -S fi if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - add_daemon krb5-kdc + add_daemon kpropd stat_done fi ;; stop) - stat_busy "Stopping Kerberos Authentication" + stat_busy "Stopping Kerberos Database Propagation Daemon" [ ! -z "$PID" ] && kill $PID &> /dev/null if [ $? -gt 0 ]; then stat_fail else - rm_daemon krb5-kdc + rm_daemon kpropd stat_done fi ;; diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index 0654acb67..5edb5273f 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 128667 2011-06-25 12:14:07Z allan $ +# $Id: PKGBUILD 142066 2011-11-04 23:35:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less pkgver=444 -pkgrel=1 +pkgrel=2.1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64' 'mips64el') url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('56f9f76ffe13f70155f47f6b3c87d421') +source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('56f9f76ffe13f70155f47f6b3c87d421' + 'd5fafbd94a9cfdeaad0c82143a033fe5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 26aaa626d..00ea96ae3 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,30 +1,38 @@ -# $Id: PKGBUILD 137228 2011-09-06 21:10:41Z dan $ +# $Id: PKGBUILD 140981 2011-10-20 13:56:51Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> -# Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=libarchive pkgver=2.8.5 -pkgrel=1 +pkgrel=2.1 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") -md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90') -sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + release-2.8-fixes.patch) +md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90' + '14dbbf2d31d68d8eedb93ec5531f3b0c') +sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d' + 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 < ../release-2.8-fixes.patch ./configure --prefix=/usr --without-xml2 make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -D -m644 COPYING $pkgdir/usr/share/licenses/libarchive/COPYING + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING } diff --git a/testing/libarchive/release-2.8-fixes.patch b/core/libarchive/release-2.8-fixes.patch index c21eeaa7b..c21eeaa7b 100644 --- a/testing/libarchive/release-2.8-fixes.patch +++ b/core/libarchive/release-2.8-fixes.patch diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD index 53495e583..6fc8cb8eb 100644 --- a/core/libcap/PKGBUILD +++ b/core/libcap/PKGBUILD @@ -1,17 +1,18 @@ -#$Id: PKGBUILD 132720 2011-07-25 12:05:15Z allan $ +#$Id: PKGBUILD 142211 2011-11-06 08:56:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libcap pkgver=2.22 -pkgrel=1 +pkgrel=2.1 pkgdesc="POSIX 1003.1e capabilities" arch=('i686' 'x86_64' 'mips64el') url="http://sites.google.com/site/fullycapable/" license=('GPL2') depends=('glibc' 'attr') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz) -md5sums=('b4896816b626bea445f0b3849bdd4077') +source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${pkgname}-${pkgver}.tar.gz{,.asc}) +md5sums=('b4896816b626bea445f0b3849bdd4077' + '9d0983e25e5a251d098507f9561d2b27') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch b/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch new file mode 100644 index 000000000..1fce472b7 --- /dev/null +++ b/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch @@ -0,0 +1,344 @@ +From bc937fc4ff6715e9bee939041fa02be0755d7d58 Mon Sep 17 00:00:00 2001 +From: Guy Harris <guy@alum.mit.edu> +Date: Sat, 13 Nov 2010 17:42:47 -0800 +Subject: [PATCH] Add support for libnl 2.x, adapted from a newer version of the iw command. + +--- + config.h.in | 3 ++ + configure | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + configure.in | 40 ++++++++++++++++++---- + pcap-linux.c | 58 ++++++++++++++++++++++++------- + 4 files changed, 184 insertions(+), 25 deletions(-) + +diff --git a/config.h.in b/config.h.in +index f988e8f..3b9ce3c 100644 +--- a/config.h.in ++++ b/config.h.in +@@ -52,6 +52,9 @@ + /* if libnl exists */ + #undef HAVE_LIBNL + ++/* if libnl exists and is version 2.x */ ++#undef HAVE_LIBNL_2_x ++ + /* Define to 1 if you have the <limits.h> header file. */ + #undef HAVE_LIMITS_H + +diff --git a/configure b/configure +index c99c1ab..7338dee 100755 +--- a/configure ++++ b/configure +@@ -7340,7 +7340,93 @@ fi + + + if test x$with_libnl != xno ; then +- { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 ++ # ++ # Try libnl 2.x first. ++ # ++ { echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5 ++echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-lnl $LIBS" ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char nl_socket_alloc (); ++int ++main () ++{ ++return nl_socket_alloc (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (ac_try="$ac_link" ++case "(($ac_try" in ++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ++ *) ac_try_echo=$ac_try;; ++esac ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 ++ (eval "$ac_link") 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && { ++ test -z "$ac_c_werror_flag" || ++ test ! -s conftest.err ++ } && test -s conftest$ac_exeext && ++ $as_test_x conftest$ac_exeext; then ++ ac_cv_lib_nl_nl_socket_alloc=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 ++ ++ ac_cv_lib_nl_nl_socket_alloc=no ++fi ++ ++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5 ++echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; } ++if test $ac_cv_lib_nl_nl_socket_alloc = yes; then ++ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL 1 ++_ACEOF ++ ++ ++cat >>confdefs.h <<\_ACEOF ++#define HAVE_LIBNL_2_x 1 ++_ACEOF ++ ++ ++else ++ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5 + echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; } + if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -7402,18 +7488,30 @@ fi + { echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5 + echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; } + if test $ac_cv_lib_nl_nl_handle_alloc = yes; then +- LIBS="-lnl $LIBS" ++ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" + + cat >>confdefs.h <<\_ACEOF + #define HAVE_LIBNL 1 + _ACEOF + ++ + else +- if test x$with_libnl = xyes ; then +- { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 ++ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5 + echo "$as_me: error: libnl support requested but libnl not found" >&2;} + { (exit 1); exit 1; }; } +- fi ++ fi ++ ++fi ++ + + fi + +diff --git a/configure.in b/configure.in +index 16eadf9..ef801ed 100644 +--- a/configure.in ++++ b/configure.in +@@ -445,13 +445,39 @@ linux) + with_libnl=$withval,,) + + if test x$with_libnl != xno ; then +- AC_CHECK_LIB(nl, nl_handle_alloc, +- LIBS="-lnl $LIBS" +- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]), +- if test x$with_libnl = xyes ; then +- AC_MSG_ERROR([libnl support requested but libnl not found]) +- fi +- ) ++ # ++ # Try libnl 2.x first. ++ # ++ AC_CHECK_LIB(nl, nl_socket_alloc, ++ [ ++ # ++ # Yes, we have libnl 2.x. ++ # ++ LIBS="-lnl-genl -lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x]) ++ ], ++ [ ++ # ++ # No, we don't; do we have libnl 1.x? ++ # ++ AC_CHECK_LIB(nl, nl_handle_alloc, ++ [ ++ # ++ # Yes. ++ # ++ LIBS="-lnl $LIBS" ++ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]) ++ ], ++ [ ++ # ++ # No, we don't have libnl at all. ++ # ++ if test x$with_libnl = xyes ; then ++ AC_MSG_ERROR([libnl support requested but libnl not found]) ++ fi ++ ]) ++ ]) + fi + + AC_LBL_TPACKET_STATS +diff --git a/pcap-linux.c b/pcap-linux.c +index f8b3f10..deabbc4 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -527,8 +527,37 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path, + return 1; + } + ++#ifndef HAVE_LIBNL_2_x ++/* libnl 2.x compatibility code */ ++ ++#define nl_sock nl_handle ++ ++static inline struct nl_handle * ++nl_socket_alloc(void) ++{ ++ return nl_handle_alloc(); ++} ++ ++static inline void ++nl_socket_free(struct nl_handle *h) ++{ ++ nl_handle_destroy(h); ++} ++ ++static inline int ++__genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache) ++{ ++ struct nl_cache *tmp = genl_ctrl_alloc_cache(h); ++ if (!tmp) ++ return -ENOMEM; ++ *cache = tmp; ++ return 0; ++} ++#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache ++#endif /* !HAVE_LIBNL_2_x */ ++ + struct nl80211_state { +- struct nl_handle *nl_handle; ++ struct nl_sock *nl_sock; + struct nl_cache *nl_cache; + struct genl_family *nl80211; + }; +@@ -536,23 +565,26 @@ struct nl80211_state { + static int + nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + { +- state->nl_handle = nl_handle_alloc(); +- if (!state->nl_handle) { ++ int err; ++ ++ state->nl_sock = nl_socket_alloc(); ++ if (!state->nl_sock) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to allocate netlink handle", device); + return PCAP_ERROR; + } + +- if (genl_connect(state->nl_handle)) { ++ if (genl_connect(state->nl_sock)) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to connect to generic netlink", device); + goto out_handle_destroy; + } + +- state->nl_cache = genl_ctrl_alloc_cache(state->nl_handle); +- if (!state->nl_cache) { ++ err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache); ++ if (err < 0) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: failed to allocate generic netlink cache", device); ++ "%s: failed to allocate generic netlink cache: %s", ++ device, strerror(-err)); + goto out_handle_destroy; + } + +@@ -568,7 +600,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + out_cache_free: + nl_cache_free(state->nl_cache); + out_handle_destroy: +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + return PCAP_ERROR; + } + +@@ -577,7 +609,7 @@ nl80211_cleanup(struct nl80211_state *state) + { + genl_family_put(state->nl80211); + nl_cache_free(state->nl_cache); +- nl_handle_destroy(state->nl_handle); ++ nl_socket_free(state->nl_sock); + } + + static int +@@ -605,7 +637,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice); + NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -626,7 +658,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -685,7 +717,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + 0, NL80211_CMD_DEL_INTERFACE, 0); + NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex); + +- err = nl_send_auto_complete(state->nl_handle, msg); ++ err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { + if (err == -ENFILE) { + /* +@@ -706,7 +738,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + return PCAP_ERROR; + } + } +- err = nl_wait_for_ack(state->nl_handle); ++ err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { + if (err == -ENFILE) { + /* +-- +1.7.3.5 + diff --git a/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch b/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch new file mode 100644 index 000000000..219494200 --- /dev/null +++ b/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch @@ -0,0 +1,159 @@ +From 9545ff8e2670db02652f9cf781aafdd6bac58ac4 Mon Sep 17 00:00:00 2001 +From: Guy Harris <guy@alum.mit.edu> +Date: Sun, 14 Nov 2010 13:48:19 -0800 +Subject: [PATCH] Libnl 2.x returns its own error codes, not errnos; handle that. + +While we're at it, don't special-case ENFILE for "delete monitor device" +operations; that's not like "add monitor device", where we want to drive +on if a device with that name already exists. +--- + pcap-linux.c | 76 ++++++++++++++++++++++++++-------------------------------- + 1 files changed, 34 insertions(+), 42 deletions(-) + +diff --git a/pcap-linux.c b/pcap-linux.c +index deabbc4..5d291e9 100644 +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -527,7 +527,9 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path, + return 1; + } + +-#ifndef HAVE_LIBNL_2_x ++#ifdef HAVE_LIBNL_2_x ++#define get_nl_errmsg nl_geterror ++#else + /* libnl 2.x compatibility code */ + + #define nl_sock nl_handle +@@ -544,6 +546,8 @@ nl_socket_free(struct nl_handle *h) + nl_handle_destroy(h); + } + ++#define get_nl_errmsg strerror ++ + static inline int + __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache) + { +@@ -584,7 +588,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device) + if (err < 0) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: failed to allocate generic netlink cache: %s", +- device, strerror(-err)); ++ device, get_nl_errmsg(-err)); + goto out_handle_destroy; + } + +@@ -639,10 +643,17 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + + err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { ++#ifdef HAVE_LIBNL_2_x ++ if (err == -NLE_FAILURE) { ++#else + if (err == -ENFILE) { ++#endif + /* + * Device not available; our caller should just +- * keep trying. ++ * keep trying. (libnl 2.x maps ENFILE to ++ * NLE_FAILURE; it can also map other errors ++ * to that, but there's not much we can do ++ * about that.) + */ + nlmsg_free(msg); + return 0; +@@ -653,17 +664,24 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + */ + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: nl_send_auto_complete failed adding %s interface: %s", +- device, mondevice, strerror(-err)); ++ device, mondevice, get_nl_errmsg(-err)); + nlmsg_free(msg); + return PCAP_ERROR; + } + } + err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { ++#ifdef HAVE_LIBNL_2_x ++ if (err == -NLE_FAILURE) { ++#else + if (err == -ENFILE) { ++#endif + /* + * Device not available; our caller should just +- * keep trying. ++ * keep trying. (libnl 2.x maps ENFILE to ++ * NLE_FAILURE; it can also map other errors ++ * to that, but there's not much we can do ++ * about that.) + */ + nlmsg_free(msg); + return 0; +@@ -674,7 +692,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + */ + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, + "%s: nl_wait_for_ack failed adding %s interface: %s", +- device, mondevice, strerror(-err)); ++ device, mondevice, get_nl_errmsg(-err)); + nlmsg_free(msg); + return PCAP_ERROR; + } +@@ -719,45 +737,19 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state, + + err = nl_send_auto_complete(state->nl_sock, msg); + if (err < 0) { +- if (err == -ENFILE) { +- /* +- * Device not available; our caller should just +- * keep trying. +- */ +- nlmsg_free(msg); +- return 0; +- } else { +- /* +- * Real failure, not just "that device is not +- * available. +- */ +- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: nl_send_auto_complete failed deleting %s interface: %s", +- device, mondevice, strerror(-err)); +- nlmsg_free(msg); +- return PCAP_ERROR; +- } ++ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, ++ "%s: nl_send_auto_complete failed deleting %s interface: %s", ++ device, mondevice, get_nl_errmsg(-err)); ++ nlmsg_free(msg); ++ return PCAP_ERROR; + } + err = nl_wait_for_ack(state->nl_sock); + if (err < 0) { +- if (err == -ENFILE) { +- /* +- * Device not available; our caller should just +- * keep trying. +- */ +- nlmsg_free(msg); +- return 0; +- } else { +- /* +- * Real failure, not just "that device is not +- * available. +- */ +- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, +- "%s: nl_wait_for_ack failed adding %s interface: %s", +- device, mondevice, strerror(-err)); +- nlmsg_free(msg); +- return PCAP_ERROR; +- } ++ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, ++ "%s: nl_wait_for_ack failed adding %s interface: %s", ++ device, mondevice, get_nl_errmsg(-err)); ++ nlmsg_free(msg); ++ return PCAP_ERROR; + } + + /* +-- +1.7.3.5 + diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD index 596e16fcc..f4489153a 100644 --- a/core/libpcap/PKGBUILD +++ b/core/libpcap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103439 2010-12-19 15:40:24Z andyrtr $ +# $Id: PKGBUILD 142215 2011-11-06 10:21:27Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=libpcap pkgver=1.1.1 -pkgrel=2 +pkgrel=4 pkgdesc="A system-independent interface for user-level packet capture" arch=('i686' 'x86_64' 'mips64el') url="http://www.tcpdump.org/" @@ -11,10 +11,15 @@ license=('BSD') depends=('glibc' 'libnl' 'sh') makedepends=('flex') source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz) + #Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch + #Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch) sha256sums=('508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85') - + #'194aa268a3397be3ba406b7102dbdbc14fc16c6e4b535d0a0fab6b04d414563a' + #'f1f31c3e2b064f4c9d0e643e8ed1874a65ec17f770362f8ffa3b3f9ee9dc71bb') build() { cd ${srcdir}/${pkgname}-${pkgver} + #patch -p1 -i "${srcdir}"/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch + #patch -p1 -i "${srcdir}"/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch ./configure --prefix=/usr --enable-ipv6 make } diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD index a0a0f5045..513901bbc 100644 --- a/core/libpipeline/PKGBUILD +++ b/core/libpipeline/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 119506 2011-04-11 19:53:04Z andyrtr $ +# $Id: PKGBUILD 142205 2011-11-06 08:47:46Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=libpipeline pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" arch=('i686' 'x86_64' 'mips64el') url="http://libpipeline.nongnu.org/" license=('GPL') -groups=('base') depends=('glibc') options=('!libtool') source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD index 7031203ce..6e571f9ee 100644 --- a/core/librpcsecgss/PKGBUILD +++ b/core/librpcsecgss/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121187 2011-04-29 07:12:44Z stephane $ +# $Id: PKGBUILD 142792 2011-11-15 09:00:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com> pkgname=librpcsecgss pkgver=0.19 -pkgrel=5 +pkgrel=7 pkgdesc="Library for RPCSECGSS support" arch=('i686' 'x86_64' 'mips64el') url="http://www.citi.umich.edu/projects/nfsv4/linux/" @@ -21,6 +21,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="$pkgdir/" install diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD index c9f8a44b9..e04b555db 100644 --- a/core/libsasl/PKGBUILD +++ b/core/libsasl/PKGBUILD @@ -8,7 +8,7 @@ #pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') pkgname=libsasl pkgver=2.1.23 -pkgrel=8 +pkgrel=8.1 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index 76b0b92b1..dd52c6771 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 138461 2011-09-24 03:53:12Z allan $ +# $Id: PKGBUILD 141370 2011-10-30 06:46:45Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # NOTE: requires rebuilt with each new gcc version pkgname=('libtool' 'libltdl') -pkgver=2.4 -pkgrel=5 +pkgver=2.4.2 +pkgrel=2 pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig} nopic.patch) -md5sums=('4e6144439d95d7332dc50ace6dd24c55' +md5sums=('2ec8997e0c07249eb4cbd072417d70fe' + '1e6ba57420c82c663c85e745d11c7eed' '46443cf0e3e1b4e4891812af73385615') build() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i "${srcdir}/nopic.patch" + [ "$CARCH" = "mips64el" ] && patch -Np1 -i "${srcdir}/nopic.patch" ./configure --prefix=/usr make } @@ -30,7 +31,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.2') groups=('base-devel') install=libtool.install diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD index 2391c2cbd..ff8b34a8b 100644 --- a/core/libusb-compat/PKGBUILD +++ b/core/libusb-compat/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 101197 2010-11-28 15:10:38Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 142817 2011-11-15 17:24:12Z andrea $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: arjan <arjan@archlinux.org> pkgname=libusb-compat pkgver=0.1.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64' 'mips64el') depends=('libusb' 'sh') url="http://libusb.sourceforge.net/" license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } diff --git a/core/libusb/PKGBUILD b/core/libusb/PKGBUILD index e097bc137..c7ab438b6 100644 --- a/core/libusb/PKGBUILD +++ b/core/libusb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 101194 2010-11-28 15:05:41Z tpowa $ +# $Id: PKGBUILD 142115 2011-11-05 10:15:17Z tpowa $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libusb pkgver=1.0.8 -pkgrel=1 +pkgrel=2 depends=('glibc') pkgdesc="Library to enable user space application programs to communicate with USB devices." arch=(i686 x86_64 'mips64el') @@ -19,6 +19,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package () { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD index 0939ae538..5134874b1 100644 --- a/core/linux-atm/PKGBUILD +++ b/core/linux-atm/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 107943 2011-01-28 01:46:01Z stephane $ +# $Id: PKGBUILD 142964 2011-11-19 08:22:13Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Surain Mallawa Arachchi <mas@crc32.net> pkgname=linux-atm -pkgver=2.5.1 -pkgrel=2 +pkgver=2.5.2 +pkgrel=1 pkgdesc="Drivers and tools to support ATM networking under Linux." arch=('i686' 'x86_64' 'mips64el') depends=('glibc') url="http://linux-atm.sourceforge.net/" license=(GPL) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tgz +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz man-pages.patch) -md5sums=('9560b0e1f410a05b849dfdab465dd758' - '181390736336cdb615ae32f1ae5acfa6') options=(!libtool !makeflags) +md5sums=('d49499368c3cf15f73a05d9bce8824a8' + '181390736336cdb615ae32f1ae5acfa6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,4 +27,3 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } - diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index 97cddc85d..4d31f5f17 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -4,7 +4,7 @@ pkgname=logrotate pkgver=3.8.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64' 'mips64el') url="https://fedorahosted.org/logrotate/" diff --git a/core/m4/PKGBUILD b/core/m4/PKGBUILD index 01f5364f0..749937e1a 100644 --- a/core/m4/PKGBUILD +++ b/core/m4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129843 2011-06-29 04:25:22Z allan $ +# $Id: PKGBUILD 142068 2011-11-04 23:36:00Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=m4 pkgver=1.4.16 -pkgrel=1 +pkgrel=2.1 pkgdesc="The GNU macro processor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/m4" @@ -12,11 +12,15 @@ license=('GPL3') groups=('base-devel') depends=('glibc' 'bash') install=m4.install -source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz) -md5sums=('7548ec061a1ba993790159764f522d0e') +source=(ftp://ftp.gnu.org/gnu/m4/$pkgname-$pkgver.tar.xz{,.sig} + m4-1.4.16-readlink-einval.patch) +md5sums=('7548ec061a1ba993790159764f522d0e' + 'eebe5c94e74e7551e2e30c5844f1b653' + 'cea138fa9b568d06e46269611cec8dd0') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i $srcdir/m4-1.4.16-readlink-einval.patch ./configure --prefix=/usr make } diff --git a/core/m4/m4-1.4.16-readlink-einval.patch b/core/m4/m4-1.4.16-readlink-einval.patch new file mode 100644 index 000000000..6a987510d --- /dev/null +++ b/core/m4/m4-1.4.16-readlink-einval.patch @@ -0,0 +1,12 @@ +diff -up m4-1.4.16/tests/test-readlink.h.orig m4-1.4.16/tests/test-readlink.h +--- m4-1.4.16/tests/test-readlink.h.orig 2011-09-19 12:44:58.745546826 +0200 ++++ m4-1.4.16/tests/test-readlink.h 2011-09-19 12:46:00.079548410 +0200 +@@ -38,7 +38,7 @@ test_readlink (ssize_t (*func) (char con + ASSERT (errno == ENOENT); + errno = 0; + ASSERT (func ("", buf, sizeof buf) == -1); +- ASSERT (errno == ENOENT); ++ ASSERT (errno == ENOENT || errno == EINVAL); + errno = 0; + ASSERT (func (".", buf, sizeof buf) == -1); + ASSERT (errno == EINVAL); diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index e2e797741..e17c3f9cf 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $ +# $Id: PKGBUILD 141112 2011-10-24 09:59:21Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> + pkgname=mkinitcpio-busybox -pkgver=1.18.5 +pkgver=1.19.2 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.busybox.net/" license=('GPL') depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' - '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') +options=('!buildflags') +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config') +sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9' + '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8') build() { - cd "${srcdir}/busybox-${pkgver}" + cd "$srcdir/busybox-$pkgver" - unset CFLAGS CXXFLAGS case $CARCH in - x86_64) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; - i686) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; mips64el) - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-O2 -march=loongson2f -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config ;; + local safeflags='loongson2f -O2 -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;; + *) + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;; esac + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config + make } package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" } + # vim:set ts=2 sw=2 et: diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 31a9d4330..86160a203 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.5 -# Sun Aug 14 01:22:25 2011 +# Busybox version: 1.19.2 +# Sun Oct 16 15:24:19 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -89,6 +89,8 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SIZE_VS_SPEED=0 CONFIG_FEATURE_FAST_TOP=y @@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y @@ -106,6 +109,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y CONFIG_FEATURE_NON_POSIX_CP=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_HWIB is not set @@ -169,12 +173,17 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set # CONFIG_CAL is not set # CONFIG_CATV is not set CONFIG_CHGRP=y @@ -212,10 +221,8 @@ CONFIG_FALSE=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set -# CONFIG_ID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y @@ -262,12 +269,11 @@ CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set # CONFIG_SYNC is not set -# CONFIG_TAC is not set +CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y @@ -279,7 +285,6 @@ CONFIG_UNIQ=y # CONFIG_UUENCODE is not set CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set # CONFIG_WHOAMI is not set CONFIG_YES=y @@ -350,20 +355,13 @@ CONFIG_MKTEMP=y # Editors # # CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -372,6 +370,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -419,7 +425,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set +CONFIG_INIT=y # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -430,6 +436,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # # Login/Password Management Utilities @@ -515,6 +522,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FBSET is not set @@ -523,7 +531,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set # CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -618,10 +626,25 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -662,15 +685,6 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -704,11 +718,17 @@ CONFIG_STRINGS=y # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -781,17 +801,12 @@ CONFIG_IPRULE=y # CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -824,12 +839,14 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" @@ -865,15 +882,19 @@ CONFIG_FEATURE_MIME_CHARSET="" # # CONFIG_IOSTAT is not set # CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set # CONFIG_PMAP is not set # CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set CONFIG_PGREP=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y @@ -894,7 +915,6 @@ CONFIG_FEATURE_PS_WIDE=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y # CONFIG_WATCH is not set # @@ -932,6 +952,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_GETOPTS=y @@ -972,6 +993,7 @@ CONFIG_SH_MATH_SUPPORT=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities @@ -980,6 +1002,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/core/mkinitcpio/PKGBUILD b/core/mkinitcpio/PKGBUILD index 06396efb6..faed61e50 100644 --- a/core/mkinitcpio/PKGBUILD +++ b/core/mkinitcpio/PKGBUILD @@ -1,13 +1,12 @@ pkgname=mkinitcpio -pkgver=0.7.4 +pkgver=0.7.5 pkgrel=1 -epoch=13 pkgdesc="Modular initramfs image creation utility" -arch=('any') +arch=('mips64el') url="http://www.archlinux.org/" license=('GPL') depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' - 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=171-2' 'file' 'gzip') + 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' @@ -17,7 +16,7 @@ replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'patch.patch') backup=(etc/mkinitcpio.conf) -sha256sums=('60ce2c78ecec35a9762c300774753da6870b4469f3b259fe0c116771ff643fd6' +sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9' 'abf6bb9d692838cc2f97f12f0901f0209dbf6f437f9590accd26dbcfc48f1b16') package() { @@ -26,4 +25,6 @@ package() { patch install/base ../patch.patch make DESTDIR="$pkgdir" install -}
\ No newline at end of file +} +sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9' + 'bb6517e0497cc43aea1287e43b0be2892b7af74add5eca3f3740b091f997729e') diff --git a/core/mkinitcpio/patch.patch b/core/mkinitcpio/patch.patch index ce3553557..62dadac32 100644 --- a/core/mkinitcpio/patch.patch +++ b/core/mkinitcpio/patch.patch @@ -1,4 +1,11 @@ -4c4 -< for dir in proc sys dev run usr/{bin,sbin}; do ---- -> for dir in lib32 proc sys dev run usr/{bin,sbin}; do # Added `lib32' like fauno told me to. +--- install/base 2011-10-22 12:37:45.000000000 -0300 ++++ install/base.orig 2011-11-03 19:54:45.574991740 -0300 +@@ -1,7 +1,7 @@ + #!/bin/bash + + build() { +- for dir in new_root proc sys dev run usr/{bin,sbin}; do ++ for dir in new_root proc sys dev run usr/{bin,sbin} lib32; do + add_dir "/$dir" + done + diff --git a/core/mlocate/PKGBUILD b/core/mlocate/PKGBUILD index ff73f4f8b..818bae57c 100644 --- a/core/mlocate/PKGBUILD +++ b/core/mlocate/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118924 2011-04-09 12:46:47Z allan $ +# $Id: PKGBUILD 142070 2011-11-04 23:36:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: lydgate pkgname=mlocate pkgver=0.24 -pkgrel=1 +pkgrel=2 pkgdesc="Faster merging drop-in for slocate" arch=('i686' 'x86_64' 'mips64el') url="http://carolina.mff.cuni.cz/~trmac/blog/mlocate" diff --git a/core/module-init-tools/PKGBUILD b/core/module-init-tools/PKGBUILD index d3299c964..d52b61042 100644 --- a/core/module-init-tools/PKGBUILD +++ b/core/module-init-tools/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 128937 2011-06-25 14:35:00Z dreisner $ +# $Id: PKGBUILD 142296 2011-11-08 00:38:05Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=module-init-tools pkgver=3.16 -pkgrel=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" +pkgrel=2 +pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules" arch=('i686' 'x86_64' 'mips64el') -url="http://kerneltools.org" +url="https://modules.wiki.kernel.org" license=('GPL') depends=('glibc') makedepends=('docbook2x') backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 +source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2" modprobe.conf docfix.patch) md5sums=('bc44832c6e41707b8447e2847d2019f5' - '316f1bda4c21af02b30252eb014a0a55' + '325657db471b3190f685e5a89c9b90e3' '4320d19902ded43bed55c804b065cdc7') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" # fix headers in SGML manpage sources and an XML typo patch -Np0 < "$srcdir/docfix.patch" @@ -30,10 +31,13 @@ build() { } package() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make DESTDIR=$pkgdir install + # extra modprobe.d conf dir + install -dm755 "$pkgdir/lib/modprobe.d" + # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf + install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf" } diff --git a/core/module-init-tools/modprobe.conf b/core/module-init-tools/modprobe.conf index 83865a3af..551bdfbdf 100644 --- a/core/module-init-tools/modprobe.conf +++ b/core/module-init-tools/modprobe.conf @@ -1,3 +1,3 @@ # -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) +# /etc/modprobe.d/modprobe.conf # diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 0ed1392cb..f51d9e2a0 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140252 2011-10-11 00:43:43Z allan $ +# $Id: PKGBUILD 142421 2011-11-09 09:27:32Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr _pkgver=3.1.0 -_patchlevel=p1 +_patchlevel=p3 pkgver=${_pkgver}.${_patchlevel} pkgrel=1 pkgdesc="Multiple-precision floating-point library" @@ -15,10 +15,11 @@ license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz +source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} mpfr-${_pkgver}.${_patchlevel}.patch) md5sums=('6e495841bb026481567006cec0f821c3' - 'ec988293368d4988c76f50d6a3460166') + '293374ee4b01527f8f7889fdfa9016f8' + 'd65858ccddbea968d6580124320fb6a0') build() { cd "${srcdir}/${pkgname}-${_pkgver}" diff --git a/core/mpfr/mpfr-3.1.0.p1.patch b/core/mpfr/mpfr-3.1.0.p1.patch deleted file mode 100644 index 437b1a278..000000000 --- a/core/mpfr/mpfr-3.1.0.p1.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_unlikely -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 -@@ -1 +1 @@ --3.1.0 -+3.1.0-p1 -diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h ---- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 -@@ -988,10 +988,11 @@ - ******************************************************/ - - /* Theses macros help the compiler to determine if a test is -- * likely or unlikely. */ -+ likely or unlikely. The !! is necessary in case x is larger -+ than a long. */ - #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) - # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) --# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) -+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) - #else - # define MPFR_LIKELY(x) (x) - # define MPFR_UNLIKELY(x) (x) -diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h ---- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.1.0" -+#define MPFR_VERSION_STRING "3.1.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c ---- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0"; -+ return "3.1.0-p1"; - } diff --git a/core/mpfr/mpfr-3.1.0.p3.patch b/core/mpfr/mpfr-3.1.0.p3.patch new file mode 100644 index 000000000..16d944047 --- /dev/null +++ b/core/mpfr/mpfr-3.1.0.p3.patch @@ -0,0 +1,393 @@ +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-05 21:39:57.000000000 +0000 +@@ -0,0 +1 @@ ++mpfr_unlikely +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-03 08:17:15.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-05 21:39:57.000000000 +0000 +@@ -1 +1 @@ +-3.1.0 ++3.1.0-p1 +diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h +--- mpfr-3.1.0-a/src/mpfr-impl.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr-impl.h 2011-10-05 21:39:57.000000000 +0000 +@@ -988,10 +988,11 @@ + ******************************************************/ + + /* Theses macros help the compiler to determine if a test is +- * likely or unlikely. */ ++ likely or unlikely. The !! is necessary in case x is larger ++ than a long. */ + #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0) + # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1)) +-# define MPFR_UNLIKELY(x) (__builtin_expect((x),0)) ++# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0)) + #else + # define MPFR_LIKELY(x) (x) + # define MPFR_UNLIKELY(x) (x) +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0" ++#define MPFR_VERSION_STRING "3.1.0-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-05 21:39:57.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0"; ++ return "3.1.0-p1"; + } +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-10-14 10:43:32.000000000 +0000 +@@ -0,0 +1 @@ ++lib-search-path +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-10-14 10:43:32.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p1 ++3.1.0-p2 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p1" ++#define MPFR_VERSION_STRING "3.1.0-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-05 21:39:57.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-10-14 10:43:32.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p1"; ++ return "3.1.0-p2"; + } +diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am +--- mpfr-3.1.0-a/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.am 2011-10-03 08:17:14.000000000 +0000 +@@ -65,8 +65,24 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs +diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in +--- mpfr-3.1.0-a/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 ++++ mpfr-3.1.0-b/tests/Makefile.in 2011-10-03 08:17:35.000000000 +0000 +@@ -1124,11 +1124,27 @@ + TESTS = $(check_PROGRAMS) + TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND) + +-# Option to prevent libtool from generating wrapper scripts for the tests. ++# The -no-install option prevents libtool from generating wrapper scripts ++# for the tests. + # This is useful to easily run the test scripts under valgrind or gdb. + # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033 + # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular. +-AM_LDFLAGS = -no-install ++# ++# The -L$(top_builddir)/src/.libs option is necessary for some platforms, ++# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR ++# library is already installed in the corresponding lib directory: its ++# purpose is to make sure that the local .libs comes first in the library ++# search path (otherwise the tests are linked against the old MPFR library ++# by the LINK command -- see the generated Makefile). See: ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html ++# http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html ++# and ++# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728 ++# ++AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs + all: all-am + + .SUFFIXES: +diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES +--- mpfr-3.1.0-a/PATCHES 2011-11-03 15:15:11.000000000 +0000 ++++ mpfr-3.1.0-b/PATCHES 2011-11-03 15:15:11.000000000 +0000 +@@ -0,0 +1 @@ ++vasprintf +diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION +--- mpfr-3.1.0-a/VERSION 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/VERSION 2011-11-03 15:15:11.000000000 +0000 +@@ -1 +1 @@ +-3.1.0-p2 ++3.1.0-p3 +diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h +--- mpfr-3.1.0-a/src/mpfr.h 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/mpfr.h 2011-11-03 15:15:11.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "3.1.0-p2" ++#define MPFR_VERSION_STRING "3.1.0-p3" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c +--- mpfr-3.1.0-a/src/vasprintf.c 2011-10-03 08:17:09.000000000 +0000 ++++ mpfr-3.1.0-b/src/vasprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -1178,7 +1178,7 @@ + mpfr_exp_t exp; + char * str; + const int spec_g = (spec.spec == 'g' || spec.spec == 'G'); +- const int keep_trailing_zeros = spec_g && spec.alt; ++ const int keep_trailing_zeros = !spec_g || spec.alt; + + /* WARNING: an empty precision field is forbidden (it means precision = 6 + and it should have been changed to 6 before the function call) */ +@@ -1356,7 +1356,7 @@ + else + /* 1 <= |p| */ + { +- size_t nsd; /* Number of significant digits */ ++ size_t str_len; + + /* Determine the position of the most significant decimal digit. */ + exp = floor_log10 (p); +@@ -1365,12 +1365,10 @@ + /* P is too large to print all its integral part digits */ + return -1; + +- np->ip_size = exp + 1; +- +- nsd = spec.prec + np->ip_size; + if (dec_info == NULL) +- { +- str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode); ++ { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */ ++ str = ++ mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode); + register_string (np->sl, str); + } + else +@@ -1379,81 +1377,60 @@ + str = dec_info->str; + } + np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */ ++ str_len = strlen (str); ++ ++ /* integral part */ ++ if (exp > str_len) ++ /* mpfr_get_str gives no trailing zero when p is rounded up to the next ++ power of 10 (p integer, so no fractional part) */ ++ { ++ np->ip_trailing_zeros = exp - str_len; ++ np->ip_size = str_len; ++ } ++ else ++ np->ip_size = exp; + + if (spec.group) + /* thousands separator in integral part */ + np->thousands_sep = MPFR_THOUSANDS_SEPARATOR; + +- if (nsd == 0 || (spec_g && !spec.alt)) +- /* compute how much non-zero digits in integral and fractional +- parts */ ++ /* fractional part */ ++ str += np->ip_size; ++ str_len -= np->ip_size; ++ if (!keep_trailing_zeros) ++ /* remove trailing zeros, if any */ + { +- size_t str_len; +- str_len = strlen (str); /* note: the sign has been skipped */ +- +- if (exp > str_len) +- /* mpfr_get_str doesn't give the trailing zeros when p is a +- multiple of 10 (p integer, so no fractional part) */ +- { +- np->ip_trailing_zeros = exp - str_len; +- np->ip_size = str_len; +- if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; +- } +- else +- /* str may contain some digits which are in fractional part */ ++ char *ptr = str + str_len - 1; /* pointer to the last digit of ++ str */ ++ while ((*ptr == '0') && (str_len != 0)) + { +- char *ptr; +- +- ptr = str + str_len - 1; /* points to the end of str */ +- str_len -= np->ip_size; /* number of digits in fractional +- part */ +- +- if (!keep_trailing_zeros) +- /* remove trailing zeros, if any */ +- { +- while ((*ptr == '0') && (str_len != 0)) +- { +- --ptr; +- --str_len; +- } +- } +- +- if (str_len > INT_MAX) +- /* too many digits in fractional part */ +- return -1; +- +- if (str_len != 0) +- /* some digits in fractional part */ +- { +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = str_len; +- } ++ --ptr; ++ --str_len; + } + } +- else +- /* spec.prec digits in fractional part */ ++ ++ if (str_len > 0) ++ /* some nonzero digits in fractional part */ + { +- if (np->ip_size == exp - 1) +- /* the absolute value of the number has been rounded up to a power +- of ten. +- Insert an additional zero in integral part and put the rest of +- them in fractional part. */ +- np->ip_trailing_zeros = 1; ++ if (str_len > INT_MAX) ++ /* too many digits in fractional part */ ++ return -1; + +- if (spec.prec != 0) +- { +- MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp); +- MPFR_ASSERTD (np->ip_size + spec.prec == nsd); ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_ptr = str; ++ np->fp_size = str_len; ++ } + +- np->point = MPFR_DECIMAL_POINT; +- np->fp_ptr = str + np->ip_size; +- np->fp_size = spec.prec; +- } +- else if (spec.alt) +- np->point = MPFR_DECIMAL_POINT; ++ if (keep_trailing_zeros && str_len < spec.prec) ++ /* add missing trailing zeros */ ++ { ++ np->point = MPFR_DECIMAL_POINT; ++ np->fp_trailing_zeros = spec.prec - np->fp_size; + } ++ ++ if (spec.alt) ++ /* add decimal point even if no digits follow it */ ++ np->point = MPFR_DECIMAL_POINT; + } + + return 0; +diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c +--- mpfr-3.1.0-a/src/version.c 2011-10-14 10:43:32.000000000 +0000 ++++ mpfr-3.1.0-b/src/version.c 2011-11-03 15:15:11.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.0-p2"; ++ return "3.1.0-p3"; + } +diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c +--- mpfr-3.1.0-a/tests/tsprintf.c 2011-10-03 08:17:14.000000000 +0000 ++++ mpfr-3.1.0-b/tests/tsprintf.c 2011-11-03 15:15:11.000000000 +0000 +@@ -475,6 +475,18 @@ + check_sprintf ("-1.", "%- #0.1RG", x); + + /* precision zero */ ++ mpfr_set_d (x, 9.5, MPFR_RNDN); ++ check_sprintf ("9", "%.0RDf", x); ++ check_sprintf ("10", "%.0RUf", x); ++ ++ mpfr_set_d (x, 19.5, MPFR_RNDN); ++ check_sprintf ("19", "%.0RDf", x); ++ check_sprintf ("20", "%.0RUf", x); ++ ++ mpfr_set_d (x, 99.5, MPFR_RNDN); ++ check_sprintf ("99", "%.0RDf", x); ++ check_sprintf ("100", "%.0RUf", x); ++ + mpfr_set_d (x, -9.5, MPFR_RNDN); + check_sprintf ("-10", "%.0RDf", x); + check_sprintf ("-10", "%.0RYf", x); +@@ -1078,6 +1090,23 @@ + mpfr_clear (x); + } + ++static void ++bug20111102 (void) ++{ ++ mpfr_t t; ++ char s[100]; ++ ++ mpfr_init2 (t, 84); ++ mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN); ++ mpfr_sprintf (s, "%.20RNg", t); ++ if (strcmp (s, "1000") != 0) ++ { ++ printf ("Error in bug20111102, expected 1000, got %s\n", s); ++ exit (1); ++ } ++ mpfr_clear (t); ++} ++ + /* In particular, the following test makes sure that the rounding + * for %Ra and %Rb is not done on the MPFR number itself (as it + * would overflow). Note: it has been reported on comp.std.c that +@@ -1161,6 +1190,7 @@ + locale = setlocale (LC_ALL, "C"); + #endif + ++ bug20111102 (); + native_types (); + hexadecimal (); + binary (); diff --git a/core/nano/PKGBUILD b/core/nano/PKGBUILD index bdd3d4a5a..08eb2d3e7 100644 --- a/core/nano/PKGBUILD +++ b/core/nano/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101599 2010-11-29 19:19:03Z andyrtr $ +# $Id: PKGBUILD 142207 2011-11-06 08:47:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd <judd@archlinux.org> pkgname=nano pkgver=2.2.6 -pkgrel=1 +pkgrel=2.1 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD index a54e03e1e..4c816ce0b 100644 --- a/core/ncurses/PKGBUILD +++ b/core/ncurses/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 118921 2011-04-09 12:39:04Z allan $ +# $Id: PKGBUILD 142072 2011-11-04 23:36:06Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=ncurses pkgver=5.9 -pkgrel=1 +pkgrel=2.1 pkgdesc="System V Release 4.0 curses emulation library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/ncurses/" license=('MIT') depends=('glibc') -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1' + '014ffdbbfec6d41a9a89d6cbe6434638') build() { cd ${srcdir}/ diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index 5c761e2a2..5b450319c 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139639 2011-10-04 00:28:38Z eric $ +# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=net-tools pkgver=1.60.20110819cvs -pkgrel=1 +pkgrel=3 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64 'mips64el') license=('GPL2') diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index efed9d5b0..2dcb2954c 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 138811 2011-09-28 12:19:49Z stephane $ +# $Id: PKGBUILD 142181 2011-11-05 20:47:37Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.26 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') url="http://www.openldap.org/" license=('custom') -makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl') +makedepends=('libfetch' 'libltdl' 'libsasl') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz slapd slapd.default ntlm.patch) md5sums=('f36f3086031dd56ae94f722ffae8df5e' @@ -43,7 +43,7 @@ check() { package_libldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries" - depends=('libsasl' 'libfetch' 'e2fsprogs') + depends=('libsasl' 'libfetch') backup=('etc/openldap/ldap.conf') options=('!libtool') @@ -66,7 +66,7 @@ package_libldap() { package_openldap() { pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server" - depends=("libldap>=${pkgver}" 'libtool' 'util-linux') + depends=("libldap>=${pkgver}" 'libltdl') backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd') options=('!libtool' 'emptydirs') install=openldap.install diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD index fcdcb99f9..af1f711ec 100644 --- a/core/openssh/PKGBUILD +++ b/core/openssh/PKGBUILD @@ -5,7 +5,7 @@ pkgname=openssh pkgver=5.9p1 -pkgrel=4 +pkgrel=4.1 pkgdesc='Free version of the SSH connectivity tools' arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index a0237888d..e5c5da68a 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -17,24 +17,23 @@ backup=('etc/ssl/openssl.cnf') source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" 'fix-manpages.patch' 'no-rpath.patch' + 'gnu-linux-mips64el-gcc.patch' 'ca-dir.patch') md5sums=('7040b89c4c58c7a1016c0dfa6e821c86' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' + 'd7115f0cc44df346d7b68c681819f94b' '3bf51be3a1bbd262be46dc619f92aa90') +[ "$CARCH" = "mips64el" ] && \ +makedepends=('imake') + # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd $srcdir/$pkgname-$_ver - if [ "${CARCH}" == 'x86_64' ]; then - openssltarget='linux-x86_64' - elif [ "${CARCH}" == 'i686' ]; then - openssltarget='linux-elf' - fi - # avoid conflicts with other man pages # see http://www.linuxfromscratch.org/patches/downloads/openssl/ patch -p1 -i $srcdir/fix-manpages.patch @@ -42,11 +41,32 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch + + patch -p0 -i $srcdir/gnu-linux-mips64el-gcc.patch + + case "${CARCH}" in + 'x86_64') + openssltarget='linux-x86_64' ;; + 'i686') + openssltarget='linux-elf' ;; + 'mips64el') +# ./config + openssltarget='gnu-linux-mips64el-gcc' ;; + # openssltarget='linux-generic32' ;; + esac + # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + if [ "$CARCH" = "mips64el" ]; then + ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ + shared zlib enable-md2 \ + "${openssltarget}" -Wa,--noexecstack "${CFLAGS}" + else ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 \ "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + + fi make depend make diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index f8bbaf00c..778b58e6e 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134648 2011-08-07 10:12:55Z tpowa $ +# $Id: PKGBUILD 141297 2011-10-28 10:57:26Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam -pkgver=1.1.4 -pkgrel=1 +pkgver=1.1.5 +pkgrel=1.1 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -14,11 +14,12 @@ makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') [ "$CARCH" = "mips64el" ] && \ makedepends=('flex' 'docbook-xml>=4.4' 'docbook-xsl') backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) -source=(http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 +source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 + #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2 other) options=('!libtool' '!emptydirs') -md5sums=('e9af5fb27bb22edb55d077e2888b3ebc' +md5sums=('927ee5585bdec5256c75117e9348aa47' 'e2788389a6c59224110a45fcff30e02b' '6e6c8719e5989d976a14610f340bd33a') @@ -56,3 +57,6 @@ _EOT # set unix_chkpwd uid chmod +s $pkgdir/sbin/unix_chkpwd } +md5sums=('927ee5585bdec5256c75117e9348aa47' + 'e2788389a6c59224110a45fcff30e02b' + '6e6c8719e5989d976a14610f340bd33a') diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD index 6865c1091..e66b9163b 100644 --- a/core/patch/PKGBUILD +++ b/core/patch/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 99945 2010-11-19 15:36:41Z stephane $ +# $Id: PKGBUILD 142074 2011-11-04 23:36:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=patch pkgver=2.6.1 -pkgrel=2 +pkgrel=3.1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc') +makedepends=('ed') optdepends=('ed: Interpret the patch as an ed script; for patch -e functionality(deprecated)') -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz patch-2.6.1-get-arg.patch) -md5sums=('d758eb96d3f75047efc004a720d33daf' '45cd5709adbbcdcb3ab95dc43559c07c') +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + patch-2.6.1-get-arg.patch) +md5sums=('d758eb96d3f75047efc004a720d33daf' + 'f7953f3e472fae5118815e6138372e22' + '45cd5709adbbcdcb3ab95dc43559c07c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} # Fixed argument type for --get # see https://bugzilla.redhat.com/show_bug.cgi?id=553624 - patch -Np1 -i ../patch-2.6.1-get-arg.patch + patch -Np1 -i $srcdir/patch-2.6.1-get-arg.patch ./configure --prefix=/usr --mandir=/usr/share/man make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install } diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 0ee60d462..28017b729 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 115045 2011-03-16 15:19:12Z jgc $ +# $Id: PKGBUILD 142117 2011-11-05 10:16:08Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils -pkgver=3.1.7 -pkgrel=4 +pkgver=3.1.8 +pkgrel=1 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64 'mips64el') license=('GPL2') @@ -11,8 +11,9 @@ url="http://mj.ucw.cz/pciutils.html" optdepends=('sh: required by update-pciids') makedepends=('wget') depends=('glibc') -source=(ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('35222edb86b50a6641352c66fe829b2e') +source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) +md5sums=('79312f138311d29291c7d44d624cd37e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index 00b5cc450..cd77d8c4f 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 136192 2011-08-24 03:36:11Z allan $ +# $Id: PKGBUILD 141157 2011-10-25 05:06:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.13 -pkgrel=2 +pkgver=8.20 +pkgrel=1.1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 - r661.diff) -md5sums=('5e595edbcded141813fa1a10dbce05cb' - '70e2725b46ff6f3f114ce5067fd03405') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('a1931c70e1273e3450d5036fe273d25c' + '41c2dceac25c6ebf192ec128021be339') build() { cd "${srcdir}"/${pkgname}-${pkgver} - # http://bugs.exim.org/show_bug.cgi?id=1136 - patch -Np2 -i "${srcdir}"/r661.diff - sed -i '12140d' testdata/testoutput2 - [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties + ./configure --prefix=/usr --enable-jit \ + --enable-utf8 --enable-unicode-properties make } diff --git a/core/pcre/r661.diff b/core/pcre/r661.diff deleted file mode 100644 index 7bed4ce2e..000000000 --- a/core/pcre/r661.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 -+++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 -@@ -2295,8 +2295,13 @@ - A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. - It seems that the appearance of a nested POSIX class supersedes an apparent - external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or --a digit. Also, unescaped square brackets may also appear as part of class --names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. -+a digit. -+ -+In Perl, unescaped square brackets may also appear as part of class names. For -+example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for -+[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not -+seem right at all. PCRE does not allow closing square brackets in POSIX class -+names. - - Arguments: - ptr pointer to the initial [ -@@ -2314,6 +2319,7 @@ - { - if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) - ptr++; -+ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; - else - { - if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 720f72aae..e033b61c4 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: francois <francois.archlinux.org> pkgname=perl pkgver=5.14.2 -pkgrel=2 +pkgrel=2.1 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64 'mips64el') license=('GPL' 'PerlArtistic') diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD index f1f0657a1..ed96f3380 100644 --- a/core/pkg-config/PKGBUILD +++ b/core/pkg-config/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124806 2011-05-24 14:39:31Z stephane $ +# $Id: PKGBUILD 142076 2011-11-04 23:36:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=pkg-config pkgver=0.26 -pkgrel=1 +pkgrel=2.1 pkgdesc="A system for managing library compile/link flags" arch=('i686' 'x86_64' 'mips64el') url="http://pkgconfig.freedesktop.org/wiki/" @@ -18,7 +18,8 @@ source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) md5sums=('47525c26a9ba7ba14bf85e01509a7234') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} + # Use system popt ./configure --prefix=/usr --with-installed-popt @@ -26,11 +27,11 @@ build() { } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD index 41f132a87..09ec1ca1a 100644 --- a/core/popt/PKGBUILD +++ b/core/popt/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 105825 2011-01-12 14:39:27Z stephane $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142191 2011-11-06 02:28:05Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=popt pkgver=1.16 -pkgrel=3 +pkgrel=4 pkgdesc="A commandline option parser" arch=('i686' 'x86_64' 'mips64el') url="http://rpm5.org" @@ -28,14 +29,14 @@ package() { make DESTDIR="${pkgdir}" install # move libs in /lib - install -Dm755 ${pkgdir}/usr/lib/libpopt.so.0.0.0 \ + install -Dm755 "${pkgdir}"/usr/lib/libpopt.so.0.0.0 \ ${pkgdir}/lib/libpopt.so.0.0.0 - rm ${pkgdir}/usr/lib/libpopt.so* - ln -sf /lib/libpopt.so ${pkgdir}/usr/lib/libpopt.so - ln -sf libpopt.so.0 ${pkgdir}/lib/libpopt.so - ln -sf libpopt.so.0.0.0 ${pkgdir}/lib/libpopt.so.0 + rm "${pkgdir}"/usr/lib/libpopt.so* + ln -sf /lib/libpopt.so "${pkgdir}"/usr/lib/libpopt.so + ln -sf libpopt.so.0 "${pkgdir}"/lib/libpopt.so + ln -sf libpopt.so.0.0.0 "${pkgdir}"/lib/libpopt.so.0 # install license - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index 193da1a19..57cb47e14 100644 --- a/core/ppl/PKGBUILD +++ b/core/ppl/PKGBUILD @@ -16,6 +16,11 @@ md5sums=('ce014f153a28006009db207ca953a984') build() { cd $srcdir/ppl-$pkgver + # Workaround madd.d making a SIGILL on a NaN. + [ "$CARCH" == "mips64el" ] && { + CFLAGS=${CFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} + CXXFLAGS=${CXXFLAGS/-march=loongson2f/-march=mips3 -mtune=loongson2f} + } ./configure --prefix=/usr --enable-interfaces="c,cxx" make } diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD index 038c0f52c..e9e6d7c32 100644 --- a/core/ppp/PKGBUILD +++ b/core/ppp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 109460 2011-02-09 19:24:24Z stephane $ +# $Id: PKGBUILD 142987 2011-11-19 20:10:23Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=ppp pkgver=2.4.5 -pkgrel=2 +pkgrel=3 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" arch=(i686 x86_64 'mips64el') url="http://www.samba.org/ppp/" diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD index 68f497aa1..1040e8ba9 100644 --- a/core/pptpclient/PKGBUILD +++ b/core/pptpclient/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 99891 2010-11-19 12:45:55Z allan $ +# $Id: PKGBUILD 142906 2011-11-18 07:42:07Z pierre $ # Maintainer: Daniel Isenmann <daniel @ archlinux.org> # Contributor: Mark Nikkel <mnikkel@gmail.com> -pkgname=pptpclient +pkgname=pptpclient pkgver=1.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP." arch=('i686' 'x86_64' 'mips64el') url="http://pptpclient.sourceforge.net/" license=('GPL') depends=('ppp' 'iproute2') -backup=(etc/ppp/options.pptp) -source=(http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz) +backup=('etc/ppp/options.pptp') +source=("http://downloads.sourceforge.net/sourceforge/pptpclient/pptp-$pkgver.tar.gz") md5sums=('4c3d19286a37459a632c7128c92a9857') -build() { +build() { cd $srcdir/pptp-$pkgver - + # use our CFLAGS and LDFLAGS sed -i -e "/CFLAGS =/ c\CFLAGS = ${CFLAGS}" Makefile sed -i -e "/LDFLAGS =/ c\LDFLAGS = ${LDFLAGS}" Makefile - + # adjust ip path sed -i 's#/bin/ip#/usr/sbin/ip#' routing.c - + make } diff --git a/core/procinfo-ng/PKGBUILD b/core/procinfo-ng/PKGBUILD index 65e348f20..45fa85e68 100644 --- a/core/procinfo-ng/PKGBUILD +++ b/core/procinfo-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102696 2010-12-09 23:17:33Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 142353 2011-11-08 18:37:45Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> pkgname=procinfo-ng pkgver=2.0.304 -pkgrel=2 +pkgrel=3 pkgdesc="Displays useful information from /proc" arch=('i686' 'x86_64' 'mips64el') url="http://procinfo-ng.sourceforge.net/" @@ -13,10 +13,10 @@ depends=('ncurses' 'perl') provides=('procinfo') conflicts=('procinfo') replaces=('procinfo') -source=(http://downloads.sourceforge.net/project/procinfo-ng/procinfo-ng/2.0.304/${pkgname}-${pkgver}.tar.bz2 +source=(http://downloads.sourceforge.net/project/procinfo-ng/procinfo-ng/${pkgver}/${pkgname}-${pkgver}.tar.bz2 ftp://ftp.archlinux.org/other/procinfo-ng/procinfo-18.tar.gz) -md5sums=('ed018fe37becc36ceb1ebe3ed909c4d2' '27658d0a69040aca05a65b9888599d50') -sha1sums=('da2176a505bcdf65c4eadcf5a2e056fb7a3f84af' '8bc75669cbd27775c3a837209425c5ce76238ebc') +sha1sums=('da2176a505bcdf65c4eadcf5a2e056fb7a3f84af' + '8bc75669cbd27775c3a837209425c5ce76238ebc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index f44e6be37..e86d50fcb 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 129370 2011-06-27 05:49:47Z 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=2 +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64' 'mips64el') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -15,23 +15,26 @@ depends=('glibc' 'ncurses') backup=('etc/inputrc') options=('!emptydirs') install=readline.install -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz +source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} inputrc) if [ $_patchlevel -gt 00 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p)) + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) done fi md5sums=('67948acb2ca081f23359d0256e9a271c' + '928f7d248320a65e43c2dc427e99582b' '58d54966c1191db45973cb3191ac621a' - '83287d52a482f790dfb30ec0a8746669') + '83287d52a482f790dfb30ec0a8746669' + '8e6a51e2e0e6e45a82752e3692c111ac' + '0665020ea118e8434bd145fb71f452cc' + '285361ca6d48c51ae2428157e174e812') build() { cd ${srcdir}/${pkgname}-$_basever - for p in ../readline${_basever//./}-*; do - [ -e "$p" ] || continue - msg "applying patch ${p}" - patch -Np0 -i ${p} + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) done # Remove RPATH from shared objects (FS#14366) diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index c723d2922..769a72908 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 102064 2010-12-04 10:58:12Z allan $ +# $Id: PKGBUILD 142934 2011-11-18 14:00:58Z pierre $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs pkgver=3.6.21 -pkgrel=3 +pkgrel=4 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64' 'mips64el') -url="http://www.kernel.org/pub/linux/utils/fs/reiserfs/README" +url="http://www.kernel.org/" license=('GPL') groups=('base') -depends=('util-linux-ng>=2.16') -source=(http://www.kernel.org/pub/linux/utils/fs/reiserfs/reiserfsprogs-${pkgver}.tar.bz2) +depends=('util-linux-ng') +source=("ftp://ftp.archlinux.org/other/reiserfsprogs/reiserfsprogs-${pkgver}.tar.bz2") md5sums=('0639cefac8f8150536cfa7531c2aa2d2') build() { @@ -20,6 +20,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index e17e77cb5..040eef5b6 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109452 2011-02-09 18:22:15Z stephane $ +# $Id: PKGBUILD 142840 2011-11-16 20:25:37Z dan $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill pkgver=0.4 -pkgrel=2 +pkgrel=3 pkgdesc="A tool for enabling and disabling wireless devices" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwireless.org/en/users/Documentation/rfkill" diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 2d3c66e67..7ddf7799e 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 103509 2010-12-20 18:40:07Z andyrtr $ +# $Id: PKGBUILD 142757 2011-11-14 20:23:15Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=3 +pkgrel=5 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') @@ -25,6 +25,11 @@ build() { make } +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install diff --git a/core/run-parts/PKGBUILD b/core/run-parts/PKGBUILD index e459b8bf5..792ecf9c2 100644 --- a/core/run-parts/PKGBUILD +++ b/core/run-parts/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 136455 2011-08-29 16:51:36Z pierre $ +# $Id: PKGBUILD 142725 2011-11-13 21:03:15Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=run-parts -pkgver=4.0.2 +pkgver=4.0.4 pkgrel=1 pkgdesc='run scripts or programs in a directory' arch=('i686' 'x86_64' 'mips64el') url='http://packages.qa.debian.org/d/debianutils.html' license=('GPL') depends=('glibc') -source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") -sha256sums=('c2fca92e93437ea5f0904f12847779d67b13d4b9d6ca85b8213e678a03ed76dc') +source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz") +sha256sums=('9a14722c7422c6d16f30c80b74201d9c803beeef2bb4c004964d0979eaa1232f') build() { cd $srcdir/debianutils-$pkgver diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD index a61ecc2c7..b1497971a 100644 --- a/core/sdparm/PKGBUILD +++ b/core/sdparm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 99522 2010-11-14 22:33:34Z andrea $ +# $Id: PKGBUILD 142819 2011-11-15 17:24:15Z andrea $ # Maintainer: # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: grimi@poczta.fm pkgname=sdparm pkgver=1.06 -pkgrel=1 +pkgrel=2 pkgdesc="An utility similar to hdparm but for SCSI devices" arch=('i686' 'x86_64' 'mips64el') url="http://sg.danny.cz/sg/sdparm.html" @@ -15,14 +15,20 @@ source=("http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz") md5sums=('5e19913658bb4f9849ddd909e0f47cde') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install - install -Dm644 COPYING $pkgdir/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD index 78365b98a..b83f77aaf 100644 --- a/core/sed/PKGBUILD +++ b/core/sed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100052 2010-11-20 03:28:20Z stephane $ +# $Id: PKGBUILD 142078 2011-11-04 23:36:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=sed pkgver=4.2.1 -pkgrel=3 +pkgrel=4.1 pkgdesc="GNU stream editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/sed" @@ -13,16 +13,22 @@ groups=('base') depends=('acl' 'sh') makedepends=('gettext') install=sed.install -source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz) -md5sums=('f0fd4d7da574d4707e442285fd2d3b86') +source=(ftp://ftp.gnu.org/pub/gnu/sed/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('f0fd4d7da574d4707e442285fd2d3b86' + '91871b227dbf0916e019ba1fb0fbfdf3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD index c43c4cb19..46322c125 100644 --- a/core/sqlite3/PKGBUILD +++ b/core/sqlite3/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 138770 2011-09-28 04:21:04Z andyrtr $ +# $Id: PKGBUILD 142094 2011-11-05 09:05:38Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl') -_amalgamationver=3070800 +_amalgamationver=3070900 _amalgamationver2=${_amalgamationver/00/} _docver=${_amalgamationver} #3070700 pkgver=${_amalgamationver2//0/.} -pkgrel=2 +pkgrel=1.1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -18,10 +18,8 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542' +md5sums=('dce303524736fe89a76b8ed29d566352' 'c1cdbc5544034d9012e421e75a5e4890') -sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724' - 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index d26d3fc2f..a78fcaeb9 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135926 2011-08-20 07:14:30Z allan $ +# $Id: PKGBUILD 141376 2011-10-30 06:48:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.2 +_ver=1.8.3p1 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 +pkgrel=1.1 pkgdesc="Give certain users the ability to run some commands as root" arch=('i686' 'x86_64' 'mips64el') url="http://www.sudo.ws/sudo/" @@ -13,9 +13,10 @@ license=('custom') depends=('glibc' 'pam') backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') -source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('000f458e7391be9fdf459a9ad6a4912a' +md5sums=('7becc572fa97f94cf721a2ee8299c45b' + 'b0726a25694fb2cdd5e1c146eb024e9c' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD index d33e59680..0d725bfb3 100644 --- a/core/sysfsutils/PKGBUILD +++ b/core/sysfsutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108847 2011-02-04 11:49:39Z stephane $ +# $Id: PKGBUILD 142543 2011-11-11 21:17:05Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=sysfsutils pkgver=2.1.0 -pkgrel=6 +pkgrel=7 pkgdesc="System Utilities Based on Sysfs" arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') @@ -20,6 +20,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD index b83a5a570..ddd689e4f 100644 --- a/core/syslog-ng/PKGBUILD +++ b/core/syslog-ng/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140503 2011-10-15 23:07:16Z dreisner $ +# $Id: PKGBUILD 143107 2011-11-23 02:58:14Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=syslog-ng -pkgver=3.3.1 -pkgrel=1 +pkgver=3.3.2 +pkgrel=2 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -22,13 +22,13 @@ source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source syslog-ng.conf syslog-ng.logrotate syslog-ng.rc) -sha1sums=('f084d66754c7fa1eada56946f77ef3066faa27a1' +sha1sums=('a7cfc987cdd584e357e253d2794bad1159776638' '98074e0facfc6ef036202662cc86d04b38a2c142' - 'ac997b25d7d8e69e66782d3771a0e12aff55ae7f' + '949128fe3d7f77a7aab99048061f885bc758000c' 'a6ad26912b5bcbe1b47b003309945d733613b98f') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -44,9 +44,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" diff --git a/core/syslog-ng/syslog-ng.logrotate b/core/syslog-ng/syslog-ng.logrotate index e0e6929f2..3509f2970 100644 --- a/core/syslog-ng/syslog-ng.logrotate +++ b/core/syslog-ng/syslog-ng.logrotate @@ -2,6 +2,6 @@ missingok sharedscripts postrotate - /bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true endscript } diff --git a/core/sysvinit/PKGBUILD b/core/sysvinit/PKGBUILD index caf26a1c5..b521d1895 100644 --- a/core/sysvinit/PKGBUILD +++ b/core/sysvinit/PKGBUILD @@ -4,7 +4,7 @@ pkgname=sysvinit pkgver=2.88 -pkgrel=3 +pkgrel=3.1 pkgdesc="Linux System V Init" arch=('i686' 'x86_64' 'mips64el') url="http://savannah.nongnu.org/projects/sysvinit" diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD index 5bc4add28..ffd5cb336 100644 --- a/core/tar/PKGBUILD +++ b/core/tar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129859 2011-06-29 04:33:10Z allan $ +# $Id: PKGBUILD 142080 2011-11-04 23:36:17Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=tar pkgver=1.26 -pkgrel=1 +pkgrel=2 pkgdesc="Utility used to store, backup, and transport files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/tar/tar.html" @@ -13,10 +13,11 @@ groups=('base') depends=('glibc' 'sh') options=('!emptydirs') install=tar.install -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} tar.1) md5sums=('0ced6f20b9fa1bea588005b5ad4b52c1' - 'e0538778516a284e3558c454b2576c2f') + '6618d5fe7785e138c27d7d6a24e998b2' + 'e97e7343f4e23724b4c48bca2f033e38') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/core/tar/tar.1 b/core/tar/tar.1 index 872c8dcec..75bbcd38c 100644 --- a/core/tar/tar.1 +++ b/core/tar/tar.1 @@ -1,5 +1,5 @@ -.\" generated by script on Wed Mar 10 17:01:09 2010 -.Dd Mar 10, 2010 +.\" generated by script on Fri Aug 19 16:19:30 2011 +.Dd Aug 19, 2011 .Dt TAR 1 .Sh NAME .Nm tar @@ -110,6 +110,8 @@ use archive file or device ARCHIVE run script at end of each tape (implies -M) .It Fl \-force\-local archive file is local even if it has a colon +.It Fl \-full\-time +print file time to its full resolution .It Fl g , Fl \-listed\-incremental Ar FILE handle new GNU-format incremental backup .It Fl G , Fl \-incremental @@ -283,7 +285,7 @@ unquote filenames read with -T (default) .It Fl \-no\-unquote do not unquote filenames read with -T .It Fl \-utc -print file modification dates in UTC +print file modification times in UTC .It Fl v , Fl \-verbose verbosely list files processed .It Fl V , Fl \-label Ar TEXT @@ -329,6 +331,7 @@ Device or file to use for the archive if .Fl \-file is not specified. If this environment variable is unset, use stdin or stdout instead. +.It Ev TAR_LONGLINK_100 .El .Sh EXAMPLES Create archive.tar from files foo and bar. diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD index b59654b67..18faca132 100644 --- a/core/texinfo/PKGBUILD +++ b/core/texinfo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102128 2010-12-06 05:33:18Z allan $ +# $Id: PKGBUILD 142185 2011-11-05 22:42:55Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=texinfo pkgver=4.13a -pkgrel=5 +pkgrel=6.1 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/texinfo/" @@ -12,8 +12,9 @@ license=('GPL3') groups=('base') depends=('ncurses' 'findutils' 'gzip') install=texinfo.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('71ba711519209b5fb583fed2b3d86fcb') +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('71ba711519209b5fb583fed2b3d86fcb' + 'db2ca82c831684cd7cef181234017c46') build() { cd ${srcdir}/${pkgname}-4.13 @@ -25,6 +26,6 @@ package() { cd ${srcdir}/${pkgname}-4.13 make DESTDIR=${pkgdir} install - # fix this here as it prevent make from trying to rebuild manual pages + # fix this here as it prevents make from trying to rebuild manual pages sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi } diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD index 119c133ea..a1b8601c0 100644 --- a/core/tzdata/PKGBUILD +++ b/core/tzdata/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138534 2011-09-27 04:34:24Z andyrtr $ +# $Id: PKGBUILD 141939 2011-11-03 11:23:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata -pkgver=2011k +pkgver=2011n pkgrel=1 _tzcode=2011i -_tzdata=2011k +_tzdata=2011n pkgdesc="Sources for time zone and daylight saving time data" arch=('i686' 'x86_64' 'mips64el') url="http://www.twinsun.com/tz/tz-link.htm" @@ -15,14 +15,12 @@ makedepends=() optdepends=('bash: required by tzselect') options=('!emptydirs') source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ - ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ + ftp://munnari.oz.au/pub/${pkgname}${_tzdata}.tar.gz + #ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ Makefile.patch) md5sums=('cf7f4335b7c8682899fa2814e711c1b2' - '9da1c2d4d1a01f9f504b73ccd371830f' + '20dbfb28efa008ddbf6dd34601ea40fa' 'a64ed97d1fc03c66ee8612c0d9f40507') -sha1sums=('4f58cede47df8bba55b37982d8b38cd65266d412' - '56f0847a10eaea672be19984b4b403e29631c98b' - 'e8890681333949977ccff0b7a429ad25ed78dbcf') build() { cd ${srcdir} @@ -37,7 +35,7 @@ build() { check() { cd ${srcdir} - make check + make -k check # || /bin/true } package() { diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules index 71f1a883b..6bdf4e249 100644 --- a/core/udev/81-arch.rules +++ b/core/udev/81-arch.rules @@ -1,71 +1,9 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> # do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# +# this file is going away in the near future -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" +# this might belong in <http://aur.archlinux.org/packages.php?ID=22698> +# see also /usr/src/*/Documentation/laptops/sonypi.txt KERNEL=="sonypi", MODE="0666" -# USB devices +# this might belong in <https://aur.archlinux.org/packages.php?ID=18393> KERNEL=="legousbtower*", MODE="0666" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index f959e9b3c..44a8705ca 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,28 +1,25 @@ -# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> +# $Id: PKGBUILD 142408 2011-11-09 04:55:56Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Thomas Bächler <thomas@archlinux.org> pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=173 -pkgrel=3 +pkgver=175 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') groups=('base') -# older initscripts versions required start_udev options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - bluetooth.patch +makedepends=('gobject-introspection' 'gperf') +#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 +source=(http://people.freedesktop.org/~kay/udev/$pkgbase-$pkgver.tar.bz2 81-arch.rules) build() { cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/25356 (submitted upstream) - patch -Np1 -i ../bluetooth.patch if [ "$CARCH" = "mips64el" ]; then msg "Remove -Wl,--gc-sections" @@ -36,13 +33,13 @@ build() { --with-systemdsystemunitdir=/lib/systemd/system\ --disable-rule-generator\ --enable-udev_acl + make } package_udev() { pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') + depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils') install=udev.install backup=(etc/udev/udev.conf) conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') @@ -59,11 +56,14 @@ package_udev() { echo "blacklist $mod" done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 + # /dev/loop0 is created for convenience, to autoload the module if necessary + # may be obsoleted by https://lkml.org/lkml/2011/7/30/111 mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # udevd moved, symlink to make life easy for restarting udevd manually + ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; @@ -102,6 +102,5 @@ package_udev-compat() { # /dev/ppp mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 } -md5sums=('91a88a359b60bbd074b024883cc0dbde' - '36cb9bfb55a8d931b7498d2e46730745' - 'ec529eb1ddaabb70c61b38f80bb8462a') +md5sums=('2fc9c1efcbde98e3d73ffee7a77aea47' + '3da2bb9891592f9438a07bd641465531') diff --git a/core/udev/bluetooth.patch b/core/udev/bluetooth.patch deleted file mode 100644 index 96f5d6901..000000000 --- a/core/udev/bluetooth.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 7462d61442f606cc118722e0572ac8db48fa2540 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org> -Date: Tue, 2 Aug 2011 10:56:33 +0200 -Subject: [PATCH] rules: input - fix detection of bluetooth hid devices in - Xorg - -Commit c49df20758e0f22778cfc93b598f2929f4c86272 prevented udev from -creating broken symlinks for bluetooth hid devices. Unfortunately, -it also removed the ID_INPUT=1 and ID_INPUT_{KEY,MOUSE}=1 properties -from those devices. Xorg relies on these properties for cold- and -hotplugging of input devices. - -With this patch, udev still omits the broken symlinks, but also -imports the input_id properties again. ---- - rules/rules.d/60-persistent-input.rules | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules -index 65a6381..28d50d2 100644 ---- a/rules/rules.d/60-persistent-input.rules -+++ b/rules/rules.d/60-persistent-input.rules -@@ -2,9 +2,9 @@ - - ACTION=="remove", GOTO="persistent_input_end" - SUBSYSTEM!="input", GOTO="persistent_input_end" --SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" - - ENV{ID_INPUT}=="", IMPORT{program}="input_id %p" -+SUBSYSTEMS=="bluetooth", GOTO="persistent_input_end" - SUBSYSTEMS=="usb", ENV{ID_BUS}=="", IMPORT{program}="usb_id --export %p" - - # determine class name for persistent symlinks --- -1.7.6 - diff --git a/core/udev/udev.install b/core/udev/udev.install index 272ab60c0..2cc8caaa0 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -2,7 +2,7 @@ # arg 2: the old package version post_upgrade() { - if [ "$(vercmp $2 172)" -lt 0 ]; then + if [ "$(vercmp $2 174)" -lt 0 ]; then echo "ATTENTION UDEV:" echo "----------" if [ "$(vercmp $2 168)" -lt 0 ]; then @@ -32,41 +32,31 @@ post_upgrade() { echo "Add them to MODULES in rc.conf if you need them." echo " --" fi - echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat." - echo " --" - echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo "takes precedence." + if [ "$(vercmp $2 172)" -lt 0 ]; then + echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat." + echo " --" + echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" + echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" + echo "takes precedence." + echo " --" + echo "kbd and rtc devices are no longer world readable." + echo " --" + echo "rtc is no longer in the audio group and fb devices are no longer in" + echo "the video group, as permissions and ownership of fb devices are controlled" + echo "by X." + echo " --" + fi + echo "We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo "'scanner' and 'video' groups. Beware of any changes." echo " --" - echo "kbd and rtc devices are no longer world readable." + echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0." echo " --" - echo "rtc is no longer in the audio group and fb devices are no longer in" - echo "the video group, as permissions and ownership of fb devices are controlled" - echo "by X." + echo "For security reasons, we no longer add devices to the 'storage' group. Use" + echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo "this functionality back." + echo " --" + echo "We no longer create the static nodes on install needed for an initrd-less and" + echo "devtmpfs-less boot, this only affects fresh installs." echo "---------------" fi } - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 818051b79..c732a46ae 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138467 2011-09-24 11:28:45Z tomegun $ +# $Id: PKGBUILD 141022 2011-10-21 21:39:17Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.20.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') diff --git a/core/util-linux/agetty-typo.patch b/core/util-linux/agetty-typo.patch deleted file mode 100644 index a333d6280..000000000 --- a/core/util-linux/agetty-typo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 7 Sep 2011 07:37:03 +0200 -Subject: [PATCH] agetty: double equals sign typo in opentty() - -Reported-by: Francesco Cosoleto <cosoleto@gmail.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - term-utils/agetty.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/term-utils/agetty.c b/term-utils/agetty.c -index 733be38..35bb389 100644 ---- a/term-utils/agetty.c -+++ b/term-utils/agetty.c -@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) - * In case of a virtual console the ioctl TIOCMGET fails and - * the error number will be set to EINVAL. - */ -- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { -+ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { - op->flags |= F_VCONSOLE; - if (!op->term) - op->term = DEFAULT_VCTERM; --- -1.7.6.1 - diff --git a/core/util-linux/dmesg-non-printk.patch b/core/util-linux/dmesg-non-printk.patch deleted file mode 100644 index ea2354420..000000000 --- a/core/util-linux/dmesg-non-printk.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Wed, 31 Aug 2011 12:28:39 +0200 -Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels - - * dmesg(1) incorrectly assumes that lines like "<6>\n" - are broken. - - * it's more robust to assume the end of the record is "\n<" - - * print \n for empty lines - -Reported-by: "Gabor Z. Papp" <gzp@papp.hu> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/dmesg.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index 6090f4e..8e7bb4b 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - - if (!begin) - begin = p; -- if (*p == '\n') -- end = p; - if (i + 1 == rec->next_size) { - end = p + 1; - i++; -- } -+ } else if (*p == '\n' && *(p + 1) == '<') -+ end = p; -+ - if (begin && !*begin) - begin = NULL; /* zero(s) at the end of the buffer? */ - if (!begin || !end) -@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - } - } - -- if (end <= begin) -- return -1; /* error */ -- - if (*begin == '[' && (*(begin + 1) == ' ' || - isdigit(*(begin + 1)))) { - if (ctl->delta || ctl->ctime) { -@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, - } - - while (get_next_record(ctl, &rec) == 0) { -- if (!rec.mesg_size) -- continue; - - if (!accept_record(ctl, &rec)) - continue; - -+ if (!rec.mesg_size) { -+ putchar('\n'); -+ continue; -+ } -+ - if (ctl->decode && rec.level >= 0 && rec.facility >= 0) - printf("%-6s:%-6s: ", facility_names[rec.facility].name, - level_names[rec.level].name); --- -1.7.6.1 - diff --git a/core/util-linux/dmesg-space.patch b/core/util-linux/dmesg-space.patch deleted file mode 100644 index 2038888cc..000000000 --- a/core/util-linux/dmesg-space.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Fri, 2 Sep 2011 14:42:04 +0200 -Subject: [PATCH] dmesg: remove extra space only after time stamp - -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - sys-utils/dmesg.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c -index 8e7bb4b..b3713a0 100644 ---- a/sys-utils/dmesg.c -+++ b/sys-utils/dmesg.c -@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) - break; - } - } -+ if (begin < end && *begin == ' ') -+ begin++; - } - -- if (begin < end && *begin == ' ') -- begin++; -- - rec->mesg = begin; - rec->mesg_size = end - begin; - --- -1.7.6.1 - diff --git a/core/util-linux/dont-close-0.patch b/core/util-linux/dont-close-0.patch deleted file mode 100644 index 75cfc5c5e..000000000 --- a/core/util-linux/dont-close-0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001 -From: Petr Uzel <petr.uzel@suse.cz> -Date: Tue, 13 Sep 2011 11:08:46 +0200 -Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit() - -If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt' -which hasn't been fully initialised. The 'dir_fd' is still 0, so -sysfs_deinit calls "close(0)". - -Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151 -Reported-by: Diego Ercolani <diego.ercolani@gmail.com> -Analysed-by: Neil Brown <nfbrown@suse.com> -Signed-off-by: Petr Uzel <petr.uzel@suse.cz> ---- - lib/sysfs.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/lib/sysfs.c b/lib/sysfs.c -index eec1f24..ebb3bb5 100644 ---- a/lib/sysfs.c -+++ b/lib/sysfs.c -@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent) - int fd, rc = 0; - - memset(cxt, 0, sizeof(*cxt)); -+ cxt->dir_fd = -1; - - if (!sysfs_devno_path(devno, path, sizeof(path))) - goto err; --- -1.7.6.1 - diff --git a/core/util-linux/fix-remount.patch b/core/util-linux/fix-remount.patch deleted file mode 100644 index 67149ab46..000000000 --- a/core/util-linux/fix-remount.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 13 Sep 2011 22:59:39 +0200 -Subject: [PATCH 2/2] mount: check for target before source on remount - -Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091 -Reported-by: Eric Paris <eparis@redhat.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - mount/fstab.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/mount/fstab.c b/mount/fstab.c -index 8d88f68..77bf81c 100644 ---- a/mount/fstab.c -+++ b/mount/fstab.c -@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) { - mc0 = mtab_head(); - if (!mcprev) - mcprev = mc0; -+ - for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) -- if (streq(mc->m.mnt_dir, name) || -- streq(mc->m.mnt_fsname, name)) -+ if (streq(mc->m.mnt_dir, name)) - return mc; -+ -+ for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev) -+ if (streq(mc->m.mnt_fsname, name)) -+ return mc; -+ - return NULL; - } - --- -1.7.6.1 - diff --git a/core/util-linux/write-freopen.patch b/core/util-linux/write-freopen.patch deleted file mode 100644 index a2014a107..000000000 --- a/core/util-linux/write-freopen.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 6 Sep 2011 03:18:46 +0200 -Subject: [PATCH] write: fix path for freopen() - -Reported-by: xinglp <xinglp@gmail.com> -Signed-off-by: Karel Zak <kzak@redhat.com> ---- - term-utils/write.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/term-utils/write.c b/term-utils/write.c -index a825f62..a70eb7b 100644 ---- a/term-utils/write.c -+++ b/term-utils/write.c -@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) - - if (strlen(tty) + 6 > sizeof(path)) - errx(EXIT_FAILURE, _("tty path %s too long"), tty); -- printf(path, "/dev/%s", tty); -+ snprintf(path, sizeof(path), "/dev/%s", tty); - if ((freopen(path, "w", stdout)) == NULL) - err(EXIT_FAILURE, "%s", path); - --- -1.7.6.1 - diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD index d818079d0..315396003 100644 --- a/core/vi/PKGBUILD +++ b/core/vi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118363 2011-04-06 12:35:06Z jgc $ +# $Id: PKGBUILD 142189 2011-11-06 02:27:51Z stephane $ # Maintainer: tobias [ tobias at archlinux org ] pkgname=vi pkgver=050325 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='The original ex/vi text editor.' arch=('i686' 'x86_64' 'mips64el') diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index 168ab9bda..941e89846 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -4,7 +4,7 @@ pkgname=wget pkgver=1.13.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/wget/wget.html" diff --git a/core/which/PKGBUILD b/core/which/PKGBUILD index cd8017801..6a60bea84 100644 --- a/core/which/PKGBUILD +++ b/core/which/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100049 2010-11-20 03:27:58Z stephane $ +# $Id: PKGBUILD 142082 2011-11-04 23:36:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=which pkgver=2.20 -pkgrel=4 +pkgrel=5 pkgdesc="A utility to show the full path of commands" arch=('i686' 'x86_64' 'mips64el') url="http://www.xs4all.nl/~carlo17/which" diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD index 922f4dc7b..1b996d604 100644 --- a/core/wireless_tools/PKGBUILD +++ b/core/wireless_tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100106 2010-11-20 11:19:34Z pierre $ +# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributer: Jason Chu <jchu@xentac.net> pkgname=wireless_tools pkgver=29 -pkgrel=4 +pkgrel=5.1 pkgdesc="Wireless Tools" arch=('i686' 'x86_64' 'mips64el') url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD index 6ab3a526a..9d3d375ad 100644 --- a/core/wpa_actiond/PKGBUILD +++ b/core/wpa_actiond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 112297 2011-03-04 15:33:07Z stephane $ +# $Id: PKGBUILD 142219 2011-11-06 10:21:32Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_actiond pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/wpa_actiond.git/" diff --git a/core/wpa_supplicant/PKGBUILD b/core/wpa_supplicant/PKGBUILD index d34f6dd97..9ba3ad15a 100644 --- a/core/wpa_supplicant/PKGBUILD +++ b/core/wpa_supplicant/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112948 2011-03-07 23:26:54Z heftig $ +# $Id: PKGBUILD 142217 2011-11-06 10:21:29Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=wpa_supplicant pkgver=0.7.3 -pkgrel=3 +pkgrel=4.1 pkgdesc="A utility providing key negotiation for WPA wireless networks" url="http://hostap.epitest.fi/wpa_supplicant" arch=('i686' 'x86_64' 'mips64el') diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD index 9d01c2a9b..e4fcf373b 100644 --- a/core/xfsprogs/PKGBUILD +++ b/core/xfsprogs/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 118982 2011-04-09 21:14:21Z tpowa $ +# $Id: PKGBUILD 142968 2011-11-19 08:45:36Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=xfsprogs -pkgver=3.1.5 +pkgver=3.1.7 pkgrel=1 pkgdesc="XFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('util-linux-ng>=2.16') options=('!makeflags' '!libtool') # We mirror the sources as upstream tends to move them once a new release is out source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") -md5sums=('b1db37749e2b4149a0dd178abff956be') +md5sums=('049cf9873794ea49d0bb3f12d45748a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index 552b96cf9..8401ed2a9 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131821 2011-07-15 23:50:00Z dan $ +# $Id: PKGBUILD 142541 2011-11-11 21:16:44Z tpowa $ # Maintainer: # Contributor: Judd <jvinet@zeroflux.org> pkgname=xinetd pkgver=2.3.14 -pkgrel=7 +pkgrel=8 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64' 'mips64el') url="http://www.xinetd.org/" diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 8fbba74df..69602c83c 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 139213 2011-10-01 18:55:35Z ibiru $ +# $Id: PKGBUILD 141268 2011-10-27 16:31:57Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=accountsservice -pkgver=0.6.14 +pkgver=0.6.15 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64 'mips64el') @@ -11,7 +12,7 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('88f4d5d0d1f0ce0fa6a180cbff936041') +md5sums=('939e58e57334801ca578b182a09141c4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD index 828c589c0..cee35d88c 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' 'mips64el') @@ -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/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD index a71edea4e..314410011 100644 --- a/extra/aisleriot/PKGBUILD +++ b/extra/aisleriot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139215 2011-10-01 18:55:37Z ibiru $ +# $Id: PKGBUILD 142864 2011-11-17 18:34:18Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=aisleriot -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Solitaire card games" arch=(mips64el) @@ -14,7 +14,7 @@ makedepends=(gnome-doc-utils intltool itstool) options=('!emptydirs' '!libtool') install=aisleriot.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dba561dc35641cb393626151cf048f407c47960c7a254f378b986ab95d899d85') +sha256sums=('818e16767f30238a98332fe07e8b905376a71de05feb3de19815652a48fdfcca') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index fa829a121..db0594f7a 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $ +# $Id: PKGBUILD 142269 2011-11-07 18:27:05Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=5.0.4 +pkgver=5.0.5 pkgrel=1 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64' 'mips64el') url="http://alleg.sourceforge.net/" license=('custom') depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') -makedepends=('cmake' 'mesa') +makedepends=('cmake' 'mesa' 'freetype2') source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) -md5sums=('e2e314ee7116c7efddd0497d6c885e46') +md5sums=('4d879afe7062f7dc9b8913cba2e44bdf') build() { cd "${srcdir}" diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 957ef0b1c..7fe44ddc0 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -3,7 +3,7 @@ pkgname=alsa-lib pkgver=1.0.24.1 -pkgrel=1 +pkgrel=1.1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64' 'mips64el') url="http://www.alsa-project.org" diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 11aed0c85..f1470b1d9 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122044 2011-05-02 00:18:38Z heftig $ +# $Id: PKGBUILD 142610 2011-11-12 17:15:00Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Daniel Ehlers <danielehlers@mindeye.net> pkgname=alsa-plugins pkgver=1.0.24 -pkgrel=2 +pkgrel=3 pkgdesc="Extra alsa plugins" arch=(i686 x86_64 'mips64el') url="http://www.alsa-project.org" diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD index 2dbf5d668..cf0bb42f2 100644 --- a/extra/amarok/PKGBUILD +++ b/extra/amarok/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134019 2011-08-01 10:23:47Z andrea $ +# $Id: PKGBUILD 142612 2011-11-12 17:15:02Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=amarok replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree') pkgver=2.4.3 -pkgrel=1 +pkgrel=3 pkgdesc="The powerful music player for KDE" arch=("i686" "x86_64" 'mips64el') url="http://amarok.kde.org" diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 78e948415..09c6fa9ae 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140393 2011-10-12 09:39:10Z giovanni $ +# $Id: PKGBUILD 143076 2011-11-22 12:47:07Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10645 +pkgver=10683 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('2dfd86333cd42b6df5cb312de852a1f3') +md5sums=('c9adbecbbec7831fc42b177c8b548e05') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index f16153495..93c2775d2 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 139217 2011-10-01 18:55:41Z ibiru $ +# $Id: PKGBUILD 142974 2011-11-19 10:42:16Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils') +depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://anjuta.sourceforge.net/" install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('2ff968af17e9202fcdb12c47aadaa9d3cb4b98d78c22db8a0cedcb4bf0a81fb8') +sha256sums=('909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e') build() { - cd "${srcdir}/anjuta-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package(){ - cd "${srcdir}/anjuta-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/python$|&2|" \ $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py diff --git a/extra/anjuta/anjuta.install b/extra/anjuta/anjuta.install index c6fcfec11..59113c6f5 100644 --- a/extra/anjuta/anjuta.install +++ b/extra/anjuta/anjuta.install @@ -1,9 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-mime-database usr/share/mime > /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome + update-mime-database /usr/share/mime > /dev/null } pre_upgrade() { diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 07037b49c..bd62ef75f 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139223 2011-10-01 18:55:48Z ibiru $ +# $Id: PKGBUILD 140838 2011-10-20 05:41:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,9 +12,8 @@ depends=('at-spi2-core' 'libx11' 'atk' 'dconf') makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') -groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7fd0e043d2a32f06cab1ca116f36114d9b0c482ca421e26b1d565687db171150') +sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 58c7a2793..872d9006c 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139225 2011-10-01 18:55:51Z ibiru $ +# $Id: PKGBUILD 140840 2011-10-20 05:41:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9b3f645560749067ea250c26b281248e3eb912316323a02d358fc2be5dea3848') +sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD index 806c39d81..9bc7244d4 100644 --- a/extra/atkmm/PKGBUILD +++ b/extra/atkmm/PKGBUILD @@ -3,15 +3,15 @@ pkgbase=atkmm pkgname=(atkmm atkmm-docs) -pkgver=2.22.5 +pkgver=2.22.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++') license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('61e03e5e67952c8fd9919049fae680bd0f2a1547344394f36b98b05b34b7be6c') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD index a984a7082..d50a08cfe 100644 --- a/extra/attica/PKGBUILD +++ b/extra/attica/PKGBUILD @@ -1,8 +1,8 @@ -# $Id$ +# $Id: PKGBUILD 142782 2011-11-15 06:11:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=attica -pkgver=0.2.0 +pkgver=0.2.9 pkgrel=1 pkgdesc='A library to access Open Collaboration Service providers' arch=('i686' 'x86_64' 'mips64el') @@ -11,10 +11,10 @@ license=('LGPL') depends=('qt') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('df3dcea0229cfa31539bdd427976e15b') +md5sums=('7dadb6ca7dec09f89d41cd868ea6dc39') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +24,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 0df8b5229..6d8566651 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 138257 2011-09-19 16:24:40Z bisson $ +# $Id: PKGBUILD 142549 2011-11-11 23:52:56Z bisson $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=audacious -pkgver=3.0.3 -pkgrel=1 +pkgver=3.1 +pkgrel=2 pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality' -arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' license=('GPL3') -depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' +arch=('i686' 'x86_64' 'mips64el') +depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils') -optdepends=('unzip: zipped skins support') +optdepends=('p7zip-libre: zipped skins support') source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz") -sha1sums=('713cc7ee277ca548ea143b4ec3bd40bcacdb327f') +sha1sums=('53d89b3e2faf5ca13dca55875dc04efc753328f2') provides=('audacious-player') replaces=('audacious-player') @@ -22,8 +22,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - [[ ${CARCH} == x86_64 ]] && _extraopts='' || _extraopts='--disable-sse2' - ./configure --prefix=/usr ${_extraopts} + ./configure --prefix=/usr make } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 72a021dd1..0a4f58a15 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.30 -pkgrel=5.1 +pkgrel=5.3 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64' 'mips64el') url='http://www.avahi.org/' diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index a0ecb58ef..9e33a4c91 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $ +# $Id: PKGBUILD 142664 2011-11-12 17:45:03Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=4 +pkgrel=6 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" @@ -98,7 +98,7 @@ package_avidemux-gtk() { package_avidemux-qt() { pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI" - depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils') + depends=("avidemux-cli=${pkgver}" 'qt') install=avidemux.install cd "${srcdir}/${pkgbase}_${pkgver}" diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD index 6745d25f4..8e94c989e 100644 --- a/extra/banshee/PKGBUILD +++ b/extra/banshee/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138285 2011-09-19 20:41:10Z ibiru $ +# $Id: PKGBUILD 141669 2011-11-02 03:17:44Z eric $ # Contributor: György Balló <ballogy@freestart.hu> pkgname=banshee -pkgver=2.2.0 +pkgver=2.2.1 pkgrel=1 pkgdesc="Music management and playback for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -19,8 +19,8 @@ options=('!libtool') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/2.2/$pkgname-$pkgver.tar.xz banshee-recent-gpod.patch) -sha256sums=('85026f270777be15b778a8bf676d2c6e1a0d3d9758145515809bf209f7ab1815' -'018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9') +sha256sums=('55c03ddf9732199b9f83d4ff375af99ae5a4eea46b8a198695427e5c48f1b9a5' + '018eeb00d1b4e625d13f1184863e499be5b5dde050a7513e012d5898125073d9') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD index 478c142dc..dddf5cf4b 100644 --- a/extra/bigloo/PKGBUILD +++ b/extra/bigloo/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 138164 2011-09-17 22:07:10Z andrea $ +# $Id: PKGBUILD 140975 2011-10-20 08:57:44Z eric $ # Maintainer: Jürgen Hötzel <juergen@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: Kevin Piche <kevin@archlinux.org> pkgname=bigloo -_pkgver=3.6a +_pkgver=3.7a-2 pkgver=${_pkgver/-/_} -pkgrel=3 +pkgrel=1 pkgdesc="Fast scheme compiler" arch=('i686' 'x86_64' 'mips64el') url="http://www-sop.inria.fr/mimosa/fp/Bigloo/" license=('GPL' 'LGPL') -depends=('openssl' 'sqlite3') +depends=('openssl' 'sqlite3' 'alsa-lib') makedepends=('java-environment' 'emacs' 'zip') optdepends=('emacs') options=('!makeflags') install=bigloo.install source=(ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${pkgname}${_pkgver}.tar.gz) -md5sums=('484c09cd0e0f84c96999d889de35cd1e') +md5sums=('1a692b950843e36910e13e0e91f90534') build() { cd "${srcdir}/${pkgname}${_pkgver}" @@ -33,6 +33,11 @@ build() { make build compile-bee } +check() { + cd "${srcdir}/${pkgname}${_pkgver}" + make test +} + package() { cd "${srcdir}/${pkgname}${_pkgver}" make DESTDIR="${pkgdir}" install install-bee diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD new file mode 100644 index 000000000..a5dbd1c25 --- /dev/null +++ b/extra/bin86/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=bin86 +pkgver=0.16.18 +pkgrel=3 +pkgdesc="A complete 8086 assembler and loader" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.debath.co.uk/" +depends=('glibc') +source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz" + bin86-0.16.17-x86_64-1.patch) +md5sums=('914068fb649b93642d1cf21857b75699' + '92bdce7b0655cd2e9f83c83fc56d128e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + if [[ $CARCH = x86_64 ]]; then + patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch" + fi + + make PREFIX=/usr +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1" + make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install +} diff --git a/core/bin86/bin86-0.16.17-x86_64-1.patch b/extra/bin86/bin86-0.16.17-x86_64-1.patch index 152413ee7..152413ee7 100644 --- a/core/bin86/bin86-0.16.17-x86_64-1.patch +++ b/extra/bin86/bin86-0.16.17-x86_64-1.patch diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index e9243bbad..b9acf0d7d 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137100 2011-09-06 08:10:20Z bisson $ +# $Id: PKGBUILD 142846 2011-11-16 23:53:56Z ibiru $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Mario Vazquez <mario_vazq@hotmail.com> @@ -6,8 +6,8 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.1 -_pkgver=9.8.1 +pkgver=9.8.1.P1 +_pkgver=9.8.1-P1 pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' +sha1sums=('1cff6594aa185d84942edd2f3cc06dff9cebb04b' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' '18f477f510df31e6c6f547ee2d5fc46e973479bf' diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 4f63eeece..d4e1c3b34 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138192 2011-09-18 13:23:24Z bisson $ +# $Id: PKGBUILD 142776 2011-11-15 02:49:37Z bisson $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> @@ -7,7 +7,7 @@ pkgname=bitlbee pkgver=3.0.3 -pkgrel=4 +pkgrel=6 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64' 'mips64el') url='http://www.bitlbee.org/' @@ -15,9 +15,11 @@ license=('GPL') depends=('openssl' 'glib2' 'libotr') optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" + 'msn.patch' 'xinetd' 'rc.d') sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' + 'fee9dcd59ad0231ffbcae822f17b68d9a8684376' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' 'be09d29af3853825778331df451f16ca9e452d03') @@ -26,6 +28,8 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../msn.patch ./configure --prefix=/usr \ --etcdir=/etc/bitlbee \ diff --git a/extra/bitlbee/msn.patch b/extra/bitlbee/msn.patch new file mode 100644 index 000000000..55e2f9b92 --- /dev/null +++ b/extra/bitlbee/msn.patch @@ -0,0 +1,27 @@ +Index: devel/lib/http_client.c
+===================================================================
+--- devel/lib/http_client.c (revision devel,783)
++++ devel/lib/http_client.c (revision devel,824)
+@@ -314,5 +314,5 @@
+ }
+
+- if( ( req->status_code == 301 || req->status_code == 302 ) && req->redir_ttl-- > 0 )
++ if( ( req->status_code >= 301 && req->status_code <= 303 ) && req->redir_ttl-- > 0 )
+ {
+ char *loc, *new_request, *new_host;
+@@ -375,8 +375,11 @@
+ going to use strcat(), whether you like it or not. :-) */
+
+- sprintf( new_request, "GET %s HTTP/1.0", url->file );
+-
+- s = strstr( req->request, "\r\n" );
+- if( s == NULL )
++ *s = 0;
++ sprintf( new_request, "%s %s HTTP/1.0\r\nHost: %s",
++ req->status_code == 303 || req->request[0] == 'G' ? "GET" : "POST", url->file, url->host );
++ *s = ' ';
++
++ if( !( ( s = strstr( req->request, "\r\nHost: " ) ) &&
++ ( s = strstr( s + strlen( "\r\nHost: " ), "\r\n" ) ) ) )
+ {
+ req->status_string = g_strdup( "Error while rebuilding request string" );
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD index 85354f042..5c8ff5b77 100644 --- a/extra/blender/PKGBUILD +++ b/extra/blender/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138476 2011-09-24 16:46:30Z stephane $ +# $Id: PKGBUILD 142616 2011-11-12 17:15:07Z ibiru $ # Contributor: John Sowiak <john@archlinux.org> # Maintainer: tobias <tobias@archlinux.org> @@ -12,21 +12,21 @@ _svn=false pkgname=blender -pkgver=2.59 -pkgrel=3 -epoch=2 +pkgver=2.60a +pkgrel=2 +epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.blender.org" depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \ - 'freetype2' 'openal' 'libsamplerate' 'ffmpeg') -makedepends=('cmake') # 'subversion' + 'freetype2' 'openal' 'libsndfile' 'ffmpeg') +makedepends=('cmake') install=blender.install if [ $_svn = false ]; then source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz) - md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe') + md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6') else source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz) md5sums=('7579d1139d0d6025df8afcfca64a65c4') @@ -34,6 +34,7 @@ fi # source PKGBUILD && mksource mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) _svnver=38016 _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender" _svnmod="$pkgname-$pkgver" diff --git a/extra/blender/blender.install b/extra/blender/blender.install index f4d7cc443..724bfce00 100644 --- a/extra/blender/blender.install +++ b/extra/blender/blender.install @@ -5,13 +5,9 @@ post_install() { } post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + post_install } diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index b83dc429e..67219aee0 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137203 2011-09-06 17:17:14Z andrea $ +# $Id: PKGBUILD 141623 2011-10-31 21:27:41Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.47.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 32801c297..3a6e3f964 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126155 2011-06-01 20:36:52Z andyrtr $ +# $Id: PKGBUILD 142442 2011-11-09 21:20:39Z guillaume $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty -pkgver=4.2 -pkgrel=4 +pkgver=4.3 +pkgrel=1 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://mielke.cc/brltty" @@ -16,13 +16,13 @@ optdepends=('bluez: bluetooth support') backup=(etc/brltty.conf etc/conf.d/brltty.conf) options=('!makeflags' '!emptydirs') source=(http://mielke.cc/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz - 'brltty-4.2-S_ISCHR.patch' 'brltty' 'brltty.conf') -md5sums=('192af5e634210616928496645e392097' - '5954b289efaf2ff17676d06de9a88854' +# 'brltty-4.2-S_ISCHR.patch' +md5sums=('5ada573f88df32b6150db3b9a620e20b' '831ebaf0c56091702929c68805d20c4f' 'a8ab8b3dd059e96e1734bc9cdcf844fc') +# '5954b289efaf2ff17676d06de9a88854' build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -36,7 +36,7 @@ build() { --disable-caml-bindings \ PYTHON=/usr/bin/python2 - patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch +# patch -Np1 -i ${srcdir}/brltty-4.2-S_ISCHR.patch make } diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index 7d7f338c5..d68c778a5 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138003 2011-09-14 02:50:25Z eric $ +# $Id: PKGBUILD 141925 2011-11-03 07:48:25Z andrea $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.4.1 +pkgver=2.4.2 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,9 @@ url="http://bazaar.canonical.com/en/" license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') -source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz") -md5sums=('61068bfc1f0c9fb8a4b92bca204e0df8') +source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) +md5sums=('cfc06fddd348445c65a247c0b33a05db' + '90294e34a45df20b16be47a32c800c89') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD index 75c8351dc..39792ed75 100644 --- a/extra/c-ares/PKGBUILD +++ b/extra/c-ares/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 104396 2011-01-02 08:09:16Z dgriffiths $ +# $Id: PKGBUILD 143105 2011-11-23 02:52:51Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=c-ares -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc='C library that performs DNS requests and name resolves asynchronously' arch=('i686' 'x86_64' 'mips64el') @@ -12,22 +13,22 @@ url='http://c-ares.haxx.se/' license=('custom') depends=('glibc') options=('!libtool') -source=(http://c-ares.haxx.se/${pkgname}-${pkgver}.tar.gz - LICENSE) -md5sums=('dd71e8f07d9f3c837e12a5416d1b7f73' +source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} + 'LICENSE') +md5sums=('800875fc23cd8e1924d8af9172ed33e7' + '593129fa3c0612b78594adbe4ee48ca1' 'c69f2042941b708ce3e7121424d0b7e6') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --enable-shared || return 1 - make || return 1 + ./configure --prefix=/usr --enable-shared + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + cd "$srcdir/$pkgname-$pkgver" - install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index ea9b5a6cc..0feb4c2bc 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139466 2011-10-01 23:23:01Z ibiru $ +# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') url="http://live.gnome.org/Caribou" license=('LGPL') depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('9d9aeab26956371e9a8e807e2554be5ca08e32f6a27632598065cf2e85e66d16') +sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index ca3e41400..c0a9544e0 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139231 2011-10-01 18:56:02Z ibiru $ +# $Id: PKGBUILD 140845 2011-10-20 05:41:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b') +sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index b8c6c2ee2..6f61bdd74 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 139555 2011-10-03 12:43:44Z ibiru $ +# $Id: PKGBUILD 141289 2011-10-28 07:37:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + pkgname=clutter-gst -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +12,7 @@ depends=('clutter' 'gstreamer0.10-base' 'libxdamage') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('48f623a08a6793ab688ef6b899a2d889ef68053718ba44aac7997a1f9f619e7e') +sha256sums=('9fdcf8d8531d4d78342e7ac901d1768c7a8f78124f74dd6be8e51961169b8fb5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 1ddff2183..a1af69d63 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139233 2011-10-01 18:56:07Z ibiru $ +# $Id: PKGBUILD 142273 2011-11-07 19:57:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.8.0 -pkgrel=1 +pkgver=1.8.2 +pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -13,16 +13,19 @@ options=('!libtool') license=('LGPL') depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c8bd379154d40400b19932934dfa05e8a02057bbff2455f09afda7aa6c4b5ef8') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fallback.patch::http://git.gnome.org/browse/clutter/patch/?id=f05432d57e5e980d0841fd6c13a7f886a46107fe) +sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f' + '30c3c1dfdf1c74e8a7dc2cc6eac305127b7441504cb7040b7cf8d46a4b67fdd9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i $srcdir/fallback.patch ./configure --prefix=/usr --enable-introspection make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index beb0e41cc..3e826570a 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 132775 2011-07-26 00:10:12Z eric $ +# $Id: PKGBUILD 142618 2011-11-12 17:15:10Z ibiru $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64' 'mips64el') url="http://cmus.sourceforge.net/" license=('GPL') depends=('ncurses') -makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' +makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack' 'libmp4v2') optdepends=('alsa-lib: for ALSA output plugin support' 'libao: for AO output plugin support' diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 84718b6dd..e8d745d94 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139237 2011-10-01 18:56:15Z ibiru $ +# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.8.0 +pkgver=1.8.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=(mips64el) @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('b1551c129d5570b63e7130971622fc2ab8d4ecbf0dc1773df1c54fa9c1cb0a2c') +sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index fc4ff867e..b5a0db0de 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -4,9 +4,9 @@ pkgname=colord pkgver=0.1.13 -pkgrel=1 +pkgrel=1.1 pkgdesc="Color daemon" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/software/colord" license=('GPL2') depends=('lcms2' 'sqlite3' 'polkit' 'udev' 'sane') diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index 48fb72e1a..f96f8c71b 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z bisson $ # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: James Rayner <james@archlinux.org> # Contributor: Partha Chowdhury <kira.laucas@gmail.com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=conky -pkgver=1.8.1 -pkgrel=3 -pkgdesc='An advanced, highly configurable system monitor for X based on torsmo' -arch=('i686' 'x86_64' 'mips64el') +pkgver=1.8.2git20111107 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' -license=('custom') -replaces=('torsmo') -makedepends=('pkg-config') +license=('BSD' 'GPL') +arch=('i686' 'x86_64' 'mips64el') +options=('!emptydirs') +makedepends=('pkg-config' 'docbook2x') depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2') backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'current-power.patch') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha1sums=('133fc6fdc725162af9a98c72c1b7349efc22447c') -sha1sums=('06bbe9b7eed8603fa7a971b27c5c61f38424ac6f' - '2eeef0cc5a0b612826b2a7f0b43b7a3b7e10bf0b') +# git clone git://git.omp.am/conky.git; cd conky; git archive --prefix=${pkgname}-${pkgver}/ origin/1.8.2 | xz > ../${pkgname}-${pkgver}.tar.xz + +replaces=('torsmo') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../current-power.patch # See FS#21984 + sh autogen.sh - ./configure \ + CPPFLAGS="${CXXFLAGS}" LIBS="${LDFLAGS}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --enable-ibm \ diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake new file mode 100644 index 000000000..7f980868f --- /dev/null +++ b/extra/conky/PKGBUILD.cmake @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 118899 2011-04-09 10:32:42Z bisson $ +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=conky +pkgver=1.8.2git20111021 +pkgrel=1 +pkgdesc='Lightweight system monitor for X' +url='http://conky.sourceforge.net/' +license=('BSD' 'GPL') +arch=('i686' 'x86_64') +makedepends=('pkg-config' 'cmake' 'git' 'docbook2x') +depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'libxdamage' 'imlib2' 'lua') + +replaces=('torsmo') + +build() { + cd "${srcdir}" + + cd conky && { git pull origin; cd ..; } || git clone git://git.omp.am/conky.git + rm -fr build; mkdir build; cd build + + cmake \ + -D CMAKE_BUILD_TYPE:STRING="Release" \ + -D MAINTAINER_MODE:BOOL=ON \ + -D BUILD_CURL:BOOL=ON \ + -D BUILD_IMLIB2:BOOL=ON \ + -D BUILD_LUA_IMLIB2:BOOL=OFF \ + -D BUILD_MYSQL:BOOL=OFF \ + -D BUILD_RSS:BOOL=ON \ + -D BUILD_WEATHER_METAR:BOOL=ON \ + -D BUILD_WEATHER_XOAP:BOOL=ON \ + -D BUILD_WLAN:BOOL=ON \ + -D CMAKE_INSTALL_PREFIX:PATH=/usr \ + ../conky + + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" +} diff --git a/extra/conky/current-power.patch b/extra/conky/current-power.patch deleted file mode 100644 index 1e7cf5a23..000000000 --- a/extra/conky/current-power.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/src/linux.c new/src/linux.c ---- old/src/linux.c 2010-10-05 23:29:36.000000000 +0200 -+++ new/src/linux.c 2010-12-06 22:18:59.346667183 +0100 -@@ -1671,6 +1671,8 @@ - the tradition! */ - else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0) - sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate); -+ else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0) -+ sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0) - sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity); - else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0) diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD index c0c7c48d0..da0efb9a2 100644 --- a/extra/cscope/PKGBUILD +++ b/extra/cscope/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 67119 2010-02-03 17:32:32Z andrea $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Jason Chu <jason@archlinux.org> +# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=cscope pkgver=15.7a -pkgrel=2 +pkgrel=3 pkgdesc="A developers tool for browsing program code" arch=('i686' 'x86_64' 'mips64el') -url="http://cscope.sourceforge.net/index.html" +url="http://cscope.sourceforge.net/" license=('BSD') depends=('ncurses' 'sh') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) md5sums=('da43987622ace8c36bbf14c15a350ec1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|/usr/local/lib/cs|/usr/lib/cs|' contrib/ocs - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - - install -d "${pkgdir}/usr/lib/cs" + ./configure --prefix=/usr + make +} - cd contrib/xcscope - install -Dm644 xcscope.el ${pkgdir}/usr/share/emacs/site-lisp/xcscope.el || return 1 - install -m755 cscope-indexer $pkgdir/usr/bin || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d ${pkgdir}/usr/lib/cs + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd contrib/xcscope + install -Dm644 xcscope.el "${pkgdir}"/usr/share/emacs/site-lisp/xcscope.el + install -m755 cscope-indexer "${pkgdir}"/usr/bin } diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index ba3430d87..414cb2802 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -4,7 +4,7 @@ pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.5.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD index fc4c6c60e..339372336 100644 --- a/extra/dbus-glib/PKGBUILD +++ b/extra/dbus-glib/PKGBUILD @@ -3,7 +3,7 @@ pkgname=dbus-glib pkgver=0.98 -pkgrel=1 +pkgrel=1.1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64 'mips64el') license=('GPL') diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 8de562ddb..46e810395 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -4,7 +4,7 @@ # pkgname=dbus pkgver=1.4.16 -pkgrel=1 +pkgrel=1.1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64 'mips64el') diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index baeddbc94..59eb011b1 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 125668 2011-05-27 23:18:08Z eric $ +# $Id: PKGBUILD 141206 2011-10-26 08:04:28Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.08 +pkgver=9.11 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64' 'mips64el') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') -depends=('lcms') +depends=('lcms' 'jasper') source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz license.txt) -md5sums=('eb1d365c27495a513c0768b2f696ba66' - '110b4604a6dacd5537339c4082e9e12a') -sha1sums=('1282402201ca48f922d9167ad078aa58cb18593e' +sha1sums=('79dc403d6b629df6dac3218ad33dc89c4a86c234' '502c8f0ac7434d48f5dcb2eefe7599627cb69454') build() { cd "${srcdir}/${pkgname}" - gcc ${CFLAGS} -O3 -o dcraw dcraw.c -lm -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" + gcc ${CFLAGS} -O3 -o dcraw dcraw.c \ + -Wall -Wno-unused-result -Wno-array-bounds \ + -lm -ljasper -ljpeg -llcms -DLOCALEDIR=\"/usr/share/locale/\" } package() { diff --git a/extra/desktop-file-utils/PKGBUILD b/extra/desktop-file-utils/PKGBUILD index 884bb0985..11d431a9c 100644 --- a/extra/desktop-file-utils/PKGBUILD +++ b/extra/desktop-file-utils/PKGBUILD @@ -3,7 +3,7 @@ pkgname=desktop-file-utils pkgver=0.18 -pkgrel=1 +pkgrel=1.1 pkgdesc="Command line utilities for working with desktop entries" arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/desktop-file-utils" diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index 0e80c24ed..7f441db76 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140256 2011-10-11 02:47:40Z eric $ +# $Id: PKGBUILD 143044 2011-11-21 22:39:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.30 +pkgver=4.31 pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.gentoo.com/di/" license=('ZLIB') depends=('glibc') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe') +sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 83a0afe72..fb496e309 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 139601 2011-10-03 17:47:38Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142485 2011-11-10 18:57:46Z ronald $ +# Maintainer: Andrea Scarpino <ronald@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=2.2.0 -pkgrel=1 +pkgver=2.3.0 +pkgrel=2 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('be6100de4961a8cb99a8d9d1688a0460') +sha1sums=('15b8b16d7cce6ac50fb958d30166214f2f2b83ee') build() { cd "${srcdir}" @@ -43,6 +44,10 @@ package_digikam() { make DESTDIR="${pkgdir}" install cd "${srcdir}"/build/po make DESTDIR="${pkgdir}" install + + # these are in oxygen-icons + rm -rf ${pkgdir}/usr/share/icons + } package_libkface() { @@ -80,7 +85,7 @@ package_libmediawiki() { package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam" depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane' - 'opencv' 'qjson' 'libkvkontakte') + 'opencv' 'qjson' 'libkvkontakte' 'libkexiv2') optdepends=('libkgeomap' 'libmediawiki' 'libgpod' diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 1b584820d..d310e6c2a 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140810 2011-10-19 16:21:22Z dreisner $ +# $Id: PKGBUILD 141089 2011-10-23 16:20:24Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq pkgver=2.59 -pkgrel=2 +pkgrel=2.1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('29d43f182ecad06d64b3598c02380a80' +md5sums=('b5757ef2d7b651748eeebb88af29d7d6' '66479e99123faeab83ebaed709ef95b5' '9f180cc236808bbd02ca8652fd2e8217' 'f329d86f8ba1cd85f9b6ee59e0ce3791') diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 8108bf6b4..be7a8e2b3 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138194 2011-09-18 13:49:40Z andyrtr $ +# $Id: PKGBUILD 142912 2011-11-18 08:18:50Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.0.15 +pkgver=2.0.16 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ backup=(etc/dovecot/dovecot.conf etc/ssl/dovecot-openssl.cnf) install=$pkgname.install source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh) -md5sums=('16a08dfd24422d482440a8b03d6f7f6c' +md5sums=('e01a29a355afefcb9fb5f8b7a54e1a14' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index 180860595..4b202d372 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -8,7 +8,7 @@ _minorver=a # upstream uses "23.3a", which is a bit silly and interpreted as alpha. pkgver=$_majorver.$_minorver _realver=$_majorver$_minorver -pkgrel=3 +pkgrel=3.1 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 6576f1976..e44a59713 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $ +# $Id: PKGBUILD 142866 2011-11-17 18:34:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.0.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' 'libcanberra' 'iso-codes' 'networkmanager') +depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' +'libcanberra' 'iso-codes' 'networkmanager') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-butterfly: MSN support' @@ -19,11 +20,11 @@ optdepends=('telepathy-gabble: XMPP/Jabber support' options=('!libtool') groups=('gnome-extra') install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ @@ -35,6 +36,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 8800d6d31..c519e11e2 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139249 2011-10-01 18:56:37Z ibiru $ +# $Id: PKGBUILD 143098 2011-11-22 18:39:54Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/" license=('GPL2') -depends=('eog' 'libpeas' 'libchamplain' 'libexif' 'libgdata') +depends=('eog' 'libchamplain' 'libgdata') makedepends=('intltool') install=eog-plugins.install options=('!libtool') groups=(gnome-extra) -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('49a78e862a1967733b439ca4a4cde42084e8d4b1947c4a5ddb1b3581bec64dc0') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('123e50be69c33bddc5d6def0a1f618970e01207c2e959edbaf0afc56717d8975') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,7 +25,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index b0b7c2c88..7f73d8c1b 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139247 2011-10-01 18:56:34Z ibiru $ +# $Id: PKGBUILD 142868 2011-11-17 18:34:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64' 'mips64el') @@ -13,20 +13,20 @@ install=eog.install groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('79184d0cf420d4b8c1d1de92c30f1d95afc7cd686876e07b20cb82a2ec20d8e3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop } diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD index 2e1094690..7c22b9d5d 100644 --- a/extra/epiphany-extensions/PKGBUILD +++ b/extra/epiphany-extensions/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 140164 2011-10-08 07:58:37Z ibiru $ +# $Id: PKGBUILD 142997 2011-11-20 09:46:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany-extensions pkgver=3.2.0 -pkgrel=1 +pkgrel=2 url="http://www.gnome.org/projects/epiphany/" pkgdesc="Various extentions for the Epiphany web browser" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('epiphany' 'opensp' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') options=('!libtool' '!emptydirs') install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + rss-link-dbus-glib.patch) +sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae' + '6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/rss-link-dbus-glib.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ @@ -25,6 +30,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/epiphany-extensions/rss-link-dbus-glib.patch b/extra/epiphany-extensions/rss-link-dbus-glib.patch new file mode 100644 index 000000000..1737c49ea --- /dev/null +++ b/extra/epiphany-extensions/rss-link-dbus-glib.patch @@ -0,0 +1,29 @@ +From 2066084961b77810477b658cabbb7f6e90a17b94 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Sat, 19 Nov 2011 01:01:12 -0500 +Subject: [PATCH] rss: add DBUS_LIBS to librssextension_la_LIBADD + +Otherwise, epiphany-3.2 crashes. + +https://bugzilla.gnome.org/show_bug.cgi?id=664369 +--- + extensions/rss/Makefile.am | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/extensions/rss/Makefile.am b/extensions/rss/Makefile.am +index ed6962f..da669c8 100644 +--- a/extensions/rss/Makefile.am ++++ b/extensions/rss/Makefile.am +@@ -25,6 +25,9 @@ librssextension_la_LDFLAGS = \ + -export-symbols $(top_srcdir)/ephy-extension.symbols \ + $(AM_LDFLAGS) + ++librssextension_la_LIBADD = \ ++ $(DBUS_LIBS) ++ + uidir = $(pkgdatadir)/ui + ui_DATA = rss-ui.ui + +-- +1.7.8.rc3 + diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index ccc751b2f..a47982e99 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139251 2011-10-01 18:56:40Z ibiru $ +# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -14,14 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - fix_crash::http://git.gnome.org/browse/epiphany/patch/?id=1cb7fb1109aecedd224d03fda202165adf3423a7) -sha256sums=('e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2' - 'ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_crash" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ diff --git a/extra/erlang/PKGBUILD b/extra/erlang/PKGBUILD index 3a9533fdd..12150c3c6 100644 --- a/extra/erlang/PKGBUILD +++ b/extra/erlang/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 110837 2011-02-22 18:42:08Z vesa $ -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# $Id: PKGBUILD 140857 2011-10-20 05:42:01Z ibiru $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> pkgname=erlang -pkgver=R14B -pkgrel=2 +pkgver=R14B04 +pkgrel=1 pkgdesc="A small concurrent functional programming language developed by Ericsson." arch=(i686 x86_64 'mips64el') url="http://www.erlang.org/index.html" license=('custom') depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') optdepends=('wxgtk: for wx support' 'unixodbc: database') options=('!makeflags') @@ -22,14 +23,11 @@ build() { ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) - # fix for #17001 - sed -i 's|WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`|WX_LIBS="`$WX_CONFIG_WITH_ARGS --libs` -lGLU"|' lib/wx/configure || return 1 - - sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure || return 1 + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --enable-ethread-pre-pentium4-compatibility enable_ethread_pre_pentium4_compatibilit=yes --prefix=/usr --enable-smp-support --enable-threads || return 1 - make || return 1 - make INSTALL_PREFIX="$pkgdir" install || return 1 + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + make + make INSTALL_PREFIX="$pkgdir" install # fix prefix cd "$pkgdir" @@ -37,22 +35,22 @@ build() { usr/lib/erlang/bin/start \ usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i || return 1 + usr/lib/erlang/releases/RELEASES ;do + sed -i "s#$pkgdir##" $i done # fix symlinks cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd + ln -sf ../erts-${ERTSVERSION}/bin/epmd cd "$pkgdir/usr/bin" for file in *; do - ln -sfv ../lib/erlang/bin/$file || return 1 + ln -sfv ../lib/erlang/bin/$file done - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" || return 1 + ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" -# install documentation +# install documentation install -d "$pkgdir/usr/share/doc/erlang" install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" @@ -60,5 +58,5 @@ build() { install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" } -md5sums=('5292a04556d17ad528d570e02357dfbb' - '011530a24fbcc194be9bd01f779325a2') +md5sums=('4b469729f103f52702bfb1fb24529dc0' + 'f31e72518daae4007f595c0b224dd59f') diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index dfb163f9c..8f5fe461c 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $ +# $Id: PKGBUILD 142650 2011-11-12 17:18:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' - 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235') +sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 308c9d890..48754fefd 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139257 2011-10-01 18:56:49Z ibiru $ +# $Id: PKGBUILD 142872 2011-11-17 18:34:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64' 'mips64el') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('de2a75e5256143ed7eb273a78a45ff2ba8af81c894dbf17c5dade5be349fc427') +sha256sums=('2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD new file mode 100644 index 000000000..29fa39fd2 --- /dev/null +++ b/extra/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 142874 2011-11-17 18:34:31Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=evolution-ews +pkgver=3.2.2 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f6a557a93e632e19cde1501f6f0540f67e41c193120d7297268662ddc7927439') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index c0b698272..2a6e166fc 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139259 2011-10-01 18:56:51Z ibiru $ +# $Id: PKGBUILD 140865 2011-10-20 05:42:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f61a5e5e5a51a6bc45c0df20d7a99a8c5361fac07eb9eadc15dd5329af1f1f29') +sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD index 5a79f4628..786ecc16a 100644 --- a/extra/evolution-groupwise/PKGBUILD +++ b/extra/evolution-groupwise/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $ +# $Id: PKGBUILD 140867 2011-10-20 05:42:12Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=evolution-groupwise -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GroupWise connector for evolution" arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=(intltool evolution) optdepends=('evolution: evolution plugin') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3) +sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,6 +27,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index daf315c25..8dfdf8698 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139255 2011-10-01 18:56:46Z ibiru $ +# $Id: PKGBUILD 142870 2011-11-17 18:34:24Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d') +sha256sums=('03c68242bbf494dda3bf34f52ec843c282c9bb07f9415a69fe58237c7efbbe7d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index db5811f80..e6a5d5ab2 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $ +# $Id: PKGBUILD 141087 2011-10-23 16:12:32Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=exo pkgver=0.6.2 -pkgrel=1 +pkgrel=3 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL') @@ -28,7 +28,6 @@ build() { --libexecdir=/usr/lib/xfce4 \ --localstatedir=/var \ --disable-static \ - --enable-gio-unix \ --enable-python \ --enable-gtk-doc \ --disable-debug diff --git a/extra/exo/exo.install b/extra/exo/exo.install index 3525fa4a2..17ca8f78a 100644 --- a/extra/exo/exo.install +++ b/extra/exo/exo.install @@ -1,6 +1,5 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - usr/bin/gio-querymodules usr/lib/gio/modules } post_upgrade() { diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index b7376f6bc..84b4598bc 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140246 2011-10-10 21:07:53Z bisson $ +# $Id: PKGBUILD 141903 2011-11-03 00:30:00Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=2.0 +pkgver=2.1 pkgrel=1 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('890e4f7343e7c2157f25f1011a75688adcf6c3f2') +sha1sums=('a5964122bf2ee2675eb9423dea7839410806fee9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 3965375d6..26eba0f2a 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,21 +1,26 @@ -# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z 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=20111003 +pkgver=20111123 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') url="http://ffmpeg.org/" license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump') -makedepends=('yasm' 'git') +if [ "${CARCH}" = "mips64el" ] ; then + depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libxfixes' 'schroedinger' 'libvpx' 'openjpeg' 'rtmpdump' 'speex' 'gsm') + makedepends=('git' 'pkg-config') +else + depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm') + makedepends=('yasm' 'git' 'pkg-config') +fi #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('38139817bee918a5664c549adb487468' +md5sums=('8ec30d05efe0f6cc6f702933e6781e8e' '081d03278559a351322157a441fabcf5') build() { @@ -23,6 +28,12 @@ build() { # [ "$CARCH" = "mips64el" ] && patch -Np1 -i $srcdir/ffmpeg-loongson.patch + if [ "$CARCH" = "mips64el" ] ; then + extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi" + else + extraconf="" + fi + ./configure \ --prefix=/usr \ --enable-libmp3lame \ @@ -31,6 +42,8 @@ build() { --enable-libx264 \ --enable-libvpx \ --enable-libtheora \ + --enable-libgsm \ + --enable-libspeex \ --enable-postproc \ --enable-shared \ --enable-x11grab \ @@ -42,7 +55,9 @@ build() { --enable-gpl \ --enable-version3 \ --enable-runtime-cpudetect \ - --disable-debug + --disable-static \ + --disable-debug \ + $extraconf make make tools/qt-faststart diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index dcf15c5e3..568d9f583 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -4,16 +4,16 @@ pkgname=ffmpegthumbnailer pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight video thumbnailer that can be used by file managers." url="http://code.google.com/p/ffmpegthumbnailer/" license=('GPL2') arch=('i686' 'x86_64' 'mips64el') depends=('ffmpeg' 'libjpeg' 'libpng') optdepends=('gvfs: support for gio uris') -source=(http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz - ffmpegthumbnailer.desktop) -options=(!libtool) +source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz" + 'ffmpegthumbnailer.desktop') +options=('!libtool') sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73' 'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53') @@ -30,7 +30,5 @@ package() { # FS#24105: Generate thumbnails in nautilus install -Dm644 ${srcdir}/ffmpegthumbnailer.desktop \ - ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop + ${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.desktop } - - diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index d6d2555f2..4a0262131 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -25,27 +25,36 @@ sha1sums=('e44493ba4babeacba184568e727876d9aed44205') build() { cd ${srcdir}/${pkgname}-${pkgver} + if [ "$CARCH" = "mips64el" ] ; then + sse2="" + sse="" + aligndouble="" + else + sse2="--enable-sse2" + sse="--enable-sse" + aligndouble="-malign-double" + fi + # use upstream default CFLAGS while keeping our -march/-mtune - [ "$CARCH" = "mips64el" ] || CFLAGS+=" -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math" - [ "$CARCH" = "mips64el" ] && CFLAGS+=" -O3 -fomit-frame-pointer -fstrict-aliasing -ffast-math" + CFLAGS+=" -O3 -fomit-frame-pointer $aligndouble -fstrict-aliasing -ffast-math" CONFIGURE="./configure F77=gfortran --prefix=/usr \ --enable-shared --enable-threads" - # build & install double precision - $CONFIGURE --enable-sse2 + msg "Build & install double precision" + $CONFIGURE $sse2 make make DESTDIR=${pkgdir} install - make clean + make clean - # build & install long double precission + msg "build & install long double precission" $CONFIGURE --enable-long-double make make DESTDIR=${pkgdir} install make clean - # build & install single precision - $CONFIGURE --enable-float --enable-sse + msg "build & install single precision" + $CONFIGURE --enable-float $sse make make DESTDIR=${pkgdir} install } diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD index ed71922ad..a77c78bbf 100644 --- a/extra/fltk/PKGBUILD +++ b/extra/fltk/PKGBUILD @@ -1,19 +1,22 @@ -# $Id: PKGBUILD 130308 2011-07-04 21:56:54Z eric $ +# $Id: PKGBUILD 142179 2011-11-05 20:03:57Z eric $ +# Maintainer: pkgbase=fltk -pkgname=('fltk' 'fltk-docs') +pkgname=('fltk' 'fltk-docs' 'fltk-games') pkgver=1.3.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom:LGPL') url="http://www.fltk.org/" -depends=('sh' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils') -makedepends=('mesa' 'doxygen') +makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \ + 'alsa-lib' 'desktop-file-utils') source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz) md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3') build() { cd "$srcdir/$pkgbase-$pkgver" + sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \ + -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared make cd documentation @@ -22,18 +25,20 @@ build() { package_fltk() { pkgdesc="Graphical user interface toolkit for X" + depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \ + 'desktop-file-utils' 'xdg-utils') options=('!docs') install=fltk.install cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir" install install-desktop + make DESTDIR="$pkgdir" install + (cd fluid; make DESTDIR="$pkgdir" install install-linux) chmod 644 "$pkgdir"/usr/lib/*.a install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } package_fltk-docs() { pkgdesc="Graphical user interface toolkit for X (documentation)" - depends=('') cd "$srcdir/$pkgbase-$pkgver/documentation" install -d "$pkgdir"/usr/share/doc/fltk/ @@ -44,3 +49,14 @@ package_fltk-docs() { make DESTDIR="$pkgdir" install install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + +package_fltk-games() { + pkgdesc="Example games that accompany FLTK: blocks, checkers and sudoku" + depends=('alsa-lib' 'fltk') + install=fltk-games.install + + cd "$srcdir/$pkgbase-$pkgver/test" + make DESTDIR="$pkgdir" install-linux + (cd ../documentation; make DESTDIR="$pkgdir" install-linux) + install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/fltk/fltk-games.install b/extra/fltk/fltk-games.install new file mode 100644 index 000000000..f3fe2b08b --- /dev/null +++ b/extra/fltk/fltk-games.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/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD index e6c39b586..59b098efe 100644 --- a/extra/fluxbox/PKGBUILD +++ b/extra/fluxbox/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 111648 2011-02-28 00:45:15Z eric $ +# $Id: PKGBUILD 141366 2011-10-30 03:08:02Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fluxbox -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc="A lightweight and highly-configurable window manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.fluxbox.org" license=('MIT') -depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'sh' 'imlib2' 'fribidi') -makedepends=('pkg-config') +depends=('libxft' 'libxpm' 'libxinerama' 'libxrandr' 'gcc-libs' 'imlib2' 'fribidi') optdepends=('xorg-xmessage: for using the fbsetbg and fluxbox-generate_menu utilities') options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ fluxbox.desktop) -md5sums=('0eaa940a69c0a876a520bb85d67b8bec' 'eeae9c88a2526ac0bd8afcd9ce97f9ed') -sha1sums=('1c4755b8ac1042c98f700848240ac99ef18dca01' 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') +sha1sums=('15ba1b9eaaf170d87fa647b7118a63c05f093b5c' + 'f3f83b8ce84d79c2f8670ef687e0dd89ab0552b8') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --enable-gnome --enable-xft --enable-xinerama \ + --enable-xft --enable-xinerama \ --enable-imlib2 --enable-nls make } diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index a91686c88..6f6d25f5e 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 139263 2011-10-01 18:56:56Z ibiru $ +# $Id: PKGBUILD 142520 2011-11-11 10:53:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.3.2 +pkgver=0.6.5 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Folks" license=('LGPL2.1') depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') -makedepends=('gobject-introspection' 'vala' 'intltool') +makedepends=('gobject-introspection' 'intltool') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414') +sha256sums=('86fd13cb32f3e85a96f9bc999616307323c967baddca3f9f3b402f23629bd5ee') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 514fc8f9d..73953f1f8 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig pkgver=2.8.0 -pkgrel=1 +pkgrel=1.1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') url="http://www.fontconfig.org/release/" diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD index 07159f7a7..7e77ed5b8 100644 --- a/extra/foobillard++/PKGBUILD +++ b/extra/foobillard++/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138073 2011-09-16 03:35:31Z eric $ +# $Id: PKGBUILD 141931 2011-11-03 08:55:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=foobillard++ -pkgver=3.4beta +pkgver=3.41beta pkgrel=1 pkgdesc="An OpenGL billiard game" arch=(mips64el) @@ -11,8 +11,7 @@ license=('GPL2') depends=('bzip2' 'freetype2' 'libpng' 'mesa' 'sdl_net') replaces=('foobillard') source=(http://downloads.sourceforge.net/foobillardplus/foobillardplus-${pkgver}.tar.gz) -md5sums=('130418a45ba84b4132f9b27712feb919') -sha1sums=('d8723568e460ee62cb913b0c8d7c9a9f557395ee') +sha1sums=('41d6db473557386ffeacd98b9a2ee26198e42c6a') build() { cd "${srcdir}/foobillardplus-${pkgver}" diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD new file mode 100644 index 000000000..bb5c2d2b5 --- /dev/null +++ b/extra/fprintd/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 142462 2011-11-10 09:32:21Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Nikolay Rysev <mad.f3ka@gmail.com> + +pkgname=fprintd +pkgver=0.4.1 +pkgrel=3 +pkgdesc="D-Bus service to access fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/fprintd" +license=(GPL) +depends=(libfprint dbus-glib polkit) +makedepends=(intltool gtk-doc) +groups=(fprint) +options=(!libtool) +_snap=V_${pkgver//./_} +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('58fcac035c181dce8f49c374181aa2ae') + +build() { + cd "$srcdir/$_snap" + ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --disable-static + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" pammoddir="/lib/security" install +} diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD index 97f181e2a..d284831b3 100644 --- a/extra/freeciv/PKGBUILD +++ b/extra/freeciv/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 135708 2011-08-18 01:12:48Z eric $ +# $Id: PKGBUILD 143020 2011-11-21 02:06:36Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=freeciv -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64' 'mips64el') url="http://www.freeciv.org/" license=('GPL') -depends=('gtk2' 'sdl_mixer' 'bzip2' 'hicolor-icon-theme') +depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') options=('!libtool') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('70fd4285f2da7d41bdadac43458e62c9') -sha1sums=('d4e871ad749e1807957df4e353fbb8f5510b7248') +sha1sums=('9d9ee9f48f4c945fc6525139d340443d5a25aac4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index 3fc7ee10d..a9b9a792c 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 133922 2011-07-30 12:02:55Z ibiru $ +# $Id: PKGBUILD 142921 2011-11-18 09:26:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.6 +pkgver=2.4.8 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') license=('GPL') url="http://freetype.sourceforge.net" -depends=('zlib') +depends=('zlib' 'bzip2' 'sh') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 freetype-2.3.0-enable-spr.patch freetype-2.2.1-enable-valid.patch) -md5sums=('5e6510613f612809d2d7862592b92ab7' +md5sums=('dbf2caca1d3afd410a29217a9809d397' '816dc8619a6904a7385769433c0a8653' '214119610444c9b02766ccee5e220680') @@ -26,6 +26,11 @@ build() { make } +check() { + cd "${srcdir}/freetype-${pkgver}" + make -k check +} + package() { cd "${srcdir}/freetype-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index ef08b69d6..92d96cdf0 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94450 2010-10-07 10:30:45Z ronald $ +# $Id: PKGBUILD 141256 2011-10-27 14:45:14Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.8.5 +pkgver=2.8.6 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64' 'mips64el') @@ -16,20 +16,23 @@ install=fuse.install source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('862320b56d6bc4ad5e7be2b1e0b5029166aae09b' +sha1sums=('c2c0f9fff8bfee217da200888123e5abb5b498f2' '3b42e37a741d4651099225987dc40e7f02a716ad') - build() { cd ${srcdir}/${pkgname}-${pkgver} + + # fix building with glibc-2.14 + sed -i '1i#define _GNU_SOURCE' util/fusermount.c + ./configure --prefix=/usr --enable-lib \ --enable-util --bindir=/bin - make || return 1 + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # static device nodes will cause collision. rm -rf ${pkgdir}/dev @@ -40,16 +43,19 @@ package() { #install -D -m755 ${srcdir}/fuse.rc.d ${pkgdir}/etc/rc.d/fuse install -d ${pkgdir}/lib - mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} || return 1 - ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 || return 1 - mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ || return 1 - ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 || return 1 - ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 || return 1 + mv ${pkgdir}/usr/lib/libfuse.so.${pkgver} ${pkgdir}/lib/ + ln -s ../../lib/libfuse.so.${pkgver} ${pkgdir}/usr/lib/libfuse.so.${pkgver} + ln -s libfuse.so.${pkgver} ${pkgdir}/lib/libfuse.so.2 + mv ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 ${pkgdir}/lib/ + ln -s ../../lib/libulockmgr.so.1.0.1 ${pkgdir}/usr/lib/libulockmgr.so.1.0.1 + ln -s libulockmgr.so.1.0.1 ${pkgdir}/lib/libulockmgr.so.1 # install sample config file - install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf || return 1 + install -Dm644 ${srcdir}/fuse.conf ${pkgdir}/etc/fuse.conf # Fix udev rule location install -d -m755 "${pkgdir}/lib" mv "${pkgdir}/etc/udev" "${pkgdir}/lib/" + + # remove udev rules (should already be in udev package} + rm -f ${pkgdir}/lib/udev/rules.d/99-fuse.rules } diff --git a/extra/fuse/fuse.install b/extra/fuse/fuse.install index 595ac7c12..f186d64c7 100644 --- a/extra/fuse/fuse.install +++ b/extra/fuse/fuse.install @@ -8,7 +8,3 @@ post_install() { -> For a static /dev, run: mknod /dev/fuse -m 0666 c 10 229 EOM } - -op=$1 -shift -$op $* diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index c1d48b9b3..121bfc29e 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $ +# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.7.0 +pkgver=2.1.0 pkgrel=1 pkgdesc='Input method server supporting various input methods' -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') url='http://hyperrate.com/dir.php?eid=67' +license=('LGPL') +arch=('i686' 'x86_64' 'mips64el') depends=('gtk2' 'libxtst') makedepends=('qt' 'gtk3' 'anthy' 'libchewing') optdepends=('qt: support for qt4 input method' @@ -18,8 +18,8 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258' - '4307b0d7d6dc10f15909c94973c4357caf31de7e') +sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' + '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch index 13cb3dc15..abc15950e 100644 --- a/extra/gcin/qt4-lib64.patch +++ b/extra/gcin/qt4-lib64.patch @@ -1,15 +1,6 @@ diff -aur old/configure new/configure ---- old/configure 2011-06-08 16:00:37.000000000 +0200 -+++ new/configure 2011-07-05 08:02:33.223601351 +0200 -@@ -164,7 +164,7 @@ - - LIB='lib' - if [ -d /lib64 ]; then --LIB='lib64' -+LIB='lib' - fi - - QT_IM='N' +--- old/configure 2011-11-07 06:51:12.000000000 +1100 ++++ new/configure 2011-11-25 14:02:10.819256960 +1100 @@ -188,7 +188,7 @@ @@ -20,8 +11,8 @@ diff -aur old/configure new/configure pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then diff -aur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-06-08 15:03:50.000000000 +0200 -+++ new/qt4-im/Makefile 2011-07-05 08:04:15.717731695 +0200 +--- old/qt4-im/Makefile 2011-06-08 23:03:50.000000000 +1000 ++++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100 @@ -1,5 +1,5 @@ include ../config.mak -QT=qt4 diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index 1722f517c..7134cc0b2 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139267 2011-10-01 18:57:03Z ibiru $ +# $Id: PKGBUILD 141600 2011-10-31 15:48:45Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=3.2.0 -pkgrel=1 +pkgver=3.2.3 +pkgrel=1.1 pkgdesc="A configuration database system" arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -17,7 +17,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('f371745529d7ed209b0b222f33f5996231cc153e901aea3ce0ad0a46b5a96d0b' +sha256sums=('9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 61725c08e..72a36a17e 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139472 2011-10-02 01:28:00Z ibiru $ +# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1.1 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,27 +16,24 @@ depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'me makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') optdepends=('gnome-shell: new login interface') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam - check-for-shell.patch::http://git.gnome.org/browse/gdm/patch/?id=64e6b10f98fe7226a2f41807268dae3afa80236d) -sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7' + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4' + '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834' - 'ae54f11e593e97e031d2dd7b33ce9899038356cef87b354f3c4c596a3153155d') + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/check-for-shell.patch" patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" diff --git a/extra/gdm/check-for-shell.patch b/extra/gdm/check-for-shell.patch deleted file mode 100644 index f3ac9cf9a..000000000 --- a/extra/gdm/check-for-shell.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001 -From: György Balló <ballogy@freestart.hu> -Date: Fri, 30 Sep 2011 21:48:40 +0000 -Subject: data: add back check for gnome-shell before running gdm-shell session - -Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3 - -This commit does a quick check to make sure gnome-shell is -installed, and supports --gdm-mode. If either of those fail, -then fall back to the old greeter. - -https://bugzilla.gnome.org/show_bug.cgi?id=660409 ---- -diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in -index 3d408c3..496cc10 100644 ---- a/data/gdm-shell.session.in -+++ b/data/gdm-shell.session.in -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Display Manager - RequiredComponents=gnome-shell;gnome-settings-daemon; --IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated -+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' - FallbackSession=gdm-fallback --- -cgit v0.9.0.2 diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index 7beda835a..aa4d4dd47 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -14,7 +14,7 @@ password required pam_unix.so session required pam_loginuid.so -session optional pam_systemd.so -session optional pam_keyinit.so revoke +session optional pam_keyinit.so force revoke session required pam_limits.so session required pam_unix.so session optional pam_gnome_keyring.so auto_start diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index b9732be50..fda42d319 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -9,6 +9,7 @@ post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor gconfpkg --install ${pkgname} glib-compile-schemas usr/share/glib-2.0/schemas + dconf update } pre_remove() { @@ -23,6 +24,7 @@ post_upgrade() { post_remove() { glib-compile-schemas usr/share/glib-2.0/schemas + dconf update gtk-update-icon-cache -q -t -f usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index a7934cd27..1b80a60be 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139273 2011-10-01 18:57:12Z ibiru $ +# $Id: PKGBUILD 142878 2011-11-17 18:34:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.0 +pkgver=3.2.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9db009de74874846edadc0f4a7dc0127a4272cff4348a13544c611cc3696b751') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --disable-scrollkeeper \ @@ -27,6 +27,6 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/extra/gegl/0.1.6-ffmpeg.patch @@ -0,0 +1,33 @@ +diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c +--- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300 ++++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300 +@@ -69,17 +69,17 @@ + { + switch (err) + { +- case AVERROR_NUMEXPECTED: ++ case AVERROR(EDOM): + g_warning ("%s: Incorrect image filename syntax.\n" + "Use '%%d' to specify the image number:\n" + " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n" + " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n", + filename); + break; +- case AVERROR_INVALIDDATA: ++ case AVERROR(EINVAL): + g_warning ("%s: Error while parsing header\n", filename); + break; +- case AVERROR_NOFMT: ++ case AVERROR(EILSEQ): + g_warning ("%s: Unknown format\n", filename); + break; + default: +@@ -278,7 +278,7 @@ + for (i = 0; i< p->ic->nb_streams; i++) + { + AVCodecContext *c = p->ic->streams[i]->codec; +- if (c->codec_type == CODEC_TYPE_VIDEO) ++ if (c->codec_type == AVMEDIA_TYPE_VIDEO) + { + p->video_st = p->ic->streams[i]; + p->video_stream = i; diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 2d99183f7..808942a8a 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 110564 2011-02-20 03:00:42Z eric $ +# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl pkgver=0.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.gegl.org/" license=('GPL3' 'LGPL3') -depends=('babl' 'libpng' 'libjpeg' 'gtk2') +depends=('babl' 'gtk2') makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2') optdepends=('openexr: for using the openexr plugin' \ 'ffmpeg: for using the ffmpeg plugin' \ 'librsvg: for using the svg plugin' \ 'jasper: for using the jasper plugin') options=('!libtool') -source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('af5e5a7d3c7ddfaa2b3414de2a7e9113') -sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d') +source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \ + 0.1.6-ffmpeg.patch) +sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d' + 'd62d4987f1c0fc256f5968271fc65cce0cc4c195') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch" ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ --with-libavformat --with-jasper --disable-docs make diff --git a/extra/ggz-gtk-client/PKGBUILD b/extra/ggz-gtk-client/PKGBUILD new file mode 100644 index 000000000..4f886abb8 --- /dev/null +++ b/extra/ggz-gtk-client/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 143018 2011-11-21 01:24:00Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Contributor: dazzy + +pkgname=ggz-gtk-client +pkgver=0.0.14.1 +pkgrel=5 +pkgdesc="GGZ Gaming Zone GTK+ client" +arch=('i686' 'x86_64') +url="http://www.ggzgamingzone.org/" +license=('GPL') +depends=('gtk2' 'ggz-client-libs') +options=('!libtool') +source=(http://ftp.ggzgamingzone.org/pub/ggz/${pkgver}/ggz-gtk-client-${pkgver}.tar.gz + gtk2.patch) +md5sums=('87f67ff01f867bd04ba894a7c6a9f7fc' + '368f993d07befd41681ac76ef532b448') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/gtk2.patch" + ./configure --prefix=/usr --sysconfdir=/etc --disable-debug + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/ggz-gtk-client/gtk2.patch b/extra/ggz-gtk-client/gtk2.patch new file mode 100644 index 000000000..b8332f401 --- /dev/null +++ b/extra/ggz-gtk-client/gtk2.patch @@ -0,0 +1,40 @@ +--- ggz-gtk-client-0.0.14.1/ggz-gtk/props.c 2008-01-05 20:03:36.000000000 +0100 ++++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/props.c 2010-08-04 01:53:37.573425091 +0200 +@@ -1203,7 +1203,7 @@ + gtk_box_pack_start (GTK_BOX (vbox9), color_table, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (color_table), 3); + +- h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1); ++ h_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0); + h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (h_spin_adj), 1, 0); + gtk_widget_ref (h_spin); + g_object_set_data_full(G_OBJECT (dlg_props), "h_spin", h_spin, +@@ -1213,7 +1213,7 @@ + (GtkAttachOptions) (0), 0, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (h_spin), TRUE); + +- n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1); ++ n_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0); + n_spin = gtk_spin_button_new (GTK_ADJUSTMENT (n_spin_adj), 1, 0); + gtk_widget_ref (n_spin); + g_object_set_data_full(G_OBJECT (dlg_props), "n_spin", n_spin, +@@ -1223,7 +1223,7 @@ + (GtkAttachOptions) (0), 0, 0); + gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (n_spin), TRUE); + +- f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 1); ++ f_spin_adj = gtk_adjustment_new (1, 0, 15, 1, 1, 0); + f_spin = gtk_spin_button_new (GTK_ADJUSTMENT (f_spin_adj), 1, 0); + gtk_widget_ref (f_spin); + g_object_set_data_full(G_OBJECT (dlg_props), "f_spin", f_spin, +--- ggz-gtk-client-0.0.14.1/ggz-gtk/xtext.c 2008-01-05 20:03:36.000000000 +0100 ++++ ggz-gtk-client-0.0.14.1.PATCHED/ggz-gtk/xtext.c 2010-08-04 01:52:36.446764446 +0200 +@@ -720,7 +720,7 @@ + xtext->overdraw = FALSE; + xtext->tint_red = xtext->tint_green = xtext->tint_blue = TINT_VALUE; + +- xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 1); ++ xtext->adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 1, 1, 1, 0); + g_object_ref (G_OBJECT (xtext->adj)); + gtk_object_sink ((GtkObject *) xtext->adj); + diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index c6d138e8b..77c52b0f7 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139595 2011-10-03 14:35:14Z dan $ +# $Id: PKGBUILD 143010 2011-11-20 20:58:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.7 +pkgver=1.7.7.4 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -80,11 +80,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -md5sums=('5d645884e688921e773186783b65ce33' - '2ee47bd79dfd391bc7d1b466539b9734' - '8e2648910fd5dd4f1c41d3c7fa9e9156' - '2e42bf97779a1c6411d89043334c9e78') -sha256sums=('5a977bc01e4989b9928345e99aab15ce896cf5897c6e32eb449538574df377f6' - 'dde1ffaee0d90cce80f98126c5d9013c6687dc6f0b26bd12d61e229346701ecb' - '2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598' - 'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68') +sha1sums=('5b6920989480a37ec65977e756b24961578795dd' + 'cb21e55ae793865453c165a0e666348f2db8c740' + 'f2b41828bd912b72e2cb3e14677739c4f370de66' + '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index cc7b36ef6..c09e20c45 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139279 2011-10-01 18:57:20Z ibiru $ +# $Id: PKGBUILD 140877 2011-10-20 05:42:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c') +sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index f739422fc..7599f84f9 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139277 2011-10-01 18:57:17Z ibiru $ +# $Id: PKGBUILD 142936 2011-11-18 15:46:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.30.0 +pkgver=2.30.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') -url="http://gtkmm.sourceforge.net/" -sha256sums=('a7ad3fc34c2ba108511738a6ecbf9396edeb26776b2f9b5f4490551509ee0db4') +url="http://www.gtkmm.org/" +sha256sums=('69582b584666cab1dc4253faffee548054730bc058e28466871e6a954d7ff897') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } @@ -23,13 +23,13 @@ build() { package_glibmm() { pkgdesc="Glib-- (glibmm) is a C++ interface for glib" depends=('glib2' 'libsigc++2.0') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$srcdir/$pkgbase-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_glibmm-docs() { pkgdesc="Developer documentation for glibmm" - cd "${srcdir}/${pkgbase}-${pkgver}/docs" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/docs" + make DESTDIR="$pkgdir" install } diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index f9adaf9c3..96177510c 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137328 2011-09-07 08:13:58Z jgc $ +# $Id: PKGBUILD 142226 2011-11-06 17:01:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.4.26 +pkgver=2.4.28 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('gtk-sharp-2' 'pkgconfig') makedepends=('pkgconfig') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bad2c9ceb36a685a8f31eccf047be9d761da781c777c7657b093f9ff0bba401f') +sha256sums=('8487faf949ca60c7fb814338e6457d4b4260fcba361158667e1f3fe3e7cce13e') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index 34e939187..87dca22fc 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139281 2011-10-01 18:57:22Z ibiru $ +# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('18e41753d98644689126c3f237f4bf2e1b973cac15544166cef299ba6faa95ef') +sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 031264334..e4c84cba3 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139284 2011-10-01 18:57:27Z ibiru $ +# $Id: PKGBUILD 140881 2011-10-20 05:42:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca' +sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 324206a95..887d73675 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139883 2011-10-05 19:06:43Z andrea $ +# $Id: PKGBUILD 140883 2011-10-20 05:42:30Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64 'mips64el') url="http://projects.gnome.org/gnome-color-manager/" @@ -14,7 +14,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273') +sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436') build(){ cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index c9bcbfa68..ccbdbcb4e 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139288 2011-10-01 18:57:32Z ibiru $ +# $Id: PKGBUILD 141004 2011-10-21 08:06:14Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.2.0.1 +pkgver=3.2.2 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') makedepends=('intltool' 'vala') install= source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('2d8e2a325ecc661805f6e7c6339b3876e766c1e227ff084dc02a7535e5983641') +sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index 6360bb938..9c5db6383 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 139290 2011-10-01 18:57:35Z ibiru $ +# $Id: PKGBUILD 142419 2011-11-09 07:46:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64' 'mips64el') depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') optdepends=('mesa-demos-libre: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts') + 'apg: adds password generation for user accounts' + 'gnome-color-manager: for color management tasks') makedepends=('gnome-doc-utils' 'intltool') url="http://www.gnome.org" groups=('gnome') @@ -16,7 +17,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('06c927dcbee2bf63e4960441ccb9bea55d12aa83078e5d71e9832d52fd1966aa') +sha256sums=('e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index dc3c88a51..1faf9806b 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139292 2011-10-01 18:57:38Z ibiru $ +# $Id: PKGBUILD 140889 2011-10-20 05:42:36Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c5e8ba08f3c7ba12b5f4062c9b5bcef58383d1e3ec26161eb8bcf49dfea62ff5') +sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 1837e56bc..6865f4fdc 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139294 2011-10-01 18:57:41Z ibiru $ +# $Id: PKGBUILD 142279 2011-11-07 20:29:49Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=2 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL') groups=('gnome-extra') -depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') -makedepends=('intltool' 'vala') +depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') +makedepends=('intltool') optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('51c171a6b8a36ebe0b251d0b4d0acb360b5d7738fe8106006ea5504c03ad4932') +sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index 2f02992f5..fb899dd13 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139296 2011-10-01 18:57:45Z ibiru $ +# $Id: PKGBUILD 140893 2011-10-20 05:42:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -14,7 +14,7 @@ install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d8595b09ecbb3c94cd4a655f5fb56cd585fd9441038ad334cba29b92d592279d') +sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 673fca110..9274a5956 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 139301 2011-10-01 18:57:53Z ibiru $ +#$Id: PKGBUILD 142880 2011-11-17 18:34:39Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5bd7dbe18f983aae237517d1eb4b070295c7b848d16c2a9d0a8a6046ea0801bc') +sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index 37d76c56a..e899ab5a2 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -1,9 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-mime-database usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + update-mime-database /usr/share/mime 1> /dev/null + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q - setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon + setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon } post_upgrade() { diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index c89add260..7edd769fe 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139305 2011-10-01 18:58:00Z ibiru $ +# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.2.0.1 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b53e1429930294872b64987bf18e8f2cf07adaac5b1a8c9c15d2fb95ea1e8b2b') +sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index addb04676..d627522a0 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139307 2011-10-01 18:58:03Z ibiru $ +# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,7 +16,7 @@ replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f') +sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index 16f44063a..0d91ed969 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139313 2011-10-01 18:58:13Z ibiru $ +# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d66f97f6cff716dd3c612f1a17b0e2b5dfb138deb92ea3d0a782a0144a7eab95') +sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index b1ac14f85..1e098f700 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139317 2011-10-01 18:58:19Z ibiru $ +# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e') +sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index a69a3ff75..93768bae2 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139631 2011-10-03 21:04:24Z ibiru $ +# $Id: PKGBUILD 142417 2011-11-09 07:29:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,14 +15,12 @@ url="http://www.gnome.org" groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz -fix_color_crash.patch) -sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b' - 'b249d21702d4cf9a3a8dc177ba17c00d33e8e742e548811552d79ddeff1e91e3') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix_color_crash.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids diff --git a/extra/gnome-settings-daemon/fix_color_crash.patch b/extra/gnome-settings-daemon/fix_color_crash.patch deleted file mode 100644 index 24602100f..000000000 --- a/extra/gnome-settings-daemon/fix_color_crash.patch +++ /dev/null @@ -1,186 +0,0 @@ -From fd4c0057b8e3f72b30acb6f1c82688e29b31c0c0 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Mon, 03 Oct 2011 08:52:06 +0000 -Subject: color: Fix a crash if ~/.local is deleted at runtime - -Resolves https://bugzilla.gnome.org/show_bug.cgi?id=660664 ---- -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c -index d325162..3dde406 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -254,6 +254,8 @@ gcm_profile_store_process_child (GcmProfileStore *profile_store, - - /* check we're not in a loop */ - helper = gcm_profile_store_find_directory (profile_store, path); -+ if (helper == NULL) -+ goto out; - if (helper->depth > GCM_PROFILE_STORE_MAX_RECURSION_LEVELS) { - g_warning ("recursing more than %i levels deep is insane", - GCM_PROFILE_STORE_MAX_RECURSION_LEVELS); --- -cgit v0.9.0.2 -From e3313eb16fd2cb25ab3fbc010837b910e525acf6 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Mon, 03 Oct 2011 10:02:56 +0000 -Subject: color: Simplify gcm_profile_store_mkdir_with_parents() - -No need to check for the path existing, -g_file_make_directory_with_parents() will do that for us. ---- -(limited to 'plugins/color/gcm-profile-store.c') - -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c -index 3dde406..d705604 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -419,19 +419,12 @@ static gboolean - gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) - { - gboolean ret; -- GFile *file = NULL; - - /* ensure destination exists */ -- ret = g_file_test (filename, G_FILE_TEST_EXISTS); -- if (!ret) { -- file = g_file_new_for_path (filename); -- ret = g_file_make_directory_with_parents (file, NULL, error); -- if (!ret) -- goto out; -- } --out: -- if (file != NULL) -- g_object_unref (file); -+ file = g_file_new_for_path (filename); -+ ret = g_file_make_directory_with_parents (file, NULL, error); -+ g_object_unref (file); -+ - return ret; - } - --- -cgit v0.9.0.2 -From a711ba99fd5a9bc7bf79dcdc763deed39440eb86 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Mon, 03 Oct 2011 10:38:36 +0000 -Subject: Make commit e3313eb16fd2cb25ab3fbc010837b910e525acf6 actually compile - ---- -(limited to 'plugins/color/gcm-profile-store.c') - -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c -index d705604..0b3cfa0 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -419,6 +419,7 @@ static gboolean - gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) - { - gboolean ret; -+ GFile *file; - - /* ensure destination exists */ - file = g_file_new_for_path (filename); --- -cgit v0.9.0.2 -From 42fa1af884fda1590bc7af0f78e4fc70d0eb621b Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Mon, 03 Oct 2011 10:34:04 +0000 -Subject: color: Cancel any in-progress directory searching on plugin unload - ---- -diff --git a/plugins/color/gcm-profile-store.c b/plugins/color/gcm-profile-store.c -index 0b3cfa0..bcb7adc 100644 ---- a/plugins/color/gcm-profile-store.c -+++ b/plugins/color/gcm-profile-store.c -@@ -34,6 +34,7 @@ struct _GcmProfileStorePrivate - { - GPtrArray *filename_array; - GPtrArray *directory_array; -+ GCancellable *cancellable; - }; - - enum { -@@ -326,7 +327,7 @@ gcm_profile_store_next_files_cb (GObject *source_object, - g_file_enumerator_next_files_async (enumerator, - 5, - G_PRIORITY_LOW, -- NULL, -+ profile_store->priv->cancellable, - gcm_profile_store_next_files_cb, - user_data); - -@@ -343,6 +344,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, - gchar *path = NULL; - GError *error = NULL; - GFileEnumerator *enumerator; -+ GcmProfileStore *profile_store = GCM_PROFILE_STORE (user_data); - - enumerator = g_file_enumerate_children_finish (G_FILE (source_object), - res, -@@ -360,7 +362,7 @@ gcm_profile_store_enumerate_children_cb (GObject *source_object, - g_file_enumerator_next_files_async (enumerator, - 5, - G_PRIORITY_LOW, -- NULL, -+ profile_store->priv->cancellable, - gcm_profile_store_next_files_cb, - user_data); - g_object_unref (enumerator); -@@ -407,7 +409,7 @@ gcm_profile_store_search_path (GcmProfileStore *profile_store, const gchar *path - G_FILE_ATTRIBUTE_STANDARD_TYPE, - G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, - G_PRIORITY_LOW, -- NULL, -+ profile_store->priv->cancellable, - gcm_profile_store_enumerate_children_cb, - profile_store); - out: -@@ -416,14 +418,16 @@ out: - } - - static gboolean --gcm_profile_store_mkdir_with_parents (const gchar *filename, GError **error) -+gcm_profile_store_mkdir_with_parents (const gchar *filename, -+ GCancellable *cancellable, -+ GError **error) - { - gboolean ret; - GFile *file; - - /* ensure destination exists */ - file = g_file_new_for_path (filename); -- ret = g_file_make_directory_with_parents (file, NULL, error); -+ ret = g_file_make_directory_with_parents (file, cancellable, error); - g_object_unref (file); - - return ret; -@@ -438,7 +442,9 @@ gcm_profile_store_search (GcmProfileStore *profile_store) - - /* get Linux per-user profiles */ - path = g_build_filename (g_get_user_data_dir (), "icc", NULL); -- ret = gcm_profile_store_mkdir_with_parents (path, &error); -+ ret = gcm_profile_store_mkdir_with_parents (path, -+ profile_store->priv->cancellable, -+ &error); - if (!ret) { - g_warning ("failed to create directory on startup: %s", error->message); - g_error_free (error); -@@ -480,6 +486,7 @@ static void - gcm_profile_store_init (GcmProfileStore *profile_store) - { - profile_store->priv = GCM_PROFILE_STORE_GET_PRIVATE (profile_store); -+ profile_store->priv->cancellable = g_cancellable_new (); - profile_store->priv->filename_array = g_ptr_array_new_with_free_func (g_free); - profile_store->priv->directory_array = g_ptr_array_new_with_free_func ((GDestroyNotify) gcm_profile_store_helper_free); - } -@@ -490,6 +497,8 @@ gcm_profile_store_finalize (GObject *object) - GcmProfileStore *profile_store = GCM_PROFILE_STORE (object); - GcmProfileStorePrivate *priv = profile_store->priv; - -+ g_cancellable_cancel (profile_store->priv->cancellable); -+ g_object_unref (profile_store->priv->cancellable); - g_ptr_array_unref (priv->filename_array); - g_ptr_array_unref (priv->directory_array); - --- -cgit v0.9.0.2 diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index caf138427..3116f3315 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139662 2011-10-04 16:16:39Z ibiru $ +# $Id: PKGBUILD 140909 2011-10-20 05:43:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/GnomeShell" @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324') +sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 229fe1b37..7f26b0a44 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139324 2011-10-01 18:58:30Z ibiru $ +# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c') +sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index cae5ded12..c4ee90d1c 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139326 2011-10-01 18:58:34Z ibiru $ +# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1') +sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index b9f7c6a4d..a6d46c6ab 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139328 2011-10-01 18:58:37Z ibiru $ +# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.2.0.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('49b8177fcc6693690eceef207f78173f0ca34bdef873a6c1fed90bef28791bc1') +sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 82c43da59..f860a5fad 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 117703 2011-04-04 16:40:52Z ibiru $ +# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64' 'mips64el') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') makedepends=('intltool' 'gnome-doc-utils' 'nautilus') options=('!emptydirs' '!libtool') install=gnome-user-share.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1987d08ebb88bd3fecd7c76d2d9549dba2c7132a7c2b3cfe68fdc2a24260fafe') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-utils/PKGBUILD b/extra/gnome-utils/PKGBUILD index b3354b31f..50c0ecbb1 100644 --- a/extra/gnome-utils/PKGBUILD +++ b/extra/gnome-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139332 2011-10-01 18:58:41Z ibiru $ +# $Id: PKGBUILD 140921 2011-10-20 05:43:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-utils -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" arch=(i686 x86_64 mips64el) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-utils.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('532e071ad772afa9bcd116144bc6b644c8af3daf2eb3f76f6fa306aced1ef5f8') +sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 5bbd882c0..37e19bfb2 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 139548 2011-10-03 12:22:55Z jgc $ +# $Id: PKGBUILD 141031 2011-10-22 05:09:05Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.7 -pkgrel=2 +pkgver=2.4.8 +pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnucash.org" license=("GPL") -depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'hicolor-icon-theme' - 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') +depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils') makedepends=('intltool') optdepends=('evince: for print preview' 'perl-finance-quote: for stock information lookups' @@ -18,8 +17,7 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0f85c8bfd165b2605a7853f579808823') -sha1sums=('e99dd56949de27c19d9c3413d30c87a0f74e8ff9') +sha1sums=('cdd8793bc8e8cbb433a0237007023f4973a51781') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 388da42fd..13e2761f2 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $ +# $Id: PKGBUILD 142708 2011-11-13 11:53:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.8 +pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') @@ -12,14 +12,11 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz - addGNU-stack.diff) -md5sums=('748d537027978abcb7dd33ec396dc511' - '19b92429e8d1639cfc4dfad0883298cb') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) +md5sums=('bce40a4e9bec343b266707eb9819132b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/addGNU-stack.diff ./configure --prefix=/usr \ --with-zlib \ --disable-static \ diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff deleted file mode 100644 index 8324b5a58..000000000 --- a/extra/gnutls/addGNU-stack.diff +++ /dev/null @@ -1,13 +0,0 @@ -Description: Prevent executable stack -Author: Andreas Metzler <ametzler@debian.org> - ---- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s -+++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s -@@ -38,3 +38,7 @@ is_padlock_nano: - xorl %eax,%eax - ret - .size is_padlock_nano,.-is_padlock_nano -+ -+#if defined(__linux__) && defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 14021c4e5..3109c2cc4 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140162 2011-10-08 07:31:59Z giovanni $ +# $Id: PKGBUILD 141724 2011-11-02 15:23:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted -pkgver=0.9.1 -pkgrel=3 +pkgver=0.10.0 +pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" @@ -23,7 +23,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('f35785099994c7c9b7b2e842840f8b72' +md5sums=('d5b339eb5bef7a99ff73f750834b37b9' '27c264cfad8fa413d75954dda7a2dd50') build() { diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 3068d223f..6a15d34cf 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140082 2011-10-06 08:10:19Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142040 2011-11-04 20:43:48Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.1 +pkgver=3.3 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') @@ -17,11 +17,12 @@ optdepends=('php: generate a PHP status page for your GPS' 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool' '!buildflags') +options=('!libtool') install="${pkgname}.install" -source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('f783c2890774fcafa56bdb968a0372fc' +md5sums=('4cfdcfd88e925f4d0d6c2272fc573ab5' + '90086315ed6f266748b9acb338b903a5' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') @@ -32,8 +33,8 @@ build() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps gpscat gpsfake \ - gpsprof xgps xgpsspeed + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \ + gpscat gpsfake gpsprof xgps xgpsspeed scons prefix=/usr \ systemd=yes \ @@ -62,6 +63,7 @@ package() { chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so install -D -m644 packaging/X11/xgps.desktop \ "${pkgdir}/usr/share/applications/xgps.desktop" diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD index 1b767eba5..c71f63ce3 100644 --- a/extra/grantlee/PKGBUILD +++ b/extra/grantlee/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 128623 2011-06-24 16:39:02Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142010 2011-11-03 23:27:16Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=grantlee -pkgver=0.1.9 +pkgver=0.2.0 pkgrel=1 pkgdesc="A string template engine based on the Django template system and written in Qt" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +12,7 @@ license=('LGPL3') depends=('qt') makedepends=('cmake') source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz") -md5sums=('3d93b5312814ebee373fba5509d88bdb') +md5sums=('0622ed30630a44b5fac0bfa7e176d3fe') build() { cd "${srcdir}" diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD index 24954127d..fab274a09 100644 --- a/extra/graphite/PKGBUILD +++ b/extra/graphite/PKGBUILD @@ -1,42 +1,39 @@ -# $Id: PKGBUILD 137743 2011-09-10 14:59:36Z pierre $ +# $Id: PKGBUILD 142675 2011-11-12 18:27:50Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> -pkgbase=graphite -pkgname=('libgraphite' 'pango-graphite') -pkgver=2.3.1 -pkgrel=2 +pkgname=graphite +pkgver=1.0.3 +pkgrel=1 +epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://graphite.sil.org/" -makedepends=('pango' 'gcc-libs') +pkgdesc='reimplementation of the SIL Graphite text processing engine' +license=('custom_SIL Dual license') +depends=('gcc-libs') +makedepends=('cmake' 'freetype2') options=('!libtool' '!emptydirs') -source=("http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz") -md5sums=('d35724900f6a4105550293686688bbb3') +source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz") +md5sums=('3bf481ca95109b14435125c0dd1f2217') build() { - cd "${srcdir}/silgraphite-${pkgver}" - ./configure --prefix=/usr --disable-static + cd "${srcdir}" + mkdir build + cd build + cmake -G "Unix Makefiles" ../graphite2-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr make } -package_libgraphite() { - pkgdesc='SILGraphite - a "smart font" rendering engine - the libs and headers' - license=('custom_SIL Dual license') - depends=('gcc-libs') +check() { + cd "${srcdir}"/build + ctest +} - cd "${srcdir}/silgraphite-${pkgver}"/engine +package() { + cd "${srcdir}"/build make DESTDIR="$pkgdir/" install # licenses mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 license/*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/ -} - -package_pango-graphite() { - pkgdesc="SILGraphite support for pango" - license=('LGPL') - depends=('pango' 'libgraphite') - install=pango-graphite.install - - cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite - make DESTDIR="$pkgdir/" install + install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/ } diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index 2af2c4c62..07deaf13d 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 129245 2011-06-26 09:32:03Z bisson $ +# $Id: PKGBUILD 143016 2011-11-21 00:00:02Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz pkgver=2.28.0 -pkgrel=4 +pkgrel=5 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' license=('custom:EPL') arch=('i686' 'x86_64' 'mips64el') -depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango') +depends=('gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt') optdepends=('mono: sharp bindings' 'guile: guile bindings' diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index b57eefce4..6c9daaaa4 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 139613 2011-10-03 19:05:35Z heftig $ +# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.1.17 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') -makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest' 'libtracker-sparql') +makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' + 'rest' 'libtracker-sparql') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' - 'quvi: Youtube plugin' + 'libquvi: Youtube plugin' 'sqlite3: Podcasts plugin' 'gmime: Podcasts plugin' 'sqlite3: Bookmarks plugin' diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 0ddce1182..080217834 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $ +# $Id: PKGBUILD 142666 2011-11-12 17:45:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 432627371..ef7f376cc 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139885 2011-10-05 19:06:47Z andrea $ +# $Id: PKGBUILD 141228 2011-10-26 22:25:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=2.13.91 -pkgrel=2 +pkgver=2.14.0 +pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -15,7 +15,7 @@ optdepends=('gstreamer0.10-base: video support') options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90') +sha256sums=('9db3e4f714d62b91185e4f8edbee2c98a85bd76f0d4b82a7d7868a9b86ae10a2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD index 46ccad415..559d96c43 100644 --- a/extra/gtk-sharp-2/PKGBUILD +++ b/extra/gtk-sharp-2/PKGBUILD @@ -1,28 +1,31 @@ -# $Id: PKGBUILD 72892 2010-03-21 15:11:50Z ibiru $ +# $Id: PKGBUILD 142257 2011-11-07 12:49:15Z jgc $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gtk-sharp-2 -pkgver=2.12.10 +pkgver=2.12.11 pkgrel=1 pkgdesc="gtk2 bindings for C#" arch=(i686 x86_64 'mips64el') license=('LGPL') url="http://gtk-sharp.sourceforge.net" -depends=('mono>=2.4' 'libglade>=2.6.4' 'gtk2>=2.18.0') +depends=('mono' 'libglade' 'gtk2') makedepends=('pkgconfig' 'monodoc') conflicts=('gtk#') options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/GNOME/sources/gtk-sharp/2.12/gtk-sharp-${pkgver}.tar.bz2) -sha256sums=('aaa53f7916f25f0f83760b6ffbf0d465d13ecfa55aa645603f1ca876b7d0f770') +source=(http://download.mono-project.com/sources/gtk-sharp212/gtk-sharp-${pkgver}.tar.bz2) +md5sums=('c278da6a472c6c13b698af012f543c64') build() { # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR="${srcdir}/weird" + export MONO_SHARED_DIR="${srcdir}/wapi" mkdir -p "${MONO_SHARED_DIR}" cd "${srcdir}/gtk-sharp-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static || return 1 - make || return 1 - make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \ - DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "${srcdir}/gtk-sharp-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index 0b322c6ba..a962a152b 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 138088 2011-09-16 07:43:49Z ibiru $ +# $Id: PKGBUILD 142786 2011-11-15 06:28:23Z eric $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.4.3 -pkgrel=2 +pkgver=0.4.4 +pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64' 'mips64el') url="http://live.gnome.org/gtk-vnc" license=('LGPL') -depends=('gtk3') +depends=('libgcrypt' 'gtk3') optdepends=('gtk2: GTK2 widget') -makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2') +makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7') build() { cd "$srcdir" diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index 7337b409c..02209a249 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136812 2011-09-01 19:14:23Z ibiru $ +# $Id: PKGBUILD 142844 2011-11-16 23:13:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.6 +pkgver=2.24.8 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" @@ -11,18 +11,17 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') options=('!libtool' '!docs') license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch - gtk2-dont-ellipsize-filters.diff) -sha256sums=('8a026b545dc1fa0c1a69b395232ad7c8ee8fa260be5f7d9a2f2ffcd799efefca' + revert-iconview.patch) +sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '90a9d50c1407ab87f6fa9ae131c2663477540419955b0ba39520a18882afceb8') + '517b3d0797b27324b8fa042ce4b653334ff3b55e48b921de3485505b9ca99fba') build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - #https://bugzilla.gnome.org/show_bug.cgi?id=657949 - patch -Np1 -i "${srcdir}/gtk2-dont-ellipsize-filters.diff" + cd "$srcdir/gtk+-$pkgver" + patch -Np1 -i "$srcdir/xid-collision-debug.patch" + patch -Np1 -i "$srcdir/revert-iconview.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -36,24 +35,24 @@ build() { } package_gtk2() { - pkgdesc="The GTK+ Toolkit (v2)" + pkgdesc="GTK+ is a multi-platform toolkit (v2)" install=gtk2.install depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') backup=(etc/gtk-2.0/gtkrc) - cd "${srcdir}/gtk+-${pkgver}" + cd "$srcdir/gtk+-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" + echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc" #split this out to use with gtk3 too - rm ${pkgdir}/usr/bin/gtk-update-icon-cache + rm $pkgdir/usr/bin/gtk-update-icon-cache } package_gtk-update-icon-cache() { pkgdesc="The GTK+ update icon cache tool" depends=('gdk-pixbuf2') - cd "${srcdir}/gtk+-${pkgver}/gtk" + cd "$srcdir/gtk+-$pkgver/gtk" - install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache + install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache } diff --git a/extra/gtk2/gtk2-dont-ellipsize-filters.diff b/extra/gtk2/gtk2-dont-ellipsize-filters.diff deleted file mode 100644 index ff8dff6ef..000000000 --- a/extra/gtk2/gtk2-dont-ellipsize-filters.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c -index 2ee7903..37d9e8d 100644 ---- a/gtk/gtkfilechooserdefault.c -+++ b/gtk/gtkfilechooserdefault.c -@@ -2322,23 +2322,9 @@ renderer_editing_canceled_cb (GtkCellRendererText *cell_renderer_text, - static GtkWidget * - filter_create (GtkFileChooserDefault *impl) - { -- GtkCellRenderer *cell; -- GList *cells; -- - impl->filter_combo = gtk_combo_box_text_new (); - gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (impl->filter_combo), FALSE); - -- /* Get the combo's text renderer and set ellipsize parameters */ -- cells = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (impl->filter_combo)); -- g_assert (cells); -- cell = cells->data; -- -- g_object_set (G_OBJECT (cell), -- "ellipsize", PANGO_ELLIPSIZE_END, -- NULL); -- -- g_list_free (cells); -- - g_signal_connect (impl->filter_combo, "changed", - G_CALLBACK (filter_combo_changed), impl); - diff --git a/extra/gtk2/revert-iconview.patch b/extra/gtk2/revert-iconview.patch new file mode 100644 index 000000000..e16fc38e3 --- /dev/null +++ b/extra/gtk2/revert-iconview.patch @@ -0,0 +1,30 @@ +From 5c3bb1839cac52828756f9ddb98f49d586853991 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Wed, 16 Nov 2011 22:38:45 +0000 +Subject: Revert "iconview: layout items immediately when setting a GtkTreeModel" + +It makes GtkIconView segfault on GTK 2.24. + +gtk_icon_view_expose() calls gtk_icon_view_layout() first thing if +there's a layout queued anyway, so we wouldn't end up in the same +situation causing the crash the original patch is supposed to fix. + +This reverts commit 5a03f4a6a50237d86959f596dda143dfc2f040d1. + +https://bugzilla.gnome.org/show_bug.cgi?id=663138 +--- +diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c +index 62877fa..54b3f3b 100644 +--- a/gtk/gtkiconview.c ++++ b/gtk/gtkiconview.c +@@ -5423,7 +5423,7 @@ gtk_icon_view_set_model (GtkIconView *icon_view, + + gtk_icon_view_build_items (icon_view); + +- gtk_icon_view_layout (icon_view); ++ gtk_icon_view_queue_layout (icon_view); + } + + g_object_notify (G_OBJECT (icon_view), "model"); +-- +cgit v0.9.0.2 diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 2c9844ed0..c64a69d8e 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139599 2011-10-03 17:26:32Z ibiru $ +# $Id: PKGBUILD 143028 2011-11-21 05:59:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=2 -pkgdesc="The GTK+ Toolkit (v3)" +pkgdesc="GTK+ is a multi-platform toolkit (v3)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" install=gtk3.install @@ -13,16 +13,16 @@ makedepends=('gobject-introspection') options=('!libtool' '!docs') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz settings.ini - a11y.patch::http://git.gnome.org/browse/gtk+/patch/?id=e248c6812e8e33150d61074471ef0330668aed45) -sha256sums=('bce3c1a9be6afd7552c795268656d8fdd09c299765a7faaf5a76498bb82ed44c' + fix_crash_treeview.patch) +sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - '0ae5f9c3553f9fc6c515343de96046c17544654936b17c09330443ed44778cb2') + 'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9') build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/a11y.patch" + cd "$srcdir/gtk+-$pkgver" + patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -34,8 +34,8 @@ build() { } package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/gtk+-$pkgver" + make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" } diff --git a/extra/gtk3/fix_crash_treeview.patch b/extra/gtk3/fix_crash_treeview.patch new file mode 100644 index 000000000..12c6372f1 --- /dev/null +++ b/extra/gtk3/fix_crash_treeview.patch @@ -0,0 +1,55 @@ +From 456b19a35adbdc4b098e6da020c3a87cb62ae7f4 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 10 Nov 2011 15:52:44 +0000 +Subject: a11y: Fix gcc warning + +--- +diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c +index 663bb51..b2ca9ba 100644 +--- a/gtk/a11y/gtktreeviewaccessible.c ++++ b/gtk/a11y/gtktreeviewaccessible.c +@@ -238,7 +238,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, + accessible->n_children_deleted = 0; + + accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, +- g_int_equal, NULL, cell_info_free); ++ g_int_equal, NULL, (GDestroyNotify) cell_info_free); + + widget = GTK_WIDGET (data); + tree_view = GTK_TREE_VIEW (widget); +-- +cgit v0.9.0.2 +From b25621173734ad1c9cee83802f7ac32ab7df20e7 Mon Sep 17 00:00:00 2001 +From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> +Date: Wed, 09 Nov 2011 13:32:32 +0000 +Subject: gtktreeviewaccessible: use a value_destroy_func with the cell_info_by_index hash + +This ensures that we don't leak any GtkTreeViewAccessibleCellInfo when +re-inserting a new one with the same key. + +https://bugzilla.gnome.org/show_bug.cgi?id=663694 +--- +diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c +index 046e253..4ad323c 100644 +--- a/gtk/a11y/gtktreeviewaccessible.c ++++ b/gtk/a11y/gtktreeviewaccessible.c +@@ -237,7 +237,8 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, + accessible->idle_expand_path = NULL; + accessible->n_children_deleted = 0; + +- accessible->cell_info_by_index = g_hash_table_new (g_int_hash, g_int_equal); ++ accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, ++ g_int_equal, NULL, cell_info_free); + + widget = GTK_WIDGET (data); + tree_view = GTK_TREE_VIEW (widget); +@@ -2845,7 +2846,6 @@ garbage_collect_cell_data (gpointer data) + { + if (!cell_info->in_use) + { +- cell_info_free (cell_info); + g_hash_table_iter_remove (&iter); + } + } +-- +cgit v0.9.0.2 diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 332d577d9..9f5764c6d 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139348 2011-10-01 18:59:07Z ibiru $ +# $Id: PKGBUILD 142883 2011-11-17 18:34:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.0 +pkgver=4.2.2 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('a4e50ac159fe49ddac07a3d0fba386ac90b404afce770a89e6077580578c38af') +sha256sums=('e20bb5d461e9ae9d3a8d4e13d544db1813707810ded7cbde9287485f2394dd2c') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index aa8d3101c..03c3c7c0f 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $ +# $Id: PKGBUILD 141679 2011-11-02 07:51:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4') +sha256sums=('73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD new file mode 100644 index 000000000..57d38d906 --- /dev/null +++ b/extra/gts/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 143014 2011-11-20 23:59:13Z bisson $ + +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thomas Dziedzic <gostrc at gmail> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> + +pkgname=gts +pkgver=0.7.6 +pkgrel=2 +pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles' +url='http://gts.sourceforge.net/' +license=('LGPL') +arch=('i686' 'x86_64') +depends=('glib2') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040') +options=('!libtool') + +build() { + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index e90b0a97a..51ab892ac 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139354 2011-10-01 18:59:17Z ibiru $ +# $Id: PKGBUILD 142885 2011-11-17 18:34:47Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64' 'mips64el') @@ -12,11 +12,11 @@ depends=('gconf' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('42aacc32beeb0ebb24db519aaceeb184e4212fdd7732bd7b0f6a15f00afc9501') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-scrollkeeper --enable-introspection @@ -24,10 +24,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas } diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 34790722a..eea981de0 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 139360 2011-10-01 18:59:26Z ibiru $ +# $Id: PKGBUILD 140933 2011-10-20 05:43:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.0 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' - 'libarchive' 'libgdu' 'pkgconfig' 'intltool' - 'libimobiledevice' 'avahi' 'dconf') +makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8') +sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index 19a5223fe..26916756b 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139476 2011-10-02 02:49:32Z eric $ +# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $ # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> pkgname=hplip -pkgver=3.11.7 -pkgrel=2 +pkgver=3.11.10 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" license=('GPL') -makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat') + 'net-snmp>=5.7.1') +makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -19,22 +19,25 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - hplip-cups-1.5.0-compatibility.patch) -md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1' - 'f4422ee0dc842e1a53b75c24f468d65c' - 'a767000ce920e9f7f6a5b0a8e4392ef9') +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('6143f30f3b6905ef22105176a3b80db0' + '396bbd8c5cc92aa8295e5bcb508692f3') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch" export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + # fix sysfs rules + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + data/rules/56-hpmud_support.rules + ./configure --prefix=/usr \ --enable-qt4 \ --enable-foomatic-rip-hplip-install \ @@ -51,21 +54,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - rm -rf "$pkgdir/etc/sane.d" - # remove autostart of hp-daemon - rm -r "$pkgdir/etc/xdg" - # move udev rules to /lib/udev/rules.d - mkdir -p "$pkgdir/lib/udev/rules.d" - mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" - rm -r "$pkgdir/etc/udev" - # remove lp user, it's not used on archlinux - sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - -e 's|"bin/sh|"/bin/sh|g' \ - "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} } - diff --git a/extra/hplip/hplip-cups-1.5.0-compatibility.patch b/extra/hplip/hplip-cups-1.5.0-compatibility.patch deleted file mode 100644 index a4039e6c9..000000000 --- a/extra/hplip/hplip-cups-1.5.0-compatibility.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- hplip-3.11.7~/prnt/hpps/hppsfilter.c 2011-07-24 18:58:05.000000000 +0000 -+++ hplip-3.11.7/prnt/hpps/hppsfilter.c 2011-08-09 20:51:54.150214165 +0000 -@@ -38,6 +38,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <cups/cups.h> -+#include <cups/ppd.h> - #include <sys/types.h> - #include <sys/stat.h> - diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD index 0771238a8..3038722a8 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' 'mips64el') 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/htop/htop.c.patch b/extra/htop/htop.c.patch deleted file mode 100644 index 41a2dd377..000000000 --- a/extra/htop/htop.c.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Roman Kosenko <madkite@gmail.com> -Date: Thu, 10 Mar 2011 16:23:53 +0200 -Subject: [PATCH] Fix stupid bug with --sort-key - ---- htop.c.old 2010-11-24 20:45:38.000000000 +0200 -+++ htop.c 2011-03-10 16:32:18.473716667 +0200 -@@ -282,7 +282,7 @@ - printVersionFlag(); - break; - case 's': -- if (strcmp(optarg, "help")) { -+ if (!strcmp(optarg, "help")) { - for (int j = 1; j < LAST_PROCESSFIELD; j++) - printf ("%s\n", Process_fieldNames[j]); - exit(0); diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD index 4c3d7611d..b24becb80 100644 --- a/extra/hwloc/PKGBUILD +++ b/extra/hwloc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139869 2011-10-05 15:17:09Z stephane $ +# $Id: PKGBUILD 143086 2011-11-22 17:32:42Z stephane $ # Maintainer : Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Sylvain HENRY <hsyl20@yahoo.fr> # Contributor: Hervé YVIQUEL <elldekaa@gmail.com> pkgname=hwloc -pkgver=1.2.2 +pkgver=1.3 pkgrel=1 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org/projects/hwloc/" license=('BSD') -depends=('sh') +depends=('sh' 'pciutils') makedepends=('pkg-config') optdepends=('cairo: Graphical output' 'libxml2: XML export') options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.2/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9805effb53a69199bcaf86efaf349fee684cb0a6') +source=(http://www.open-mpi.org/software/hwloc/v1.3/downloads/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4d4de0f48f8b9a1eaf75d55bc93e0e624f6194eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 5aa4b468f..d5424ed9e 100644 --- a/testing/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') -pkgver=1.1.3 +pkgver=1.1.4 #_date=20110925 #pkgrel=0.${_date}.1 pkgrel=1 @@ -12,11 +12,11 @@ url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'xulrunner') source=(#ftp://ftp.archlinux.org/other/$pkgname/${pkgbase}-${_date}.tar.xz - http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) + http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz #http://icedtea.classpath.org/download/source/${pkgname}-${pkgver}.tar.gz -md5sums=('0e2e653c7436d81edcbc1d4255571ab6') -sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37') - + icedtea-web-1.1.4-npapi-fix.patch) +md5sums=('1ed24b7e58da26471187dfae80b020b6' + '81ac36e05ea1b55f1580bdb28c24f4db') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -32,12 +32,13 @@ mksource() { build() { cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}" - #. /etc/profile.d/jre.sh - . /etc/profile.d/jre7-openjdk.sh - #. /etc/profile.d/jdk.sh - . /etc/profile.d/jdk7-openjdk.sh + . /etc/profile.d/jre.sh + . /etc/profile.d/jdk.sh + + #autoreconf --force --install - autoreconf --force --install + # fix build with Xulrunner 8 + patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch ./configure --prefix=${_jvmdir} \ --datarootdir=/usr/share \ diff --git a/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch new file mode 100644 index 000000000..79ca0a6c0 --- /dev/null +++ b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch @@ -0,0 +1,12 @@ +diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc +--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500 ++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500 +@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT + + // Returns a string describing the MIME type that this plugin + // handles. +-char* ++const char* + NP_GetMIMEDescription () + { + PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); diff --git a/testing/icedtea-web-java7/icedtea-web-java7.install b/extra/icedtea-web-java7/icedtea-web-java7.install index 80312d4a6..80312d4a6 100644 --- a/testing/icedtea-web-java7/icedtea-web-java7.install +++ b/extra/icedtea-web-java7/icedtea-web-java7.install diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index cf49683cb..35d3d66a9 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 139127 2011-09-30 05:42:46Z andyrtr $ +# $Id: PKGBUILD 142413 2011-11-09 05:54:47Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -md5sums=('0e2e653c7436d81edcbc1d4255571ab6') -sha1sums=('5c8d8fbbdc9db0b7113a6cced751c428b4d3ea37') - +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz + icedtea-web-1.1.4-npapi-fix.patch) +md5sums=('1ed24b7e58da26471187dfae80b020b6' + '81ac36e05ea1b55f1580bdb28c24f4db') build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" + + # fix build with Xulrunner 8 + patch -Np1 -i ${srcdir}/icedtea-web-1.1.4-npapi-fix.patch + ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make diff --git a/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch new file mode 100644 index 000000000..79ca0a6c0 --- /dev/null +++ b/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch @@ -0,0 +1,12 @@ +diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc +--- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500 ++++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500 +@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT + + // Returns a string describing the MIME type that this plugin + // handles. +-char* ++const char* + NP_GetMIMEDescription () + { + PLUGIN_DEBUG ("NP_GetMIMEDescription\n"); diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index fb61387a9..6689b196a 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134716 2011-08-07 16:47:04Z andyrtr $ +# $Id: PKGBUILD 141339 2011-10-29 15:01:45Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=4.8.1 +pkgver=4.8.1.1 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ depends=('gcc-libs' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('af36f635271a239d76d038d6cf8da8df' +md5sums=('ea93970a0275be6b42f56953cd332c17' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index f5de91c3c..5839ec94a 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140515 2011-10-16 08:18:29Z foutrelis $ +# $Id: PKGBUILD 142234 2011-11-06 21:12:47Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.3.1 +pkgver=6.7.3.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('67e20cf171fa50e76c30bf6e703d37419164ce70' +sha1sums=('317dbb760c0ff8a22f031c3864d3c13f03b93a4c' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -20,7 +20,7 @@ build() { sed '/AC_PATH_XTRA/d' -i configure.ac autoreconf - patch -Np0 -i ../perlmagick.rpath.patch + patch -p0 -i ../perlmagick.rpath.patch LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl" \ ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ @@ -32,6 +32,11 @@ build() { make } +check() { + cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} + make check +} + package_imagemagick() { pkgdesc="An image viewing/manipulation program" optdepends=('ghostscript: for Ghostscript support' diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 78479b8ab..4bbc11f02 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $ +# $Id: PKGBUILD 142652 2011-11-12 17:18:29Z ibiru $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=3 +pkgrel=4 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch b/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch deleted file mode 100644 index 56bd529c2..000000000 --- a/extra/irqbalance/Fix-detection-of-CPUs-in-sysfs.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Shawn Bohrer <sbohrer@rgmadvisors.com> - -Only count directories that match /sys/devices/system/cpu/cpu[0-9]+ as -CPUs. Previously any directory that started with cpu was counted which -caused cpufreq and cpuidle to be counted as CPUs. - -Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com> ---- - cputree.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/cputree.c b/cputree.c -index 3b0c982..b879785 100644 ---- a/cputree.c -+++ b/cputree.c -@@ -25,6 +25,7 @@ - */ - - #include "config.h" -+#include <ctype.h> - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -@@ -321,7 +322,7 @@ void parse_cpu_tree(void) - return; - do { - entry = readdir(dir); -- if (entry && strlen(entry->d_name)>3 && strstr(entry->d_name,"cpu")) { -+ if (entry && !strncmp(entry->d_name,"cpu", 3) && isdigit(entry->d_name[3])) { - char new_path[PATH_MAX]; - sprintf(new_path, "/sys/devices/system/cpu/%s", entry->d_name); - do_one_cpu(new_path); --- -1.6.5.2 - diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD index 953d1533b..26f7397c1 100644 --- a/extra/irqbalance/PKGBUILD +++ b/extra/irqbalance/PKGBUILD @@ -2,34 +2,24 @@ # Contributor: Martin Striz <ms@poruba.net> pkgname=irqbalance -pkgver=0.56 -pkgrel=3 +pkgver=1.0.2 +pkgrel=1 pkgdesc="IRQ balancing daemon for SMP systems" arch=('i686' 'x86_64' 'mips64el') -url="http://www.irqbalance.org/" +url="http://code.google.com/p/irqbalance" license=('GPL') -depends=(glib2) +depends=(glib2 numactl libcap-ng) makedepends=(pkgconfig) backup=(etc/conf.d/irqbalance) -source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tbz2 +source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz irqbalance.conf.d - irqbalance.rc.d - current-trunk.patch - Fix-detection-of-CPUs-in-sysfs.patch - Special-interrupt-counts-line-NMI-may-start-with-a-s.patch) -md5sums=('cd0c4d3b2bb84778a04fc594ad83949a' + irqbalance.rc.d) +md5sums=('58e1c9c164b12d797b500634a73938b4' '336c1ee99818f9ecda1687e34c69fd6b' - 'fb82fc5d267d39110baf720d81282a7c' - '64df09f54cf80d9ce5ff2751a882032d' - '00dcb394dac884c116657ade4fe623ee' - 'e774aff57054ce3c8b5adc7c3e5a74c2') + 'fb82fc5d267d39110baf720d81282a7c') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np0 < ../current-trunk.patch - patch -Np1 < ../Fix-detection-of-CPUs-in-sysfs.patch - patch -Np1 < ../Special-interrupt-counts-line-NMI-may-start-with-a-s.patch - ./autogen.sh ./configure --prefix=/usr make } @@ -37,8 +27,6 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make install DESTDIR="$pkgdir" - #install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance - #install -D -m644 irqbalance.1 $pkgdir/usr/share/man/man1/irqbalance.1 install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance } diff --git a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch b/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch deleted file mode 100644 index c2e69c218..000000000 --- a/extra/irqbalance/Special-interrupt-counts-line-NMI-may-start-with-a-s.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Shawn Bohrer <sbohrer@rgmadvisors.com> - -Special interrupt counts line NMI may start with a space - -The kernel determines the maximum number of possible IRQs and pads the -first field of /proc/interrupts appropriately. With four or more digits -of precession the special interrupt counts all start with a space -instead of a letter. This caused the special interrupt counts to be -counted on my system and that caused the cpunr count to be off when it -reached the ERR and MIS lines forcing a CPU rescan. - -Signed-off-by: Shawn Bohrer <sbohrer@rgmadvisors.com> ---- - procinterrupts.c | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) - -diff --git a/procinterrupts.c b/procinterrupts.c -index e336efe..322f4de 100644 ---- a/procinterrupts.c -+++ b/procinterrupts.c -@@ -55,20 +55,18 @@ void parse_proc_interrupts(void) - if (getline(&line, &size, file)==0) - break; - -- -+ number = strtoul(line, &c, 10); - /* lines with letters in front are special, like NMI count. Ignore */ -- if (!(line[0]==' ' || (line[0]>='0' && line[0]<='9'))) -- break; -- c = strchr(line, ':'); -- if (!c) -+ if (line == c) -+ continue; -+ -+ if (c[0] == ':') -+ ++c; -+ else - continue; -- *c = 0; -- c++; -- number = strtoul(line, NULL, 10); -+ - count = 0; - cpunr = 0; -- -- c2=NULL; - while (1) { - uint64_t C; - C = strtoull(c, &c2, 10); -@@ -78,11 +76,11 @@ void parse_proc_interrupts(void) - c=c2; - cpunr++; - } -- if (cpunr != core_count) -+ if (cpunr != core_count) - need_cpu_rescan = 1; -- -+ - set_interrupt_count(number, count); -- } -+ } - fclose(file); - free(line); - } --- -1.6.5.2 - diff --git a/extra/irqbalance/current-trunk.patch b/extra/irqbalance/current-trunk.patch deleted file mode 100644 index 83f08575c..000000000 --- a/extra/irqbalance/current-trunk.patch +++ /dev/null @@ -1,217 +0,0 @@ -Index: powermode.c -=================================================================== ---- powermode.c (.../tags/irqbalance-0.56) (revision 33) -+++ powermode.c (.../trunk) (revision 33) -@@ -40,7 +40,8 @@ - char *line = NULL; - size_t size = 0; - char *c; -- uint64_t dummy, irq, softirq; -+ uint64_t dummy __attribute__((unused)); -+ uint64_t irq, softirq; - file = fopen("/proc/stat", "r"); - if (!file) - return; -Index: cputree.c -=================================================================== ---- cputree.c (.../tags/irqbalance-0.56) (revision 33) -+++ cputree.c (.../trunk) (revision 33) -@@ -47,6 +47,7 @@ - /* Users want to be able to keep interrupts away from some cpus; store these in a cpumask_t */ - cpumask_t banned_cpus; - -+cpumask_t cpu_possible_map; - - /* - it's convenient to have the complement of banned_cpus available so that -@@ -158,6 +159,8 @@ - memset(cpu, 0, sizeof(struct cpu_core)); - - cpu->number = strtoul(&path[27], NULL, 10); -+ -+ cpu_set(cpu->number, cpu_possible_map); - - cpu_set(cpu->number, cpu->mask); - -@@ -219,15 +222,15 @@ - core_count++; - } - --static void dump_irqs(int spaces, GList *interrupts) -+static void dump_irqs(int spaces, GList *dump_interrupts) - { - struct interrupt *irq; -- while (interrupts) { -+ while (dump_interrupts) { - int i; -- for (i=0; i<spaces;i++) printf(" "); -- irq = interrupts->data; -+ for (i=0; i<spaces; i++) printf(" "); -+ irq = dump_interrupts->data; - printf("Interrupt %i (%s/%u) \n", irq->number, classes[irq->class], (unsigned int)irq->workload); -- interrupts = g_list_next(interrupts); -+ dump_interrupts = g_list_next(dump_interrupts); - } - } - -Index: placement.c -=================================================================== ---- placement.c (.../tags/irqbalance-0.56) (revision 33) -+++ placement.c (.../trunk) (revision 33) -@@ -272,7 +272,7 @@ - } - if ((!cpus_empty(irq->node_mask)) && - (!cpus_equal(irq->mask, irq->node_mask)) && -- (!cpus_full(irq->node_mask))) { -+ (!__cpus_full(&irq->node_mask, num_possible_cpus()))) { - irq->old_mask = irq->mask; - irq->mask = irq->node_mask; - } -Index: cpumask.h -=================================================================== ---- cpumask.h (.../tags/irqbalance-0.56) (revision 33) -+++ cpumask.h (.../trunk) (revision 33) -@@ -1,7 +1,7 @@ - #ifndef __LINUX_CPUMASK_H - #define __LINUX_CPUMASK_H - --#define NR_CPUS 256 -+#define NR_CPUS 4096 - /* - * Cpumasks provide a bitmap suitable for representing the - * set of CPU's in a system, one bit position per CPU number. -Index: bitmap.c -=================================================================== ---- bitmap.c (.../tags/irqbalance-0.56) (revision 33) -+++ bitmap.c (.../trunk) (revision 33) -@@ -74,6 +74,19 @@ - return 1; - } - -+int __bitmap_weight(const unsigned long *bitmap, int bits) -+{ -+ int k, w = 0, lim = bits/BITS_PER_LONG; -+ -+ for (k = 0; k < lim; k++) -+ w += hweight_long(bitmap[k]); -+ -+ if (bits % BITS_PER_LONG) -+ w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits)); -+ -+ return w; -+} -+ - int __bitmap_equal(const unsigned long *bitmap1, - const unsigned long *bitmap2, int bits) - { -Index: irqlist.c -=================================================================== ---- irqlist.c (.../tags/irqbalance-0.56) (revision 33) -+++ irqlist.c (.../trunk) (revision 33) -@@ -28,6 +28,7 @@ - #include <unistd.h> - #include <sys/types.h> - #include <dirent.h> -+#include <errno.h> - - #include "types.h" - #include "irqbalance.h" -@@ -39,6 +40,7 @@ - void get_affinity_hint(struct interrupt *irq, int number) - { - char buf[PATH_MAX]; -+ cpumask_t tempmask; - char *line = NULL; - size_t size = 0; - FILE *file; -@@ -51,7 +53,9 @@ - fclose(file); - return; - } -- cpumask_parse_user(line, strlen(line), irq->node_mask); -+ cpumask_parse_user(line, strlen(line), tempmask); -+ if (!__cpus_full(&tempmask, num_possible_cpus())) -+ irq->node_mask = tempmask; - fclose(file); - free(line); - } -@@ -64,7 +68,7 @@ - DIR *dir; - struct dirent *entry; - char *c, *c2; -- int nr , count = 0; -+ int nr , count = 0, can_set = 1; - char buf[PATH_MAX]; - sprintf(buf, "/proc/irq/%i", number); - dir = opendir(buf); -@@ -77,7 +81,7 @@ - size_t size = 0; - FILE *file; - sprintf(buf, "/proc/irq/%i/smp_affinity", number); -- file = fopen(buf, "r"); -+ file = fopen(buf, "r+"); - if (!file) - continue; - if (getline(&line, &size, file)==0) { -@@ -86,7 +90,13 @@ - continue; - } - cpumask_parse_user(line, strlen(line), irq->mask); -- fclose(file); -+ /* -+ * Check that we can write the affinity, if -+ * not take it out of the list. -+ */ -+ fputs(line, file); -+ if (fclose(file) && errno == EIO) -+ can_set = 0; - free(line); - } else if (strcmp(entry->d_name,"allowed_affinity")==0) { - char *line = NULL; -@@ -119,7 +129,7 @@ - count++; - - /* if there is no choice in the allowed mask, don't bother to balance */ -- if (count<2) -+ if ((count<2) || (can_set == 0)) - irq->balance_level = BALANCE_NONE; - - -Index: Makefile.am -=================================================================== ---- Makefile.am (.../tags/irqbalance-0.56) (revision 33) -+++ Makefile.am (.../trunk) (revision 33) -@@ -21,7 +21,7 @@ - # - - AUTOMAKE_OPTIONS = no-dependencies --EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 -+EXTRA_DIST = README INSTALL COPYING autogen.sh cap-ng.m4 - - INCLUDES = -I${top_srcdir} - LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) -@@ -31,6 +31,7 @@ - sbin_PROGRAMS = irqbalance - irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \ - irqlist.c network.c numa.c placement.c powermode.c procinterrupts.c -+dist_man_MANS = irqbalance.1 - - CONFIG_CLEAN_FILES = debug*.list config/* - clean-generic: -Index: network.c -=================================================================== ---- network.c (.../tags/irqbalance-0.56) (revision 33) -+++ network.c (.../trunk) (revision 33) -@@ -160,10 +160,8 @@ - } - - while (!feof(file)) { -- uint64_t rxcount; -- uint64_t txcount; -- uint64_t delta; -- int dummy; -+ uint64_t dummy __attribute__((unused)); -+ uint64_t rxcount, txcount, delta; - char *c, *c2; - if (getline(&line, &size, file)==0) - break; diff --git a/testing/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 219c5588f..84488e042 100644 --- a/testing/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -20,7 +20,7 @@ _LANGTOOLS_CHANGESET=9b85f1265346 _OPENJDK_CHANGESET=0a76e5390e68 pkgver=${_java_ver}.${_openjdk_build}_${_icedtea_ver} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org" license=('custom') @@ -28,8 +28,8 @@ makedepends=('libcups' 'libxp' 'libxtst' 'libxi' 'libxt' 'libxslt' 'freetype2' # 'alsa-lib' 'xalan-java' 'glib2' 'gtk2' 'apache-ant>=1.6.5' 'giflib' 'libjpeg>=6b' 'zlib' 'rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'lcms2') source=( #ftp://ftp.archlinux.org/other/$pkgname/icedtea7-${_date}-hg.tar.xz - http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz - http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz + http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz + http://icedtea.classpath.org/hg/icedtea7-forest/archive/${_OPENJDK_CHANGESET}.tar.gz # openjdk.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/corba/archive/${_CORBA_CHANGESET}.tar.gz # corba.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/jaxp/archive/${_JAXP_CHANGESET}.tar.gz # jaxp.tar.gz http://icedtea.classpath.org/hg/icedtea7-forest/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz # jaxws.tar.gz @@ -68,7 +68,7 @@ md5sums=('752721a037a625001fad7a5fc2013f60' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'c195c4865b84d9e2e0fd71ac6d88eadb' '203640d6e79e41b0065e016818c17ccd' - 'fe39da48a62b1fdd8fc24de0e0c4b525' + 'b7b8996448c7b4fa7dd2d744488ed3bd' 'cdabafad0ec413d9a983888bf445a443' '612b0fec7e0943c37a6de77c43622007' '62443459da0cb28181feb260dc0e5ce7' @@ -92,7 +92,7 @@ build() { unset JAVA_HOME unset CLASSPATH # default is to build with first found java-environment found in our repos - is jdk7-openjdk - [ -f /etc/profile.d/jdk7-openjdk.sh ] && . /etc/profile.d/jdk7-openjdk.sh + [ -f /etc/profile.d/jdk7.sh ] && . /etc/profile.d/jdk7.sh unset MAKEFLAGS export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" @@ -107,11 +107,11 @@ build() { # autoreconf --force --install ./configure \ - --disable-bootstrap \ - --with-parallel-jobs="${MAKEFLAGS/-j}" \ + --disable-bootstrap \ + --with-parallel-jobs="${MAKEFLAGS/-j}" \ --disable-tests \ --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-${CARCH} \ - --with-jdk-home=${JAVA_HOME} \ + --with-jdk-home=${JAVA_HOME} \ --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \ --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \ --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \ @@ -120,16 +120,15 @@ build() { --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \ --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \ --enable-pulse-java \ -# --with-rhino #--help +# --with-rhino #--help #--with-jaxp-drop-zip=${srcdir}/jaxp145_01.zip \ #--with-jaf-drop-zip=${srcdir}/jdk7-jaf-2010_08_19.zip \ #--with-jaxws-drop-zip=${srcdir}/jdk7-jaxws2_2_4-b03-2011_05_27.zip \ - -# --enable-systemtap Enable inclusion of SystemTap trace support -# --enable-nss Enable inclusion of NSS security provider -# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed +# --enable-systemtap Enable inclusion of SystemTap trace support +# --enable-nss Enable inclusion of NSS security provider +# --with-abs-install-dir The absolute path where the j2sdk-image dir will be installed make } @@ -142,14 +141,14 @@ check() { package_jre7-openjdk() { pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - runtime environment" depends=('gcc-libs' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' - 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng') + 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng' 'gsettings-desktop-schemas') optdepends=('icedtea-web-java7: web browser plugin + Java Web Start' 'alsa-lib: for sound' 'giflib: for gif format support') provides=('java-runtime=7') conflicts=('java-runtime') # replaces=('openjdk6') # once we remove openjdk6 pkg from the repos - backup=(etc/profile.d/jre7-openjdk.sh) + backup=(etc/profile.d/jre7.sh) install=jre7-openjdk.install _jvmdir=/usr/lib/jvm/java-7-openjdk @@ -194,8 +193,8 @@ package_jre7-openjdk() { # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh - install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jre.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jre.csh # Install license install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/ @@ -209,7 +208,7 @@ package_jdk7-openjdk() { provides=('java-environment=7') conflicts=('java-environment') # replaces=('openjdk6') - backup=(etc/profile.d/jdk7-openjdk.sh) + backup=(etc/profile.d/jdk7.sh) _jvmdir=/usr/lib/jvm/java-7-openjdk @@ -252,8 +251,8 @@ package_jdk7-openjdk() { # Set some variables install -m755 -d ${pkgdir}/etc/profile.d/ - install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/${pkgname}.sh - install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/${pkgname}.csh + install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh + install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh } package_openjdk7-src() { diff --git a/testing/java7-openjdk/fix_corba_cmds_path.diff b/extra/java7-openjdk/fix_corba_cmds_path.diff index 842657880..842657880 100644 --- a/testing/java7-openjdk/fix_corba_cmds_path.diff +++ b/extra/java7-openjdk/fix_corba_cmds_path.diff diff --git a/testing/java7-openjdk/fontconfig-paths.diff b/extra/java7-openjdk/fontconfig-paths.diff index fa08db629..fa08db629 100644 --- a/testing/java7-openjdk/fontconfig-paths.diff +++ b/extra/java7-openjdk/fontconfig-paths.diff diff --git a/testing/java7-openjdk/jconsole.desktop b/extra/java7-openjdk/jconsole.desktop index ffbdd42ad..ffbdd42ad 100644 --- a/testing/java7-openjdk/jconsole.desktop +++ b/extra/java7-openjdk/jconsole.desktop diff --git a/testing/java7-openjdk/jdk7-openjdk.profile b/extra/java7-openjdk/jdk7-openjdk.profile index c69fdb9b3..91265cc86 100644 --- a/testing/java7-openjdk/jdk7-openjdk.profile +++ b/extra/java7-openjdk/jdk7-openjdk.profile @@ -3,4 +3,4 @@ export J2REDIR=$J2SDKDIR/jre export JAVA_HOME=/usr/lib/jvm/java-7-openjdk # For non-reparenting window managers, enable '_JAVA_AWT_WM_NONREPARENTING' -# in /etc/profile.d/jre7-openjdk.sh +# in /etc/profile.d/jre7.sh diff --git a/testing/java7-openjdk/jdk7-openjdk.profile.csh b/extra/java7-openjdk/jdk7-openjdk.profile.csh index cc7dc8ab1..cc7dc8ab1 100644 --- a/testing/java7-openjdk/jdk7-openjdk.profile.csh +++ b/extra/java7-openjdk/jdk7-openjdk.profile.csh diff --git a/testing/java7-openjdk/jre7-openjdk.install b/extra/java7-openjdk/jre7-openjdk.install index 8e3ff0ee0..d311e6e44 100644 --- a/testing/java7-openjdk/jre7-openjdk.install +++ b/extra/java7-openjdk/jre7-openjdk.install @@ -5,7 +5,7 @@ post_install() { fi echo "when you use a non-reparenting window manager" echo "set _JAVA_AWT_WM_NONREPARENTING=1 in" - echo "/etc/profile.d/jre7-openjdk.sh" + echo "/etc/profile.d/jre7.sh" # update-desktop-database -q } diff --git a/testing/java7-openjdk/jre7-openjdk.profile b/extra/java7-openjdk/jre7-openjdk.profile index c86ce857a..c86ce857a 100644 --- a/testing/java7-openjdk/jre7-openjdk.profile +++ b/extra/java7-openjdk/jre7-openjdk.profile diff --git a/testing/java7-openjdk/jre7-openjdk.profile.csh b/extra/java7-openjdk/jre7-openjdk.profile.csh index a9aed27d1..a9aed27d1 100644 --- a/testing/java7-openjdk/jre7-openjdk.profile.csh +++ b/extra/java7-openjdk/jre7-openjdk.profile.csh diff --git a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff index c68bd4441..c68bd4441 100644 --- a/testing/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff +++ b/extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff diff --git a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff index ba1a588e1..ba1a588e1 100644 --- a/testing/java7-openjdk/openjdk7_nonreparenting-wm.diff +++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff diff --git a/testing/java7-openjdk/policytool.desktop b/extra/java7-openjdk/policytool.desktop index 702b44a6f..702b44a6f 100644 --- a/testing/java7-openjdk/policytool.desktop +++ b/extra/java7-openjdk/policytool.desktop diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD index 9aedb3d7d..92672f290 100644 --- a/extra/json-glib/PKGBUILD +++ b/extra/json-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139365 2011-10-01 18:59:34Z ibiru $ +# $Id: PKGBUILD 141211 2011-10-26 14:49:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=json-glib -pkgver=0.14.0 +pkgver=0.14.2 pkgrel=1 pkgdesc="JSON library built on GLib" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz) -sha256sums=('821e90196673408a9293845e37ef572826a960a101096db9bcba45cf4c4afc56') +sha256sums=('b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7') build(){ cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD index a8836e6e5..9f1e4287e 100644 --- a/extra/k3b/PKGBUILD +++ b/extra/k3b/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 106655 2011-01-17 20:23:05Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: jlvsimoes +# $Id: PKGBUILD 142626 2011-11-12 17:15:20Z ibiru $ +# Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=k3b pkgver=2.0.2 -pkgrel=1 -depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad' - 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' - 'shared-mime-info' 'libxft') -makedepends=('cmake' 'pkgconfig' 'automoc4' ) +pkgrel=4 pkgdesc="Feature-rich and easy to handle CD burning application" -url="http://k3b.sourceforge.net/" arch=("i686" "x86_64" 'mips64el') +url="http://k3b.org/" license=('GPL') -install="${pkgname}.install" +depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' + 'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrdao' 'cdrkit' 'libxft') +makedepends=('cmake' 'automoc4' 'docbook-xml') optdepends=('dvd+rw-tools: for dvd burning support' - 'vcdimager: for vcd burning support' - 'transcode: for advanced mpeg conversion support' - 'emovix: for bootable multimedia cd/dvd support') + 'vcdimager: for vcd burning support' + 'transcode: for advanced mpeg conversion support' + 'emovix: for bootable multimedia cd/dvd support') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +install=k3b.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ + k3b-2.0.2-ffmpeg.patch) +sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532' + '8120c0e22e6c41ea285ca6060be13723ed91c52b') build() { cd "${srcdir}" + (cd ${pkgname}-${pkgver}; patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch") mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -33,7 +35,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } -md5sums=('c86113af31a2032e57fd2f302b5f637a') diff --git a/extra/k3b/fix-crash-with-qt-4.7.0.patch b/extra/k3b/fix-crash-with-qt-4.7.0.patch deleted file mode 100644 index a99b5c639..000000000 --- a/extra/k3b/fix-crash-with-qt-4.7.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: src/option/k3bpluginoptiontab.cpp -=================================================================== ---- src/option/k3bpluginoptiontab.cpp (revision 1168967) -+++ src/option/k3bpluginoptiontab.cpp (working copy) -@@ -43,12 +43,28 @@ - layout->addWidget( label ); - layout->addWidget( pluginSelector ); - -+ // find all categories -+ QHash<QString, QString> categoryNames; -+ - foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -- kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -- pluginSelector->addPlugins( QList<KPluginInfo>() << plugin->pluginInfo(), -+ categoryNames[ plugin->category() ] = plugin->categoryName(); -+ } -+ -+ // add all plugins in each category -+ foreach( const QString &category, categoryNames.keys() ) { -+ QList<KPluginInfo> plugins; -+ -+ foreach( K3b::Plugin* plugin, k3bcore->pluginManager()->plugins() ) { -+ if ( plugin->category() == category ) { -+ plugins << plugin->pluginInfo(); -+ kDebug() << "Adding plugin" << plugin->pluginInfo().name(); -+ } -+ } -+ pluginSelector->addPlugins( plugins, - KPluginSelector::ReadConfigFile, -- plugin->categoryName(), -- plugin->category() ); -+ categoryNames[ category ], -+ category -+ ); - } - } - diff --git a/extra/k3b/k3b-2.0.2-ffmpeg.patch b/extra/k3b/k3b-2.0.2-ffmpeg.patch new file mode 100644 index 000000000..2878b1edc --- /dev/null +++ b/extra/k3b/k3b-2.0.2-ffmpeg.patch @@ -0,0 +1,96 @@ +commit 61ca30beb978f68e72257408777c6433f33129bd +Author: Michal Malek <michalm@jabster.pl> +Date: Sun Aug 28 20:18:53 2011 +0200 + + Fixed compilation with new FFMPEG + + BUG: 274817 + FIXED-IN: 2.0.3 + +diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +index 0ad59fc..0c5f366 100644 +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open() + #else + ::AVCodecContext* codecContext = d->formatContext->streams[0]->codec; + #endif +- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) { ++ if( codecContext->codec_type != ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ AVMEDIA_TYPE_AUDIO) ++#else ++ CODEC_TYPE_AUDIO) ++#endif ++ { + kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename; + return false; + } +@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const + QString K3bFFMpegFile::title() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->title[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->title ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const + QString K3bFFMpegFile::author() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->author[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->author ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const + QString K3bFFMpegFile::comment() const + { + // FIXME: is this UTF8 or something?? +- if( d->formatContext->comment[0] != '\0' ) +- return QString::fromLocal8Bit( d->formatContext->comment ); ++ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 ); ++ if( ade == NULL ) ++ return QString(); ++ if( ade->value != '\0' ) ++ return QString::fromLocal8Bit( ade->value ); + else + return QString(); + } +@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer() + #if LIBAVCODEC_VERSION_MAJOR < 52 + int len = ::avcodec_decode_audio( + #else ++ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ int len = ::avcodec_decode_audio3( ++ #else + int len = ::avcodec_decode_audio2( ++ #endif + #endif ++ + #ifdef FFMPEG_BUILD_PRE_4629 + &d->formatContext->streams[0]->codec, + #else +@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer() + #endif + (short*)d->alignedOutputBuffer, + &d->outputBufferSize, ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0) ++ &d->packet ); ++#else + d->packetData, d->packetSize ); ++#endif + + if( d->packetSize <= 0 || len < 0 ) + ::av_free_packet( &d->packet ); diff --git a/extra/k3b/k3b.install b/extra/k3b/k3b.install index a60d358ce..413ad60f7 100644 --- a/extra/k3b/k3b.install +++ b/extra/k3b/k3b.install @@ -1,12 +1,13 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null + 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_install } post_remove() { - post_install + post_install } diff --git a/extra/kdeaccessibility/PKGBUILD b/extra/kdeaccessibility/PKGBUILD index b2de00550..48a2d6911 100644 --- a/extra/kdeaccessibility/PKGBUILD +++ b/extra/kdeaccessibility/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139936 2011-10-05 19:10:20Z andrea $ +# $Id: PKGBUILD 141787 2011-11-02 18:13:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -8,7 +8,7 @@ pkgname=('kdeaccessibility-jovie' 'kdeaccessibility-kmag' 'kdeaccessibility-kmousetool' 'kdeaccessibility-kmouth') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://accessibility.kde.org' @@ -16,7 +16,7 @@ license=('GPL' 'FDL') groups=('kde' 'kdeaccessibility') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('7a2f7ea0e635f0ba79d7d54b118814bcefa4b6a1') +sha1sums=('9695d2b8b6f55266e3f76ebf05543f23857b9520') build() { cd ${srcdir} @@ -25,8 +25,7 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_Opentts=OFF + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index ab152fe30..29d56822b 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139938 2011-10-05 19:10:23Z andrea $ +# $Id: PKGBUILD 141789 2011-11-02 18:13:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -17,7 +17,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'syslog-path.patch') -sha1sums=('c96ddd94a4903b035e73b3e958e6b189ca173fe9' +sha1sums=('b2d6d210bc40e8731a9ae8409673f3d71b57de0a' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { @@ -31,7 +31,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_strigi-analyzer=OFF + -DBUILD_strigi-analyzer=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 3de7e9fc6..e9f8a56af 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139940 2011-10-05 19:10:25Z andrea $ +# $Id: PKGBUILD 141791 2011-11-02 18:13:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('a536d530e1f97d14f11ada47435f3e194e93beae') +sha1sums=('4d3611cbcd6052a7ba7137baa196c654d9d38d4d') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 33a8c8fc2..6cc4d02a4 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139942 2011-10-05 19:10:28Z andrea $ +# $Id: PKGBUILD 141793 2011-11-02 18:13:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2") -sha1sums=('20150963cc5ebd2f2c13a617a37e018440e0f18c') +sha1sums=('ecf5d1cc087d78ba049fe65e06ee992a2fadcc19') build() { cd "${srcdir}" diff --git a/extra/kdebase-runtime/PKGBUILD b/extra/kdebase-runtime/PKGBUILD index 184c783d3..444df1228 100644 --- a/extra/kdebase-runtime/PKGBUILD +++ b/extra/kdebase-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139898 2011-10-05 19:09:13Z andrea $ +# $Id: PKGBUILD 141749 2011-11-02 18:12:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-runtime -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="KDE Base Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -16,10 +16,15 @@ 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/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2") -sha1sums=('4d0b1883a2f65cc9472c4788c24e6b241f3b8828') +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2" + 'libqzeitgeist08.patch') +sha1sums=('293dec26e0d7278396d2ad0240d14aeea6060970' + '164c9e4305029cb68a2101cfeeb76c7066c2fd39') build() { + cd "${srcdir}"/kde-runtime-${pkgver} + patch -p1 -i "${srcdir}"/libqzeitgeist08.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdebase-runtime/libqzeitgeist08.patch b/extra/kdebase-runtime/libqzeitgeist08.patch new file mode 100644 index 000000000..f832cd8b2 --- /dev/null +++ b/extra/kdebase-runtime/libqzeitgeist08.patch @@ -0,0 +1,102 @@ +--- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~ 2011-10-29 15:46:55.003710230 +0000 ++++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt 2011-10-29 15:47:28.910716093 +0000 +@@ -21,7 +21,7 @@ + ) + endif(Nepomuk_FOUND) + +-# Checking for QtZeitgeist ++# Checking for QZeitgeist + macro_optional_find_package(QZeitgeist) + + if (QZEITGEIST_INCLUDE_DIR) +@@ -30,8 +30,8 @@ + + macro_log_feature( + QZeitgeist_FOUND +- "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" +- "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking") ++ "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE "" ++ "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking") + if (QZeitgeist_FOUND) + set(HAVE_QZEITGEIST 1) + include_directories(${QZEITGEIST_INCLUDE_DIR}) +--- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~ 2011-10-29 15:47:40.960836591 +0000 ++++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp 2011-10-29 15:48:57.034930073 +0000 +@@ -21,31 +21,31 @@ + + #ifndef HAVE_QZEITGEIST + #ifdef __GNUC__ +- #warning "No QtZeitgeist, disabling desktop events processing" ++ #warning "No QZeitgeist, disabling desktop events processing" + #endif + + #else // HAVE_QZEITGEIST + + #include "ZeitgeistEventBackend.h" + +-#include <QtZeitgeist/QtZeitgeist> +-#include <QtZeitgeist/Interpretation> +-#include <QtZeitgeist/Manifestation> ++#include <QZeitgeist/QZeitgeist> ++#include <QZeitgeist/Interpretation> ++#include <QZeitgeist/Manifestation> + + static QString eventInterpretation(Event::Type type) + { + switch (type) { + case Event::Accessed: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Opened: +- return QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ return QZeitgeist::Interpretation::Event::ZGAccessEvent; + + case Event::Modified: +- return QtZeitgeist::Interpretation::Event::ZGModifyEvent; ++ return QZeitgeist::Interpretation::Event::ZGModifyEvent; + + case Event::Closed: +- return QtZeitgeist::Interpretation::Event::ZGLeaveEvent; ++ return QZeitgeist::Interpretation::Event::ZGLeaveEvent; + + } + +@@ -57,23 +57,23 @@ + { + switch (reason) { + case Event::User: +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + + case Event::Heuristic: +- return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity; ++ return QZeitgeist::Manifestation::Event::ZGHeuristicActivity; + + case Event::Scheduled: +- return QtZeitgeist::Manifestation::Event::ZGScheduledActivity; ++ return QZeitgeist::Manifestation::Event::ZGScheduledActivity; + + case Event::System: +- return QtZeitgeist::Manifestation::Event::ZGSystemNotification; ++ return QZeitgeist::Manifestation::Event::ZGSystemNotification; + + case Event::World: +- return QtZeitgeist::Manifestation::Event::ZGWorldActivity; ++ return QZeitgeist::Manifestation::Event::ZGWorldActivity; + } + + // shut up GCC +- return QtZeitgeist::Manifestation::Event::ZGUserActivity; ++ return QZeitgeist::Manifestation::Event::ZGUserActivity; + } + + static QString applicationUri(const QString & application) +@@ -84,7 +84,6 @@ + + ZeitgeistEventBackend::ZeitgeistEventBackend() + { +- QtZeitgeist::init(); + } + + void ZeitgeistEventBackend::addEvents(const EventList & events) diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 70e4027c1..57f02f9bd 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139920 2011-10-05 19:09:49Z andrea $ +# $Id: PKGBUILD 141771 2011-11-02 18:12:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.7.2 -pkgrel=1 +pkgver=4.7.3 +pkgrel=3 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -34,7 +34,7 @@ options=('emptydirs') source=("http://download.kde.org/stable/${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=('afd37b2f583690e391828c1ceb7311e2e8d37c6f' +sha1sums=('f3ed24e3e70671033718a5139cb61d0d7e2e709e' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' @@ -62,7 +62,8 @@ build() { -DWITH_Googlegadgets=OFF \ -DWITH_libgps=OFF \ -DWITH_OpenGLES=OFF \ - -DKWIN_BUILD_WITH_OPENGLES=OFF + -DKWIN_BUILD_WITH_OPENGLES=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } diff --git a/extra/kdebase-workspace/fix-powerprofiles.patch b/extra/kdebase-workspace/fix-powerprofiles.patch new file mode 100644 index 000000000..309fcf3db --- /dev/null +++ b/extra/kdebase-workspace/fix-powerprofiles.patch @@ -0,0 +1,23 @@ +From: Dario Freddi <drf@kde.org> +Date: Tue, 04 Oct 2011 14:09:09 +0000 +Subject: Use full config when reading settings +X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=8d59876457387d1c72ca3626ae2d267adf100014 +--- +Use full config when reading settings + +BUG: 267323 +--- + + +--- a/powerdevil/daemon/powerdevilcore.cpp ++++ b/powerdevil/daemon/powerdevilcore.cpp +@@ -88,7 +88,7 @@ void Core::onBackendReady() + { + kDebug() << "Backend is ready, KDE Power Management system initialized"; + +- m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig); ++ m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig); + + // Is it brand new? + if (m_profilesConfig->groupList().isEmpty()) { + diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index d517aae2c..a14566963 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139922 2011-10-05 19:09:53Z andrea $ +# $Id: PKGBUILD 141773 2011-11-02 18:12:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2") -sha1sums=('b52937ad8e5e4be884cc76f265c19964f461ac2c') +sha1sums=('952dc26d0d908b41973a8d7b4d27765bf5128d58') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index d2cbd360f..99ab380c8 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139944 2011-10-05 19:10:30Z andrea $ +# $Id: PKGBUILD 141795 2011-11-02 18:13:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2") -sha1sums=('2c2c331991e2b42101957ecfd13a18fbd4f86a68') +sha1sums=('d87622d46bce9a5f8b875393ac2292f5a57d5f78') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 3e271d9e7..3262e30d0 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139946 2011-10-05 19:10:32Z andrea $ +# $Id: PKGBUILD 141797 2011-11-02 18:13:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="KDE bindings for ruby" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.bz2") -sha1sums=('091cfd121e41d4edf38eab31e2dca65656e7349d') +sha1sums=('bf41817298a8b18ba3542e45256c1c6ddb08c900') build() { cd "${srcdir}" diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index 640b0d3f4..7686e051c 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139948 2011-10-05 19:10:35Z andrea $ +# $Id: PKGBUILD 141799 2011-11-02 18:13:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('7dba16c2e5e18c955d2fc40536d6a40bc4872cff') +sha1sums=('3e31b85d1a27a273450652d9f5a33f2c3c035329') build() { cd "${srcdir}" @@ -22,7 +22,8 @@ build() { cmake ../kross-interpreters-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_ruby=OFF + -DBUILD_ruby=OFF \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 9f5185ee6..74f5a4dca 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139950 2011-10-05 19:10:37Z andrea $ +# $Id: PKGBUILD 141801 2011-11-02 18:13:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2") -sha1sums=('a355563b55dc2dd004373a39853af38cda0d005d') +sha1sums=('e0cc0d644084f1c71b6afc30d5467c49ba9a9fab') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index edc0cc00c..016bd8d5b 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139912 2011-10-05 19:09:36Z andrea $ +# $Id: PKGBUILD 141763 2011-11-02 18:12:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2") -sha1sums=('cde0c6b325e62d26ee6bd2f3f25d01e0563197c9') +sha1sums=('6e69719edccb23e3ced7ba30b72e88d214d6f54e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 89e2f71cc..5c8a7ebb8 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139914 2011-10-05 19:09:38Z andrea $ +# $Id: PKGBUILD 141765 2011-11-02 18:12:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-python -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="KDE bindings for Python" url="http://kde.org/" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2") -sha1sums=('cc7844851110697f06da60cf4a1ee527eda76087') +sha1sums=('16063793d39fdc9f5b9916cab49236103ce79da2') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index 6b8ecc86e..147af2513 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139918 2011-10-05 19:09:45Z andrea $ +# $Id: PKGBUILD 141769 2011-11-02 18:12:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Qt bindings for ruby" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2") -sha1sums=('1d13c0dd79a2c90c9e964e23fee3573c9397bd4d') +sha1sums=('2e3b36ece9039ccd39be76145575015503c6283c') build() { cd "${srcdir}" diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 4e67b9cb1..2c6a7439f 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139916 2011-10-05 19:09:41Z andrea $ +# $Id: PKGBUILD 141767 2011-11-02 18:12:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="http://kde.org/" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2") -sha1sums=('f002a31fcdcaa94af02bbf5e368e79463974e467') +sha1sums=('676042633b8c426adf1f47ad143f5db20ae257ef') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index f0446d495..22a7bd81c 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139902 2011-10-05 19:09:18Z andrea $ +# $Id: PKGBUILD 141753 2011-11-02 18:12:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="http://kde.org/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2") -sha1sums=('f2f605b2ca40403529b9065e745ebb1d9b7e0fcb') +sha1sums=('ede4095fdb190b3bef13b246111e7d79903ad77e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 1fd2528c2..7c532e38b 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139910 2011-10-05 19:09:34Z andrea $ +# $Id: PKGBUILD 141761 2011-11-02 18:12:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="http://kde.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2") -sha1sums=('8874744db367dd5c9d7a8783f662b6283b69dc1f') +sha1sums=('a25114d92c540f16af9022366ca2b5da447a1531') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index bbe7ed5fd..d7207015d 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139904 2011-10-05 19:09:22Z andrea $ +# $Id: PKGBUILD 142565 2011-11-12 08:14:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.7.2 -pkgrel=1 +pkgver=4.7.3 +pkgrel=2 pkgdesc="Language independent library for Qt bindings" url="http://kde.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2") -sha1sums=('93bf50c340e5188f2432da97c5a3ff7e2928eb3e') +sha1sums=('cf1c4b7116695f0842972b2985eca65f6b63702e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index c77d6f8ea..91e7a18be 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139952 2011-10-05 19:10:40Z andrea $ +# $Id: PKGBUILD 141803 2011-11-02 18:13:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2") -sha1sums=('ec0418900c5d71d64f65407b898d740a5255ce08') +sha1sums=('24f09f604e1687062b3296a30b873d1781379543') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 8fafd4843..f97ac94c2 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139954 2011-10-05 19:10:42Z andrea $ +# $Id: PKGBUILD 141805 2011-11-02 18:13:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2") -sha1sums=('5cb978903868d3dbda7367fec21a02818f693d6b') +sha1sums=('ce6240d44cbf47b3dbfd1dbc03196c916e4394e9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index cc0d23541..f0d4411b4 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139956 2011-10-05 19:10:44Z andrea $ +# $Id: PKGBUILD 141807 2011-11-02 18:13:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2") -sha1sums=('4507b93e67d953705f7fe5eccec10868971a79ca') +sha1sums=('88cc89a6c942b7cef548532702c5e68bf75f0748') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index e5372e5a0..ddf686d8c 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139958 2011-10-05 19:10:48Z andrea $ +# $Id: PKGBUILD 141809 2011-11-02 18:13:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2") -sha1sums=('3e750692964ca76da9ccbae5bdc263413a22a049') +sha1sums=('e22b54be4a2e8ce8a22af73fa6155ee012fa6fdf') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index 87d2a3bd6..bf4942ea7 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139960 2011-10-05 19:10:53Z andrea $ +# $Id: PKGBUILD 141811 2011-11-02 18:13:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2") -sha1sums=('0dd7dd66f87f99a5f0f2b4a7340c4690240c2478') +sha1sums=('44a60b76bbc8ae61b8673c37c2b8721f12dc22bb') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index aef7b95aa..365128388 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139962 2011-10-05 19:10:58Z andrea $ +# $Id: PKGBUILD 141813 2011-11-02 18:13:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2") -sha1sums=('db4959982db7a36fef61798978d8c885408a3e3f') +sha1sums=('c90205954d9c153aaa5966b424aa437b07e657f7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index fab28f3d9..5a839bb6b 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139964 2011-10-05 19:11:02Z andrea $ +# $Id: PKGBUILD 141815 2011-11-02 18:13:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2") -sha1sums=('843322c2dd1131122abf03d226b87ec31217ed36') +sha1sums=('5f9835994ec6ad9454f7ee19bf003c8457e11d9e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index f216d15be..17b1eea92 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139966 2011-10-05 19:11:07Z andrea $ +# $Id: PKGBUILD 141817 2011-11-02 18:14:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2") -sha1sums=('24d3c41b0cf0aaf68ad053b0e701d7bc3df8bd0f') +sha1sums=('aef288a20209a4c1bf5d6f48be689c433049ea83') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index eeb53ed23..250fcc24b 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139968 2011-10-05 19:11:11Z andrea $ +# $Id: PKGBUILD 141819 2011-11-02 18:14:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2") -sha1sums=('2234ddb85e8c52214f9fdb5eb25f9491e23c7d86') +sha1sums=('5a948b641f380e1cc6cf0f91d795a97029464bbb') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index e662383ff..4891170f0 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139970 2011-10-05 19:11:15Z andrea $ +# $Id: PKGBUILD 141821 2011-11-02 18:14:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2") -sha1sums=('f6d76b2c15fdf47090db15303413114180358f39') +sha1sums=('5df19802a731b5f7033b43aa9b35e0b20164cd3e') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index b70d20580..edb96cc11 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139972 2011-10-05 19:11:17Z andrea $ +# $Id: PKGBUILD 141823 2011-11-02 18:14:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2") -sha1sums=('44a0fa094b90da19c5b0acc25da1150c0ff02b1a') +sha1sums=('da01b1c71d74f634ace0b6c2fc6e0186a08f9974') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 2e4e93fa7..543470bfc 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139974 2011-10-05 19:11:19Z andrea $ +# $Id: PKGBUILD 141825 2011-11-02 18:14:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2") -sha1sums=('dc496d88d6e062f7ecbf6f41187df95aa374fe9b') +sha1sums=('e98ba022e987b9601ea1b27e97607ff7885ff788') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index fa16eaf28..775af4f8b 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139976 2011-10-05 19:11:22Z andrea $ +# $Id: PKGBUILD 141827 2011-11-02 18:14:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2") -sha1sums=('bc51179a16fc2337d1dacab4c1d291042fc0b69c') +sha1sums=('41d333f726d9752a7ddb48f98817d91744adb7b0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index 48d44b990..b66c3555b 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139978 2011-10-05 19:11:24Z andrea $ +# $Id: PKGBUILD 141829 2011-11-02 18:14:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2") -sha1sums=('d5e0abd7defece0f455818c7bc53c50730419c46') +sha1sums=('46b865ece6e14d4476297d4a3b400d5fab6564ea') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index d77055440..a5bb66c24 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139980 2011-10-05 19:11:27Z andrea $ +# $Id: PKGBUILD 141831 2011-11-02 18:14:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2") -sha1sums=('cc86eb08310e8ff591ebb394d08ffc214c264206') +sha1sums=('07d5ad5c1b8308c2c8c2ff48e2c0c18adfd051ca') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 577531d46..0290a54c2 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139982 2011-10-05 19:11:29Z andrea $ +# $Id: PKGBUILD 141833 2011-11-02 18:14:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2") -sha1sums=('f9450b1b7f539955e55877d96b37424c8abe576e') +sha1sums=('616c16a94066ec2930bc0795f8053be221c871e5') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index c4438125c..a1ac2edb7 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139926 2011-10-05 19:09:59Z andrea $ +# $Id: PKGBUILD 141777 2011-11-02 18:12:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") -sha1sums=('2b6353ff589d66dcf95a3eb79059275f620e03b2') +sha1sums=('980a8dae9c7a0f8483fde5dc839fae834763933a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index bb3d21938..4e4e85026 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139984 2011-10-05 19:11:31Z andrea $ +# $Id: PKGBUILD 141835 2011-11-02 18:14:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2") -sha1sums=('65fab5b04f2b0a3598c764ab138acb3c335cbb48') +sha1sums=('a5d06f373976554d58c8aae279e411a6be028826') build() { cd "${srcdir}" diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index 1ac7c4c21..4006d6eac 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139986 2011-10-05 19:11:33Z andrea $ +# $Id: PKGBUILD 141837 2011-11-02 18:14:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime' 'boost-libs') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2") -sha1sums=('19f2bf19dfe7a0787180c3fc9d1f32c14316f985') +sha1sums=('5c7d4115f029e09a006912bf816d4ce396a9b49a') options=('!makeflags') build() { diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 760752a9a..8af05974a 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139988 2011-10-05 19:11:36Z andrea $ +# $Id: PKGBUILD 141839 2011-11-02 18:14:34Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2") -sha1sums=('642f24c49990181ab2cc2d1ad974bcdc3d47ed46') +sha1sums=('411695882916a8a1d0db86426a0d8f935fab21ad') build() { cd "${srcdir}" diff --git a/extra/kdegames/PKGBUILD b/extra/kdegames/PKGBUILD index b1ea80a5e..4721fae86 100644 --- a/extra/kdegames/PKGBUILD +++ b/extra/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139990 2011-10-05 19:11:41Z andrea $ +# $Id: PKGBUILD 141841 2011-11-02 18:14:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -43,7 +43,7 @@ pkgname=('kdegames-bomber' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted' 'kdebindings-python' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('a84be8406fce38cf5b172c320904bb1cbe59e729') +sha1sums=('abd90be42fa67cd6d6be1defe90dcd0408e94445') build() { cd $srcdir @@ -61,7 +61,8 @@ build() { cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index de69e8de4..97b500140 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139992 2011-10-05 19:11:44Z andrea $ +# $Id: PKGBUILD 141843 2011-11-02 18:14:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2") -sha1sums=('ce1c3df9e9147d81ce250c41e7d9a328993d8632') +sha1sums=('7096721285d15311699acc76abd62755d6e93860') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index 830cb870e..183d6dd0c 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139994 2011-10-05 19:11:47Z andrea $ +# $Id: PKGBUILD 141845 2011-11-02 18:14:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2") -sha1sums=('354d45d8f62c66bef0bc04c6e6e2056060ca7f0b') +sha1sums=('820f9b6449732f6cab48f5c2d9e7dbcf53eb6437') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 84e252904..c734d406b 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139996 2011-10-05 19:11:49Z andrea $ +# $Id: PKGBUILD 141847 2011-11-02 18:14:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2") -sha1sums=('64bd726f1bbb1e771bc037d9929f0eba098d844d') +sha1sums=('bdd35e5defbcfc151f4960541c351246cb4dfa9e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 68559caa2..c3eb024e3 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139998 2011-10-05 19:11:51Z andrea $ +# $Id: PKGBUILD 141849 2011-11-02 18:14:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2") -sha1sums=('3f8cf9bf169a0bc058d0de610bfa4910c54ef475') +sha1sums=('d97511574120614ffb85308888c23eb2d3ba1b01') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index f28ac581a..6fb85c217 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140000 2011-10-05 19:11:54Z andrea $ +# $Id: PKGBUILD 141851 2011-11-02 18:15:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2") -sha1sums=('d4ec3e463ea3d50731e9fc87cc52eec50bc67ff8') +sha1sums=('d276d230e76f7fbe91229dd015a6465cb1a6956e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 9bb24a938..32a58e460 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140002 2011-10-05 19:11:56Z andrea $ +# $Id: PKGBUILD 141853 2011-11-02 18:15:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2") -sha1sums=('acd3b77bf68fb409f456322d8a68a9d59d1014cb') +sha1sums=('2cc0b9d31248604ab570404a0c67ef325e8ed00e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 4621b140d..73f41b412 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140004 2011-10-05 19:11:58Z andrea $ +# $Id: PKGBUILD 141855 2011-11-02 18:15:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2") -sha1sums=('0a35cd7818089b31772dc974dc01a936e91c7d80') +sha1sums=('547c298e2f3f7b8f651e3402bf18507321d4a7ce') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 1b180b661..842085d19 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140006 2011-10-05 19:12:00Z andrea $ +# $Id: PKGBUILD 141857 2011-11-02 18:15:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2") -sha1sums=('b6b3978639f7f3c06cf5b5653d9a367e38a70cec') +sha1sums=('e0dd6e093cd487fa6604077371122d84b3e8efb7') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 180e866ba..de770154a 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140008 2011-10-05 19:12:02Z andrea $ +# $Id: PKGBUILD 141859 2011-11-02 18:15:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2") -sha1sums=('554dabf927e406aeff5e495b8eb7445a080d3195') +sha1sums=('a55908cbc951c98dd27171909c1ccc5d978eec65') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index 0936bbc1d..67280fc9f 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139906 2011-10-05 19:09:29Z andrea $ +# $Id: PKGBUILD 141757 2011-11-02 18:12:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('5bc14efec8d00429a45a807a5bc839ffc783a10f') +sha1sums=('a14700386f386cc50f7dd6785eeb93dae10a0362') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 1c14530c5..aef829149 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140010 2011-10-05 19:12:05Z andrea $ +# $Id: PKGBUILD 141861 2011-11-02 18:15:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6094f33788f619e316efad7bc3eb6178b1b28121') +sha1sums=('827b18fd902a464162db7a3cd98a22fa211bafc9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index 8eceb12f5..a0ef75125 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140012 2011-10-05 19:12:07Z andrea $ +# $Id: PKGBUILD 141863 2011-11-02 18:15:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A KPart for viewving SVGs" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2") -sha1sums=('fe17a4f801ef94356a6bbc629affadc28a203b72') +sha1sums=('fa7f8cac53f6041f18a2bee09c2aa3885e27f7c7') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index c894f0386..a18545c7b 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140014 2011-10-05 19:12:09Z andrea $ +# $Id: PKGBUILD 141865 2011-11-02 18:15:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('281c84bcec1ce4b02148caf164c28fbc47d9b11b') +sha1sums=('219fd55d94d695cee8c7b650dbe8088cc9807e5c') build() { cd "${srcdir}" diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 16d13fea9..9de106e09 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140212 2011-10-09 17:04:53Z ronald $ +# $Id: PKGBUILD 143000 2011-11-20 11:13:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs -pkgver=4.7.2 -pkgrel=2 +pkgver=4.7.3 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,24 +14,19 @@ depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5' 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' 'docbook-xsl') -makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' - 'hspell') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell') replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch' - 'kdelibs-nepomuk-unicode.diff') -sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7' - 'e24aae17ef0d83085199ad7c7623afef9919b8ff') + 'kde-applications-menu.patch') +sha1sums=('4f1bbd1b4d558f3541057747db9bf7e9dcececb3' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7') build() { cd "${srcdir}"/${pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch - # nepomuk unicode character fix - patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff cd "${srcdir}" mkdir build diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff deleted file mode 100644 index 1c85d6fc9..000000000 --- a/extra/kdelibs/kdelibs-nepomuk-unicode.diff +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h -index 055482e..3880e13 100644 ---- a/nepomuk/query/querybuilderdata_p.h -+++ b/nepomuk/query/querybuilderdata_p.h -@@ -32,6 +32,28 @@ - #include "query_p.h" - #include "groupterm_p.h" - -+namespace { -+/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle -+/// utf8 chars which use more than one char, ie. wide chars. -+/// Thus, we simply truncate each term at the first wide char. -+QStringList stripExtendedCharsHack(const QStringList& terms) { -+ QStringList newTerms; -+ foreach(const QString& term, terms) { -+ int i = 0; -+ while(i < term.length()) { -+ if(term[i].unicode() > 0x7f) { -+ break; -+ } -+ ++i; -+ } -+ if(i > 0) { -+ newTerms.append(term.left(i)); -+ } -+ } -+ return newTerms; -+} -+} -+ - namespace Nepomuk { - namespace Query { - class QueryBuilderData -@@ -246,16 +268,23 @@ namespace Nepomuk { - for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin(); - it != m_fullTextSearchTerms.constEnd(); ++it ) { - const QString& varName = it.key(); -- const QStringList& terms = it.value(); -- // bif:search_excerpt wants a vector of all search terms -- excerptParts -- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") -- .arg( terms.join(QLatin1String("','")), -- varName ); -+ const QStringList terms = stripExtendedCharsHack(it.value()); -+ if(terms.count()) { -+ // bif:search_excerpt wants a vector of all search terms -+ excerptParts -+ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") -+ .arg( terms.join(QLatin1String("','")), -+ varName ); -+ } - } - -- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") -- .arg(excerptParts.join(QLatin1String(","))); -+ if(excerptParts.count()) { -+ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") -+ .arg(excerptParts.join(QLatin1String(","))); -+ } -+ else { -+ return QString(); -+ } - } - else { - return QString();
\ No newline at end of file diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index 2d26ea031..cde1482de 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140016 2011-10-05 19:12:12Z andrea $ +# $Id: PKGBUILD 142628 2011-11-12 17:15:23Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.7.2 -pkgrel=1 +pkgver=4.7.3 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -20,7 +20,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp' 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'mplayerthumbs.config') -sha1sums=('2fc12558284fe95da63e24c73612846c6c1d31e1' +sha1sums=('4db44494e6a2ef886e3513b6a2eb4e526741a6ff' 'ba016fa2563c14ffcba852c62506b66bfc6ee683') build() { diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index 34d8b8cc1..0a99ea940 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140018 2011-10-05 19:12:17Z andrea $ +# $Id: PKGBUILD 141869 2011-11-02 18:15:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('59e9e3629dff0362cfa2a6d897c77bc9cfbe8d5c') +sha1sums=('5d8ed6a478d9afdaf19d350f1d2fe7e9dd48b2f7') build() { cd "${srcdir}" diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index 630457d3e..27ff41080 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140395 2011-10-12 10:17:54Z andrea $ +# $Id: PKGBUILD 141751 2011-11-02 18:12:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.7.2 -pkgrel=2 +pkgver=4.7.3 +pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -12,15 +12,10 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'smi0.91.patch') -sha1sums=('f82886a63c48d718f30d60bd76ea7ac97f17a4c3' - 'b5af2b56cd7c9c57522e862b591e3d4ad23641c6') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('fa0e336e17f7abea1e36d28d941a4ef79b4e4635') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/smi0.91.patch - cd "${srcdir}" mkdir build cd build diff --git a/extra/kdepim-runtime/smi0.91.patch b/extra/kdepim-runtime/smi0.91.patch deleted file mode 100644 index 2229f9cd1..000000000 --- a/extra/kdepim-runtime/smi0.91.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop~ 2011-10-12 10:05:55.432618174 +0000 -+++ kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop 2011-10-12 10:06:06.586046531 +0000 -@@ -89,7 +89,7 @@ - Comment[zh_TW]=地址物件的 Akonadi 序列器外掛程式 - - [Plugin] --Type=text/vcard,text/directory -+Type=text/vcard - X-Akonadi-Class=legacy;default;KABC::Addressee; - X-KDE-Library=akonadi_serializer_addressee - X-KDE-ClassName=Akonadi::SerializerPluginAddressee diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 6e106f710..be4e55bb2 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140020 2011-10-05 19:12:21Z andrea $ +# $Id: PKGBUILD 141871 2011-11-02 18:15:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' @@ -29,7 +29,7 @@ groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('41983556eb54a740a20d274878006ace5bc73c1c') +sha1sums=('b540de51ba5b9995ce3b7c05cfb09112423d8569') build() { cd "${srcdir}" diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 96a0dbf70..fc01cff36 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139895 2011-10-05 19:09:07Z andrea $ +# $Id: PKGBUILD 141746 2011-11-02 18:12:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9ad72ec123c2837783e6836e8c79210c658d2536') +sha1sums=('b95822a3e38587744174308b629336cd3d0444f4') build() { cd ${srcdir} diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index be943c0f5..bad1591cf 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140022 2011-10-05 19:12:28Z andrea $ +# $Id: PKGBUILD 141873 2011-11-02 18:15:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -72,7 +72,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-pattern' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -81,7 +81,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('e1504ed7e21da8982610f42e70c3028b77ede6f1') +sha1sums=('decdea2d081396c90daabc9af754a233b43a0783') build() { cd "${srcdir}" diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 99f3206f2..dccc6f3c6 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -4,8 +4,8 @@ pkgname=kdeplasma-applets-networkmanagement epoch=1 -pkgver=0.9.0beta1 -_commit=90c59c37c68920a44860ff5b8f7bcc146850efcf +pkgver=0.9.0rc2 +_pkgver=0.8.95 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -17,14 +17,14 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info' optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers' 'openconnect: Cisco AnyConnect compatible VPN client') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('d6100be03b9114bffc079ef4b690a33e') +source=("ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/${_pkgver}/src/networkmanagement-${_pkgver}.tar.bz2") +sha1sums=('43df2e26acb1b96f3b5e394568a25d04036a085b') build() { cd "${srcdir}" mkdir build cd build - cmake ../networkmanagement \ + cmake ../networkmanagement-${_pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index b2298855b..ab43ade39 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139908 2011-10-05 19:09:32Z andrea $ +# $Id: PKGBUILD 141759 2011-11-02 18:12:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-kwrite' 'kdesdk-kate') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2" 'pkgbuild-syntax-highlight.patch') -sha1sums=('467b0558f1f86d0b210abd2d78c94cbe63b8579d' +sha1sums=('d67e871a49d426246f2e555ace0ad5a303c41045' 'ab0c5d2a796b0f283154799add161c99f48ffcd5') build() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 81ddf1363..773086d6f 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140024 2011-10-05 19:12:39Z andrea $ +# $Id: PKGBUILD 141875 2011-11-02 18:15:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -24,7 +24,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -34,7 +34,7 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" 'fix-python2-path.patch') -sha1sums=('b6259b46fed642c35e1c1d1f90712084141ca441' +sha1sums=('c0afae643345c92bce387ceafbcea59d3fbd812e' 'd05ca0231869c484fd3861955d960a60aff7dcfb') build() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 6bc983af1..6b6c0441b 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140026 2011-10-05 19:12:45Z andrea $ +# $Id: PKGBUILD 141877 2011-11-02 18:15:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('51213ffadf0326863aad82d9d581a2c9997dda58') +sha1sums=('93d6f0a92c805de51fc68469f940f38858f81fbe') build() { cd $srcdir diff --git a/extra/kdeutils/PKGBUILD b/extra/kdeutils/PKGBUILD index 80e63bfc3..f875791fc 100644 --- a/extra/kdeutils/PKGBUILD +++ b/extra/kdeutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140028 2011-10-05 19:12:50Z andrea $ +# $Id: PKGBUILD 141879 2011-11-02 18:15:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdeutils-ark' 'kdeutils-printer-applet' 'kdeutils-superkaramba' 'kdeutils-sweeper') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,16 +26,26 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('52ce9b6b5f2c20475f46b6f7378ca4c530df37b4') +sha1sums=('23fc9823647152d5d8cc250a55402c8930db4059') build() { - cd ${srcdir} + cd "${srcdir}"/${pkgbase}-${pkgver} + + # Use Python2 + sed -i 's|/usr/bin/python|/usr/bin/python2|' \ + kcharselect/kcharselect-generate-datafile.py \ + superkaramba/examples/richtext/rtext.py + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py + + cd "${srcdir}" mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 make } @@ -159,9 +169,6 @@ package_kdeutils-printer-applet() { make DESTDIR=$pkgdir install cd $srcdir/build/printer-applet/doc 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_kdeutils-superkaramba() { diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index ef7a0e6dd..ac5d5745e 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140030 2011-10-05 19:12:56Z andrea $ +# $Id: PKGBUILD 141881 2011-11-02 18:15:58Z andrea $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=kdewebdev @@ -6,7 +6,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -15,7 +15,7 @@ groups=('kde' 'kdewebdev') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('82910da01dc84e86134d0dbae23b4bf66b565faa') +sha1sums=('11108698887d376d00f02cbdfa1496aa3cb268c1') build() { cd $srcdir diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD index a32733fd7..432c6b015 100644 --- a/extra/kino/PKGBUILD +++ b/extra/kino/PKGBUILD @@ -1,26 +1,37 @@ -# $Id: PKGBUILD 56265 2009-10-20 20:59:02Z giovanni $ +# $Id: PKGBUILD 141101 2011-10-23 23:38:04Z andrea $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=kino pkgver=1.3.4 -pkgrel=2 -pkgdesc="A non-linear DV editor." +pkgrel=4 +pkgdesc="A non-linear DV editor" arch=('i686' 'x86_64' 'mips64el') url="http://www.kinodv.org/" license=('GPL') depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm') -makedepends=('intltool') +makedepends=('intltool' 'v4l-utils') options=('!libtool') install=kino.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('52f8ce690e45a089e3edc6c7af61a05c') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'videodev-header.patch') +md5sums=('52f8ce690e45a089e3edc6c7af61a05c' + '940404c0eec3c9d954c289ceb52d15a6') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i "${srcdir}"/videodev-header.patch + ./configure --prefix=/usr \ --with-udev-rules-dir=/lib/udev/rules.d - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - chown root:root -R $pkgdir/usr/share/kino/help + + # Fix permissions + chown -R root:root "${pkgdir}/usr/share/kino/help" } diff --git a/extra/kino/kino.install b/extra/kino/kino.install index 7dc309965..83b78df92 100644 --- a/extra/kino/kino.install +++ b/extra/kino/kino.install @@ -1,14 +1,13 @@ post_install() { - echo "update desktop mime database..." update-mime-database usr/share/mime 1> /dev/null update-desktop-database -q } + post_upgrade() { post_install $1 } post_remove() { - echo "update desktop mime database..." update-mime-database usr/share/mime 1> /dev/null update-desktop-database -q } diff --git a/extra/kino/videodev-header.patch b/extra/kino/videodev-header.patch new file mode 100644 index 000000000..01394fc47 --- /dev/null +++ b/extra/kino/videodev-header.patch @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" + diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index 56a5e6907..01d3dad85 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $ +# $Id: PKGBUILD 142654 2011-11-12 17:18:33Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,29 +37,30 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=9 +pkgrel=11 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons') + 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons' 'libgsf') [ "$CARCH" = "mips64el" ] && \ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'libkdcraw' 'oxygen-icons') + 'libwpg' 'libkdcraw' 'oxygen-icons' 'libgsf') groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') + 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch') sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - + 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739' + 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa') build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" patch -p1 -i "${srcdir}"/gcc46.patch + patch -p1 -i "${srcdir}"/qt48fix.patch cd "${srcdir}" mkdir build @@ -75,8 +76,8 @@ build() { package_koffice-filters(){ pkgdesc="Filters for the KDE office suite" - depends=('shared-mime-info') - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + depends=('shared-mime-info' 'libgsf') + optdepends=('libwpd: WordPerfect document importer' 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' 'libkdcraw: support for raw images' 'poppler: support for pdf' 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' diff --git a/extra/koffice/qt48fix.patch b/extra/koffice/qt48fix.patch new file mode 100644 index 000000000..de72926d5 --- /dev/null +++ b/extra/koffice/qt48fix.patch @@ -0,0 +1,10 @@ +--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100 ++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200 +@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh + << "visible="<<ba.isVisible() + << "brush="<<ba.brush() + << "pixmapmode="<<ba.pixmapMode() +- << "pixmap="<<ba.pixmap() + << ")"; + return dbg; + } diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD index 05f8f1873..a3c3ed9e2 100644 --- a/extra/kradio/PKGBUILD +++ b/extra/kradio/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 105372 2011-01-08 12:01:40Z tpowa $ +# $Id: PKGBUILD 142630 2011-11-12 17:15:25Z ibiru $ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> pkgname=kradio pkgver=4.0.2 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') -pkgdesc="KRadio is a comfortable KDE radio application" +pkgdesc="A comfortable KDE radio application" url="http://kradio.sourceforge.net/" -depends=('lame' 'kdelibs' 'libsndfile' 'lirc-utils' 'libmms' 'ffmpeg') -makedepends=('pkgconfig' 'automoc4') -source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2) +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('pkg-config' 'automoc4' 'cmake') +install=kradio.install +source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff) options=(!libtool) build() { - cd $srcdir + cd "$srcdir" + (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff") mkdir build cd build cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release @@ -22,7 +24,9 @@ build() { } package() { - cd $srcdir/build - make DESTDIR=$startdir/pkg install + cd "$srcdir/build" + make DESTDIR="$pkgdir" install } -md5sums=('18fea3e2bc7100882075187c6a89f7bd') +md5sums=('18fea3e2bc7100882075187c6a89f7bd' + '5f407eb75536f39e79c77a70613e8704' + '7d31a4f54602bc109f39cc0a7a1dc50c') diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff new file mode 100644 index 000000000..27d224fec --- /dev/null +++ b/extra/kradio/kradio-ffmpeg.diff @@ -0,0 +1,34 @@ +X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988 + +diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp +index 4cd6cc0..c74d6e2 100644 +--- a/plugins/internetradio/decoder_thread.cpp ++++ b/plugins/internetradio/decoder_thread.cpp +@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + + //av_log_set_level(255); + m_av_pFormatCtx = avformat_alloc_context(); +- memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx)); + m_av_pFormatCtx->probesize = m_maxProbeSize; + m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE; + +@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_pFormatCtx_opened = true; + } + else { +- + // IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start"); + if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) { + if (warningsNotErrors) { +@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE + m_av_audioStream = -1; + for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) { + // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) { ++#if LIBAVCODEC_VERSION_MAJOR < 53 + if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream ++#else ++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream ++#endif + m_av_audioStream = i; + break; + } diff --git a/extra/kradio/kradio.install b/extra/kradio/kradio.install new file mode 100644 index 000000000..af52669f5 --- /dev/null +++ b/extra/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD index 086bbd42f..c7f2f5cde 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' 'mips64el') @@ -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/lftp/PKGBUILD b/extra/lftp/PKGBUILD index c9f882744..3c71a1460 100644 --- a/extra/lftp/PKGBUILD +++ b/extra/lftp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138121 2011-09-17 02:03:36Z allan $ +# $Id: PKGBUILD 141035 2011-10-22 08:18:19Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=lftp -pkgver=4.3.2 +pkgver=4.3.3 pkgrel=1 pkgdesc="Sophisticated command line based FTP client" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('autoconf') url="http://lftp.yar.ru/" backup=('etc/lftp.conf') source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('18f5c5b351cfad0a0ab069592effd664') +md5sums=('91757a201c1030714ac1996f27437cc7') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -27,4 +27,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -rf ${pkgdir}/usr/lib -}
\ No newline at end of file +} diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD index 0fc31c993..38c6764a1 100644 --- a/extra/libatasmart/PKGBUILD +++ b/extra/libatasmart/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 56826 2009-10-28 08:21:58Z jgc $ +# $Id: PKGBUILD 141499 2011-10-31 03:19:13Z andrea $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libatasmart -pkgver=0.17 -pkgrel=1 +pkgver=0.18 +pkgrel=1.1 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('udev>=146') +depends=('udev>=174') url="http://0pointer.de/blog/projects/being-smart.html" -options=(!libtool) -source=(http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz) -md5sums=('dc36cadbbb7fa38f8af175713eda1a21') +options=('!libtool') +source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz") +md5sums=('dc22b7acda1c2230f55ae98737e8b159') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index 051d67b70..044155702 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 137630 2011-09-10 08:40:20Z pierre $ +# $Id: PKGBUILD 142887 2011-11-17 18:34:50Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.2 -pkgrel=2 -pkgdesc="GNOME CSS2 parsing and manipulation toolkit" +pkgver=0.6.3 +pkgrel=1 +pkgdesc="A CSS parsing library" arch=('x86_64' 'i686' 'mips64el') depends=('glib2' 'libxml2') -makedepends=('intltool' 'pkgconfig') +makedepends=('intltool') license=('LGPL') options=('!libtool') -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2") +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -md5sums=('1429c597aa4b75fc610ab3a542c99209') +sha256sums=('8b7c565bf3eae1dff0a09d128fc3726acc1a492a7de23b25dce803a4f93d42c1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD index 1a5ec986b..4776c7fa9 100644 --- a/extra/libdatrie/PKGBUILD +++ b/extra/libdatrie/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 87837 2010-08-18 12:55:23Z jgc $ +# $Id: PKGBUILD 142248 2011-11-07 09:16:13Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libdatrie -pkgver=0.2.4 +pkgver=0.2.5 pkgrel=1 pkgdesc="Implementation of double-array structure for representing trie, as proposed by Junichi Aoe." -url="http://linux.thai.net/~thep/datrie/datrie.html" +url="http://linux.thai.net/projects/datrie" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.gz) -md5sums=('7f7d592114f98db9e4c7171c3f2befc5') +md5sums=('c9b057d07198d66e1ac2eff32937d3d4') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 7523955ae..15c62994a 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 130679 2011-07-07 17:20:06Z andyrtr $ +# $Id: PKGBUILD 141675 2011-11-02 06:41:48Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.26 +pkgver=2.4.27 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') license=('custom') depends=('glibc' 'libpciaccess') +makedepends=('cairo') options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch COPYING) -md5sums=('062569426773f69b11a47a7712bba770' +md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd' 'c722c8406507b7e3a8da7a3030d1d9cf' 'ba65e71c481b94ef0fb6c23c7f21ffa1') @@ -32,6 +33,11 @@ build() { make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD index e5c47a2ee..7297fa12d 100644 --- a/extra/libdvbpsi/PKGBUILD +++ b/extra/libdvbpsi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136933 2011-09-03 00:24:33Z giovanni $ +# $Id: PKGBUILD 143078 2011-11-22 13:07:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=libdvbpsi -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5') conflicts=('libdvbpsi4' 'libdvbpsi5') url="http://developers.videolan.org/libdvbpsi/" source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c8582dc18fc7ea1f76016d78a76ea5dd') +md5sums=('b387e07ffd844b61c7a050c47307c0f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -25,5 +25,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install } diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index fffcd698a..06764d19f 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 102948 2010-12-13 12:51:30Z stephane $ +# $Id: PKGBUILD 142850 2011-11-17 01:39:31Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss -pkgver=1.2.10 -pkgrel=2 +pkgver=1.2.11 +pkgrel=1 pkgdesc="A portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,7 @@ license=('GPL') depends=('glibc') options=('!libtool') source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('7c933d011e34c218048d48f0c1a8b4ff56798dcd') - +sha512sums=('32dec992cf2f352a09c4edc39ea16101fc9005f3aecc43460aa1b5834c104d3f2c1efc81051339fa18fd4f33cfa949fd17ffe84414519a92b91d0d8a1ae4c467') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD index 0dd0d0e9d..76dc2d222 100644 --- a/extra/libepc/PKGBUILD +++ b/extra/libepc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140436 2011-10-14 09:44:47Z ibiru $ +# $Id: PKGBUILD 143091 2011-11-22 18:13:16Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libepc -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 pkgdesc="Easy Publish and Consume Library" arch=(i686 x86_64 'mips64el') @@ -10,20 +10,18 @@ license=('LGPL') url="http://live.gnome.org/libepc" depends=('gtk3' 'avahi' 'libsoup') makedepends=('intltool') -options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3dff25a7f2f0d024b7609389f13664789b0ab45a0e5740908395e3d49cceefc2') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) +sha256sums=('57303bc180ef1447e060a64590fd359365390e14a90dddc8b8af8d3a6551e454') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } - - diff --git a/testing/libffado/60-ffado.rules b/extra/libffado/60-ffado.rules index 6ab8ef851..6ab8ef851 100644 --- a/testing/libffado/60-ffado.rules +++ b/extra/libffado/60-ffado.rules diff --git a/extra/libffado/PKGBUILD b/extra/libffado/PKGBUILD index 5db7a3de8..3bc12b63f 100644 --- a/extra/libffado/PKGBUILD +++ b/extra/libffado/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 106834 2011-01-19 12:28:15Z andrea $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> +# $Id: PKGBUILD 142989 2011-11-19 21:35:53Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: galiyosha@gmail.com # Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> pkgname=libffado pkgver=2.0.1 -pkgrel=3 +pkgrel=5 pkgdesc="Driver for FireWire audio devices" arch=('i686' 'x86_64' 'mips64el') url="http://www.ffado.org/" license=('GPL') depends=('libiec61883' 'libavc1394' 'libsigc++' 'libxml++' 'alsa-lib' 'dbus') -[ "$CARCH" = "mips64el" ] || { makedepends=('scons' 'python2-qt') -optdepends=('python2-qt: mixer applet') -} -[ "$CARCH" = "mips64el" ] && \ -makedepends=('scons') -source=(http://www.ffado.org/files/$pkgname-$pkgver.tar.gz) -md5sums=('786f31facd417e6207e429f50af0e15e') +optdepends=('python2: ffado-diag' + 'python2-qt: mixer applet') +provides=('ffado') +source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" + '60-ffado.rules') +md5sums=('786f31facd417e6207e429f50af0e15e' + 'f03a3e950801c4405b8934084651bca8') build() { cd "$srcdir/$pkgname-$pkgver" @@ -46,7 +46,12 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install + scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install + + # add audio device rules + # see https://bugs.archlinux.org/task/26342 + install -Dm644 "$srcdir/60-ffado.rules" \ + "$pkgdir/lib/udev/rules.d/60-ffado.rules" # python2 fix for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD new file mode 100644 index 000000000..b5b2ab225 --- /dev/null +++ b/extra/libfprint/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 142730 2011-11-14 08:43:18Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=libfprint +pkgver=0.4.0 +pkgrel=2 +pkgdesc="Library for fingerprint readers" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/fprint/libfprint" +license=(LGPL) +depends=(libusb nss gdk-pixbuf2) +groups=(fprint) +options=(!libtool !emptydirs) +_snap=$pkgname-48ec64f68330452b011d14be67653f1d48fb1405 +source=(http://cgit.freedesktop.org/libfprint/$pkgname/snapshot/$_snap.tar.bz2) +md5sums=('858a0f0d7abd21ac494f9bec904dc156') + +build() { + cd "$srcdir/$_snap" + sed -i '\|^./configure|,+1d' autogen.sh + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc --disable-static + make +} + +package() { + cd "$srcdir/$_snap" + make DESTDIR="$pkgdir" install + + mkdir -p "$pkgdir/lib/udev/rules.d" + mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" +} diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 8c0e0c460..145f1465c 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139371 2011-10-01 18:59:41Z ibiru $ +# $Id: PKGBUILD 143012 2011-11-20 22:59:47Z heftig $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=4.99.4 +pkgver=5.0.2 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64 'mips64el') @@ -12,12 +12,12 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') -makedepends=('intltool' 'gobject-introspection' 'java-environment' 'gtk-doc') +makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala') options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac') +sha256sums=('53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index f20543a4d..2556215aa 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138009 2011-09-14 09:17:28Z ibiru $ +# $Id: PKGBUILD 142433 2011-11-09 18:26:23Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libgee -pkgver=0.6.2.1 +pkgver=0.6.3 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" @@ -12,16 +12,16 @@ arch=('i686' 'x86_64' 'mips64el') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389') +source=(http://ftp.gnome.org/pub/GNOME/sources/libgee/0.6/$pkgname-$pkgver.tar.xz) +sha256sums=('6b1ef59e26dd10feed279fdd7cc49c3391e124d31c46ac56c410ba0ce3bd1716') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 208d460dd..3b12c60d2 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 139377 2011-10-01 18:59:51Z ibiru $ +#$Id: PKGBUILD 142889 2011-11-17 18:34:54Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64 'mips64el') @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0516403432b06ecc173c9f9dbe3eaa87b2c7a230806fcac4dfd73ad998e928f5') +sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 4fd3a2540..e98bc6ae5 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139379 2011-10-01 18:59:56Z ibiru $ +# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ url="http://www.gnome.org/" install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz gettext-not-xml.patch) -sha256sums=('7fdae4aad787759ed0d0124d66991311a24c8c9a3c9a46c56f62e4cc4575aea9' +sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5' '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3') build() { diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 291cf682d..e3d6354c0 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139928 2011-10-05 19:10:03Z andrea $ +# $Id: PKGBUILD 141779 2011-11-02 18:12:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('9e32ee20a1d201e55aacc5a1fb1de87ad50f3579') +sha1sums=('084f6aff760957d2005dd571dad178ca685abb68') build() { cd "${srcdir}" diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 8eeca5ceb..95b05321a 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139924 2011-10-05 19:09:56Z andrea $ +# $Id: PKGBUILD 141775 2011-11-02 18:12:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('51f8ce8847b71674244f7620536939ba4f36d476') +sha1sums=('d2a1e88c6135fa23cea7670dfbb7c8634dc9c870') build() { cd "${srcdir}" diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index ee94c9469..6e8787d8d 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139930 2011-10-05 19:10:08Z andrea $ +# $Id: PKGBUILD 141781 2011-11-02 18:12:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="http://kde.org/" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fbd158168c219cbe1009019d2a33376fca951a5e') +sha1sums=('daaf507f75855660ae9f1af00158c2746c574902') build() { cd "${srcdir}" diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 2cceb8403..1ccf20cea 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139932 2011-10-05 19:10:13Z andrea $ +# $Id: PKGBUILD 141783 2011-11-02 18:13:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('a75cd016c2d9faa71b2867cb4b3eed40edfb3b85') +sha1sums=('9c6d4406a1292cfe81fa27508ffe4d96633417bf') build() { cd "${srcdir}" diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index 1c865a706..09bef8527 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139934 2011-10-05 19:10:18Z andrea $ +# $Id: PKGBUILD 141785 2011-11-02 18:13:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.7.2 +pkgver=4.7.3 pkgrel=1 pkgdesc="An image scanning library" url="http://kde.org/" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('223182cf23fc29a10ff2f1ce7756aecf4258b41c') +sha1sums=('d1efdd1f5f7f99ba173ddcc88b2ddee343ecf96b') build() { cd "${srcdir}" diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD index 82008c65f..40ef899b5 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' 'mips64el') @@ -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/libmpcdec/PKGBUILD b/extra/libmpcdec/PKGBUILD index 5ce2000d7..de27d8451 100644 --- a/extra/libmpcdec/PKGBUILD +++ b/extra/libmpcdec/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 57066 2009-10-31 11:59:42Z allan $ +# $Id: PKGBUILD 141656 2011-11-01 10:26:35Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libmpcdec pkgver=1.2.6 -pkgrel=2 +pkgrel=3 pkgdesc="Musepack decoding library" arch=('i686' 'x86_64' 'mips64el') url="http://musepack.net/" license=('custom') depends=('glibc') options=('!libtool') -source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2) +source=("http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2") md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD index f64f57a3c..fb6dc9072 100644 --- a/extra/libmpdclient/PKGBUILD +++ b/extra/libmpdclient/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 50625 2009-08-30 03:02:23Z allan $ +# $Id: PKGBUILD 141673 2011-11-02 05:35:47Z bisson $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libmpdclient -pkgver=2.5 +pkgver=2.6 pkgrel=1 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages' -arch=('i686' 'x86_64' 'mips64el') url='http://mpd.wikia.com/wiki/ClientLib:libmpdclient' -license=('custom') +license=('custom:BSD') +arch=('i686' 'x86_64' 'mips64el') options=('!libtool') source=("http://downloads.sourceforge.net/project/musicpd/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('a2e68352f2b7d55787d14a45ee0d902f2427b3dc') +sha1sums=('39bdcf5399fb98e34b8b6110057b64f4d1945333') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +22,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - + cd "${pkgdir}" install -d usr/share/licenses/libmpdclient ln -s ../../doc/libmpdclient/COPYING usr/share/licenses/libmpdclient/COPYING diff --git a/extra/libmsn/PKGBUILD b/extra/libmsn/PKGBUILD index 21eace859..d8d115132 100644 --- a/extra/libmsn/PKGBUILD +++ b/extra/libmsn/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 143093 2011-11-22 18:18:21Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Charly Ghislain <charlyghislain@gmail.com> pkgname=libmsn -pkgver=4.1 +pkgver=4.2 pkgrel=2 pkgdesc="A reusable, open-source, fully documented library for connecting to Microsoft's MSN" url="http://sourceforge.net/projects/libmsn/" @@ -12,22 +13,24 @@ license=('GPL2') depends=('openssl') makedepends=('cmake') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" - 'openssl1.patch') -md5sums=('769d3cf0e5625263fbc23321c1ddfcb0' - 'c8d7e2113d967a1d38a531e9fe8e7861') + 'fix-header.patch') +md5sums=('8887196051d2960a9279a5e00c8416a4' + '918b4fc89910118c63b2147eacc2c3f3') build() { - cd ${srcdir} - patch -Np0 -i ${srcdir}/openssl1.patch || return 1 + cd "${srcdir}" + + patch -p0 -i "${srcdir}"/fix-header.patch + mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release || return 1 - make || return 1 + -DCMAKE_BUILD_TYPE=Release + make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make "DESTDIR=${pkgdir}" install } diff --git a/extra/libmsn/fix-header.patch b/extra/libmsn/fix-header.patch new file mode 100644 index 000000000..82fae6fc4 --- /dev/null +++ b/extra/libmsn/fix-header.patch @@ -0,0 +1,12 @@ +diff -up libmsn-4.2/msn/CMakeLists.txt.xmlParser_h libmsn-4.2/msn/CMakeLists.txt +--- libmsn-4.2/msn/CMakeLists.txt.xmlParser_h 2010-01-05 06:07:08.000000000 -0600 ++++ libmsn-4.2/msn/CMakeLists.txt 2011-11-18 17:00:37.758298054 -0600 +@@ -37,7 +37,7 @@ set(msn_HEADERS + buddy.h + passport.h + sstream_fix.h +- soap.h ++ soap.h xmlParser.h + p2p.h + msnobject.h + libmsn_export.h) diff --git a/extra/libmsn/openssl1.patch b/extra/libmsn/openssl1.patch deleted file mode 100644 index 0ff7de898..000000000 --- a/extra/libmsn/openssl1.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- libmsn-4.1/msntest/msntest.cpp~ 2010-04-01 15:05:13.248056050 +0200 -+++ libmsn-4.1/msntest/msntest.cpp 2010-04-01 15:07:18.938878993 +0200 -@@ -259,7 +259,13 @@ - if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected) - { - BIO *bio_socket_new; -- SSL_METHOD *meth=NULL; -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ const SSL_METHOD *meth=NULL; -+#else -+ SSL_METHOD *meth=NULL; -+#endif -+ - meth=SSLv23_client_method(); - SSLeay_add_ssl_algorithms(); - mySocketsSsl[i].ctx = SSL_CTX_new(meth); diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index d9d149aff..682d26792 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 137565 2011-09-09 17:36:39Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142810 2011-11-15 16:35:49Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.4 +pkgver=1.0.5 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64' 'mips64el') @@ -11,13 +12,13 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('9c840d6a7dc96055c6eb5a7d36d02a7c') +md5sums=('37af04b1e944f982e35b69c04b5d1b0f') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname} \ + cmake ../${pkgname}.${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD index 360f2ecc8..b64e27dd8 100644 --- a/extra/libmythes/PKGBUILD +++ b/extra/libmythes/PKGBUILD @@ -9,7 +9,8 @@ arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sourceforge.net/ " license=('custom') depends=('glibc' 'perl') -options=('force' '!libtool') +makedepends=('hunspell') +options=('!libtool') provides=('mythes') source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz) md5sums=('54b310488dda6929cf31ae859928c945') diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD index c82563fbc..7c0b48819 100644 --- a/extra/libproxy/PKGBUILD +++ b/extra/libproxy/PKGBUILD @@ -22,7 +22,7 @@ build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \ -DCMAKE_SKIP_RPATH=ON \ @@ -31,7 +31,8 @@ build() { -WITH_WEBKIT=OFF \ -WITH_MOZJS=OFF \ -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \ - -DCMAKE_C_FLAGS="${CFLAGS}" + -DCMAKE_C_FLAGS="${CFLAGS}" \ + ../${pkgname}-${pkgver} make } diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD index 7dddbaeea..c2aca401d 100644 --- a/extra/libqzeitgeist/PKGBUILD +++ b/extra/libqzeitgeist/PKGBUILD @@ -1,23 +1,29 @@ -# $Id: PKGBUILD 125364 2011-05-26 10:10:50Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 141345 2011-10-29 16:06:26Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libqzeitgeist -pkgver=0.7.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="A Qt interface to the Zeitgeist event tracking system" url="https://projects.kde.org/projects/kdesupport/libqzeitgeist" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('qt') -makedepends=('cmake') -source=("http://releases.zeitgeist-project.com/qzeitgeist/QtZeitgeist-${pkgver}.tar.bz2") -md5sums=('e58d4b988bbab812f8bd6878d87c0956') +makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('97bdea6a1865db7d5f29c93e3a492f24') build() { cd "${srcdir}" + + # Fix python2 path + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ + ${pkgname}-${pkgver}/scripts/onto2cpp.py + mkdir build cd build - cmake ../QtZeitgeist-${pkgver}-Source \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 15b67b82a..aea20a745 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $ +# $Id: PKGBUILD 142694 2011-11-12 21:17:53Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -10,57 +10,59 @@ pkgname=('libreoffice-common' 'libreoffice-impress' 'libreoffice-kde4' 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' 'libreoffice-writer' 'libreoffice-en-US' #'libreoffice-extension-barcode' # - 'libreoffice-extension-diagram' - 'libreoffice-extension-google-docs' 'libreoffice-extension-hunart' #'libreoffice-extension-lightproof' # no source integration #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity - 'libreoffice-extension-nlpsolver' 'libreoffice-extension-ct2n' 'libreoffice-extension-numbertext' 'libreoffice-extension-oooblogger' 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-extension-scripting-beanshell' - 'libreoffice-extension-scripting-javascript' 'libreoffice-extension-scripting-python' - 'libreoffice-extension-typo' - 'libreoffice-extension-validator' - 'libreoffice-extension-watch-window' + 'libreoffice-extension-typo') +[ "${CARCH}" != "mips64el" ] && pkgname+=('libreoffice-sdk' \ + 'libreoffice-sdk-doc' \ + 'libreoffice-extension-diagram' \ + 'libreoffice-extension-google-docs' \ + 'libreoffice-extension-nlpsolver' \ + 'libreoffice-extension-presenter-screen' \ + 'libreoffice-extension-report-builder' \ + 'libreoffice-extension-scripting-beanshell' \ + 'libreoffice-extension-scripting-javascript' \ + 'libreoffice-extension-validator' \ + 'libreoffice-extension-watch-window' \ 'libreoffice-extension-wiki-publisher') -_LOver=3.4.3.2 -pkgver=3.4.3 -pkgrel=4 -arch=('i686' 'x86_64') +_LOver=3.4.4.2 +pkgver=3.4.4 +pkgrel=3 +arch=('i686' 'x86_64' 'mips64el') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' - 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' + 'sane' 'perl-archive-zip' 'zip' 'p7zip-libre' 'xulrunner' 'unixodbc' 'boost' + 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'vigra' 'libldap' 'libmythes' 'libwpg' 'imagemagick' + 'gstreamer0.10-base' #'saxon' - currently broken # the depends from libreoffice main pkg "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'dbus-glib' "icu>=4.6" 'libxslt' + 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' # 'graphite' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests - # translate-toolkit - todo move them to extra to allow --with-system-foo builds + # http://download.documentfoundation.org/mirrors/all.html # http://wiki.documentfoundation.org/Mirrors -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" +[ "${CARCH}" != "mips64el" ] && makedepends+=('hsqldb-java' 'apache-ant' 'beanshell' 'junit' 'mesa' 'java-environment' 'libgl' 'lucene') + +#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" +_mirror="http://dev-builds.libreoffice.org/pre-releases/src" _additional_source_url="http://hg.services.openoffice.org/binaries" source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz @@ -88,10 +90,7 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - http://download.go-oo.org/src/0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt @@ -106,14 +105,9 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_ct2n.diff vbahelper.visibility.patch scp2-more-reasonable-file-access-rights.diff - java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 - poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe - pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b - poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b - build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42) + RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip @@ -148,28 +142,26 @@ noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 0625a7d661f899a8ce263fc8a9879108-graphite2-0.9.2.tgz) -md5sums=('7c2e73f1197d169519f86efe422e5df9' - '823956297a7e0b7603c585c49bd9fd4e' - '465b3be0e30f88e1139c45d2e2217927' - 'a1d5af5be5eb522c8a24feacbb0161fa' - '8b972e130dfe62eb41d1d71d72de4b76' - 'a6b22494e3a65a3b242ecb896aa7ab48' - 'b7d86f8baee5b31af210cc81785e5676' - 'de6c062d334daab99cf0592aa3568215' - 'df46914d540ef0126cd746d09c68ca2a' - '8f308250c397ddc6fdb1aae13e102927' - '1fd00a0fcfd4a5d1956c3f6a0990d1ce' - '86914ac8bc30ea721b708b2f2faa3111' - '1452229e57ac3c4191e798eac4c0a7e0' - 'bb46bdb682689629d432cdbf5f3f42c2' - 'bec7f633562762debdf810690002e688' - '87061613efece1c253906a90cd4dc01f' - '308284d7d1d1bd6860d128b26e24390b' - 'fa8b36365a2b2fb110c44886d7069774' - 'da8a40cac4bd9d4f6f326e0e3b1b7e2a' + 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2) +md5sums=('be8b13f83045f0a53b69fe76d6d72e9c' + 'db423cbb1cee416b718138044a5de930' + '31944d2139d6d81ef1131bd513530621' + 'f447fd4ffe54aab9561c6caa262754b3' + '97fe698737a35c8803712d4e08007620' + 'acff44d97a5106d9b53c747dabeb0800' + '620d43a0b9f36388f423e030513864ef' + '4c5b1ed870363eca2602f0cb42a8415a' + '702c6ca31525d7d2c2ded86c77b0bd2e' + 'ac9b3acf78f43c1395d0e2dedc860f30' + 'd8d2c41cb86bc8ba2a07e001a5317abb' + '4d4af2fc06dbe33ec2307df812f7abe1' + '1398a566eb76598bf3005e187fc2386c' + 'dd962d2d57f88b9e07e665adad3cabbc' + 'fff0fc9cd16ef1eb2b2ed5d0a6e77f95' + 'e54d41d39e63d04ac4a88ce79e37af98' + 'dbc71403040f447683bf55d1f0be3cad' + '69ce5b72f44b008d0e78767c5b1dbf39' + '34a2e8ae6b81a042966740263c53e135' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' '798b2ffdc8bcfe7bca2cf92b62caf685' @@ -195,10 +187,7 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' '18f577b374d60b3c760a3a3350407632' '0ff7d225d087793c8c2c680d77aac3e7' '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '0625a7d661f899a8ce263fc8a9879108' '451ccf439a36a568653b024534669971' '7e7efc5d4a03126bb9ae3ae9aa2c4e87' '41c9b65ad60af4b3255bbecdfef11736' @@ -213,19 +202,20 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' '37638431e7e40baf2e47966ebb9bc0e9' - 'ca6032e86229ae798f3744ae244f5bfe' '3c6c62e77c30649a3dfe73512947cc9a' - '64497be966802e62ffe3282d3facf7b7' - '89ff871e77e10357a976fe9d1ab3a65a' - 'c4cb0d7f2602396a3f4cac55b8a4e308' - 'b8f1fb7f3902d22aeaa2575c6b08a62c') + 'eb35d4c715e0dfc23bbc706996033829') build() { + if [ "${CARCH}" != "mips64el" ] ; then unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh || . /etc/profile.d/jdk7-openjdk.sh + [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh + extraconf="--enable-opengl --enable-ext-scripting-beanshell --with-system-lucene --with-ant-home=\"/usr/share/java/apache-ant\" --with-lucene-core-jar=/usr/share/java/lucene-core.jar --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar --with-java-target-version=1.5 --enable-odk --enable-ext-diagram --enable-ext-google-docs --enable-ext-nlpsolver --enable-ext-report-builder --enable-ext-scripting-javascript --enable-ext-validator --enable-ext-watch-window --enable-ext-wiki-publisher" + else + extraconf="--disable-opengl --without-java --without-system-lucene --without-system-hsqldb --without-system-beanshell --without-system-jfreereport --without-system-saxon --without-system-mesa-headers --without-junit" + fi # move all LibO sources into one build directory mkdir ${srcdir}/build && cd ${srcdir}/build @@ -244,16 +234,14 @@ build() { cd ${srcdir}/build # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_boost.diff + #patch -Np1 -i ${srcdir}/buildfix_boost.diff patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff - patch -Np1 -i ${srcdir}/java-detection.diff patch -Np1 -i ${srcdir}/oracle-recognition.diff - patch -Np1 -i ${srcdir}/poppler-check.diff - patch -Np1 -i ${srcdir}/pdfimport.diff - patch -Np1 -i ${srcdir}/poppler-buildfix.diff - patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff + patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff + # Checks if --hash-style is accepted, not if --hash-style=both is accepted. + [ "${CARCH}" = "mips64el" ] && sed -i 's/--hash-style=both/--hash-style=sysv/' ${srcdir}/build/solenv/gbuild/platform/unxgcc.mk # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -282,11 +270,11 @@ build() { # fi # needed for 0003-distro-install-fix-en-US-only-installation.patch - autoconf -v -f + autoconf -f # non-SMP test build # export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ + ./configure --with-build-version="${_LOver} Parabola GNU/Linux-libre build-${pkgrel}" --with-vendor="Parabola GNU/Linux-libre" \ --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ @@ -299,38 +287,25 @@ build() { --enable-crashdump \ --enable-dbus \ --enable-evolution2\ - --enable-graphite --without-system-graphite \ --enable-gio\ --disable-gnome-vfs\ --disable-kde\ --enable-kde4\ --enable-ldap \ --enable-lockdown\ - --enable-opengl \ - --enable-odk\ - --enable-opengl\ --enable-ext-barcode \ - --enable-ext-diagram \ - --enable-ext-google-docs \ --enable-ext-hunart \ --disable-ext-lightproof \ --disable-ext-mysql-connector \ --with-system-mysql \ - --enable-ext-nlpsolver \ --enable-ext-ct2n \ --enable-ext-numbertext \ --enable-ext-oooblogger \ --enable-ext-pdfimport \ --enable-ext-presenter-console \ --enable-ext-presenter-minimizer \ - --enable-ext-report-builder \ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ --enable-ext-scripting-python \ --enable-ext-typo \ - --enable-ext-validator \ - --enable-ext-watch-window \ - --enable-ext-wiki-publisher \ --without-fonts\ --without-afms\ --without-ppds\ @@ -349,7 +324,6 @@ build() { --with-system-libtextcat \ --with-external-libtextcat-data \ --with-openldap\ - --with-ant-home="/usr/share/java/apache-ant"\ --without-system-boost\ --with-system-cairo\ --with-system-libs\ @@ -358,10 +332,7 @@ build() { --with-system-xrender-headers\ --with-system-headers\ --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ - --with-java-target-version=1.5 \ + $extraconf \ $EXTRAOPTS || return 1 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool @@ -392,29 +363,30 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" - 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libxslt' "icu>=4.6" + 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script #'java-runtime' #'saxon' + [ "${CARCH}" != "mips64el" ] && depends+=('libgl') optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' 'libcups: adds printing support' 'gconf: adds additional gnome support' 'nss: adds support for signed files/macros' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'poppler: for shipped pdfimport extension' 'libmythes: for use in thesaurus' - 'hsqldb-java: default database format for OpenOffice.org' - 'beanshell: interactive java -- good for prototyping /macros' 'vigra: C++ computer vision library, usable in Basebmp' 'libmspack: library for Microsoft compression formats for use in FontOOo' 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' 'libldap: to get profiles via ldap' - 'lucene: full-text search engine library for Java needed in the help section' 'sane: for scanner access' 'unixodbc: adds ODBC database support' 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress') + [ "${CARCH}" != "mips64el" ] && optdepends+=('java-runtime: adds java support' \ + 'hsqldb-java: default database format for OpenOffice.org' \ + 'beanshell: interactive java -- good for prototyping /macros' \ + 'lucene: full-text search engine library for Java needed in the help section') backup=(etc/libreoffice/sofficerc etc/libreoffice/bootstraprc etc/libreoffice/psprint.conf) @@ -547,7 +519,7 @@ package_libreoffice-gnome() { package_libreoffice-impress() { pkgdesc="Presentation Application for LibreOffice." depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') + [ "${CARCH}" != "mips64el" ] && optdepends=('mesa: for the OGLTrans extension') backup=() groups=('libreoffice') replaces=('libreoffice') @@ -629,7 +601,7 @@ package_libreoffice-sdk() { mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - # fix ArchLinux LibreOffice installation paths + # fix installation paths sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \ -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ diff --git a/extra/libreoffice/fix-nobody-temp-dir.patch b/extra/libreoffice/fix-nobody-temp-dir.patch new file mode 100644 index 000000000..a36465c05 --- /dev/null +++ b/extra/libreoffice/fix-nobody-temp-dir.patch @@ -0,0 +1,11 @@ +--- bridges/source/cpp_uno/shared/vtablefactory.cxx.orig 2011-11-05 19:38:58.812005183 +0100 ++++ bridges/source/cpp_uno/shared/vtablefactory.cxx 2011-11-05 19:40:01.654548478 +0100 +@@ -263,7 +263,7 @@ + + for (int i = strDirectory.getLength() == 0 ? 1 : 0; i < 2; ++i) + { +- if (!strDirectory.getLength()) ++ if (strDirectory.getLength() < 2) + strDirectory = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/tmp" )); + + strDirectory += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/.execoooXXXXXX" )); diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index dee391f52..42c12b653 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138210 2011-09-18 16:29:47Z ibiru $ +# $Id: PKGBUILD 142891 2011-11-17 18:34:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.34.1 -pkgrel=2 -pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" +pkgver=2.34.2 +pkgrel=1 +pkgdesc="A SVG viewing library" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') @@ -13,19 +13,19 @@ optdepends=('gtk2: for rsvg-view support') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) +sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \ + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ --with-croco --disable-static \ --with-svgz make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD index 4c01ea44f..c507f0713 100644 --- a/extra/libsexy/PKGBUILD +++ b/extra/libsexy/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 57006 2009-10-31 07:29:59Z allan $ +# $Id: PKGBUILD 141654 2011-11-01 10:11:25Z pierre $ # Maintainer: Jan de Groot <jgc@archlinux.org> + pkgname=libsexy pkgver=0.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="Doing naughty things to good widgets." arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -10,13 +11,17 @@ url="http://chipx86.com/wiki/Libsexy" depends=('gtk2' 'libxml2') makedepends=('iso-codes' 'pkgconfig') options=('!libtool') -source=(http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz) +source=("http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz") md5sums=('33c079a253270ec8bfb9508e4bb30754') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install rm -f ${pkgdir}/usr/lib/libsexy.a diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index ef0cd3637..353bc6673 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139387 2011-10-01 19:00:12Z ibiru $ +# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.0 +pkgver=2.36.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('db06af0f8c887abde427e5418e0e74bd39837a0f48a4161ff29607dfcd6b36ca') +sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD index 339395e69..8a72695ee 100644 --- a/extra/libtasn1/PKGBUILD +++ b/extra/libtasn1/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libtasn1 pkgver=2.9 -pkgrel=1 +pkgrel=1.1 pkgdesc="The ASN.1 library used in GNUTLS" arch=(i686 x86_64 'mips64el') license=('GPL3' 'LGPL') diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD index 4de54376a..cf684ed66 100644 --- a/extra/libthai/PKGBUILD +++ b/extra/libthai/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 118469 2011-04-07 08:07:24Z jgc $ +# $Id: PKGBUILD 142250 2011-11-07 09:20:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com> pkgname=libthai -pkgver=0.1.15 +pkgver=0.1.16 pkgrel=1 pkgdesc="Thai language support routines" url="http://linux.thai.net/projects/libthai" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') -depends=('libdatrie>=0.2.3') +depends=('libdatrie') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('3bc6d925eae36317aac8676be49a5741') +md5sums=('631ae09f531db6c94aedcc7ce226d6a5') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-static make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 804fce211..d40c8a8d0 100644 --- a/extra/libtheora/PKGBUILD +++ b/extra/libtheora/PKGBUILD @@ -18,7 +18,7 @@ sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') build() { cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static + ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --target=$CHOST --host=$CHOST make } diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD index a7c221246..15a09199d 100644 --- a/extra/libtiff/PKGBUILD +++ b/extra/libtiff/PKGBUILD @@ -3,7 +3,7 @@ pkgname=libtiff pkgver=3.9.5 -pkgrel=1 +pkgrel=1.1 pkgdesc="Library for manipulation of TIFF images" arch=('i686' 'x86_64' 'mips64el') url="http://www.remotesensing.org/libtiff/" diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD index 0239b1942..6bf68ba0f 100644 --- a/extra/libupnp/PKGBUILD +++ b/extra/libupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116007 2011-03-22 15:41:57Z giovanni $ +# $Id: PKGBUILD 143080 2011-11-22 13:19:50Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libupnp -pkgver=1.6.13 +pkgver=1.6.14 pkgrel=1 pkgdesc="Portable Open Source UPnP Development Kit" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glibc') makedepends=('pkgconfig') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2") -md5sums=('71476b1781ad179bfc9bead640be5f54') +md5sums=('a0497cf15b3e15f7e7ede88b3d04861b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libva-driver-intel/PKGBUILD b/extra/libva-driver-intel/PKGBUILD new file mode 100644 index 000000000..371c319db --- /dev/null +++ b/extra/libva-driver-intel/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 141738 2011-11-02 16:42:28Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> + +pkgname=libva-driver-intel +pkgver=1.0.15 +pkgrel=1 +pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." +arch=('i686' 'x86_64') +url="http://freedesktop.org/wiki/Software/vaapi" +license=('MIT') +depends=('libva') +options=('!libtool') +source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2) +md5sums=('9dbd642f18993335146480a3a2987874') + +build() { + cd ${srcdir}/intel-driver-${pkgver} + ./autogen.sh + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/intel-driver-${pkgver} + make DESTDIR="${pkgdir}" install + install -m644 -D COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index b01530d09..592f4a510 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 133625 2011-07-30 07:35:29Z ibiru $ +# $Id: PKGBUILD 141737 2011-11-02 16:40:27Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> + pkgname=libva -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/vaapi" license=('MIT') -depends=('libgl' 'libdrm>=2.4.23' 'libxfixes') +depends=('libgl' 'libdrm' 'libxfixes') makedepends=('mesa') -optdepends=('vdpau-video: VDPAU backend for VA API') +optdepends=('vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') options=('!libtool') +install=libva.install source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9a7eba239bffa3b40d7a49e3bb4fb6fb') +md5sums=('ad8a94ba87ff0563a533c3c142816794') build() { cd ${srcdir}/${pkgname}-${pkgver} ./autogen.sh - ./configure --prefix=/usr \ - --enable-i965-driver \ - --enable-glx + ./configure --prefix=/usr make } diff --git a/extra/libva/libva.install b/extra/libva/libva.install new file mode 100644 index 000000000..4d8b8e24a --- /dev/null +++ b/extra/libva/libva.install @@ -0,0 +1,5 @@ +post_upgrade() { + if [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then + echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.' + fi +} diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 8e363599a..e9e202629 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139391 2011-10-01 19:00:17Z ibiru $ +# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('7cb92e6dbe8f20f4dba327fa078fb3caa35c0ae89445bbbdf1e7a17e5116f542') +sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD index 4b08aacc3..e8cedeacf 100644 --- a/extra/libxmi/PKGBUILD +++ b/extra/libxmi/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 57021 2009-10-31 09:42:53Z allan $ +# $Id: PKGBUILD 141631 2011-11-01 00:42:15Z giovanni $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tobias Kieslich [tobias.justdreams.de] pkgname=libxmi pkgver=1.2 -pkgrel=2 -pkgdesc="library for rasterizing 2-D vector graphics" +pkgrel=5 +pkgdesc="A library for rasterizing 2-D vector graphics" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libxmi/libxmi.html" license=('GPL') depends=('glibc') +options=('!libtool') +install=libxmi.install source=(http://mirrors.usc.edu/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('4e6935484f0ad71b531920bf4c546b47') build() { - cd ${srcdir}/${pkgname}-${pkgver} - rm config.guess config.sub install-sh missing - automake --add-missing + cd "${srcdir}/${pkgname}-${pkgver}" + autoreconf --force --install ./configure --prefix=/usr --infodir=/usr/share/info - make || return 1 - make DESTDIR=${pkgdir} install + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libxmi/libxmi.install b/extra/libxmi/libxmi.install new file mode 100644 index 000000000..5d9821e43 --- /dev/null +++ b/extra/libxmi/libxmi.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(libxmi.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index 0e3ab9d1f..987b3fa83 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libxml2 pkgver=2.7.8 -pkgrel=1 +pkgrel=1.1 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64 'mips64el') license=('custom') diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD index b0dfd032d..2b5734e3b 100644 --- a/extra/libxpm/PKGBUILD +++ b/extra/libxpm/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxpm pkgver=3.5.9 -pkgrel=1 +pkgrel=1.1 pkgdesc="X11 pixmap library" arch=(i686 x86_64 'mips64el') license=('custom') diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD index 5f12019fc..1b7022396 100644 --- a/extra/liquidwar/PKGBUILD +++ b/extra/liquidwar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $ +# $Id: PKGBUILD 141061 2011-10-22 20:45:31Z eric $ # Maintainer: Jeff Mickey <jeff@archlinux.org> pkgname=liquidwar pkgver=5.6.4 -pkgrel=5 +pkgrel=6 pkgdesc="A unique multiplayer wargame" arch=('i686' 'x86_64' 'mips64el') url="http://www.ufoot.org/liquidwar/" @@ -12,12 +12,14 @@ depends=('allegro4') makedepends=('python2') install=liquidwar.install source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz - http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig) + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig liquidwar-5.6.4-ovflfix.patch) sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' - 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') + 'a262967d60e0f04ac5b99693144ef6b0038bb6c4' + 'e2102792c54a01b7cd14adb6d72404044175ec7e') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch" sed -i 's/python/python2/' doc/Makefile.in [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS diff --git a/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch new file mode 100644 index 000000000..446385624 --- /dev/null +++ b/extra/liquidwar/liquidwar-5.6.4-ovflfix.patch @@ -0,0 +1,18 @@ +--- src/wwwsrv.c.old 2010-10-26 14:16:31.000000000 +0200 ++++ src/wwwsrv.c 2010-10-26 14:17:35.000000000 +0200 +@@ -100,12 +100,12 @@ + + data->privacy = privacy; + data->log = log; +- strncpy (data->metaserver, metaserver, URL_SIZE); ++ strncpy (data->metaserver, metaserver, sizeof(data->metaserver)); + data->port = port; + data->busy_players = busy_players; + data->max_players = max_players; +- strncpy (data->password, password, URL_SIZE); +- strncpy (data->comment, comment, URL_SIZE); ++ strncpy (data->password, password, sizeof(data->password)); ++ strncpy (data->comment, comment, sizeof(data->comment)); + } + + /*------------------------------------------------------------------*/ diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 0a10e033f..502905d48 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $ +# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=6 +pkgrel=8 epoch=1 -_kernver=3.0-LIBRE +_extramodules=extramodules-3.1-LIBRE +_kernver="$(cat /lib/modules/${_extramodules}/version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-libre-headers>=3.0' 'linux-libre-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'linux-libre-headers>=3.1' 'linux-libre-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -60,15 +61,15 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux-libre>=3.0' 'linux-libre<3.1') + depends=('lirc-utils' 'linux-libre>=3.1' 'linux-libre<3.2') replaces=('lirc+pctv') install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install # set the kernel we've built for inside the install script - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" # gzip -9 modules find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; } diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 0d42e8a5c..1e7c4f4a1 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,9 +1,9 @@ -KERNEL_VERSION=3.0-ARCH +EXTRAMODULES=extramodules-3.1-ARCH post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION > /dev/null 2>&1 + depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 } post_upgrade() { diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 3b9cc46f2..8a6bb1b31 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138700 2011-09-27 16:47:11Z giovanni $ +# $Id: PKGBUILD 143082 2011-11-22 13:27:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2011.09.19 +pkgver=2011.11.20 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +11,14 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('7834800179503377d7142b4bfbbf0dca') +md5sums=('8e5ebefdf7d12ca9cfd7175ff3d7eef2') build() { cd ${srcdir}/live sed \ - -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DSOCKLEN_T/g' \ - -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) -o/g' \ + -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. '"${CFLAGS}"' -fPIC -DSOCKLEN_T/g' \ + -e 's/\(LIBRARY_LINK =\).*/\1 $(LD) '"${LDFLAGS}"' -o/g' \ -e 's/\(LIBRARY_LINK_OPTS =\).*/\1 $(LINK_OPTS) -r -Bstatic/g' \ -i config.linux ./genMakefiles linux diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 357430170..90356df24 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 129537 2011-06-28 18:36:08Z foutrelis $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# $Id: PKGBUILD 141372 2011-10-30 06:47:25Z allan $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> @@ -11,8 +11,8 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=2.9 -_gcc_ver=4.6.1 -pkgrel=6 +_gcc_ver=4.6.2 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') @@ -26,15 +26,15 @@ source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz clang-pure64.patch enable-lto.patch bug-9869-operator-h-c++0x.patch) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '016d70145d52255c9a46fedde51634e2' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4' - '047cac563a557463d7ec6bd87d953f5e') +sha256sums=('661236cfa17428b48cfa9cbb9909f7569c64b8ecd219fd91dbc00e3b557b3779' + '70c41f3f782a71cbaa7bc8d6ea29fce4263ad3e8558dfecc6dc11cdef17909df' + '12cf0bfb128cd8bd2a308c3c03cf0e607aa47bd87d9a58b422b96bd387e476c1' + 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c' + '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' + '7c05788c02697f0cd05f7c74fe65b460530c0748851313eb950c5d4d17a8115a' + '5bba4964d0d832c9e97308beb45244ff6ed4e16ed3f9f771babe571f1b82fa33' + '1a308679edf3078b8f0c33c94d4e6d0c0db6d3baad91babce08bf5370aa052ef' + '1c37346b0f412556dc979fd510585f3e20d2d45319ec095dbdec37a582d590c7') build() { cd "$srcdir/$pkgname-$pkgver" @@ -217,7 +217,7 @@ package_clang-analyzer() { done # Use Python 2 - sed -i 's/env python$/\02/' \ + sed -i 's/env python$/&2/' \ "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" diff --git a/extra/llvm/clang-toolchains-gcc-versions.patch b/extra/llvm/clang-toolchains-gcc-versions.patch index 7e0083791..7624842a8 100644 --- a/extra/llvm/clang-toolchains-gcc-versions.patch +++ b/extra/llvm/clang-toolchains-gcc-versions.patch @@ -6,7 +6,7 @@ diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChai } - const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", -+ const char* GccVersions[] = {"4.6.1", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", ++ const char* GccVersions[] = {"4.6.2", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", "4.2"}; diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index 347125050..44b249d78 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -6,7 +6,7 @@ pkgname=lsof pkgver=4.85 -pkgrel=1 +pkgrel=1.1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64' 'mips64el') url="http://people.freebsd.org/~abe/" diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD index 7bad05215..65828bc12 100644 --- a/extra/lua/PKGBUILD +++ b/extra/lua/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 138070 2011-09-16 01:15:44Z eric $ +# $Id: PKGBUILD 142952 2011-11-19 04:33:22Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=lua pkgver=5.1.4 -pkgrel=8 -pkgdesc="A powerful light-weight programming language designed for extending applications." +pkgrel=9 +_patchver=5.1.4-4 +pkgdesc="A powerful light-weight programming language designed for extending applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.lua.org/" depends=('readline') license=('MIT') options=('!makeflags' '!emptydirs') -source=("http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz" - 'http://www.lua.org/ftp/patch-lua-5.1.4-3' - 'lua-arch.patch' - 'lua-5.1-cflags.diff') +source=(http://www.lua.org/ftp/${pkgname}-${pkgver}.tar.gz + http://www.lua.org/ftp/patch-lua-${_patchver} + lua-arch.patch lua-5.1-cflags.diff) md5sums=('d0870f2de55d59c1c8419f36e8fac150' - '998ef7886183f61d3a5ca891a9ce6a79' + '329d8695e3e6f1267190e220559f7b6c' '6c5953f63904bf20a0183cdab05b80de' '249582bf1fd861ccf492d2c35a9fe732') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/patch-lua-${_patchver}" -d src patch -p1 -i "${srcdir}/lua-arch.patch" - patch -i "${srcdir}/patch-lua-5.1.4-3" -d src - [ "$CARCH" == "x86_64" ] && patch -Np1 -i ../lua-5.1-cflags.diff + [ "$CARCH" == "x86_64" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" + [ "$CARCH" == "mips64el" ] && patch -p1 -i "${srcdir}/lua-5.1-cflags.diff" + [ "$CARCH" == "mips64el" ] && export CFLAGS="$CFLAGS -fPIC" make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ linux @@ -36,10 +38,10 @@ package() { make INSTALL_DATA="cp -d" TO_LIB="liblua.a liblua.so liblua.so.5.1" LUA_SO=liblua.so \ INSTALL_TOP="${pkgdir}/usr" INSTALL_MAN="${pkgdir}/usr/share/man/man1" \ install - install -D -m 644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" + install -D -m644 etc/lua.pc "${pkgdir}/usr/lib/pkgconfig/lua.pc" install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT" # Install the documentation - mkdir -p "${pkgdir}/usr/share/doc/lua" - cp -R doc/* "${pkgdir}/usr/share/doc/lua" + install -d "${pkgdir}/usr/share/doc/lua" + install -m644 doc/*.{gif,png,css,html} "${pkgdir}/usr/share/doc/lua" } diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index adab6db53..e0ce6b0e1 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137078 2011-09-05 23:07:50Z dreisner $ +# $Id: PKGBUILD 143491 2011-11-24 21:29:37Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.24.0 -pkgrel=6 +pkgver=5.25.1 +pkgrel=2 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.0.51' 'texinfo' 'sh') + depends=('sbcl=1.0.53' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('13586c1221bb5f36067a4cce1e6d5fb31e44e41c' +sha1sums=('9c9ea66434c9ca96549092c3640c3ba5a4fba44b' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { @@ -43,11 +43,11 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - + # install some freedesktop.org compatibility install -Dm644 ${srcdir}/${pkgname}.desktop \ ${pkgdir}/usr/share/applications/${pkgname}.desktop - + # make sure, we have a nice icon for the desktop file at the right place ;) install -d ${pkgdir}/usr/share/pixmaps/ ln -s /usr/share/maxima/${pkgver}/xmaxima/maxima-new.png \ diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 13f0cf3ff..ed4634c49 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 129367 2011-06-27 05:48:53Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142632 2011-11-12 17:15:28Z ibiru $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Adrià Arrufat <swiftscythe@gmail.com> pkgname=mediastreamer pkgver=2.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64' 'mips64el') -url="http://www.linphone.org" +url="http://www.linphone.org/" license=('GPL') depends=('ortp' 'speex' 'v4l-utils' 'ffmpeg') makedepends=('cmake' 'automoc4') diff --git a/extra/memcached/ChangeLog b/extra/memcached/ChangeLog index ad9780fc4..d1f1e44d0 100644 --- a/extra/memcached/ChangeLog +++ b/extra/memcached/ChangeLog @@ -1,5 +1,5 @@ 2011-02-07 Ionut Biru <ibiru@archlinux.org> - * Rebuild 1.4.5 against libeven 2.0.10 + * Rebuild 1.4.5 against libevent 2.0.10 2011-01-31 Dan McGee <dan@archlinux.org> * Rebuild 1.4.5 with gcc 4.5.X patch accepted upstream diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD index 800c619b9..e87dc16b8 100644 --- a/extra/memcached/PKGBUILD +++ b/extra/memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135720 2011-08-18 03:34:00Z dan $ +# $Id: PKGBUILD 142481 2011-11-10 15:13:21Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> # Contributor: Michael Irwin <6d6469@gmail.com> pkgname=memcached -pkgver=1.4.7 +pkgver=1.4.10 pkgrel=1 pkgdesc="A distributed memory object caching system" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz memcached.conf memcached.sh) changelog=ChangeLog -sha256sums=('925837a4cf440e3cb451e338413ed9ad1429fd0d80ba4d903955f5fed8da7be6' +sha256sums=('2cc3de341b561464da29fc5d5e2a4facc0f6aafc151f0e1d94228705e0758fdf' '0e57a0f528b387f1f04f628ec74856c615d82d44f4d6bc041c33b3814ce13d0a' '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb') @@ -29,7 +29,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -D -m 755 scripts/memcached-tool $pkgdir/usr/bin/memcached-tool - install -D -m 644 "$srcdir/memcached.conf" $pkgdir/etc/conf.d/memcached - install -D -m 755 "$srcdir/memcached.sh" $pkgdir/etc/rc.d/memcached + install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool + # This POS is entirely RedHat specific, so not including it now + #install -D -m 755 scripts/memcached.service "$pkgdir"/lib/systemd/system/memcached.service + #sed -i -e 's#^EnvironmentFile.*#EnvironmentFile=/etc/conf.d/memcached#' "$pkgdir"/lib/systemd/system/memcached.service + install -D -m 644 "$srcdir/memcached.conf" "$pkgdir"/etc/conf.d/memcached + install -D -m 755 "$srcdir/memcached.sh" "$pkgdir"/etc/rc.d/memcached } diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 55070febf..4e6e9240d 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139517 2011-10-02 23:55:56Z giovanni $ +# $Id: PKGBUILD 141720 2011-11-02 15:09:38Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=1.9.3 +pkgver=2.0 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('f309b084aaf58773e9f4f4d66c49622a' +md5sums=('38f439a63bae1687d385758c8ad3d53e' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index f086e8c58..1cba99cdf 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 136627 2011-08-31 07:47:27Z ibiru $ +# $Id: PKGBUILD 142908 2011-11-18 07:55:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') +pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'nouveau-dri') # 'llvm-dri') [[ "$CARCH" = "mips64el" ]] && pkgname=('mesa' 'libglapi' 'libgl' 'libgles') +# prepare 7.12/8.0 +#pkgname=('mesa' 'libgl' 'libglapi' 'libgles' 'libegl' 'ati-dri' 'intel-dri' 'nouveau-dri') # 'llvm-dri') #_git=true +_gitdate=20111031 _git=false if [ "${_git}" = "true" ]; then #pkgver=7.10.99.git20110709 pkgver=7.11 else - pkgver=7.11 + pkgver=7.11.1 fi -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('glproto>=1.4.14' 'libdrm>=2.4.26' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'python2' 'libxml2' 'imake' 'udev') @@ -26,9 +29,10 @@ source=(LICENSE) if [ "${_git}" = "true" ]; then # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" + #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" ) fi [ "$CARCH" = "mips64el" ] && \ @@ -43,7 +47,13 @@ if [ "$CARCH" = "mips64el" ]; then patch -Np1 -i $srcdir/mesa-7.5-mips-wmb.patch patch -Np1 -i $srcdir/mesa-loongson.patch - ./configure --prefix=/usr \ + configure=configure + if [ ! -f configure ]; then + autoreconf -vfi + configure=autogen.sh + fi + + ./${configure} --prefix=/usr \ --enable-glx-tls \ --with-driver=xlib \ --enable-xcb \ @@ -110,12 +120,8 @@ package_libgl() { bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" cd src/mesa/drivers/dri - #make -C swrast DESTDIR="${pkgdir}" install -if [ "${_git}" = "true" ]; then - make -C ${srcdir}/mesa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - else - make -C ${srcdir}/Mesa-${pkgver/rc/-rc}/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install -fi + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + ln -s swrastg_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/swrast_dri.so" ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" @@ -138,7 +144,7 @@ package_libglapi() { } package_libgles() { - depends=('libglapi') + depends=('libglapi' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" cd ${srcdir}/?esa-* @@ -159,7 +165,7 @@ package_libgles() { } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev') + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" cd ${srcdir}/?esa-* @@ -169,7 +175,6 @@ package_libegl() { install -m755 -d "${pkgdir}/usr/include" install -m755 -d "${pkgdir}/usr/include/" install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/include/KHR" install -m755 -d "${pkgdir}/usr/share" install -m755 -d "${pkgdir}/usr/share/doc" install -m755 -d "${pkgdir}/usr/share/doc/libegl" @@ -178,15 +183,27 @@ package_libegl() { bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" install -m755 -d "${pkgdir}/usr/share/licenses/libegl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" } +package_khrplatform-devel() { + depends=('') + pkgdesc="Khronos platform development package" + + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/include/KHR" + bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" + + install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" +} + package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc + depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6') +[ "$CARCH" = "mips64el" ] || depends+=('dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3-D graphics libraries and include files" @@ -227,7 +244,7 @@ package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12 make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install } @@ -315,3 +332,11 @@ package_nouveau-dri() { # make -C ${srcdir}/Mesa-${pkgver}/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install #fi #} +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + '774eb6f30b31fa08c04e16e00ca070e1' + 'c7788f2495060bf133771aef6ad25929' + '598c24dccfcdcc99c07d883f7c09f36a') +md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' + 'a77307102cee844ff6544ffa8fafeac1' + 'c7788f2495060bf133771aef6ad25929' + '598c24dccfcdcc99c07d883f7c09f36a') diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index 75be8d734..7bc946085 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 140480 2011-10-15 10:32:49Z andyrtr $ +# $Id: PKGBUILD 142825 2011-11-16 00:02:11Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" license=('LGPL2.1') install=midori.install -depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') +depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('33dde203cd71ae2b1d2adcc7f5739f65') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('4ec9c3daa332ebe865cba6aa8256ef63') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # python2 export PYTHON=/usr/bin/python2 @@ -35,6 +35,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/midori/midori.install b/extra/midori/midori.install index 8cee6c198..4da5511fd 100644 --- a/extra/midori/midori.install +++ b/extra/midori/midori.install @@ -1,7 +1,6 @@ post_install() { - -gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor -update-desktop-database -q + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor } post_upgrade() { @@ -9,6 +8,5 @@ post_upgrade() { } post_remove() { -update-desktop-database -q -gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor + post_install $1 } diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index 2b252e890..5401bfc0a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136884 2011-09-02 16:14:24Z ronald $ +# $Id: PKGBUILD 142634 2011-11-12 17:15:30Z ibiru $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro pkgver=4.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64' 'mips64el') url="http://www.getmiro.com" @@ -12,15 +12,20 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' - 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen') makedepends=('pkg-config') install=miro.install -source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840') +options=('!makeflags') +source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" + 'ffmpeg.patch') +sha1sums=('b08cd09d514d1af0b2403ab8dcd725b8c5d4b840' + 'f0c851d51318c0e0be8b91463ef901625d2587a9') build() { - cd "${srcdir}/${pkgname}-${pkgver}/linux" + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/ffmpeg.patch" + cd linux python2 setup.py install --root="${pkgdir}" diff --git a/extra/miro/ffmpeg.patch b/extra/miro/ffmpeg.patch new file mode 100644 index 000000000..edf378459 --- /dev/null +++ b/extra/miro/ffmpeg.patch @@ -0,0 +1,95 @@ +diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c +--- miro-4.0.old/linux/miro-segmenter.c 2011-05-25 15:58:21.000000000 +0200 ++++ miro-4.0/linux/miro-segmenter.c 2011-05-25 16:09:41.000000000 +0200 +@@ -60,7 +60,7 @@ + } + + switch (input_codec_context->codec_type) { +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + output_codec_context->channel_layout = input_codec_context->channel_layout; + output_codec_context->sample_rate = input_codec_context->sample_rate; + output_codec_context->channels = input_codec_context->channels; +@@ -72,7 +72,7 @@ + output_codec_context->block_align = input_codec_context->block_align; + } + break; +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + output_codec_context->pix_fmt = input_codec_context->pix_fmt; + output_codec_context->width = input_codec_context->width; + output_codec_context->height = input_codec_context->height; +@@ -154,7 +154,7 @@ + exit(1); + } + +- ofmt = guess_format("mpegts", NULL, NULL); ++ ofmt = av_guess_format("mpegts", NULL, NULL); + if (!ofmt) { + fprintf(stderr, "Could not find MPEG-TS muxer\n"); + exit(1); +@@ -174,12 +174,12 @@ + + for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) { + switch (ic->streams[i]->codec->codec_type) { +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + video_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + video_st = add_output_stream(oc, ic->streams[i]); + break; +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + audio_index = i; + ic->streams[i]->discard = AVDISCARD_NONE; + audio_st = add_output_stream(oc, ic->streams[i]); +@@ -195,7 +195,7 @@ + exit(1); + } + +- dump_format(oc, 0, input, 1); ++ av_dump_format(oc, 0, input, 1); + + if (video_st) { + codec = avcodec_find_decoder(video_st->codec->codec_id); +@@ -208,7 +208,7 @@ + } + } + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + exit(1); + } +@@ -234,7 +234,7 @@ + break; + } + +- if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) { ++ if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) { + segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den; + } + else if (video_index < 0) { +@@ -245,10 +245,10 @@ + } + + if (segment_time - prev_segment_time >= segment_duration) { +- put_flush_packet(oc->pb); +- url_fclose(oc->pb); ++ avio_flush(oc->pb); ++ avio_close(oc->pb); + +- if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) { ++ if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) { + fprintf(stderr, "Could not open '%s'\n", output_filename); + break; + } +@@ -278,7 +278,7 @@ + av_freep(&oc->streams[i]); + } + +- url_fclose(oc->pb); ++ avio_close(oc->pb); + av_free(oc); + + return 0; diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index a344cf176..1d1ff869f 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $ +# $Id: PKGBUILD 141066 2011-10-23 00:15:19Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -pkgname=mkvtoolnix +pkgbase=mkvtoolnix +pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=5.0.1 -pkgrel=1 -pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" -depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') -makedepends=('boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") +makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'\ + 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") md5sums=('93fbbe946de6013eca699c0c2a93a4e9') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgbase}-${pkgver}" # Disable automagic curl dep used for online update checking sed -i -e '/curl/d' configure.in @@ -26,13 +26,43 @@ build() { autoreconf ./configure --prefix=/usr \ - --with-boost-libdir=/usr/lib \ - --disable-gui + --with-boost-libdir=/usr/lib rake } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" +package_mkvtoolnix-cli() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" + depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2') + provides=('mkvtoolnix') + conflicts=('mkvtoolnix') + replaces=('mkvtoolnix') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mmg + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1 + rm -rf "${pkgdir}"/usr/share/applications + rm -rf "${pkgdir}"/usr/share/icons + rm -rf "${pkgdir}"/usr/share/mime +} + +package_mkvtoolnix-gtk() { + pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI" + depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils') + install=mkvtoolnix.install + + cd "${srcdir}/${pkgbase}-${pkgver}" rake DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/bin/mkv* + rm -rf "${pkgdir}"/usr/share/doc + rm -rf "${pkgdir}"/usr/share/locale + rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv* + rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv* } diff --git a/extra/mkvtoolnix/mkvtoolnix.install b/extra/mkvtoolnix/mkvtoolnix.install new file mode 100644 index 000000000..74d9eb2ef --- /dev/null +++ b/extra/mkvtoolnix/mkvtoolnix.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + if [ -f usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime &> /dev/null + fi +} + +post_upgrade() { + post_install +} + +pre_remove() { + post_install +} diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index dbb54a577..9e460b754 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 127443 2011-06-15 03:16:57Z eric $ +# $Id: PKGBUILD 142636 2011-11-12 17:15:33Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=20110528 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64' 'mips64el') url="http://moc.daper.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libltdl' 'file') makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' @@ -18,15 +18,15 @@ optdepends=('speex: for using the speex plugin' 'libmodplug: for using the modplug plugin') options=('!libtool') source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ - gcc-undefined-symbols.diff) -md5sums=('003fd01af2165264eb666040e4f586cd' - 'efacb8559e9145e15b0c25f8fa2a9d79') + gcc-undefined-symbols.diff moc-ffmpeg.patch) sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' - 'a811a4ac7e049914aab528d3f06a6be6634c2720') + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'f7e8eb17a89fea1c08c8a68f5afd1ffdc641ce9d') build() { cd "${srcdir}/${pkgname}" patch -p0 -i ../gcc-undefined-symbols.diff + patch -p0 -i ../moc-ffmpeg.patch # Disabling aac to use the external ffmpeg to play them (FS#13164) ./autogen.sh diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/extra/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include <ffmpeg/avformat.h> + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 7a414474a..fc31188ae 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64' 'mips64el') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8.1' 'gdb') +depends=('monodevelop>=2.8.2' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('398c3b49fa1698857499a6e8261becf3') +md5sums=('0c1661c05d8a3fbe56cf1122d9730b26') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 9fac6ee7b..7de84d024 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.8.1 +pkgver=2.8.2 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('02c3f0f75e1d21d72ac5cd0b373d0e58') +md5sums=('4a445e251d5e8a12a8aa4ae22f3a6841') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index f11ba1f1f..0a65e8f60 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('65aeb0fb2c2eb5f0b06ec3aa8de5b3e2ccab02edd3a4a30adb7ef224baa74649') +sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD index 79276ebb6..4578958de 100644 --- a/extra/mpd/PKGBUILD +++ b/extra/mpd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 136986 2011-09-04 17:03:38Z angvp $ +# $Id: PKGBUILD 142638 2011-11-12 17:15:35Z ibiru $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Ben <ben@benmazer.net> pkgname=mpd -pkgver=0.16.4 -pkgrel=1 +pkgver=0.16.5 +pkgrel=2 pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,13 +17,14 @@ depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'f makedepends=('pkgconfig' 'doxygen') install=${pkgname}.install changelog=ChangeLog -source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2" +source=("http://downloads.sourceforge.net/musicpd/$pkgname-$pkgver.tar.bz2" 'mpd') -md5sums=('ddac46eb7d976c5cc6f9bac9e4e100f1' +md5sums=('f7564cff12035f6a1112cce770655df7' 'e5669c2bff4031928531e52475addeb1') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ --sysconfdir=/etc \ --enable-lastfm \ @@ -32,15 +33,18 @@ build() { --enable-documentation \ --disable-libwrap \ --disable-cue \ - --disable-sidplay + --disable-sidplay \ + --with-systemdsystemunitdir=/lib/systemd/system + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install - # set ours dirs in mpd.conf file + # set our dirs in mpd.conf file sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example @@ -50,8 +54,8 @@ package() { sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example - install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example + install -Dm644 "doc/mpdconf.example" "$pkgdir/usr/share/mpd/mpd.conf.example" - install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd - install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd} + install -Dm755 "$srcdir/mpd" "$pkgdir/etc/rc.d/mpd" + install -d "$pkgdir"/var/{lib/mpd/playlists,log/mpd} } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 815858fe1..2cb667f70 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139397 2011-10-01 19:00:26Z ibiru $ +# $Id: PKGBUILD 140941 2011-10-20 05:44:03Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('225edd0dd1cdcc44e3220075728a07de7bafb8aa7e798583aa7602dcd45237c3') +sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD index 98ada155d..9b6a803a0 100644 --- a/extra/mx/PKGBUILD +++ b/extra/mx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139399 2011-10-01 19:00:28Z ibiru $ +# $Id: PKGBUILD 141685 2011-11-02 11:04:43Z ibiru $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Guenther Wutz <admin@wutzara.de> pkgname=mx -pkgver=1.3.1 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc="A widget toolkit using Clutter" arch=('i686' 'x86_64' 'mips64el') url="http://www.clutter-project.org" @@ -13,7 +13,7 @@ depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification') makedepends=('intltool' 'gobject-introspection' 'gtk-doc') options=('!libtool') source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('4fab2d721252afe041165b909c503cca80e426aeeeb9f46676365ec25bb51cfa') +sha256sums=('6687300eef0bcee133cb7cd97d91de000e741aa2c0b50718bb2e837b6ca25250') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 6613c1aad..4be16689a 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 138094 2011-09-16 08:53:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 143260 2011-11-24 07:38:10Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.16 +pkgver=5.5.18 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') -url="http://www.mysql.com/" +url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('462ab3752dd666ec06ca32f92673b59e' +md5sums=('38b65815249f3bcacf3b0ee85171c486' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -102,7 +102,7 @@ package_mysql(){ pkgdesc="A fast SQL database server" backup=('etc/mysql/my.cnf') install=mysql.install - depends=('mysql-clients' 'net-tools') + depends=('mysql-clients') optdepends=('perl-dbi' 'perl-dbd-mysql') options=('emptydirs') diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index e4bb5007c..f66533aaa 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 139401 2011-10-01 19:00:31Z ibiru $ +# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql') +depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd') +sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD new file mode 100644 index 000000000..d2c2125af --- /dev/null +++ b/extra/nawk/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 142711 2011-11-13 14:58:31Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> + +pkgname=nawk +pkgver=20110810 +pkgrel=3 +pkgdesc="The one, true implementation of AWK" +url="http://cm.bell-labs.com/who/bwk/" +license=('MIT') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('glibc') +source=("http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz" + 'manpage-naming.patch') +md5sums=('a7062ecade93dc4cb39190e48db9a51d' + '8486d387a51fe3b3c9875c4151ad92b4') + +build() { + patch -Np1 < manpage-naming.patch + sed -n '/Copyright/,/THIS SOFTWARE\./p' README > LICENSE + + make "CPPFLAGS=-DHAS_ISBLANK" "LDFLAGS=$LDFLAGS" "CFLAGS=$CFLAGS" +} + +package() { + install -Dm755 a.out "$pkgdir/usr/bin/nawk" + install -Dm644 awk.1 "$pkgdir/usr/share/man/man1/nawk.1" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/nawk/LICENSE" +} diff --git a/extra/nawk/manpage-naming.patch b/extra/nawk/manpage-naming.patch new file mode 100644 index 000000000..782f5e427 --- /dev/null +++ b/extra/nawk/manpage-naming.patch @@ -0,0 +1,46 @@ +diff -uNr ./nawk-20100523.orig/awk.1 nawk-20100523/awk.1 +--- ./nawk-20100523.orig/awk.1 2007-03-31 16:56:19.000000000 -0400 ++++ nawk-20100523/awk.1 2010-09-20 21:49:16.840069318 -0400 +@@ -7,13 +7,11 @@ + .fi + .ft 1 + .. +-awk +-.TH AWK 1 +-.CT 1 files prog_other ++.TH NAWK 1 + .SH NAME +-awk \- pattern-directed scanning and processing language ++nawk \- pattern-directed scanning and processing language + .SH SYNOPSIS +-.B awk ++.B nawk + [ + .BI \-F + .I fs +@@ -32,7 +30,7 @@ + .I file ... + ] + .SH DESCRIPTION +-.I Awk ++.I Nawk + scans each input + .I file + for lines that match any of a set of patterns specified literally in +@@ -198,7 +196,6 @@ + .BR atan2 + are built in. + Other built-in functions: +-.TF length + .TP + .B length + the length of its argument +@@ -407,7 +404,6 @@ + do not combine with other patterns. + .PP + Variable names with special meanings: +-.TF FILENAME + .TP + .B CONVFMT + conversion format used when converting numbers + diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD index 7434c2e7b..a07a0e0c1 100644 --- a/extra/netkit-bsd-finger/PKGBUILD +++ b/extra/netkit-bsd-finger/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: dorphell <dorphell@archlinux.org> pkgname=netkit-bsd-finger pkgver=0.17 -pkgrel=5 +pkgrel=5.1 pkgdesc="bsd-finger ported to Linux" arch=('i686' 'x86_64' 'mips64el') url="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit" diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index a0bedf98e..43ea70fd4 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -37,6 +37,7 @@ build() { cp config.mk.in config.mk [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk + [ "${CARCH}" = 'mips64el' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk echo "NETPBM_DOCURL = file://${srcdir}/doc" >> config.mk echo 'TIFFLIB = libtiff.so' >> config.mk echo 'JPEGLIB = libjpeg.so' >> config.mk diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index d970890c2..be3ef6888 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -4,7 +4,7 @@ pkgname=nettle pkgver=2.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') url="http://www.lysator.liu.se/~nisse/nettle/" diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 9325dd929..e0e0b19d2 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139407 2011-10-01 19:00:39Z ibiru $ +# $Id: PKGBUILD 142489 2011-11-10 19:42:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.1.90 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64' 'mips64el') @@ -15,10 +15,10 @@ url="http://www.gnome.org/projects/NetworkManager/" depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes') makedepends=('intltool' 'gnome-bluetooth') optdepends=('gnome-bluetooth: for PAN/DUN support') -options=('!libtool') +options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('e98d285cc75a331557551900ebd815c24cb3132027f981823af4fb76ec368d95') +sha256sums=('ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 93ef02fbc..14ca124b2 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 136198 2011-08-24 08:32:50Z ibiru $ +# $Id: PKGBUILD 142493 2011-11-10 19:42:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.0 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'openconnect' 'dbus-glib' 'gconf') +depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf') makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('0fef61c672265f2b6008d8439ed5b18fe188f2a5f207227fc79a1b78657a6812') +sha256sums=('169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0') build() { cd "${srcdir}/NetworkManager-openconnect-${pkgver}" diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index cf29a5dae..4a237161d 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136200 2011-08-24 08:32:52Z ibiru $ +# $Id: PKGBUILD 142495 2011-11-10 19:42:11Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.0 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('741e39bcedd589b656067c9d3aa45ebca41a0f329914d157450f4b92e79bf7ee') +sha256sums=('a23705a0ece4d9c5438ca7c3905abc25a43aaf3a49cabb9ef21d043c338a2744') build() { cd "${srcdir}/NetworkManager-openvpn-${pkgver}" diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index b3a470c06..35f071145 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136202 2011-08-24 08:32:55Z ibiru $ +# $Id: PKGBUILD 142497 2011-11-10 19:42:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.0 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('97da81b0c8b1698316908a1dfe66c5a02a71088b56471d67d7e12066d956cbd5') +sha256sums=('2b340db7f63d39aa781099b888d4e3352e8eaa14ec4d46154bf504262fda42ba') build() { cd "${srcdir}/NetworkManager-pptp-${pkgver}" diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index af9139630..d992f7886 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 136204 2011-08-24 08:32:59Z ibiru $ +# $Id: PKGBUILD 142499 2011-11-10 19:42:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.0 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' - 'gtk3' 'libgnome-keyring') +depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') makedepends=('intltool') optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('d672ed353f57d0422486ba96bc1bd673fd08aec5f9c015584028af07c45239a4') +sha256sums=('d74bda9df11f4d3f0589d08c7f6247dc884de6daa1bab8d9c33636bc09752e40') build() { cd "${srcdir}/NetworkManager-vpnc-${pkgver}" diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 836bceb2b..cc0193e0b 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139405 2011-10-01 19:00:37Z ibiru $ +# $Id: PKGBUILD 142491 2011-11-10 19:42:04Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,7 +6,7 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.1.90 +pkgver=0.9.2.0 pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64' 'mips64el') @@ -18,13 +18,14 @@ optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' 'iptables: Connection sharing' 'dnsmasq: Connection sharing' - 'bluez: Bluetooth support') + 'bluez: Bluetooth support' + 'openresolv: openresolv support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz NetworkManager.conf disable_set_hostname.patch) -sha256sums=('de7e5d6de80bf14ada468d01f15dd4b118a6bef5d06cadf04954fd7de7ce5910' +sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') @@ -44,6 +45,7 @@ build() { --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/lib/systemd/system \ + --with-resolvconf=/usr/sbin/resolvconf \ --disable-static \ --enable-more-warnings=no \ --disable-wimax diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index 5fe3c71da..e382d9c4e 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137530 2011-09-08 19:55:05Z ibiru $ +# $Id: PKGBUILD 140945 2011-10-20 05:44:08Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> pkgname=notification-daemon -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Notification daemon for the desktop notifications framework" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ groups=('gnome') makedepends=('pkgconfig' 'intltool') options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('74ccbedfe25c9559278ba35ef716125ada9ba0074fe7321a2271abfed5990661') +sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/nouveau-drm-lts/COPYING b/extra/nouveau-drm-lts/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/extra/nouveau-drm-lts/COPYING +++ /dev/null @@ -1,48 +0,0 @@ - Copyright 2005 Adam Jackson. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation on the rights to use, copy, modify, merge, - publish, distribute, sub license, and/or sell copies of the Software, - and to permit persons to whom the Software is furnished to do so, - subject to the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NON-INFRINGEMENT. IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - ------------------------------------------------------------------------- - - Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. - Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California. - All Rights Reserved. - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice (including the - next paragraph) shall be included in all copies or substantial - portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS - SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. diff --git a/extra/nouveau-drm-lts/Makefile b/extra/nouveau-drm-lts/Makefile deleted file mode 100644 index 123bc5339..000000000 --- a/extra/nouveau-drm-lts/Makefile +++ /dev/null @@ -1,102 +0,0 @@ -# This Makefile is loosely based on the drm.git/linux-core/Makefile and -# the preliminary work by Christopher James Halse Rogers. -# Edited by Pekka Paalanen <pq@iki.fi> - -# By default, the build is done against the running linux kernel source. -# To build against a different kernel source tree, set LINUXDIR: -# -# make LINUXDIR=/path/to/kernel/source - -# By default, it is assumed the Nouveau kernel tree is found in $PWD/../. -# To use a different path to the Nouveau kernel tree, set NOUVEAUROOTDIR: -# -# make NOUVEAUROOTDIR=/path/to/nouveau/linux-2.6 - - -ifndef LINUXDIR -RUNNING_REL := $(shell uname -r) - -LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ - echo /lib/modules/$(RUNNING_REL)/source; \ - else echo /lib/modules/$(RUNNING_REL)/build; fi) -endif - -NOUVEAUGITREMOTE ?= origin -NOUVEAUROOTDIR ?= $(CURDIR)/.. -override NOUVEAUROOTDIR := $(abspath $(NOUVEAUROOTDIR)) - -TESTFILE := include/drm/nouveau_drm.h -ifeq ($(wildcard $(NOUVEAUROOTDIR)/$(TESTFILE)),) -$(error $(NOUVEAUROOTDIR) does not look like the right kernel tree, \ - please set NOUVEAUROOTDIR) -endif - -GIT_REVISION := $(shell GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git describe --always --abbrev=17 2> /dev/null) - -DRMINC := -I$(NOUVEAUROOTDIR)/include/drm -DRMDIR := $(NOUVEAUROOTDIR)/drivers/gpu/drm -DRMCFG := \ - CONFIG_DRM=m \ - CONFIG_DRM_KMS_HELPER=m \ - CONFIG_DRM_TTM=m \ - CONFIG_DRM_NOUVEAU=m \ - CONFIG_DRM_NOUVEAU_KMS=n \ - CONFIG_DRM_NOUVEAU_BACKLIGHT=y \ - CONFIG_DRM_NOUVEAU_DEBUG=y \ - CONFIG_DRM_I2C_CH7006=m \ - CONFIG_DRM_TDFX=n \ - CONFIG_DRM_R128=n \ - CONFIG_DRM_RADEON=n \ - CONFIG_DRM_MGA=n \ - CONFIG_DRM_I810=n \ - CONFIG_DRM_I830=n \ - CONFIG_DRM_I915=n \ - CONFIG_DRM_SIS=n \ - CONFIG_DRM_SAVAGE=n \ - CONFIG_DRM_VIA=n - -EXTRA_CFLAGS := -MYEXTRA_CFLAGS := -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_BACKLIGHT -MYEXTRA_CFLAGS += -DCONFIG_DRM_NOUVEAU_DEBUG - -ifneq ($(GIT_REVISION),) -MYEXTRA_CFLAGS += '-DGIT_REVISION=\"$(GIT_REVISION)\"' -endif - -MYPARMS := -C $(LINUXDIR) KCPPFLAGS="$(DRMINC)" SUBDIRS="$(DRMDIR)" $(DRMCFG) - -MYEXTRA_CFLAGS += $(EXTRA_CFLAGS) -ifneq ($(MYEXTRA_CFLAGS),) -MYPARMS += EXTRA_CFLAGS="$(MYEXTRA_CFLAGS)" -endif - -.PHONY: all modules install clean archive FORCE - -all: modules -FORCE: - -modules: - $(MAKE) $(MYPARMS) modules - -install: - $(MAKE) $(MYPARMS) modules_install - -clean: - $(MAKE) $(MYPARMS) clean - -archive: newttm-devel-compat.tar.gz newttm-devel.tar.gz master.tar.gz - -newttm-devel-compat.tar.gz: EXTRAS=nouveau README-nouveau - -%.tar: FORCE - GIT_DIR=$(NOUVEAUROOTDIR)/.git \ - git archive --format=tar --prefix=$*/ $(NOUVEAUGITREMOTE)/$* \ - drivers/gpu/drm include/drm $(EXTRAS) > $@ - -%.tar.gz: %.tar - gzip -9 -c $< > $@ - -# The commit id of the archive can be read with -# $ zcat foo.tar.gz | git get-tar-commit-id diff --git a/extra/nouveau-drm-lts/PKGBUILD b/extra/nouveau-drm-lts/PKGBUILD deleted file mode 100644 index 691795b0c..000000000 --- a/extra/nouveau-drm-lts/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 126820 2011-06-07 13:57:50Z tpowa $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=nouveau-drm-lts -_snapdate=20100313 -pkgver=0.0.16_${_snapdate} # see master/drivers/gpu/drm/nouveau/nouveau_drv.h for version -_kernver='2.6.32-lts' -pkgrel=6 -pkgdesc="nvidia opensource X driver" -arch=('i686' 'x86_64' 'mips64el') -url="http://nouveau.freedesktop.org/" -depends=("kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") -makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") -# http://nouveau.freedesktop.org/wiki/InstallDRM#head-771a47a133fba6a5a70253656e76c61e9bff93bd -optdepends=('nouveau-firmware: needed for very new card (NV50 family and above) to work properly where the OSS replacement does not work well') -#makedepends=('git' 'autoconf' 'pkgconfig') -install=nouveau-drm.install -license=('GPL') -options=('!strip') -source=(ftp://ftp.archlinux.org/other/${pkgname/-lts//}/master-${_snapdate}.tar.gz - # http://people.freedesktop.org/~pq/nouveau-drm/master.tar.gz - # get the Makefile from http://cgit.freedesktop.org/nouveau/linux-2.6/plain/nouveau/Makefile?h=master-compat - Makefile) -md5sums=('ad7ad0fb73d56bcff3d2b54a70c3d511' - 'e7d5df80186d5c736e82b0a7d46216bc') - -build() { - cd ${srcdir}/master - mkdir nouveau - cp $srcdir/Makefile ${srcdir}/master/nouveau/ - cd nouveau - make LINUXDIR=/lib/modules/${_kernver}/build DRM_MODULES="nouveau" -} - -package() { - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/drm_kms_helper.ko ${pkgdir}/lib/modules/${_kernver}/updates/drm_kms_helper.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/nouveau/nouveau.ko ${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nouveau.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/ttm/ttm.ko ${pkgdir}/lib/modules/${_kernver}/updates/ttm.ko - install -D -m 0644 ${srcdir}/master/drivers/gpu/drm/i2c/ch7006.ko ${pkgdir}/lib/modules/${_kernver}/updates/ch7006.ko - - # install script - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" ${startdir}/nouveau-drm.install - # gzip -9 modules - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; -} diff --git a/extra/nouveau-drm-lts/dont_check_for_pthread.patch b/extra/nouveau-drm-lts/dont_check_for_pthread.patch deleted file mode 100644 index 050f55767..000000000 --- a/extra/nouveau-drm-lts/dont_check_for_pthread.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -32,10 +32,6 @@ - AC_HEADER_STDC - AC_SYS_LARGEFILE - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], -diff -ru libdrm-2.4.0/libdrm/intel/Makefile.am libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am ---- libdrm-2.4.0/libdrm/intel/Makefile.am 2008-10-14 01:39:32.000000000 +0200 -+++ libdrm-2.4.0-nostubs/libdrm/intel/Makefile.am 2008-10-21 10:49:00.000000000 +0200 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_intel_la_LTLIBRARIES = libdrm_intel.la - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_intel_la_LIBADD = ../libdrm.la - - libdrm_intel_la_SOURCES = \ - intel_bufmgr.c \ ---- libdrm-2.4.5/libdrm/nouveau/Makefile.am.orig 2009-02-28 19:06:24.000000000 +0000 -+++ libdrm-2.4.5/libdrm/nouveau/Makefile.am 2009-02-28 19:06:33.000000000 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir)/libdrm \ - -I$(top_srcdir)/libdrm/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/shared-core - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/extra/nouveau-drm-lts/nouveau-drm.install b/extra/nouveau-drm-lts/nouveau-drm.install deleted file mode 100644 index beadaa563..000000000 --- a/extra/nouveau-drm-lts/nouveau-drm.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - KERNEL_VERSION='2.6.32-lts' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 - echo "if you are running kms in early mode please rebuild your initrd" -} - -post_upgrade() { - post_install $1 - rmmod nouveau || echo 'In order to use the new nouveau module, exit Xserver and unload it manually.' -} - -post_remove() { - KERNEL_VERSION='2.6.32-lts' - depmod -v $KERNEL_VERSION > /dev/null 2>&1 -} - diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 5a27990c3..776af49d9 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,78 +1,61 @@ -# $Id: PKGBUILD 117473 2011-04-03 17:50:26Z andrea $ -# Maintainer: kevin <kevin@archlinux.org> +# $Id: PKGBUILD 142201 2011-11-06 05:54:25Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> pkgname=ntp -pkgver=4.2.6.p3 -_realver=4.2.6p3 -pkgrel=3 -pkgdesc="NTP (Network Time Protocol) tries to keep servers in sync" -arch=(i686 x86_64 'mips64el') +pkgver=4.2.6.p4 +_realver=4.2.6p4 +pkgrel=2 +pkgdesc='Network Time Protocol reference implementation' +url='http://www.ntp.org/' license=('custom') -url="http://www.ntp.org/" +arch=('i686' 'x86_64' 'mips64el') depends=('openssl' 'readline' 'libcap') makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntp-client.conf') -options=('!emptydirs') -changelog=changelog -source=(http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz - ntp-4.2.4-html2man.patch - ntp.conf - ntp-client.conf - ntpd - ntpdate) -md5sums=('59876a9009b098ff59767ee45a88ebd2' '1b04e888717bb31479a6087632981723' - '398a7f270f6ae083f47f86eb8b557a75' '58997d6cf4846d80e35a01b855376a33' - 'bf20804e75656609e808ca21b53ea4aa' '99b49d763e5866f4f81c48d922c80b93') +backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') +source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" + 'ntpd' + 'ntpdate' + 'ntp.conf' + 'ntpd.conf') +sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' + '97b41b8bc34f259f4e525ab2e58707c9724e72e2' + '63572457586379aa6bf75b6e899e71d651e643f4' + '6d2d234afb1db2dcb940747a62f70217246a3d13' + '6cfcb7bbd34499b30e31dffca2f3e1a036010271') + +install=install build() { - cd "$srcdir/$pkgname-$_realver" - # fix man page generation - patch -Np1 -i ../ntp-4.2.4-html2man.patch - # configure - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - # 4.2.6p3: aclocal too old, regenerate - rm -f aclocal.m4 - libtoolize --copy --force - ac_cv_header_dns_sd_h=0 ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linux-caps - # build - make -} + cd "${srcdir}/${pkgname}-${_realver}" -package() { - cd "$srcdir/$pkgname-$_realver" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-linux-caps \ - # install - make DESTDIR="$pkgdir" install + make +} - # install conf files - install -d "$pkgdir/usr/share/ntp" - install -D -m644 conf/* "${pkgdir}/usr/share/ntp" +package() { + cd "${srcdir}/${pkgname}-$_realver" - # install launch scripts - install -d "$pkgdir/etc/rc.d" - install -D -m755 ${srcdir}/{ntpd,ntpdate} "$pkgdir/etc/rc.d" + make DESTDIR="${pkgdir}" install - # install man pages - cd html - ../scripts/html2man - sed -i 's/^[\t\ ]*$//;/./,/^$/!d' man/man*/*.[58] - install -d "$pkgdir"/usr/share/man/man{5,8} - install -m644 man/man5/* "$pkgdir/usr/share/man/man5/" - install -m644 man/man8/* "$pkgdir/usr/share/man/man8/" - mv "$pkgdir/usr/share/man/man8/ntpd.8" "$pkgdir/usr/share/man/man8/ntp-ntpd.8" - cd .. + install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd + install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate + install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf + install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf - # install sample configs - install -D -m644 "$srcdir/ntp.conf" "$pkgdir/etc/ntp.conf" - install -D -m644 "$srcdir/ntp-client.conf" \ - "$pkgdir/etc/conf.d/ntp-client.conf" + cd html + ../scripts/html2man + install -d "${pkgdir}"/usr/share/man + mv man/man* "${pkgdir}"/usr/share/man + mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + cd .. - # create /var/lib/ntp - install -d "$pkgdir/var/lib/ntp" - touch "$pkgdir/var/lib/ntp/.placeholder" + rmdir "${pkgdir}"/usr/{lib,sbin} + install -d "${pkgdir}/var/lib/ntp" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "$srcdir/$pkgname-$_realver/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + touch "${pkgdir}"/var/lib/ntp/.placeholder } diff --git a/extra/ntp/changelog b/extra/ntp/changelog deleted file mode 100644 index 528a07826..000000000 --- a/extra/ntp/changelog +++ /dev/null @@ -1,25 +0,0 @@ -2011-04-03 andrea <andrea@archlinux.org> - - * ntp 4.2.6p3-3 - - Use 'ntpd -p' to get the PID in ntpd - - Don't run the ntp client in background in ntpdate - -2011-03-28 andrea <andrea@archlinux.org> - - * ntp 4.2.6p3-2 - - Improved daemon scripts - -2010-10-16 kevin <kevin@archlinux.org> - - * ntp 4.2.6p3 - - Implemented FS#18469, replace ntpdate with ntpd -q - - Removed LIBS - - Removed old IPv6 and nano patch - -2010-10-16 kevin <kevin@archlinux.org> - - * ntp 4.2.6p2 - - Added changelog - - Set LIBS to use librt since configure doesn't set it - - Convert PKGBUILD to build()/package() format - - removed "|| return 1" diff --git a/testing/ntp/install b/extra/ntp/install index ad9a39d54..ad9a39d54 100644 --- a/testing/ntp/install +++ b/extra/ntp/install diff --git a/extra/ntp/ntp-4.2.4-html2man.patch b/extra/ntp/ntp-4.2.4-html2man.patch deleted file mode 100644 index 333d4529a..000000000 --- a/extra/ntp/ntp-4.2.4-html2man.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- ntp-4.2.4/scripts/html2man.in.html2man 2006-06-06 22:17:10.000000000 +0200 -+++ ntp-4.2.4/scripts/html2man.in 2007-01-08 12:47:31.000000000 +0100 -@@ -23,10 +23,10 @@ - 'ntpq' => ['ntpq', 8, 'ntpd(8), ntpdc(8)'], - 'ntpdate' => ['ntpdate', 8, 'ntpd(8)'], - 'ntpdc' => ['ntpdc', 8, 'ntpd(8)'], -- 'ntptime' => ['ntpdtime', 8, 'ntpd(8), ntpdate(8)'], -+ 'ntptime' => ['ntptime', 8, 'ntpd(8), ntpdate(8)'], - 'ntptrace' => ['ntptrace', 8, 'ntpd(8)'], - 'keygen' => ['ntp-keygen', 8, 'ntpd(8), ntp_auth(5)'], -- 'confopt' => ['ntp.conf', 5, 'ntpd(8)'], -+ 'confopt' => ['ntp.conf', 5, 'ntpd(8), ntp_auth(5), ntp_mon(5), ntp_acc(5), ntp_clock(5), ntp_misc(5)'], - 'authopt' => ['ntp_auth', 5, 'ntp.conf(5), ntpd(8)'], - 'monopt' => ['ntp_mon', 5, 'ntp.conf(5)'], - 'accopt' => ['ntp_acc', 5, 'ntp.conf(5)'], -@@ -34,17 +34,8 @@ - 'miscopt' => ['ntp_misc', 5, 'ntp.conf(5)']); - - # Disclaimer to go in SEE ALSO section of the man page --$seealso_disclaimer = 'These man pages are automatically hacked from the main NTP ' . -- 'documentation pages, which are maintained in HTML format. These files are ' . -- 'included in the NTP source distribution. If you installed NTP from a binary ' . -- 'package, or it came pre-installed on your system, chances are the documentation ' . -- 'was also included in the usual place for your system. The HTML files are more ' . -- 'correct and complete than these man pages, which are provided for your reference ' . -- 'only.'; -- --# Disclaimer to go right at the top --$top_disclaimer = 'This file was automatically generated from HTML source, and may be ' . -- 'incorrect. See the SEE ALSO section at the end of this file for more info'; -+$seealso_disclaimer = "Primary source of documentation: /usr/share/doc/ntp-*\n\n" . -+ "This file was automatically generated from HTML source.\n"; - - mkdir $MANDIR, 0777; - mkdir "$MANDIR/man8", 0777; -@@ -64,7 +55,8 @@ - $fileinfo = $manfiles{$filename}; - - $p = HTML::TokeParser->new("$filename.html") || die "Can't open $filename.html: $!"; -- open(MANOUT, ">$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]") -+ $fileout = "$MANDIR/man$fileinfo->[1]/$fileinfo->[0].$fileinfo->[1]"; -+ open(MANOUT, ">$fileout") - || die "Can't open: $!"; - - $p->get_tag("title"); -@@ -73,7 +65,6 @@ - - # Setup man header - print MANOUT ".TH " . $fileinfo->[0] . " " . $fileinfo->[1] . "\n"; -- print MANOUT ".UC 4\n"; - print MANOUT ".SH NAME\n"; - $pat = $fileinfo->[0]; - if ($name =~ /$pat/) { -@@ -81,10 +72,12 @@ - # Add the manpage name, if not in the HTML title already - print MANOUT "$fileinfo->[0] - "; - } -- print MANOUT "$name\n\n"; -- -- print MANOUT "$top_disclaimer\n"; -+ print MANOUT "$name\n.SH \\ \n\n"; - -+ @fontstack = (); -+ $deflevel = 0; -+ $pre = 0; -+ $ignore = 0; - # Now start scanning. We basically print everything after translating some tags. - # $token->[0] has "T", "S", "E" for Text, Start, End - # $token->[1] has the tag name, or text (for "T" case) -@@ -92,19 +85,37 @@ - while (my $token = $p->get_token) { - if($token->[0] eq "T") { - my $text = $token->[1]; -- if($tag) { -- $text =~ s/^[\n ]*//; -- $text =~ s/[\n ]*$/ /; -+ if (!$pre) { -+ if($tag) { -+ $text =~ s/^[\n\t ]*//; -+ } -+ $text =~ s/^[\n\t ][\n\t ]+$//; -+ $text =~ s/[\n\t ]+/ /g; -+ $text =~ s/ \;/ /g; -+ $text =~ s/>\;/>/g; -+ $text =~ s/<\;/</g; -+ $text =~ s/"\;/"/g; -+ $text =~ s/&\;/&/g; -+ $text =~ s/^\./\\[char46]/; - } -- $text =~ s/ \;/ /g; -- $text =~ s/^\./\\./; - print MANOUT "$text"; - $tag = 0; - } - if($token->[0] eq "S") { - if($token->[1] eq "h4") { - my $text = uc($p->get_trimmed_text("/h4")); -- print MANOUT ".SH $text\n"; -+ # ignore these two sections in ntpd.html -+ if ($filename eq "ntpd" && -+ ($text eq "FILES" || $text eq "CONFIGURATION OPTIONS")) { -+ $ignore = 1; -+ close(MANOUT); -+ open(MANOUT, ">/dev/null"); -+ } elsif ($ignore) { -+ $ignore = 0; -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n\n.SH $text\n"; - } - if($token->[1] eq "tt") { - push @fontstack, "tt"; -@@ -118,22 +129,30 @@ - my $text = $p->get_trimmed_text("/address"); - print MANOUT "\n.SH AUTHOR\n$text\n"; - } -- if($token->[1] eq "dt") { -- $tmp = $deflevel-4; -- print MANOUT "\n.RS $tmp\n"; -+ if($token->[1] eq "dt" || $token->[1] eq "br" && $deflevel > 0) { -+ print MANOUT "\n.TP 8\n"; - $tag = 1; - } - if($token->[1] eq "dd") { -- print MANOUT "\n.RS $deflevel\n"; -+ print MANOUT "\n"; - $tag = 1; - } - if($token->[1] eq "dl") { -- $deflevel+=4; -+ $deflevel+=1; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RS ", $deflevel > 1 ? 8 : 0; -+ } -+ } -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; -+ } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.nf"; -+ $pre = 1; - } - } - elsif($token->[0] eq "E") { -- if($token->[1] eq "dd") { -- print MANOUT "\n.RE\n"; -+ if($token->[1] eq "h4") { - $tag = 1; - } - if($token->[1] eq "tt") { -@@ -157,15 +176,27 @@ - print MANOUT "$fontswitch"; - } - if($token->[1] eq "dl") { -- $deflevel-=4; -+ if ($deflevel > 0) { -+ print MANOUT "\n.RE"; -+ } -+ print MANOUT "\n"; -+ $deflevel-=1; - } -- if($token->[1] eq "dt") { -- print MANOUT "\n.RE"; -+ if($token->[1] eq "p") { -+ print MANOUT "\n"; - $tag = 1; - } -+ if($token->[1] eq "pre") { -+ print MANOUT "\n.fi"; -+ $pre = 0; -+ } - } - } -- print MANOUT ".SH SEE ALSO\n\n"; -+ if ($ignore) { -+ close(MANOUT); -+ open(MANOUT, ">>$fileout"); -+ } -+ print MANOUT "\n.SH SEE ALSO\n\n"; - print MANOUT "$fileinfo->[2]\n\n"; - print MANOUT "$seealso_disclaimer\n"; - close(MANOUT); diff --git a/extra/ntp/ntp-client.conf b/extra/ntp/ntp-client.conf deleted file mode 100644 index e728db579..000000000 --- a/extra/ntp/ntp-client.conf +++ /dev/null @@ -1,5 +0,0 @@ -# client options for "ntpd -q" - ntpdate equivalent -NTP_CLIENT_OPTION="-g" - -# arguments passed to ntpd when started -NTPD_ARGS="-g" diff --git a/extra/ntp/ntp.conf b/extra/ntp/ntp.conf index 7f888e4b1..5f31fea83 100644 --- a/extra/ntp/ntp.conf +++ b/extra/ntp/ntp.conf @@ -1,52 +1,22 @@ -# NOTES: -# - you should only have to update the server line below -# - if you start getting lines like 'restrict' and 'fudge' -# and you didnt add them, AND you run dhcpcd on your -# network interfaces, be sure to add '-Y -N' to the -# dhcpcd_ethX variables in /etc/conf.d/net - -# Name of the servers ntpd should sync with -# Please respect the access policy as stated by the responsible person. -#server ntp.example.tld iburst - -server pool.ntp.org - -## -# A list of available servers can be found here: -# http://www.pool.ntp.org/ -# http://www.pool.ntp.org/#use -# A good way to get servers for your machine is: -# netselect -s 3 pool.ntp.org -## - -#server ntplocal.example.com prefer -#server timeserver.example.org - -# Warning: Using default NTP settings will leave your NTP -# server accessible to all hosts on the Internet. +# With the default settings below, ntpd will only synchronize your clock. +# +# For details, see: +# - the ntp.conf man page +# - http://support.ntp.org/bin/view/Support/GettingStarted +# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon -# A default deny all (including localhost) policy -# To use this define restrictions for all servers and clients -#restrict default ignore -#restrict -6 default ignore +# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ +server 0.pool.ntp.org +server 1.pool.ntp.org +server 2.pool.ntp.org -# A more open policy, allow access but deny changing the configuration +# Only allow read-only access from localhost restrict default nomodify nopeer -#restrict -6 default nomodify nopeer - -# Allow localhost restrict 127.0.0.1 -#restrict -6 ::1 - - -# To allow machines within your network to synchronize -# their clocks with your server, but ensure they are -# not allowed to configure the server or used as peers -# to synchronize against, uncomment this line. -# -#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap - -# you should not need to modify the following paths -driftfile /var/lib/ntp/ntp.drift +# Location of drift and log files +driftfile /var/lib/ntp/ntp.drift +logfile /var/log/ntp.log +# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing +# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/extra/ntp/ntpd b/extra/ntp/ntpd index 825efc189..a3e886e1f 100755 --- a/extra/ntp/ntpd +++ b/extra/ntp/ntpd @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf PIDFILE="/var/run/ntpd/ntpd.pid" PID=$(cat $PIDFILE 2> /dev/null) diff --git a/testing/ntp/ntpd.conf b/extra/ntp/ntpd.conf index e728db579..e728db579 100644 --- a/testing/ntp/ntpd.conf +++ b/extra/ntp/ntpd.conf diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate index 99508f4fd..4f7c8375b 100755 --- a/extra/ntp/ntpdate +++ b/extra/ntp/ntpdate @@ -2,7 +2,7 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntp-client.conf +. /etc/conf.d/ntpd.conf case "$1" in start) diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD new file mode 100644 index 000000000..0565cdc08 --- /dev/null +++ b/extra/numactl/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Dan McGee <dan@archlinux.org> +# Contributor: Florian Zeitz <florob at babelmonkeys dot de> + +pkgname=numactl +pkgver=2.0.7 +pkgrel=2 +pkgdesc="Simple NUMA policy support" +arch=('i686' 'x86_64') +url="http://oss.sgi.com/projects/libnuma/" +license=('LGPL2.1' 'GPL2') +depends=('perl') +source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz) +sha1sums=('dfdf539da65d1e880f04202071c139c4d2ba2da9') + +build() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + make +} + +package() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + make prefix="$pkgdir/usr" libdir="$pkgdir/usr/lib" install + rmdir $pkgdir/usr/share/man/man2 +} diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index 1b075036d..85f3dfbda 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136221 2011-08-24 21:00:37Z andyrtr $ +# $Id: PKGBUILD 141571 2011-10-31 07:33:57Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nxserver pkgver=3.5.0 -pkgrel=3 +pkgrel=4 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64 'mips64el') url="http://nomachine.com/" @@ -20,7 +20,7 @@ http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common #X11 Agent sources -http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-5.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common #Compression libs and proxy sources http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz @@ -33,7 +33,7 @@ md5sums=('12060433a74ac61a1c776d1d6d136117' '84c7f1575d9a1506370125ed050514ab' 'cf38ec1e5a5f6453946cd387c14f2684' 'ad8c0f133122c6d07732ca69c8759410' - '1086a92fb523d0a5d3685b89f1c96b9f' + '0a36c7e6a86c6c741179464b8f79c487' '84ade443b79ea079380b754aba9d392e' '488bb4d9b8e9f82dc272b4e6e9c57d30' 'abde2ccc33e31fc695031c2cfb60f3dd' diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index 0bc2c252d..8f94e064b 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 131750 2011-07-14 12:35:49Z ronald $ +# $Id: PKGBUILD 141254 2011-10-27 14:28:28Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor : shining <shiningxc.at.gmail.com> # Contributor : cyberdune <cyberdune@gmail.com> pkgname=octave -pkgver=3.4.2 -pkgrel=2 +pkgver=3.4.3 +pkgrel=1 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64' 'mips64el') url="http://www.octave.org" license=('GPL') depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull') -makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core') +makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'umfpack' 'texlive-core' 'fltk') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' - 'umfpack: LU decomposition of some large sparse matrices') -source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2" "curlfix.patch") + 'umfpack: LU decomposition of some large sparse matrices' + 'fltk: alternative plotting') +source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2") options=('!emptydirs') install=octave.install -sha1sums=('12cac29ef7d1ab8374980e1e2fd14637b2f15ba5' - '3f856798f5f8aa15bce1200b8abd059154f3d909') +sha1sums=('fe622c28a38f8730c59e46211bc7b18e7f51a679') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove curl/types.h include - patch -Np0 -i ${srcdir}/curlfix.patch - # http://www.nabble.com/Random-rounding-errors-td16010966.html FFLAGS="-O -ffloat-store" \ ./configure --prefix=/usr --libexecdir=/usr/lib \ - --enable-shared --disable-static + --enable-shared --disable-static --with-quantum-depth=16 LANG=C make } diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 631e127b1..1723113e8 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 56738 2009-10-26 14:27:28Z giovanni $ +# $Id: PKGBUILD 141650 2011-11-01 10:06:18Z pierre $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au> pkgname=ode pkgver=0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64' 'mips64el') url="http://www.ode.org" license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2) +source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') md5sums=('712579afabc2a15aa56e399f76171477') @@ -18,9 +18,13 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-shared - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir}/ install install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/ou/LICENSE-BSD.TXT \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE-BSD.TXT } diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 2e1336805..5486f00ad 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $ +# $Id: PKGBUILD 142672 2011-11-12 17:47:17Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.ekiga.org" diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD index a36a57435..c27dbcd5e 100644 --- a/extra/openconnect/PKGBUILD +++ b/extra/openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138456 2011-09-23 18:49:28Z ibiru $ +# $Id: PKGBUILD 142902 2011-11-17 19:06:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=openconnect -pkgver=3.12 +pkgver=3.14 pkgrel=1 epoch=1 pkgdesc="Open client for Cisco AnyConnect VPN" @@ -10,18 +10,19 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.infradead.org/openconnect.html" depends=('libxml2' 'openssl' 'libproxy') +makedepends=('intltool') options=('!libtool' '!emptydirs') -source=(ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2f4fceb3f921ca8deb3a7cbd19a5e008') +source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('c7e73dfa58c7c49683c93800a3506a0f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 360db2427..fb2ee89fc 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136364 2011-08-27 19:56:26Z schiv $ +# $Id: PKGBUILD 142640 2011-11-12 17:15:38Z ibiru $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,12 +6,12 @@ pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') license=('BSD') url="http://opencv.willowgarage.com/" -depends=('jasper' 'gstreamer0.10-base' 'openexr' +depends=('jasper' 'gstreamer0.10-base' 'openexr' 'ffmpeg>=20111030' 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') optdepends=('python2-numpy: Python 2.x interface' diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index c951ef6da..d86167dda 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139875 2011-10-05 16:57:34Z stephane $ +# $Id: PKGBUILD 143088 2011-11-22 17:32:55Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi pkgver=1.5.4 -pkgrel=1 +pkgrel=2 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index e5004d6ca..d069bf092 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $ +# $Id: PKGBUILD 141099 2011-10-23 23:25:40Z eric $ # Maintainer : Aaron Griffin <aaron@archlinux.org> pkgname=oprofile pkgver=0.9.7 -pkgrel=2 +pkgrel=3 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64' 'mips64el') url="http://oprofile.sourceforge.net" @@ -29,7 +29,7 @@ package() { install -d "$pkgdir/var/lib/oprofile" # installing development libraries - FS#20089 - install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" + install -m644 libop/op_*.h libregex/op_*.h libutil/op_*.h libutil++/op_*.h libdb/odb.h "$pkgdir/usr/include" install -m644 libop/libop.a libdb/libodb.a "$pkgdir/usr/lib/" install -m644 libabi/libabi.a "$pkgdir/usr/lib/libopabi.a" install -m644 libutil/libutil.a "$pkgdir/usr/lib/liboputil.a" diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD index 061915e98..d6af29ab2 100644 --- a/extra/oxygen-gtk/PKGBUILD +++ b/extra/oxygen-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140513 2011-10-16 08:02:52Z eric $ +# $Id: PKGBUILD 142925 2011-11-18 11:11:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk -pkgver=1.1.4 +pkgver=1.1.5 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gtk2') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('61a7424e77785501df27b5c050e5f287') +md5sums=('d20902809e634c820bebdfea49de19a1') build() { cd "${srcdir}" diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index c86beeb4a..af7957d73 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138186 2011-09-18 09:16:04Z heftig $ +# $Id: PKGBUILD 142993 2011-11-20 08:43:27Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=p11-kit -pkgver=0.6 -pkgrel=2 +pkgver=0.9 +pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64 mips64el) url="http://p11-glue.freedesktop.org" @@ -11,7 +11,7 @@ license=('BSD') depends=(glibc) options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('c1ff3e52f172fda8bf3b426f7fb63c92') +md5sums=('029aa2a3a103e7eb81b4aa731b93539e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 2cd58b3e6..f4200f93f 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pango pkgver=1.29.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD index b0c654815..ffa00e5d3 100644 --- a/extra/pangomm/PKGBUILD +++ b/extra/pangomm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138625 2011-09-27 13:05:44Z ibiru $ +# $Id: PKGBUILD 141215 2011-10-26 14:54:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pangomm pkgname=('pangomm' 'pangomm-docs') -pkgver=2.28.3 +pkgver=2.28.4 pkgrel=1 arch=(i686 x86_64 'mips64el') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('cf6eb58d58dc92df5c94012299e2c4f556ae55b4bafdf8f3768f74b7d60be0c3') +sha256sums=('778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD index e55bdd5d7..998eefa60 100644 --- a/extra/paprefs/PKGBUILD +++ b/extra/paprefs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139412 2011-10-01 19:00:47Z ibiru $ +# $Id: PKGBUILD 142425 2011-11-09 11:00:22Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> @@ -6,20 +6,22 @@ pkgname=paprefs pkgver=0.9.10 -pkgrel=1 +pkgrel=2 pkgdesc="A simple GTK-based configuration dialog for PulseAudio" arch=(i686 x86_64 'mips64el') url="http://0pointer.de/lennart/projects/paprefs" license=(GPL) depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio) makedepends=(intltool) -source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz - paprefs.desktop) -md5sums=('15bc6caea388e4de17e8746293cfb529' - '20dc978f0bd4a0bf925a4eaf80a2b8f8') +source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz + paprefs.desktop do-not-require-recompile.patch) +sha256sums=('261c5a67543f2d0c019894fb933949f6ee7c5e181808e1e9565f0784961eabb0' + '5cdd6cffb08d611451f01b34b08b316fb14cbd14b283bf5d180b8dcde11fa46b' + '00fd4b14e81d90ac6d74e6eb689fa4e20e1a2fbc2eefbb440a11b1373e115a9d') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/do-not-require-recompile.patch" ./configure --prefix=/usr --disable-lynx make } diff --git a/extra/paprefs/do-not-require-recompile.patch b/extra/paprefs/do-not-require-recompile.patch new file mode 100644 index 000000000..66d110b3e --- /dev/null +++ b/extra/paprefs/do-not-require-recompile.patch @@ -0,0 +1,33 @@ +From 4fcee37cb92c689b43a0d8fc1d8e6b2764834cbf Mon Sep 17 00:00:00 2001 +From: Colin Guthrie <colin@mageia.org> +Date: Sun, 6 Nov 2011 14:31:27 +0000 +Subject: [PATCH] Do not require a recompile for each new PA version in order to detect the modules. + +--- + src/paprefs.cc | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/paprefs.cc b/src/paprefs.cc +index 21fdc95..919b15c 100644 +--- a/src/paprefs.cc ++++ b/src/paprefs.cc +@@ -637,9 +637,14 @@ void MainWindow::readFromGConf() { + } + + gchar * MainWindow::modulePath(const gchar *name) { +- gchar *path, *pulsedir, *c; ++ gchar *path, *pulsedir, *c, **versions; + +- pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR); ++ versions = g_strsplit(pa_get_library_version(), ".", 3); ++ if (versions[0] && versions[1]) ++ pulsedir = g_strdup_printf ("pulse-%s.%s", versions[0], versions[1]); ++ else ++ pulsedir = g_strdup_printf ("pulse-%d.%d", PA_MAJOR, PA_MINOR); ++ g_strfreev(versions); + + path = g_build_filename (MODLIBDIR, pulsedir, "modules", name, NULL); + g_free (pulsedir); +-- +1.6.3.3 + diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 4fbeb965a..241d4705d 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,44 +1,41 @@ -# $Id: PKGBUILD 124660 2011-05-23 20:07:22Z remy $ +# $Id: PKGBUILD 142966 2011-11-19 08:36:20Z eric $ # Maintainer: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk _cpanname=Tk -pkgver=804.029 -pkgrel=3 +pkgver=804.030 +pkgrel=1 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') url="http://search.cpan.org/dist/${_cpanname}" license=('PerlArtistic' 'GPL' 'custom') -depends=('libx11' 'libpng' 'libjpeg' 'tk' 'perl') +depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) -md5sums=('f4aebe6fcdb309a8480514f2ccf8117c') +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz) +md5sums=('13275e85f99ee467a86d9598a437abff') build() { - cd $srcdir/${_cpanname}-$pkgver + cd "$srcdir/${_cpanname}-$pkgver" PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - /bin/chmod -R u+w * - # The Xlib header is wrong... - sed -i 's/XKeycodeToKeysym\(.*\)unsigned int/XKeycodeToKeysym\1KeyCode/' pTk/Xlib.h make } #check() { -# cd $srcdir/${_cpanname}-$pkgver +# cd "$srcdir/${_cpanname}-$pkgver" # make test #} package() { - cd $srcdir/${_cpanname}-$pkgver - make install DESTDIR=$pkgdir + cd "$srcdir/${_cpanname}-$pkgver" + make install DESTDIR="$pkgdir" # license install -D -m644 pTk/license.terms \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tk.license + "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" install -D -m644 pTk/Tix.license \ - ${startdir}/pkg/usr/share/licenses/${pkgname}/tix.license + "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" } diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index bd6391e64..cc259d36f 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 125369 2011-05-26 10:11:37Z andrea $ +# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon -pkgver=4.5.55 -pkgrel=1 +pkgver=4.5.1 +pkgrel=2 +epoch=1 arch=('i686' 'x86_64' 'mips64el') url="http://phonon.kde.org" license=('LGPL') -pkgdesc="The multimedia framework for KDE4" +pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') makedepends=('cmake' 'automoc4' 'pulseaudio') -source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=phonon.git&a=snapshot&h=37ec84753af68c4f30041d080b37f1a49a89197c&fmt=tbz2") -#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ce1316c88df988320e75a2b4c3cb8804') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'libqzeitgeist08.patch') +md5sums=('3df071b7f9996afcd67b18958955ecdd' + '99de3dc908277199b502e54613925ff6') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch + cd "${srcdir}" mkdir build cd build - cmake ../${pkgname} \ + cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_SKIP_RPATH=ON diff --git a/extra/phonon/libqzeitgeist08.patch b/extra/phonon/libqzeitgeist08.patch new file mode 100644 index 000000000..7a99101c4 --- /dev/null +++ b/extra/phonon/libqzeitgeist08.patch @@ -0,0 +1,150 @@ +--- phonon-4.5.1/phonon/mediaobject.cpp~ 2011-10-29 13:04:16.499027830 +0000 ++++ phonon-4.5.1/phonon/mediaobject.cpp 2011-10-29 13:09:49.222080364 +0000 +@@ -38,12 +38,12 @@ + #include <QtCore/QUrl> + + #ifdef HAVE_QZEITGEIST +-#include <QtZeitgeist/DataModel/Event> +-#include <QtZeitgeist/Interpretation> +-#include <QtZeitgeist/Log> +-#include <QtZeitgeist/Manifestation> +-#include <QtZeitgeist/QtZeitgeist> +-#endif ++#include <QZeitgeist/DataModel/Event> ++#include <QZeitgeist/Interpretation> ++#include <QZeitgeist/Log> ++#include <QZeitgeist/Manifestation> ++#include <QZeitgeist/QZeitgeist> ++#endif + + #include "phononnamespace_p.h" + #include "platform_p.h" +@@ -330,7 +330,7 @@ + const QString &subject_mimetype) + { + #ifdef HAVE_QZEITGEIST +- QtZeitgeist::DataModel::Subject subject; ++ QZeitgeist::DataModel::Subject subject; + QString url = subject_uri.toString(); + QString path = url.left(url.lastIndexOf(QLatin1Char('/'))); + subject.setUri(url); +@@ -340,20 +340,20 @@ + subject.setOrigin(path); + subject.setMimeType(subject_mimetype); + +- QtZeitgeist::DataModel::SubjectList subjects; ++ QZeitgeist::DataModel::SubjectList subjects; + subjects << subject; + +- QtZeitgeist::DataModel::Event event; ++ QZeitgeist::DataModel::Event event; + event.setTimestamp(subject_timestamp); + event.setInterpretation(event_interpretation); + event.setManifestation(event_manifestation); + event.setActor(event_actor); + event.setSubjects(subjects); + +- QtZeitgeist::DataModel::EventList events; ++ QZeitgeist::DataModel::EventList events; + events << event; + +- QDBusPendingReply<QtZeitgeist::DataModel::EventIdList> reply = ++ QDBusPendingReply<QZeitgeist::DataModel::EventIdList> reply = + log->insertEvents(events); + #else + Q_UNUSED(event_interpretation) +@@ -377,11 +377,11 @@ + QString eventInterpretation; + switch (eventState) { + case PlayingState: +- eventInterpretation = QtZeitgeist::Interpretation::Event::ZGAccessEvent; ++ eventInterpretation = QZeitgeist::Interpretation::Event::ZGAccessEvent; + break; + case ErrorState: + case StoppedState: +- eventInterpretation = QtZeitgeist::Interpretation::Event::ZGLeaveEvent; ++ eventInterpretation = QZeitgeist::Interpretation::Event::ZGLeaveEvent; + break; + //These states are not signifigant events. + case LoadingState: +@@ -409,10 +409,10 @@ + QString mime; + QString subjectInterpretation; + if (q->hasVideo()) { +- subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOVideo; ++ subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOVideo; + mime = "video/raw"; + } else { +- subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOAudio; ++ subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOAudio; + mime = "audio/raw"; + } + pDebug() << "Zeitgeist mime type:" << mime; +@@ -425,20 +425,20 @@ + case MediaSource::Invalid: + return; + case MediaSource::Url: +- subjectType = QtZeitgeist::Manifestation::Subject::NFORemoteDataObject; ++ subjectType = QZeitgeist::Manifestation::Subject::NFORemoteDataObject; + break; + case MediaSource::CaptureDevice: + case MediaSource::Disc: + case MediaSource::Stream: +- subjectType = QtZeitgeist::Manifestation::Subject::NFOMediaStream; ++ subjectType = QZeitgeist::Manifestation::Subject::NFOMediaStream; + break; + case MediaSource::LocalFile: +- subjectType = QtZeitgeist::Manifestation::Subject::NFOFileDataObject; ++ subjectType = QZeitgeist::Manifestation::Subject::NFOFileDataObject; + break; + } + + sendToZeitgeist(eventInterpretation, +- QtZeitgeist::Manifestation::Event::ZGUserActivity, ++ QZeitgeist::Manifestation::Event::ZGUserActivity, + QLatin1Literal("app://" ) % Platform::applicationName() % QLatin1Literal(".desktop"), + QDateTime::currentDateTime(), + mediaSource.url(), +--- phonon-4.5.1/phonon/mediaobject_p.h~ 2011-10-29 13:04:34.982530678 +0000 ++++ phonon-4.5.1/phonon/mediaobject_p.h 2011-10-29 15:27:44.679123431 +0000 +@@ -30,8 +30,8 @@ + #include "mediasource.h" + #include <QtCore/QQueue> + #ifdef HAVE_QZEITGEIST +-#include <QtZeitgeist/Log> +-#include <QtZeitgeist/QtZeitgeist> ++#include <QZeitgeist/Log> ++#include <QZeitgeist/QZeitgeist> + #endif + + QT_BEGIN_NAMESPACE +@@ -114,8 +114,7 @@ + #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM + { + #ifdef HAVE_QZEITGEIST +- QtZeitgeist::init(); +- log = new QtZeitgeist::Log(qObject()); ++ log = new QZeitgeist::Log(qObject()); + #endif + } + +@@ -142,7 +141,7 @@ + MediaSource mediaSource; + QQueue<MediaSource> sourceQueue; + #ifdef HAVE_QZEITGEIST +- QtZeitgeist::Log *log; ++ QZeitgeist::Log *log; + #endif + }; + } +--- phonon-4.5.1/phonon/CMakeLists.txt~ 2011-10-29 15:30:07.640468718 +0000 ++++ phonon-4.5.1/phonon/CMakeLists.txt 2011-10-29 15:30:26.643980831 +0000 +@@ -21,7 +21,7 @@ + endif(GLIB2_FOUND AND PULSEAUDIO_FOUND) + + macro_optional_find_package(QZeitgeist) +-macro_log_feature(QZEITGEIST_FOUND "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE) ++macro_log_feature(QZEITGEIST_FOUND "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE) + if (QZEITGEIST_FOUND) + add_definitions(-DHAVE_QZEITGEIST) + include_directories(${QZEITGEIST_INCLUDE_DIR}) diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 210328e89..41eef8858 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139167 2011-09-30 16:27:55Z foutrelis $ +# $Id: PKGBUILD 141476 2011-10-30 16:50:53Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,21 +7,19 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10' + 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - nm09-more.patch - pidgin-2.10.0-silc-remote-crash-fix.diff) -sha1sums=('859c6d9c9795c1adcf762b73e072e04a3a85a78d' - '0676b26f092fac3ee4bbea2261042b3f433c7751' - '8c7fc96abeca0f76d895bb33a530bf49e12f5bc6') + nm09-more.patch) +sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd' + '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,10 +28,6 @@ build() { # http://developer.pidgin.im/ticket/13859 patch -Np1 -i "$srcdir/nm09-more.patch" - # Fix remote crash in SILC plugin - # http://developer.pidgin.im/ticket/14636 - patch -Np0 -i "$srcdir/pidgin-2.10.0-silc-remote-crash-fix.diff" - # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} @@ -80,7 +74,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss') + depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff b/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff deleted file mode 100644 index de4b126d0..000000000 --- a/extra/pidgin/pidgin-2.10.0-silc-remote-crash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -============================================================ ---- libpurple/protocols/silc/ops.c 30ab18780af11a53b6564a44c4e8ebfc1a296d78 -+++ libpurple/protocols/silc/ops.c 80bd9a7d3faf9e5ef28438647159fe19847e9839 -@@ -408,9 +408,16 @@ silc_private_message(SilcClient client, - } - - if (flags & SILC_MESSAGE_FLAG_UTF8) { -- tmp = g_markup_escape_text((const char *)message, -1); -+ const char *msg = (const char *)message; -+ char *salvaged = NULL; -+ if (!g_utf8_validate((const char *)message, -1, NULL)) { -+ salvaged = purple_utf8_salvage((const char *)message); -+ msg = salvaged; -+ } -+ tmp = g_markup_escape_text(msg, -1); - /* Send to Purple */ - serv_got_im(gc, sender->nickname, tmp, 0, time(NULL)); -+ g_free(salvaged); - g_free(tmp); - } - } diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index 0271c3942..5ee65c636 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130771 2011-07-07 22:43:35Z andyrtr $ +# $Id: PKGBUILD 142423 2011-11-09 10:25:24Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman -pkgver=0.22.2 +pkgver=0.24.0 pkgrel=1 pkgdesc="Pixman library" arch=(i686 x86_64 'mips64el') @@ -13,15 +13,15 @@ depends=('glibc') options=('!libtool') source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 pixman-loongson2f.patch) -sha1sums=('ad2b828ce4280472f5933d8bb5f0f4d583aed7f3' +sha1sums=('a3b73c3ea6cada20d705203a394f574aa69e2177' 'ce4d69ea341f21fdc30f6d401ee479cd3571dab3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" = "mips64el" ] && { - patch -Np1 -i $srcdir/pixman-loongson2f.patch - autoreconf -i - } +# [ "$CARCH" = "mips64el" ] && { +# patch -Np1 -i $srcdir/pixman-loongson2f.patch +# autoreconf -i +# } ./configure --prefix=/usr --disable-static make } diff --git a/extra/polkit-gnome/PKGBUILD b/extra/polkit-gnome/PKGBUILD index 6da4e07c2..585d1008a 100644 --- a/extra/polkit-gnome/PKGBUILD +++ b/extra/polkit-gnome/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139416 2011-10-01 19:00:54Z ibiru $ +# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=polkit-gnome -pkgver=0.103 +pkgver=0.105 pkgrel=1 pkgdesc="PolicyKit integration for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz polkit-gnome-authentication-agent-1.desktop) -sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b' +sha256sums=('1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369' 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') build() { diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 4a60a554c..7c57b8c27 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,22 +1,30 @@ -# $Id: PKGBUILD 140587 2011-10-17 08:15:19Z jgc $ +# $Id: PKGBUILD 142670 2011-11-12 17:46:43Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.18.0 +pkgver=0.18.1 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'libtool') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) -md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77') +_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a +source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz + http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2 + git-fixes.patch) +md5sums=('d30e883a27423c936ef338ce1d967e2d' + '9dc64c254a31e570507bdd4ad4ba629a' + 'a73ba6515aa73cb20c480692da52c79e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-cairo-output \ @@ -27,6 +35,13 @@ build() { make } +check() { + cd "${srcdir}" + ln -sf test-${_testtag} test + cd ${pkgbase}-${pkgver} + make check +} + package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') diff --git a/extra/poppler/git-fixes.patch b/extra/poppler/git-fixes.patch new file mode 100644 index 000000000..a18a31aec --- /dev/null +++ b/extra/poppler/git-fixes.patch @@ -0,0 +1,107 @@ +From e4a2adb02969e872e37e408ced4c39131c6751ea Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:02:19 +0000 +Subject: pdftocairo: Make sure beginDocument() is always called + +This fixes a crash when rendering only odd/even pages in a printing +format. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index e458ee5..1b67c90 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -903,6 +903,10 @@ int main(int argc, char *argv[]) { + lastPage = firstPage; + } + ++ // Make sure firstPage is always used so that beginDocument() is called ++ if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ firstPage++; ++ + cairoOut = new CairoOutputDev(); + cairoOut->startDoc(doc->getXRef(), doc->getCatalog()); + if (sz != 0) +-- +cgit v0.9.0.2-2-gbebe +From 61b1556d1c62bf090b2eadf93e4e7d0aff7b8015 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <carlosgc@gnome.org> +Date: Sun, 30 Oct 2011 15:08:46 +0000 +Subject: pdftocairo: Use fisrtPage instead of uninitialized pg variable + +This fixes an error in my previous commit. +--- +diff --git a/utils/pdftocairo.cc b/utils/pdftocairo.cc +index 1b67c90..d0d1ec6 100644 +--- a/utils/pdftocairo.cc ++++ b/utils/pdftocairo.cc +@@ -904,7 +904,7 @@ int main(int argc, char *argv[]) { + } + + // Make sure firstPage is always used so that beginDocument() is called +- if ((printOnlyEven && pg % 2 == 0) || (printOnlyOdd && pg % 2 == 1)) ++ if ((printOnlyEven && firstPage % 2 == 0) || (printOnlyOdd && firstPage % 2 == 1)) + firstPage++; + + cairoOut = new CairoOutputDev(); +-- +cgit v0.9.0.2-2-gbebe +From ebf7fbc74da10d1bc423d33b26e30166870642e4 Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Tue, 01 Nov 2011 08:40:53 +0000 +Subject: Fix pkg-config files + +We were using $FOO_REQUIRED instead of @FOO_REQUIRED@ +--- +diff --git a/configure.ac b/configure.ac +index 3a120ca..c4f5b92 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -409,6 +409,7 @@ if test x$enable_cairo_output = xyes; then + POPPLER_GLIB_DISABLE_SINGLE_INCLUDES="" + + GLIB_REQUIRED=2.18 ++ AC_SUBST(GLIB_REQUIRED) + AC_ARG_ENABLE(poppler-glib, + AC_HELP_STRING([--disable-poppler-glib], + [Don't compile poppler glib wrapper.]), +diff --git a/poppler-glib-uninstalled.pc.in b/poppler-glib-uninstalled.pc.in +index 55a2278..5fcb6f2 100644 +--- a/poppler-glib-uninstalled.pc.in ++++ b/poppler-glib-uninstalled.pc.in +@@ -1,7 +1,7 @@ + Name: poppler-glib + Description: GLib wrapper for poppler - uninstalled + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + + Libs: ${pc_top_builddir}/${pcfiledir}/glib/libpoppler-glib.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/glib +diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake +index 3264ed6..e15e669 100644 +--- a/poppler-glib.pc.cmake ++++ b/poppler-glib.pc.cmake +@@ -6,7 +6,7 @@ includedir=${prefix}/include + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @POPPLER_VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +diff --git a/poppler-glib.pc.in b/poppler-glib.pc.in +index 04d9bb9..9ba8978 100644 +--- a/poppler-glib.pc.in ++++ b/poppler-glib.pc.in +@@ -6,7 +6,7 @@ includedir=@includedir@ + Name: poppler-glib + Description: GLib wrapper for poppler + Version: @VERSION@ +-Requires: glib-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED cairo >= $CAIRO_VERSION ++Requires: glib-2.0 >= @GLIB_REQUIRED@ gobject-2.0 >= @GLIB_REQUIRED@ cairo >= @CAIRO_VERSION@ + @PC_REQUIRES_PRIVATE@ + + Libs: -L${libdir} -lpoppler-glib +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index f5ee29640..0f60dacfb 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 136958 2011-09-03 21:03:54Z bisson $ +# $Id: PKGBUILD 142240 2011-11-07 04:19:17Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> +# Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix -pkgver=2.8.5 +pkgver=2.8.7 pkgrel=1 -pkgdesc='Secure, fast, easy to administer alternative to Sendmail' +pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' -arch=('i686' 'x86_64' 'mips64el') license=('custom') +arch=('i686' 'x86_64' 'mips64el') depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite3' 'libldap' 'db') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ 'rc.d') -sha1sums=('49ef711c80b5a3434258ab24ae00940932503e80' +sha1sums=('81c87aceff4d9af67a304354bab9c99ac98fc8a0' '5fc3de6c7df1e5851a0a379e825148868808318b' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') @@ -60,5 +60,5 @@ package() { install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" cd "${pkgdir}" - patch -p0 < "${srcdir}"/aliases.patch + patch -p0 -i "${srcdir}"/aliases.patch } diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index 8389f3206..94cf43c5c 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 138532 2011-09-27 03:18:03Z eric $ +# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $ # Maintainer: -# Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd -pkgver=1.3.3f +pkgver=1.3.4a pkgrel=1 +epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64' 'mips64el') url="http://www.proftpd.org" license=('GPL') depends=('libldap' 'libmysqlclient' 'postgresql-libs') backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') -source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2" +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') -md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27' - '99f6f9a989e70e3fa50809fc2bbbbb0a' - 'ddb09eb13131becdf0e081eef413116b' - '71d5932b0461c318ed68c2c0c2660736') +sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' + '195b06e28e503f5e5ef355c3332884cc5e7954a9' + 'b7819d725817e55b69c73e2572c21a05db48cc86' + '83c38ec40efb7cc09d9824b98e65cd948a195cc6' + 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ - --mandir=/usr/share/man \ + --libexecdir=/usr/lib \ --disable-pam \ --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ --sysconfdir=/etc \ @@ -41,12 +42,10 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" - - cd "${pkgdir}/etc" - sed -i 's|nogroup|nobody|g' proftpd.conf - rmdir "${pkgdir}/usr/libexec" } diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index b01befd3c..8ba2595fb 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $ +# $Id: PKGBUILD 140984 2011-10-20 15:35:19Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -7,8 +7,8 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" -pkgver=1.0 -pkgrel=4 +pkgver=1.1 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://pulseaudio.org/" license=(GPL LGPL) @@ -18,18 +18,13 @@ makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) options=(!emptydirs !libtool !makeflags) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit version-number.patch dont-require-dbus.patch) -sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530' - '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4') + $pkgbase.xinit) +sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee' + 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf') build() { cd "$srcdir/$pkgbase-$pkgver" - patch -Np1 -i "$srcdir/version-number.patch" - patch -Np1 -i "$srcdir/dont-require-dbus.patch" - ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -44,7 +39,8 @@ build() { } package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc) + depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc + libsamplerate) optdepends=('avahi: zeroconf support' 'bluez: bluetooth support' 'gconf: configuration through gconf (paprefs)' @@ -72,7 +68,7 @@ package_pulseaudio() { -i "$pkgdir/etc/pulse/default.pa" # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" + sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" || true install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" @@ -97,7 +93,7 @@ package_pulseaudio() { package_libpulse() { pkgdesc="$pkgdesc (client library)" - depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c) + depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsndfile json-c) optdepends=('alsa-plugins: ALSA support' 'avahi: zeroconf support') backup=(etc/pulse/client.conf) diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch deleted file mode 100644 index 915e3baec..000000000 --- a/extra/pulseaudio/dont-require-dbus.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f -Author: Tanu Kaskinen <tanuk@iki.fi> -Date: Thu Oct 6 23:28:37 2011 +0300 - - daemon: Don't treat it as a fatal error if we can't connect to the session bus - - http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html - -diff --git a/src/daemon/main.c b/src/daemon/main.c -index e2e4a81..c32f7c7 100644 ---- a/src/daemon/main.c -+++ b/src/daemon/main.c -@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) { - - #ifdef HAVE_DBUS - if (!conf->system_instance) { -- if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) -- goto finish; -- if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) -- goto finish; -+ if ((server_lookup = pa_dbusobj_server_lookup_new(c))) { -+ if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) -+ goto finish; -+ } - } - -- if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"))) -- goto finish; -+ if (start_server) -+ server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"); - #endif - - #ifdef HAVE_FORK -diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c -index 45796e7..9bdc699 100644 ---- a/src/daemon/server-lookup.c -+++ b/src/daemon/server-lookup.c -@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) { - sl->path_registered = FALSE; - - if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) { -- pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message); -+ pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message); - goto fail; - } - diff --git a/extra/pulseaudio/version-number.patch b/extra/pulseaudio/version-number.patch deleted file mode 100644 index 473b252a9..000000000 --- a/extra/pulseaudio/version-number.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c -Author: Colin Guthrie <colin@mageia.org> -Date: Sat Oct 1 12:03:44 2011 +0100 - - libpulse: Always return a three part version number in API calls. - - For both the headers and the library we should provide clean, three part - strings as this has been what we've previously done in the past - and some external systems apparently rely on this format. While it's not - something we've officially commented on before, there is no real advantage - to us to change it so let's not try to tidy things up too much - considering some third party apps (e.g. Skype) seem to dislike a two - part version string. - -diff --git a/src/pulse/context.c b/src/pulse/context.c -index 25d04a1..af144aa 100644 ---- a/src/pulse/context.c -+++ b/src/pulse/context.c -@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su - } - - const char* pa_get_library_version(void) { -- return PACKAGE_VERSION; -+ return pa_get_headers_version(); - } - - const char* pa_context_get_server(pa_context *c) { -diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in -index 7e00c5e..1be4c75 100644 ---- a/src/pulse/version.h.in -+++ b/src/pulse/version.h.in -@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN - /** Return the version of the header files. Keep in mind that this is - a macro and not a function, so it is impossible to get the pointer of - it. */ --#define pa_get_headers_version() ("@PACKAGE_VERSION@") -+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0") - - /** Return the version of the library the current application is - * linked to. */ diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 0a2c96287..44cf408a9 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139423 2011-10-01 19:01:08Z ibiru $ +# $Id: PKGBUILD 141033 2011-10-22 07:52:40Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 arch=('i686' 'x86_64') url="https://live.gnome.org/PyGObject" @@ -11,7 +11,7 @@ license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) options=('!libtool') -sha256sums=('ccb2cc765c11724fd3025569a7a7a72bf7c981365107ff5bd15499640d6adda1') +sha256sums=('e1eccc37afd2d4cbeb329b92ce3d71287d662dc2fec430c08a0471153e52a462') build() { cd "${srcdir}" diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index ce2edc0c0..bce8baf82 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 141387 2011-10-30 11:14:12Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.8.5 +pkgver=4.8.6 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://riverbankcomputing.co.uk/software/pyqt/intro" @@ -13,7 +14,7 @@ license=('GPL') makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('0e4264bb912edfbda319bb236ac84407') +md5sums=('9bfd7b08b8e438b83cc50d5c58191f97') build() { cd "${srcdir}" diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index d5e74a955..819226d3c 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135806 2011-08-18 15:04:40Z andyrtr $ +# $Id: PKGBUILD 141295 2011-10-28 08:03:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.15.0 -pkgrel=2 +pkgver=0.15.1 +pkgrel=1 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64 'mips64el') license=('GPL2' 'LGPL2.1') @@ -54,5 +54,5 @@ package() esac done } -md5sums=('b45b0deebba4ce47dcaaab3807f6ed47' +md5sums=('8800a7d6b3aa4a168ea7f78dc66c0320' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index bdad22843..b949c6ee0 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 135804 2011-08-18 15:04:37Z andyrtr $ +# $Id: PKGBUILD 141293 2011-10-28 08:03:28Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=0.15.0 -pkgrel=2 +pkgver=0.15.1 +pkgrel=1 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64' 'mips64el') license=('GPL2' 'LGPL2.1') @@ -40,5 +40,5 @@ package() { done } -md5sums=('dbc55b014bcd21b98e347f6a90f7fb6d' +md5sums=('34f17737baaf1b3495c89cd6d4a607ed' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index d8c966d4d..657199f72 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 123072 2011-05-07 23:41:27Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 142563 2011-11-12 08:13:52Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5.1 -pkgrel=2 +pkgver=2.6 +pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" -makedepends=('python2-pyqt') +makedepends=('python2-pyqt' 'chrpath') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('dd7edef5ff674d307057a3c12dbd8fce' +md5sums=('0605a8006ea752ec2d1d7fc4791d1c75' '8cf9c06252e2f11ab00e62848e322fd3') @@ -57,6 +58,9 @@ package_python-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python" install -Dm755 Qsci.so \ "${pkgdir}/usr/lib/python3.2/site-packages/PyQt4/Qsci.so" + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python3.2/site-packages/PyQt4/Qsci.so } package_python2-qscintilla() { @@ -65,4 +69,7 @@ package_python2-qscintilla() { cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2" make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install + + # Fix RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so } diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD index ed5fb8b2a..93e1e3106 100644 --- a/extra/qtcurve-gtk2/PKGBUILD +++ b/extra/qtcurve-gtk2/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140659 2011-10-17 19:15:55Z ronald $ +# $Id: PKGBUILD 141029 2011-10-22 02:18:45Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.11 +pkgver=1.8.12 pkgrel=1 +pkgdesc="A configurable set of widget styles for KDE and Gtk" arch=('i686' 'x86_64' 'mips64el') -groups=('qtcurve') +url="http://www.kde-look.org/content/show.php?content=40492" license=('GPL') -pkgdesc='A configurable set of widget styles for KDE and Gtk' -url='http://www.kde-look.org/content/show.php?content=40492' depends=('gtk2') -makedepends=('pkgconfig' 'cmake') +makedepends=('cmake') +groups=('qtcurve') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c') +sha1sums=('3b107aee1cf7dbd3ac47c693e82cd877a0fe2d5f') build() { cd "${srcdir}" diff --git a/extra/quodlibet/PKGBUILD b/extra/quodlibet/PKGBUILD index f49e53fac..96e5e179d 100644 --- a/extra/quodlibet/PKGBUILD +++ b/extra/quodlibet/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 134307 2011-08-02 21:13:14Z eric $ +# $Id: PKGBUILD 140990 2011-10-20 22:44:26Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=quodlibet -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="An audio player written in pygtk" arch=('i686' 'x86_64' 'mips64el') @@ -21,8 +21,7 @@ optdepends=('gstreamer0.10-ffmpeg: for ffmpeg (ASF/WMA) support ' 'media-player-info: for media devices support') options=('!makeflags') source=(http://quodlibet.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('354b411bd68b3ae4a687c35f6666265b') -sha1sums=('2521011633d0195084e5937eeeb01c0efefa69b1') +sha1sums=('21bc5fb988ca6c09959fc7212c05272a126a5be5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD index 0f8597943..0078dbeaf 100644 --- a/extra/r/PKGBUILD +++ b/extra/r/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132100 2011-07-20 07:19:13Z ronald $ +# $Id: PKGBUILD 142507 2011-11-10 20:30:04Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: K. Piche <kpiche@rogers.com> pkgname=r -pkgver=2.13.1 +pkgver=2.14.0 pkgrel=1 pkgdesc="Language and environment for statistical computing and graphics" arch=('i686' 'x86_64' 'mips64el') @@ -20,9 +20,10 @@ source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" 'r.desktop' 'r.png') install=r.install -sha1sums=('8b9d48c7a654186064f369652ea34a085eff239b' +sha1sums=('0f46bf75a7c150350b1142c29a98e7994d2b4bef' '13aa29219bcaa102e575de8c1c8e0833d233e836' 'a69a07ec363440efc18ce0a7f2af103375dea978') + build() { cd ${srcdir}/R-${pkgver} sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD index 4e5384815..d978a1808 100644 --- a/extra/racket/PKGBUILD +++ b/extra/racket/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 135654 2011-08-17 02:18:35Z eric $ +# $Id: PKGBUILD 142774 2011-11-15 00:48:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=racket -pkgver=5.1.3 +pkgver=5.2 pkgrel=1 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development" arch=('i686' 'x86_64' 'mips64el') url="http://racket-lang.org/" license=('LGPL') -depends=('gtk2' 'libffi' 'desktop-file-utils') +depends=('gtk2' 'desktop-file-utils') makedepends=('gsfonts') options=('!strip') install=racket.install source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz \ drracket.desktop) -md5sums=('6c33caf6ee49a422be053effaf630941' - '9223c9736ead677431542b41271c7b3c') -sha1sums=('7face74729cee8b36ce3df44b36b04ca23b4c986' +sha1sums=('f88007c12d7e5f2773b122d3652c8cd1d15da8c3' 'a20808f6b250225704856f82a544681a962a299d') build() { diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 5953b4fe1..ae413b356 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 134573 2011-08-06 08:14:08Z andrea $ +# $Id: PKGBUILD 142784 2011-11-15 06:17:05Z andrea $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.4 +pkgver=2.0.5 pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64' 'mips64el') url="http://librdf.org/raptor" -depends=('libxml2>=2.7.8' 'curl>=7.21.7' 'zlib>=1.2.5' 'libxslt>=1.1.26') +depends=('curl>=7.22.0' 'libxslt>=1.1.26') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") -md5sums=('46eff4b20f8752d1146a3e0c8b2168dd') +md5sums=('ffa2aa82c83dbd5b1f77835348ed2c2a') build() { cd "${srcdir}"/raptor2-${pkgver} @@ -28,4 +28,3 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('0373efb8d85dc872bc7bb5b1c69299fb') diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD index a9c2053e1..5e58afc6f 100644 --- a/extra/rasqal/PKGBUILD +++ b/extra/rasqal/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136218 2011-08-24 20:33:47Z andyrtr $ +# $Id: PKGBUILD 142916 2011-11-18 08:48:56Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Lawrence Lee <valheru@facticius.net> pkgname=rasqal epoch=1 -pkgver=0.9.27 +pkgver=0.9.28 pkgrel=1 pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" url="http://librdf.org/rasqal" @@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el') depends=('raptor>=2.0.3' 'mpfr') options=('!libtool') source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) -md5sums=('dd48b9a80947a6136fbdb79276d476e2') +md5sums=('a3662b8d9efef9d8ef0a3c182450fba2') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -23,6 +23,11 @@ build() { make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make -k check || /bin/true # fails some checks - should be reported upstream +} + package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD index 721a90b53..562d2542d 100644 --- a/extra/rest/PKGBUILD +++ b/extra/rest/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 120404 2011-04-23 20:50:45Z ibiru $ +# $Id: PKGBUILD 142505 2011-11-10 20:16:20Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> + pkgname=rest -pkgver=0.7.10 +pkgver=0.7.12 pkgrel=1 -pkgdesc="rest" +pkgdesc="A helper library for RESTful services." arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') depends=('glib2' 'libxml2' 'libsoup-gnome') -makedepends=('gobject-introspection' 'gtk-doc') +makedepends=('gobject-introspection') options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('16ffa4929078dabfcfac31f9ce942072ebab67e3339ce9f378127457b03baf3a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index 7caacdfef..7a85c7f94 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 140478 2011-10-15 10:11:04Z andyrtr $ +# $Id: PKGBUILD 142271 2011-11-07 18:53:02Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto -pkgver=0.1.1 +pkgver=0.2.3 pkgrel=1 -pkgdesc="Ristretto is a image viewer for Xfce" +pkgdesc="An image viewer for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/ristretto" -license=('GPL2') +license=('GPL') depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'gettext' 'pkg-config') options=('!libtool') groups=('xfce4-goodies') -source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) install=ristretto.install -md5sums=('4b0f58c00ef99f13ebf134979ee76980') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +md5sums=('62924c8abf17a921262ea9987ff8f5db') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -27,6 +27,6 @@ build() { } package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install } diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index b2c5880a7..bb080bc93 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $ +# $Id: PKGBUILD 142547 2011-11-11 23:39:40Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Robert Emil Berge <robert@rebi.no> pkgname=rosegarden -pkgver=11.06 +pkgver=11.11 pkgrel=1 pkgdesc="MIDI/audio sequencer and notation editor" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ optdepends=('lilypond: notation display' [ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support') install=$pkgname.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('77ab43d06de53ace338843ff82e26288') +md5sums=('1db7bb5289f08e634e2f1207ae163ad7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 9ed0088fc..29c8f035a 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 131846 2011-07-16 03:10:20Z eric $ +# $Id: PKGBUILD 142306 2011-11-08 07:15:40Z angvp $ # Maintainer: # Contributor: Allan McRae <allan@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -6,34 +6,36 @@ pkgbase=ruby pkgname=('ruby' 'ruby-docs') -pkgver=1.9.2_p290 +pkgver=1.9.3_p0 pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" arch=('i686' 'x86_64' 'mips64el') url="http://www.ruby-lang.org/en/" -license=('custom') -makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz') +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') [ "$CARCH" = "mips64el" ] && \ -makedepends=('openssl' 'tk' 'libffi' 'doxygen') -options=('!emptydirs') -source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2") +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'libyaml') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') build() { cd "${srcdir}/${pkgbase}-${pkgver//_/-}" - ./configure --prefix=/usr --sysconfdir=/etc \ + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ --enable-shared --enable-pthread --disable-rpath make } package_ruby() { - depends=('openssl' 'libffi') + depends=('openssl' 'libffi' 'libyaml') provides=('rubygems' 'rake') conflicts=('rake') optdepends=('tk: for Ruby/TK') cd "${srcdir}/${pkgbase}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install-nodoc - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" } package_ruby-docs() { @@ -41,6 +43,7 @@ package_ruby-docs() { cd "${srcdir}/${pkgbase}-${pkgver//_/-}" make DESTDIR="${pkgdir}" install-doc install-capi - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" } md5sums=('096758c3e853b839dc980b183227b182') diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index a8b626e22..9592c0e52 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 136436 2011-08-29 09:26:26Z tpowa $ +# $Id: PKGBUILD 141291 2011-10-28 08:03:24Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('smbclient' 'samba') -pkgver=3.6.0 +pkgver=3.6.1 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.0 -pkgrel=8 +_realver=3.6.1 +pkgrel=1 arch=(i686 x86_64 mips64el) url="http://www.samba.org" license=('GPL3') @@ -137,7 +137,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('e297e0ea7923c7de8d7c1d8fd0ec0a05' +md5sums=('5291717be0734e07dc07b6110e162e87' 'a3da19515a234c703876cf850c44e996' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index 7fd330474..ef51d1d45 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137076 2011-09-05 23:05:51Z dreisner $ +# $Id: PKGBUILD 143489 2011-11-24 20:44:47Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.0.51 +pkgver=1.0.53 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -20,7 +20,7 @@ install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp" "mips-arch.h.diff") -md5sums=('08032cc777f1236953cb901e24775457' +md5sums=('28bdb8d65b240bcc45370f19b781f9b8' '7ac0c1936547f4278198b8bf7725204d' 'a456535d65d6c5b85b1b646f11455fce') diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 80ea1a4b9..d5df7b1c8 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $ +# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') @@ -18,7 +18,7 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7' +sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') build() { diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD index 50fc9038f..a40936e48 100644 --- a/extra/shared-mime-info/PKGBUILD +++ b/extra/shared-mime-info/PKGBUILD @@ -3,7 +3,7 @@ pkgname=shared-mime-info pkgver=0.91 -pkgrel=1 +pkgrel=1.1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('i686' 'x86_64' 'mips64el') license=('GPL') diff --git a/extra/silc-toolkit/PKGBUILD b/extra/silc-toolkit/PKGBUILD deleted file mode 100644 index 62555f622..000000000 --- a/extra/silc-toolkit/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Ionut Biru <ionut@archlinux.ro> -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> - -pkgname=silc-toolkit -pkgver=1.1.10 -pkgrel=1 -pkgdesc="Toolkit for Secure Internet Live Conferencing" -url="http://www.silcnet.org" -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('glibc' 'perl' 'libidn') -source=(http://www.silcnet.org/download/toolkit/sources/$pkgname-$pkgver.tar.bz2) -options=(!libtool) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --with-etcdir=/etc/silc \ - --enable-ipv6 --with-perl=yes \ - --with-simdir=/usr/lib/silc/modules - - make || return 1 - make DESTDIR=$pkgdir install - - # remove the crapload of html docs (26MB!) - rm -rf $pkgdir/usr/share/doc/$pkgname/toolkit -} -sha256sums=('a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76') diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 2a0edc878..bd17db2be 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 141389 2011-10-30 11:14:14Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net> pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.12.4 +pkgver=4.13 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('6cbd56abb7d35aad833789c98ae61652') +md5sums=('21b4e2cad56e4156df2220143264b8ff') build() { cd "${srcdir}" diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD index 96f18be9f..1408a573f 100644 --- a/extra/slim/PKGBUILD +++ b/extra/slim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122020 2011-05-01 17:05:22Z bisson $ +# $Id: PKGBUILD 141487 2011-10-30 22:51:16Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -6,7 +6,7 @@ pkgname=slim pkgver=1.3.2 -pkgrel=5 +pkgrel=6 pkgdesc='Desktop-independent graphical login manager for X11' arch=('i686' 'x86_64' 'mips64el') url='http://slim.berlios.de/' @@ -18,10 +18,11 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'pam.d' 'logrotate' 'gcc44.patch' - 'ptr_pam.patch' + 'ptr_pam.patch' 'no-host.patch' 'restart.patch' 'sigterm.patch' + 'session-name.patch' 'tty-slowness.patch') sha1sums=('e421d5487732c8317f8f591906661e014b036358' '6fe0ba83509af634bce47be34e30995965bffc79' @@ -32,6 +33,7 @@ sha1sums=('e421d5487732c8317f8f591906661e014b036358' 'b86eddd083fb9f6259e46c735f55ebe76c655bd3' '2d526bc0c498bf307ee50e2d22b4f53ffa0c4435' '0b35048723c527fb824c5e0f9b9064f751871785' + 'fdd35562ce010babaeb793f92f9906fdcdaf3f9f' '213fefe8533c845ea8c40585b6a8097820d5e5d2') install=install @@ -45,6 +47,7 @@ build() { patch -p1 -i ../no-host.patch # cf patch: do not set PAM host patch -p1 -i ../restart.patch # cf patch: restart X server if killed patch -p1 -i ../sigterm.patch # FS#23984: do not wait for input when SIGTERM'd + patch -p1 -i ../session-name.patch # FS#26693: fix default session name patch -p1 -i ../tty-slowness.patch # FS#18313: fix sluggish TTY after slim start make USE_PAM=1 diff --git a/extra/slim/session-name.patch b/extra/slim/session-name.patch new file mode 100644 index 000000000..8211c4f72 --- /dev/null +++ b/extra/slim/session-name.patch @@ -0,0 +1,21 @@ +diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp +--- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 ++++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 +@@ -23,7 +23,7 @@ + Root = root; + cfg = config; + +- session = ""; ++ session = cfg->nextSession(session); + + // Init GC + XGCValues gcv; +@@ -188,7 +188,7 @@ + } + + void Panel::ClearPanel() { +- session = ""; ++ session = cfg->nextSession(session); + Reset(); + XClearWindow(Dpy, Root); + XClearWindow(Dpy, Win); diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD index 49419846b..d2258230d 100644 --- a/extra/smartmontools/PKGBUILD +++ b/extra/smartmontools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127374 2011-06-14 00:06:39Z giovanni $ +# $Id: PKGBUILD 141049 2011-10-22 14:30:55Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Jani Talikka <jani.talikka@gmail.com> # Contributor: Ralf Barth <archlinux.org@haggy.org> pkgname=smartmontools -pkgver=5.41 +pkgver=5.42 pkgrel=1 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives." url="http://smartmontools.sourceforge.net" @@ -17,7 +17,7 @@ backup=('etc/smartd.conf' source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz \ smartd.conf smartd.rc) -md5sums=('4577886bea79d4ff12bd9a7d323ce692' +md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a' '28c1b80c41dac52d433961dcfb4f70e0' 'fb30e07f87f2c1d99532e018291ad3e8') diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD index 854c11cc9..689723fa3 100644 --- a/extra/smb4k/PKGBUILD +++ b/extra/smb4k/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136927 2011-09-03 00:05:20Z giovanni $ +# $Id: PKGBUILD 141128 2011-10-24 13:35:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com> pkgname=smb4k -pkgver=0.10.73 +pkgver=0.10.90 pkgrel=1 pkgdesc="A KDE program that browses samba shares" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('GPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=smb4k.install -source=("http://download.berlios.de/smb4k/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8f161a1b1146dc44217826901deb35c8') +source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28development%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('6e166eead700e0a21d4f324be4471e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/smb4k/smb4k.install b/extra/smb4k/smb4k.install index c5e097f49..91d7da03d 100644 --- a/extra/smb4k/smb4k.install +++ b/extra/smb4k/smb4k.install @@ -1,14 +1,10 @@ -# $Id: smb4k.install,v 1.2 2009/02/23 03:09:26 travis Exp $ -# arg 1: the new package version post_install() { echo "==> Note: To enable mounting and unmounting of smb/cifs shares as" echo "==> user, you will need to issue the following command as root:" - echo "# chmod +s \$(which mount.cifs) \$(which umount.cifs)" + echo "# chmod +s \$(which mount.cifs)" echo "==> These command will need to be re-run every upgrade of smbclient" } -# arg 1: the new package version -# arg 2: the old package version post_upgrade() { post_install $1 } diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index 743cf732c..260ee2d77 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134583 2011-08-06 08:22:40Z andrea $ +# $Id: PKGBUILD 141613 2011-10-31 19:59:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.7.0 +pkgver=2.7.3 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso') makedepends=('cmake' 'openjdk6' 'doxygen') [ "$CARCH" = "mips64el" ] && makedepends=('cmake' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('52f216c82e731499bb25bf3b4cf0eecb') +md5sums=('2674ab79c3ec17e4d1b7ecfc76651cd0') build() { cd "${srcdir}" diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD index 577657653..a0e982625 100644 --- a/extra/sox/PKGBUILD +++ b/extra/sox/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 124581 2011-05-23 04:58:46Z eric $ +# $Id: PKGBUILD 142642 2011-11-12 17:15:40Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=sox pkgver=14.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64' 'mips64el') url="http://sox.sourceforge.net/" license=('GPL' 'LGPL') -depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') +depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr') makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse') optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' @@ -17,12 +17,14 @@ optdepends=('libao: for ao plugin' 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee') -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + sox-14.3.2-ffmpeg.patch) +sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' + '86caa6aa86a0bf7a048522114d4efd11acbbda70') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch new file mode 100644 index 000000000..5289b9b47 --- /dev/null +++ b/extra/sox/sox-14.3.2-ffmpeg.patch @@ -0,0 +1,40 @@ +Index: sox-14.3.2/src/ffmpeg.c +=================================================================== +--- sox-14.3.2.orig/src/ffmpeg.c ++++ sox-14.3.2/src/ffmpeg.c +@@ -91,7 +91,7 @@ static int stream_component_open(priv_t + + if (!codec || avcodec_open(enc, codec) < 0) + return -1; +- if (enc->codec_type != CODEC_TYPE_AUDIO) { ++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { + lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); + return -1; + } +@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) + /* Find audio stream (FIXME: allow different stream to be selected) */ + for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { + AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; +- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { ++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { + ffmpeg->audio_index = i; + break; + } +@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo + + c = st->codec; + c->codec_id = codec_id; +- c->codec_type = CODEC_TYPE_AUDIO; ++ c->codec_type = AVMEDIA_TYPE_AUDIO; + + /* put sample parameters */ + c->bit_rate = 256000; /* FIXME: allow specification */ +@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t + av_init_packet(&pkt); + pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); + pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); +- pkt.flags |= PKT_FLAG_KEY; ++ pkt.flags |= AV_PKT_FLAG_KEY; + pkt.stream_index = ffmpeg->audio_st->index; + pkt.data = ffmpeg->audio_buf_aligned; + diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index a8328580f..5ea251f2b 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131054 2011-07-09 22:10:28Z ronald $ +# $Id: PKGBUILD 142487 2011-11-10 19:40:07Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=stellarium -pkgver=0.11.0 +pkgver=0.11.1 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64" 'mips64el') @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' +sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') @@ -36,6 +36,3 @@ package() { install -Dm644 ${srcdir}/stellarium.png \ ${pkgdir}/usr/share/pixmaps/stellarium.png } -sha1sums=('e0d7293e175ac302b45d2849a82a8c0fa7e3ca3e' - 'c9cc79212542238227b5bd6af99f60fe056f4ab2' - 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index e4aafe2e3..721620a38 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139431 2011-10-01 19:01:21Z ibiru $ +# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) @@ -13,7 +13,7 @@ depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtkso makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('cdefa909afe31403c118f5c4f356dcb4787161f5a4f4ee92054f84b4c13eb59b') +sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD index c7dbef708..cb853d253 100644 --- a/extra/talloc/PKGBUILD +++ b/extra/talloc/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 116938 2011-03-26 14:56:31Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 142221 2011-11-06 11:39:12Z andrea $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=talloc -pkgver=2.0.5 +pkgver=2.0.7 pkgrel=1 pkgdesc="A hierarchical pool based memory allocator with destructors" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://talloc.samba.org/" -source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz) -makedepends=('python2') depends=('glibc') +makedepends=('python2' 'docbook-xsl') optdepends=('python2: for python bindings') +source=("http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('dbfb3146f4cc47054e13b8a2988299f9') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e 's#python#python2#g' buildtools/bin/waf ./configure --prefix=/usr \ - --sysconfdir=/etc/samba \ - --localstatedir=/var \ - --enable-talloc-compat1 + --sysconfdir=/etc/samba \ + --localstatedir=/var \ + --enable-talloc-compat1 make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir/ install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('6e3fdfbc43dde8ccba27b6af894b8fb2') diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index e594a1500..699f9ef42 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 128924 2011-06-25 14:08:35Z allan $ +# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64' 'mips64el') url="http://tcl.sourceforge.net/" license=('custom') -depends=('glibc') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('a08eaf8467c0631937067c1948dd326b') +md5sums=('b01a9691c83990b3db0ce62d1012ca67') build() { cd ${srcdir}/tcl${pkgver}/unix @@ -25,6 +24,11 @@ build() { make } +#check() { +# cd ${srcdir}/tcl${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tcl${pkgver}/unix diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD index 0e722ddeb..f4fc586b5 100644 --- a/extra/telepathy-farstream/PKGBUILD +++ b/extra/telepathy-farstream/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139433 2011-10-01 19:01:24Z ibiru $ +# $Id: PKGBUILD 142940 2011-11-18 18:23:32Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-farstream -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(mips64el) @@ -11,8 +11,8 @@ license=('LGPL2.1') depends=('telepathy-glib' 'farsight2') makedepends=('libxslt' 'python2') options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('da9179ee104bfb839cd813f66c23c066') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f858fc02e1981bb8ccd29c2bed567e50') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,7 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index f78aa084d..1f1d56a16 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139439 2011-10-01 19:01:33Z ibiru $ +# $Id: PKGBUILD 142337 2011-11-08 15:59:23Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.12.7 +pkgver=0.14.0 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) install=telepathy-gabble.install -md5sums=('3518db585403a6cf93ba253200acc5e7') +md5sums=('73afa5533833d176b9b82b96351efe63') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index df4a775e3..7dbe378d8 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 140532 2011-10-16 19:26:18Z ibiru $ +# $Id: PKGBUILD 142317 2011-11-08 12:30:16Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.16.0 +pkgver=0.16.2 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') url="http://telepathy.freedesktop.org" -groups=('telepathy') license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('071ed1b34ace45109188df73933609e4') +md5sums=('c05e48da72f013cec86ca8a05da71ffd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD index 7390c8b74..90f24162e 100644 --- a/extra/telepathy-idle/PKGBUILD +++ b/extra/telepathy-idle/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $ +# $Id: PKGBUILD 141602 2011-10-31 15:52:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Samuel Mendes <heka.lok@gmail.com> + pkgname=telepathy-idle -pkgver=0.1.10 +pkgver=0.1.11 pkgrel=1 pkgdesc="An IRC connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +15,7 @@ depends=('telepathy-glib' 'openssl') makedepends=('libxslt' 'python2') install=telepathy-idle.install source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a') +md5sums=('be277e8f0bd32ae56af799f0ff4ec72e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD index 778c0ba30..16cbc416a 100644 --- a/extra/telepathy-logger/PKGBUILD +++ b/extra/telepathy-logger/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 136819 2011-09-01 20:47:38Z ibiru $ +# $Id: PKGBUILD 141683 2011-11-02 09:28:54Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-logger -pkgver=0.2.10 -pkgrel=2 +pkgver=0.2.12 +pkgrel=1 pkgdesc="Telepathy framework logging daemon" arch=(i686 x86_64 'mips64el') url="http://telepathy.freedesktop.org/wiki/Logger" @@ -11,7 +11,7 @@ depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ec01a8f99fc11406e85153095433c155') +md5sums=('102a622855a3e20a191b0812ae7c9b8e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 348ed04ad..dfc000ed5 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140177 2011-10-08 12:03:11Z ibiru $ +# $Id: PKGBUILD 142335 2011-11-08 15:59:21Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.9.3 +pkgver=5.10.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -12,15 +12,17 @@ url="http://telepathy.freedesktop.org/wiki/Mission Control" license=('LGPL2.1') depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('15fc8e560bc67a86393a3138d7ac38e3') +md5sums=('50594028ebb2dba0181fec99e6f56ff5') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ - --enable-gnome-keyring + --enable-gnome-keyring \ + --disable-schemas-compile make } diff --git a/extra/telepathy-mission-control/telepathy-mission-control.install b/extra/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 375333cc0..047c970fd 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140179 2011-10-08 12:12:17Z ibiru $ +# $Id: PKGBUILD 142995 2011-11-20 09:11:34Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt4 -pkgver=0.7.3 +pkgver=0.8.0 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') @@ -12,20 +12,20 @@ license=('LGPL') options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('a8e4f9f996b074a4e9a8950ddb5240d7') +source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('b93f03f063d784855d83e1b3c79a1cc5') build() { - cd "${srcdir}" + cd "$srcdir" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../$pkgname-$pkgver \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd "$srcdir"/build + make DESTDIR="$pkgdir" install } diff --git a/extra/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD index c4b1b0218..61165383a 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' 'mips64el') @@ -23,4 +23,4 @@ build() { make || return 1 make DESTDIR="${pkgdir}/" install || return 1 } -md5sums=('6ef653301f309156f3a802233a3139c1') +md5sums=('3bcbf0722d3823ca155e633969ce9f0b') diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index 0a36ede79..cbd773d3f 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137567 2011-09-09 18:36:00Z ronald $ +# $Id: PKGBUILD 141258 2011-10-27 15:06:09Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=texmacs -pkgver=1.0.7.12 +pkgver=1.0.7.14 pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps') #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) -source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.12-src.tar.gz) -sha1sums=('9a6560dc2d8e685b97f4afe468b38d89bd29ca9d') +source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) +sha1sums=('5bbe0458d2ab73fa8cea8e12fee788b17b6f279a') build() { cd ${srcdir}/TeXmacs-${pkgver}-src diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD index 556f359e8..80632358d 100644 --- a/extra/thunar/PKGBUILD +++ b/extra/thunar/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 138370 2011-09-21 09:30:05Z tpowa $ -# Maintainer: andyrtr <andyrtr funnychar archlinux.org> +# $Id: PKGBUILD 142015 2011-11-04 03:17:01Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> pkgname=thunar pkgver=1.2.3 -pkgrel=1 -pkgdesc="modern file manager for Xfce" +pkgrel=2 +pkgdesc="Modern file manager for Xfce" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'LGPL2.1') url="http://thunar.xfce.org" +license=('GPL2' 'LGPL2.1') groups=('xfce4') -depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify>=0.7.1' 'udev' - 'gtk2' 'exo>=0.6.0' 'libxfce4util>=4.8.1' 'libxfce4ui' 'libpng') -makedepends=('intltool' 'gtk-doc' 'xfce4-panel>=4.8.0') +depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify' 'udev' + 'gtk2' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng') +makedepends=('intltool' 'gtk-doc' 'xfce4-panel') optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems' 'xfce4-panel: for trash applet' 'tumbler: for thumbnail previews' @@ -20,40 +20,36 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems 'thunar-archive-plugin: create and deflate archives' 'thunar-media-tags-plugin: view/edit id3/ogg tags') options=('!libtool') -install=${pkgname}.install -backup=('etc/polkit-1/localauthority/50-local.d/org.freedesktop.udisks.pkla') -source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2 - org.freedesktop.udisks.pkla) +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/${pkgname}/1.2/Thunar-${pkgver}.tar.bz2) +sha256sums=('e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6') build() { - cd ${srcdir}/Thunar-${pkgver} + cd "$srcdir/Thunar-$pkgver" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static \ - --enable-gio-unix \ - --enable-dbus \ - --enable-startup-notification \ - --enable-gudev \ - --enable-notifications \ - --enable-exif \ - --enable-pcre \ - --enable-gtk-doc \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static \ + --enable-gio-unix \ + --enable-dbus \ + --enable-startup-notification \ + --enable-gudev \ + --enable-notifications \ + --enable-exif \ + --enable-pcre \ + --enable-gtk-doc \ + --disable-debug make } package() { - cd ${srcdir}/Thunar-${pkgver} + cd "$srcdir/Thunar-$pkgver" + make DESTDIR=${pkgdir} install sed -i 's:x-directory/gnome-default-handler;::' \ - ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop - - # install udisks permission file - install -dm700 ${pkgdir}/etc/polkit-1/localauthority - install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d - install -m644 ${srcdir}/org.freedesktop.udisks.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ + "$pkgdir/usr/share/applications/Thunar-folder-handler.desktop" } -md5sums=('0a2c36cdd3cb3a2ab52cbf6055415b85' - 'a7ddb5eec02d9a8e91a2997862e73cd8') + +# vim:set ts=2 sw=2 et: diff --git a/extra/thunar/org.freedesktop.udisks.pkla b/extra/thunar/org.freedesktop.udisks.pkla deleted file mode 100644 index 5cc443bd1..000000000 --- a/extra/thunar/org.freedesktop.udisks.pkla +++ /dev/null @@ -1,7 +0,0 @@ -[Local Users] -#Identity=unix-user: your_username -Identity=unix-group:storage -Action=org.freedesktop.udisks.* -ResultAny=yes -ResultInactive=no -ResultActive=yes diff --git a/extra/thunar/thunar.install b/extra/thunar/thunar.install index 28fdb48fb..87c29e4db 100644 --- a/extra/thunar/thunar.install +++ b/extra/thunar/thunar.install @@ -4,11 +4,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } +# vim:set ts=2 sw=2 et: diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index f10e33200..ef1c58f8e 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128929 2011-06-25 14:10:32Z allan $ +# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.10 +pkgver=8.5.11 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('adfdaca46cc95fec8557df8ecdb0715c') +md5sums=('b61b72f0aad230091b100746f078b8f1') build() { cd ${srcdir}/tk${pkgver}/unix @@ -25,6 +25,11 @@ build() { make } +#check() { +# cd ${srcdir}/tk${pkgver}/unix +# make test +#} + package() { cd ${srcdir}/tk${pkgver}/unix diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index aa850f7c4..c04a71226 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139441 2011-10-01 19:01:37Z ibiru $ +# $Id: PKGBUILD 142896 2011-11-17 18:35:10Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.8.0 +pkgver=1.8.3 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64' 'mips64el') @@ -13,14 +13,14 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') groups=('gnome-extra') install=tomboy.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.8/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4f3808a8c0ef94440a2ca005e41b095a417bfd22dc081e2e55e5de69b4e4df70') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) +sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') build() { - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper \ --disable-update-mimedb @@ -28,10 +28,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 7519cf400..0eccfcb05 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139443 2011-10-01 19:01:43Z ibiru $ +# $Id: PKGBUILD 140955 2011-10-20 05:44:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.1 +pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulru } options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139') +sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -45,7 +45,8 @@ package_totem() { 'libepc: Publish Playlist plugin' 'libgdata: YouTube Browser plugin' 'bluez: Bemused plugin' - 'grilo-plugins: Browse sidebar (remote media)') + 'grilo-plugins: Browse sidebar (remote media)' + 'pyxdg: opensubtitles plugin') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install @@ -60,7 +61,7 @@ package_totem() { } package_totem-plugin() { - pkgdesc="Totem mozilla/firefox plugin" + pkgdesc="Totem plugin for web browsers" depends=("totem=${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 329ce8e55..e1d3d72ae 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 140581 2011-10-17 08:15:06Z jgc $ +# $Id: PKGBUILD 142660 2011-11-12 17:18:45Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.5 +pkgver=0.12.7 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=2 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(mips64el) license=('GPL') @@ -19,7 +19,7 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b') +sha256sums=('e7a4d016326bc0a1b6aea07e48c3de73ffc29119812149e2dee5eac35104f1b4') build() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 3b7ff35df..bb4583fd4 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,65 +1,43 @@ -# $Id: PKGBUILD 137997 2011-09-13 21:30:20Z eric $ +# $Id: PKGBUILD 142856 2011-11-17 07:09:40Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> pkgname=transcode _sripver=0.3-4 -pkgver=1.1.5 -pkgrel=6 +pkgver=1.1.6 +pkgrel=1 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64' 'mips64el') url="http://tcforge.berlios.de/" license=('GPL') -depends=('imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' +depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools' 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec') -makedepends=('nasm') -options=('!libtool' '!makeflags') -source=(http://download2.berlios.de/tcforge/${pkgname}-${pkgver}.tar.bz2 +makedepends=('nasm' 'v4l-utils') +options=('!libtool') +source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2 http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz - transcode-1.1.5-jpeg-7.patch transcode-1.1.5-mpa.patch) -md5sums=('41ac6b1c0fe30f3aab286e771fc31b9e' - 'c0bd49a88f667c68c4430ad25bbed510' - 'af4056b7530a6f147594f676849e7c7b' - 'c299cfc6c4be6a5512d1a129f04e5450') -sha1sums=('48c36e06ca0cd1cdc1a9c6a241e231f896eefd26' + subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch) +sha1sums=('e176622b2c2834b006cda3c368ab521407d375c4' 'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d' - '9e380c00a3b31725dc3ec483fa7bf5e3d8a8a977' - '6f45d9167c3aa15a83cb29545749f55eb1f1e5a2') + 'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7' + '591943a33235342a66c3df0625a164a1479c09ae') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../transcode-1.1.5-jpeg-7.patch - patch -p1 < ../transcode-1.1.5-mpa.patch - - # building from here + sed -i 's|linux/videodev.h|libv4l1-videodev.h|' configure ./configure --prefix=/usr \ - --enable-sse=no --enable-sse2=no --enable-altivec=no --enable-mmx \ + --disable-sse --disable-sse2 --disable-altivec --enable-mmx \ --enable-lame --enable-ogg --enable-vorbis --enable-theora \ --enable-libdv --enable-libxml2 --enable-v4l \ --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \ --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \ - --enable-xvid --enable-x264 --enable-alsa \ - --enable-libmpeg2 --enable-libmpeg2convert \ - --with-libxml2-prefix=/usr \ - --with-mjpegtools-prefix=/usr \ - --with-imagemagick-prefix=/usr \ - --with-libdv-includes=/usr \ - --with-libpostproc-includes=/usr/include/libpostproc \ - --with-ogg-prefix=/usr \ - --with-lame-libs=/usr \ - --with-lzo-libs=/usr/lib \ - --with-libavcodec-prefix=/usr \ - --with-libavcodec-includes=/usr/include \ - --with-libavcodec-libs=/usr/lib - + --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert make - ############################################################################## - # this imports the latest subtitleripper sources and replaces the internal - mkdir contrib - mv "${srcdir}/subtitleripper" contrib/subrip - # removes dependency on libppm, make it dependend on netpbm just failed, argh... - cd contrib/subrip + + cd "${srcdir}/subtitleripper" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch" + patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch" sed -e 's|^\(.*lppm.*\)$|#\1|' \ -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \ -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \ @@ -71,7 +49,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - cd contrib/subrip + cd "${srcdir}/subtitleripper" install -m 755 pgm2txt "${pkgdir}/usr/bin/" install -m 755 srttool "${pkgdir}/usr/bin/" install -m 755 subtitle2pgm "${pkgdir}/usr/bin/" diff --git a/extra/transcode/subtitleripper-0.3.4-linkingorder.patch b/extra/transcode/subtitleripper-0.3.4-linkingorder.patch new file mode 100644 index 000000000..7efe22346 --- /dev/null +++ b/extra/transcode/subtitleripper-0.3.4-linkingorder.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $(LIBS) $^ -o $@ ++ @$(CC) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) $(LIBS) -g $^ -o $@ ++ @$(CC) -g $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch new file mode 100644 index 000000000..2af11d257 --- /dev/null +++ b/extra/transcode/subtitleripper-0.3.4-respect-ldflags.patch @@ -0,0 +1,28 @@ +Index: subtitleripper/Makefile +=================================================================== +--- subtitleripper.orig/Makefile ++++ subtitleripper/Makefile +@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud + # Target + subtitle2pgm: subtitle2pgm.o spudec.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + subtitle2vobsub: subtitle2vobsub.o vobsub.o + @echo "Linking $@" +- @$(CC) $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + srttool: srttool.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o + @echo "Linking $@" +- @$(CC) -g $^ -o $@ $(LIBS) ++ @$(CC) $(LDFLAGS) $^ -o $@ $(LIBS) + + .PHONY: clean dist rpm + clean: diff --git a/extra/transcode/transcode-1.1.5-jpeg-7.patch b/extra/transcode/transcode-1.1.5-jpeg-7.patch deleted file mode 100644 index 288932a61..000000000 --- a/extra/transcode/transcode-1.1.5-jpeg-7.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=294488 - -Patch by: Salah Coronya - -Fix segmentation fault with jpeg-7 and above where dinfo.do_fancy_upsampling isn't set by default to FALSE anymore. - ---- export/export_jpg.c -+++ export/export_jpg.c -@@ -91,6 +91,7 @@ - - jpeg_set_quality(&encinfo, quality, TRUE); - encinfo.raw_data_in = TRUE; -+ encinfo.do_fancy_downsampling = FALSE; - encinfo.in_color_space = JCS_YCbCr; - - encinfo.comp_info[0].h_samp_factor = 2; diff --git a/extra/transcode/transcode-1.1.5-mpa.patch b/extra/transcode/transcode-1.1.5-mpa.patch deleted file mode 100644 index e7fb0fc1c..000000000 --- a/extra/transcode/transcode-1.1.5-mpa.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- transcode-1.1.5-old/export/aud_aux.c 2010-07-04 12:44:31.867550180 -0500 -+++ transcode-1.1.5/export/aud_aux.c 2010-07-04 13:41:01.253292529 -0500 -@@ -347,6 +347,7 @@ - //-- set parameters (bitrate, channels and sample-rate) -- - //-------------------------------------------------------- - memset(&mpa_ctx, 0, sizeof(mpa_ctx)); // default all -+ mpa_ctx.codec_type = CODEC_TYPE_AUDIO; - mpa_ctx.bit_rate = vob->mp3bitrate * 1000; // bitrate dest. - mpa_ctx.channels = vob->dm_chan; // channels - mpa_ctx.sample_rate = vob->a_rate; diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index 5a6c35916..76b7e4407 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 140241 2011-10-10 15:24:45Z ibiru $ +# $Id: PKGBUILD 141093 2011-10-23 18:45:30Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.41 -pkgrel=2 +pkgver=2.42 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent') +makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent') source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz transmissiond transmissiond.conf) -md5sums=('0d0a061dfb92c0cb359dc531d5da0a94' +md5sums=('50f6dd76c5c01f45d5ed20783c686815' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { @@ -43,7 +43,7 @@ package_transmission-cli() { package_transmission-gtk() { pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') + depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('notification-daemon: Desktop notification support' 'transmission-cli: daemon and web support') install=transmission-gtk.install diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD index f6272e2a9..ff3a03d79 100644 --- a/extra/truecrypt/PKGBUILD +++ b/extra/truecrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130364 2011-07-06 02:01:03Z paul $ +# $Id: PKGBUILD 141202 2011-10-25 22:33:47Z eric $ # Maintainer: Paul Mattal <paul.archlinux.org> pkgname=truecrypt -pkgver=7.0a -pkgrel=3 +pkgver=7.1 +pkgrel=1 pkgdesc="Free open-source cross-platform disk encryption software" url="http://www.truecrypt.org/" arch=('i686' 'x86_64' 'mips64el') @@ -15,33 +15,36 @@ conflicts=('truecrypt-utils') replaces=('truecrypt-utils') # N.B. Truecrypt's web-based source download is incompatible with # makepkg. Source has been placed on ftp.archlinux.org instead -source=('ftp://ftp.archlinux.org/other/tc/truecrypt-7.0a.tar.gz' \ +source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \ 'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \ "${pkgname}.desktop" \ "${pkgname}-arch-detection.patch") +md5sums=('a8268630a870faff07af940f63fb29eb' + 'ddee7c4b2419ecb44b02c8294a08fbed' + 'ce6a707b79411e82e8e558aa03e764b0' + '183b9bf04a943454d4e216130bcbac01' + '00ea70fa8437de877b31b027ac2b4060') build() { - export PKCS11_INC="${srcdir}/pkcs-2.20" - - cd ${srcdir}/${pkgname}-${pkgver}-source || return 1 + cd "${srcdir}/${pkgname}-${pkgver}-source" # Work around buggy CPU type detection - patch -Np1 -i ../${pkgname}-arch-detection.patch || return 1 + patch -Np1 -i ../${pkgname}-arch-detection.patch # Build - make || return 1 + make PKCS11_INC="${srcdir}/pkcs-2.20" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-source" # Install Binary - install -D -m755 Main/${pkgname} ${pkgdir}/usr/bin/${pkgname} || return 1 + install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}" # Install Desktop file and Icon - install -D -m644 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1 - install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm ${pkgdir}/usr/share/pixmaps/truecrypt.xpm || return 1 + install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm" # Install License - install -D -m644 License.txt ${pkgdir}/usr/share/licenses/${pkgname}/License.txt || return 1 + install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt" } -md5sums=('0a61616bc5c5ad90e876b4014c004ac9' - 'ce6a707b79411e82e8e558aa03e764b0' - '183b9bf04a943454d4e216130bcbac01' - '00ea70fa8437de877b31b027ac2b4060') diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 7f3c4bc70..b0804978b 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $ +# $Id: PKGBUILD 142662 2011-11-12 17:18:47Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler pkgver=0.1.22 -pkgrel=3 +pkgrel=4 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') @@ -15,7 +15,7 @@ makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') optdepends=('ffmpegthumbnailer: for video thumbnails' 'gstreamer0.10: for video thumbnails') options=('!libtool') -source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 +source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 fix-video-image.patch) md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' 'be9b0f1c3a4b0be102774c84d5ac29e6') diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index 217a0acf6..2f893a942 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -4,7 +4,7 @@ pkgname=usbmuxd pkgver=1.0.7 -pkgrel=2 +pkgrel=2.1 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD index 3c35d24a2..2d39e01f9 100644 --- a/extra/v4l-utils/PKGBUILD +++ b/extra/v4l-utils/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=v4l-utils pkgver=0.8.5 -pkgrel=1 +pkgrel=1.1 pkgdesc="Userspace tools and conversion library for Video 4 Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freshmeat.net/projects/libv4l" diff --git a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch b/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch deleted file mode 100644 index 7fd217016..000000000 --- a/extra/valgrind/valgrind-3.6.1-glibc-2.14.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- valgrind/configure.in.jj 2010-10-21 03:14:02.000000000 +0200 -+++ valgrind/configure.in 2010-11-05 17:09:18.674455299 +0100 -@@ -749,6 +759,13 @@ case "${GLIBC_VERSION}" in - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ AC_MSG_RESULT(2.14 family) -+ AC_DEFINE([GLIBC_2_14], 1, [Define to 1 if you're using glibc 2.14.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3) - AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3]) -@@ -762,7 +779,7 @@ case "${GLIBC_VERSION}" in - - *) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.13]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.14]) - AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION]) - AC_MSG_ERROR([or Darwin libc]) - ;; ---- valgrind/config.h.in.jj 2010-10-20 22:20:49.000000000 +0200 -+++ valgrind/config.h.in 2010-11-05 17:08:33.863454886 +0100 -@@ -33,6 +33,9 @@ - /* Define to 1 if you're using glibc 2.13.x */ - #undef GLIBC_2_13 - -+/* Define to 1 if you're using glibc 2.14.x */ -+#undef GLIBC_2_14 -+ - /* Define to 1 if you're using glibc 2.2.x */ - #undef GLIBC_2_2 - ---- valgrind/configure.jj 2010-10-21 03:16:18.000000000 +0200 -+++ valgrind/configure 2010-11-05 17:09:39.163455396 +0100 -@@ -6367,6 +6389,18 @@ $as_echo "#define GLIBC_2_13 1" >>confde - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.14) -+ echo "$as_me:$LINENO: result: 2.14 family" >&5 -+echo "${ECHO_T}2.14 family" >&6 -+ -+cat >>confdefs.h <<\_ACEOF -+#define GLIBC_2_14 1 -+_ACEOF -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - aix5) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: AIX 5.1 or 5.2 or 5.3" >&5 - $as_echo "AIX 5.1 or 5.2 or 5.3" >&6; } -@@ -6387,7 +6421,7 @@ $as_echo "#define DARWIN_LIBC 1" >>confd - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5 - $as_echo "unsupported version ${GLIBC_VERSION}" >&6; } -- as_fn_error "Valgrind requires glibc version 2.2 - 2.13" "$LINENO" 5 -+ as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5 - as_fn_error "or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION" "$LINENO" 5 - as_fn_error "or Darwin libc" "$LINENO" 5 - ;; diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD index 9cbeb3b04..11053221d 100644 --- a/extra/varnish/PKGBUILD +++ b/extra/varnish/PKGBUILD @@ -5,20 +5,21 @@ # Contributor: Roberto Alsina <ralsina@kde.org> pkgname=varnish -pkgver=3.0.1 -pkgrel=1 +pkgver=3.0.2 +pkgrel=2 pkgdesc="High-performance HTTP accelerator" arch=(mips64el) url="http://www.varnish-cache.org/" license=('BSD') depends=('gcc' 'libedit' 'pcre') -backup=('etc/conf.d/varnish') +backup=('etc/conf.d/varnish' + 'etc/varnish/default.vcl') install=$pkgname.install options=('!libtool') source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz" "$pkgname.conf.d" "rc.$pkgname") -md5sums=('d01d9c1f2da2b2a1b18299a0b44c8580' +md5sums=('c8eae0aabbe66b6daabdf3a1f58cd47a' 'd42eebc7f0ac429d9740125ff1e61daf' '18b7747020ecfe2eac7445971a7014e3') diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 87b38c68e..b2e124f72 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -12,7 +12,7 @@ license=('custom:MIT') makedepends=(# runtime deps 'libpng' 'libtiff' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' # additional makedeps - 'cmake' 'python-nose' 'doxygen' 'python-sphinx' 'boost' 'python-numpy') + 'cmake' 'python2-nose' 'doxygen' 'python-sphinx' 'boost' 'python2-numpy') options=('!libtool') source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz vigra-1.7.1.gcc460.patch) @@ -26,6 +26,7 @@ build() { patch -Np1 -i ${srcdir}/vigra-1.7.1.gcc460.patch cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_VIGRANUMPY=1 \ + -DPYTHON_EXECUTABLE=/usr/bin/python2.7 \ -DDOCINSTALL=share/doc make } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 5a989a09e..cd83d4046 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 140768 2011-10-18 23:20:38Z eric $ +# $Id: PKGBUILD 142404 2011-11-09 04:16:54Z eric $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,19 +6,19 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=338 -__hgrev=f530aef0d959 +_patchlevel=353 +__hgrev=379a6398d462 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" -makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2') +makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) -md5sums=('fc83d6580fd8441793fccfd26487aadb' +md5sums=('3a7fb107699b741a7a1a86ff5ec3b83e' '6e7adfbd5d26c1d161030ec203a7f243' 'e57777374891063b9ca48a1fe392ac05' '10353a61aadc3f276692d0e17db1478e' @@ -73,7 +73,7 @@ build() { --with-features=big --enable-gpm --enable-acl --with-x=no \ --disable-gui --enable-multibyte --enable-cscope \ --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-rubyinterp + --disable-rubyinterp --disable-luainterp make @@ -84,7 +84,7 @@ build() { --with-features=big --enable-gpm --enable-acl --with-x=yes \ --enable-gui=gtk2 --enable-multibyte --enable-cscope \ --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --enable-python3interp --enable-rubyinterp + --enable-python3interp --enable-rubyinterp --enable-luainterp make } @@ -119,7 +119,7 @@ package_vim() { package_gvim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' - 'desktop-file-utils' 'gtk2') + 'desktop-file-utils' 'gtk2' 'lua') provides=("vim=${pkgver}-${pkgrel}") conflicts=('vim') install=gvim.install diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 8fbcfcc5a..5f141bb08 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139451 2011-10-01 19:01:59Z ibiru $ +# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.0 -pkgrel=2 +pkgver=3.2.2 +pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,11 +17,11 @@ optdepends=('openssh: SSH plugin' makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') groups=('gnome-extra') options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9ba0d13000d81d0e47f456b138f52ef2cb7a603c71381993952acc87c25e2e61') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" #building with as-needed breaks rdp #https://bugzilla.gnome.org/show_bug.cgi?id=653558 @@ -32,6 +32,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index c154f2fbd..2cbfc7219 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139453 2011-10-01 19:02:04Z ibiru $ +# $Id: PKGBUILD 142900 2011-11-17 18:35:14Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.0 +pkgver=3.2.2 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,11 @@ groups=('gnome-extra') url="http://www.gnome.org" options=(!emptydirs) install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2b22737aa84c15b07815d47392f9a6ef4cf6f9410cf7024bbae538496e2eda37') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ --localstatedir=/var \ @@ -28,6 +28,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD index 988741d19..053c92e47 100644 --- a/extra/virtuoso/PKGBUILD +++ b/extra/virtuoso/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 138426 2011-09-22 19:46:09Z andrea $ +# $Id: PKGBUILD 142435 2011-11-09 18:50:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=virtuoso -pkgver=6.1.3 -pkgrel=2 +pkgver=6.1.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') pkgdesc='A scalable cross-platform server that combines SQL/RDF/XML Data Management with Web Application Server and Web Services Platform functionality' url='http://virtuoso.openlinksw.com/wiki/main/Main/' license=('GPL') -depends=('openssl') +depends=('libldap') makedepends=('bison' 'flex') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz" - 'fix-unicode.patch') -md5sums=('7d4b0497411ff1c34d7ca247618cdd17' - '550dcc877dcbda707aa7ba53800e5d5b') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-opensource-${pkgver}.tar.gz") +md5sums=('7110a0b4b171b84850d346f4fe648172') build() { cd ${srcdir}/${pkgname}-opensource-${pkgver} - # Already fixed upstream - patch -p0 -i "${srcdir}"/fix-unicode.patch - ./configure --prefix=/usr \ --localstatedir=/var \ --sysconfdir=/etc \ diff --git a/extra/virtuoso/fix-unicode.patch b/extra/virtuoso/fix-unicode.patch deleted file mode 100644 index 30046d233..000000000 --- a/extra/virtuoso/fix-unicode.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: libsrc/Wi/xqf.c -=================================================================== -RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v -retrieving revision 1.21.2.9 -retrieving revision 1.21.2.12 -diff -u -r1.21.2.9 -r1.21.2.12 ---- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 -+++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 -@@ -3520,6 +3552,12 @@ - desc = xqf_str_parser_descs + desc_idx; - if (DV_DB_NULL == arg_dtp) - return NEW_DB_NULL; -+ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ -+ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) -+ { -+ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); -+ goto res_ready; -+ } - if (DV_STRING != arg_dtp) - { - caddr_t err = NULL; diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 6c899f321..71013e312 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $ +# $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=1 +pkgrel=4 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -28,8 +28,9 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' - 'libpulse: PulseAudio support') + 'libpulse: PulseAudio support' + 'vdpau-video: vdpau back-end for nvidia' + 'libva-driver-intel: back-end for intel cards') [ "$CARCH" = "mips64el" ] && { makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' @@ -42,7 +43,6 @@ optdepends=('avahi: for service discovery using bonjour protocol' 'libavc1394: for devices using the 1394ta AV/C' 'libdc1394: for IEEE 1394 plugin' 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)' 'libpulse: PulseAudio support') } conflicts=('vlc-plugin') @@ -53,14 +53,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 + if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ --disable-rpath \ @@ -76,6 +80,7 @@ build() { --enable-upnp \ --enable-realrtsp else + ./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/vlc/vlc.install b/extra/vlc/vlc.install index 4a1091bc5..dc4961cae 100644 --- a/extra/vlc/vlc.install +++ b/extra/vlc/vlc.install @@ -1,6 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins + usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins update-desktop-database -q } diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD index 28994abc2..1e1228bba 100644 --- a/extra/vpnc/PKGBUILD +++ b/extra/vpnc/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 135620 2011-08-16 16:43:05Z dreisner $ +# $Id: PKGBUILD 142551 2011-11-12 00:27:55Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=vpnc -pkgver=0.5.3.svn457 +_vpncver=0.5.3 +pkgver=$_vpncver.svn472 pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" @@ -14,9 +15,23 @@ arch=('i686' 'x86_64') source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('033e642e17200a0efc0eda1c1c1886a2' +md5sums=('51c350341ad4e7f8efbba19810b138a3' 'a3f4e0cc682f437e310a1c86ae198e45') +mktarball() { + svn co http://svn.unix-ag.uni-kl.de/vpnc/trunk + pushd trunk + _svnrev=$(svn info | awk '/^Revision:/ { print $2 }') + popd + + git clone git://git.infradead.org/users/dwmw2/vpnc-scripts.git + cp vpnc-scripts/vpnc-script trunk/ + + find trunk/ -type d -name .svn -exec rm -rf {} + + mv trunk "$pkgname-$_vpncver.svn$_svnrev" + tar cJf "$pkgname-$_vpncver.svn$_svnrev"{.tar.xz,} +} + build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD index 679d89cc3..14cb5013b 100644 --- a/extra/vte/PKGBUILD +++ b/extra/vte/PKGBUILD @@ -1,35 +1,38 @@ -# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $ +# $Id: PKGBUILD 142691 2011-11-12 18:51:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vte pkgver=0.28.2 -pkgrel=2 +pkgrel=3 pkgdesc="Virtual Terminal Emulator widget for use with GTK2" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') options=('!libtool' '!emptydirs') depends=('gtk2' 'vte-common') -makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc') +makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz) -sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ - --enable-introspection --with-gtk=2.0 \ - --enable-gtk-doc + --enable-introspection --with-gtk=2.0 make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir/usr/lib/vte/gnome-pty-helper" } diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 610261ccd..8b2f70aed 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 139455 2011-10-01 19:02:07Z ibiru $ +# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.30.0 -pkgrel=1 +pkgver=0.30.1 +pkgrel=2 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('4b4e13b46e026f1ba088a5bdf9786a339fedb88438f0e094bc7afe5e376be410') +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" #warning: type-punning to incomplete type might break strict-aliasing rules export CFLAGS="$CFLAGS -fno-strict-aliasing" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ --localstatedir=/var --disable-static \ @@ -28,15 +31,15 @@ build() { package_vte3(){ depends=('gtk3' 'vte-common') - cd "${srcdir}/vte-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/vte-$pkgver" + make DESTDIR="$pkgdir" install - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper + rm "$pkgdir"/usr/lib/vte/gnome-pty-helper } package_vte-common() { pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/vte-${pkgver}" + cd "$srcdir/vte-$pkgver" - make -C gnome-pty-helper DESTDIR="${pkgdir}" install + make -C gnome-pty-helper DESTDIR="$pkgdir" install } diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index b19995eaf..95801df8c 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111485 2011-02-27 10:22:27Z thomas $ +# $Id: PKGBUILD 141081 2011-10-23 14:16:24Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" @@ -14,14 +14,17 @@ backup=(etc/watchdog.conf etc/conf.d/wd_keepalive) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.sh - watchdog.cf) + watchdog.cf + watchdog-5.9-use-oom_score_adj.patch) md5sums=('d7cae3c9829f5d9a680764f314234867' '854451f554718b55186599faaa8d85f6' - '01c1e2e13f515131180b4ebe9b8b7cc3') + '01c1e2e13f515131180b4ebe9b8b7cc3' + '9a1ab454e42a7f2969ef6bf2da8a4543') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/watchdog-5.9-use-oom_score_adj.patch ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ @@ -31,14 +34,14 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install DESTDIR=${pkgdir} + cd "${srcdir}"/${pkgname}-${pkgver} + make install DESTDIR="${pkgdir}" for fil in watchdog wd_keepalive ; do - install -D -m755 ${srcdir}/watchdog.sh ${pkgdir}/etc/rc.d/${fil} - install -D -m644 ${srcdir}/watchdog.cf ${pkgdir}/etc/conf.d/${fil} + install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} + install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} done - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/rc.d/wd_keepalive - sed -i 's/watchdog/wd_keepalive/g' ${pkgdir}/etc/conf.d/wd_keepalive - sed -i 's/Watchdog/Simple Watchdog/' ${pkgdir}/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive + sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive + sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive } diff --git a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch new file mode 100644 index 000000000..90508d777 --- /dev/null +++ b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch @@ -0,0 +1,91 @@ +diff -ur watchdog-5.9.orig/src/watchdog.c watchdog-5.9/src/watchdog.c +--- watchdog-5.9.orig/src/watchdog.c 2010-06-16 15:45:51.000000000 +0200 ++++ watchdog-5.9/src/watchdog.c 2011-10-23 15:51:58.631689778 +0200 +@@ -636,7 +636,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); ++ filename_buf = (char*)malloc(max(strlen(logdir) + sizeof("/repair-bin.stdout") + 1, strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1)); + if (!filename_buf) { + error(progname); + exit(1); +@@ -886,11 +886,19 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); +- (void) fclose(fp); ++ fprintf(fp, "-1000\n"); ++ (void) fclose(fp); ++ } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } + } + + /* main loop: update after <tint> seconds */ +diff -ur watchdog-5.9.orig/src/wd_keepalive.c watchdog-5.9/src/wd_keepalive.c +--- watchdog-5.9.orig/src/wd_keepalive.c 2010-06-16 15:45:49.000000000 +0200 ++++ watchdog-5.9/src/wd_keepalive.c 2011-10-23 15:50:43.061563281 +0200 +@@ -212,7 +212,7 @@ + FILE *fp; + char *configfile = CONFIG_FILENAME; + char *filename_buf; +- pid_t child_pid; ++ pid_t pid, child_pid; + int count = 0; + int c; + /* allow all options watchdog understands too */ +@@ -284,7 +284,7 @@ + + /* allocate some memory to store a filename, this is needed later on even + * if the system runs out of memory */ +- filename_buf = (char*)malloc(strlen("/proc//oom_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); ++ filename_buf = (char*)malloc(strlen("/proc//oom_score_adj") + sizeof(int) * CHAR_BIT * 10 / 3 + 1); + if (!filename_buf) { + error(progname); + exit(1); +@@ -363,9 +363,10 @@ + #endif + + /* tuck my process id away */ ++ pid = getpid(); + fp = fopen(KA_PIDFILE, "w"); + if ( fp != NULL ) { +- fprintf(fp, "%d\n", getpid()); ++ fprintf(fp, "%d\n", pid); + (void) fclose(fp); + } + +@@ -403,12 +404,20 @@ + #endif + + /* tell oom killer to not kill this process */ +- sprintf(filename_buf, "/proc/%d/oom_adj", getpid()); ++ sprintf(filename_buf, "/proc/%d/oom_score_adj", pid); + fp = fopen(filename_buf, "w"); + if (fp != NULL) { +- fprintf(fp, "-17\n"); ++ fprintf(fp, "-1000\n"); + (void) fclose(fp); + } ++ else { ++ sprintf(filename_buf, "/proc/%d/oom_adj", pid); ++ fp = fopen(filename_buf, "w"); ++ if (fp != NULL) { ++ fprintf(fp, "-17\n"); ++ (void) fclose(fp); ++ } ++ } + + /* main loop: update after <tint> seconds */ + while ( _running ) { diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD index cc551e671..09e7c3a69 100644 --- a/extra/weechat/PKGBUILD +++ b/extra/weechat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135812 2011-08-18 15:04:52Z andyrtr $ +# $Id: PKGBUILD 141059 2011-10-22 19:05:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: lucke <lucke at o2 dot pl> pkgname=weechat -pkgver=0.3.5 -pkgrel=3 +pkgver=0.3.6 +pkgrel=1 pkgdesc="Fast, light and extensible IRC client (curses UI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.weechat.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell') options=('!libtool') source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('0d2a089bfbfa550e0c65618a171fb3c4') +md5sums=('db2392b8e31738f79f0898f77eda8daa') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD index 7916e1320..ac95cae6c 100644 --- a/extra/whois/PKGBUILD +++ b/extra/whois/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108896 2011-02-04 18:32:02Z giovanni $ +# $Id: PKGBUILD 141085 2011-10-23 14:30:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=whois -pkgver=5.0.11 +pkgver=5.0.12 pkgrel=1 pkgdesc="The whois client by Marco d'Itri" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('libidn') makedepends=('perl') source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.gz") -md5sums=('942e2d90b0bcd7d22765c8e3344fe118') +md5sums=('1147b6a993af384ba341cb91666c7e97') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 0e1b15b7d..a12445446 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 137559 2011-09-09 12:10:57Z guillaume $ +# $Id: PKGBUILD 142976 2011-11-19 11:40:12Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('301677b5f8150265315632fb6247e06e') +md5sums=('a348521c514fcdd890d974f2a0b59db3') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -37,7 +37,7 @@ package_wireshark-cli() { #wireshark uid group is 150 chgrp 150 "${pkgdir}/usr/bin/dumpcap" chmod 754 "${pkgdir}/usr/bin/dumpcap" - rm "$pkgdir/usr/bin/wireshark" + rm "${pkgdir}/usr/bin/wireshark" } package_wireshark-gtk() { diff --git a/extra/wv2/PKGBUILD b/extra/wv2/PKGBUILD index c2609d367..73b733286 100644 --- a/extra/wv2/PKGBUILD +++ b/extra/wv2/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 57827 2009-11-02 14:26:13Z ronald $ +# $Id: PKGBUILD 142173 2011-11-05 11:56:53Z pierre $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=wv2 pkgver=0.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="MSWord 9,8,7,6 formats parser" arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/wvware/" depends=('libgsf') makedepends=('cmake') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool') +source=("http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.bz2") license=('GPL2') md5sums=('850ed8e44a84e7bf0610747827018cbc') build() { - cd ${srcdir} - mkdir build - cd build + cd ${srcdir} + mkdir build + cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install } diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD index 4a5370c27..36c51c5ca 100644 --- a/extra/wxpython/PKGBUILD +++ b/extra/wxpython/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 134638 2011-08-07 02:39:42Z eric $ +# $Id: PKGBUILD 142236 2011-11-07 00:38:07Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxpython pkgver=2.8.12.1 -pkgrel=1 +pkgrel=2 pkgdesc="A wxWidgets GUI toolkit for Python" arch=('i686' 'x86_64' 'mips64el') license=('custom:wxWindows') url="http://www.wxpython.org" depends=('wxgtk' 'python2') makedepends=('mesa') -source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2) -md5sums=('8c06c5941477beee213b4f2fa78be620') -sha1sums=('05688dc03d61631750f5904273122bb40a2115f5') +source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxpython-cairo.patch) +sha1sums=('05688dc03d61631750f5904273122bb40a2115f5' + '420700b0a216b853352ffafd054f406a82a30bb3') build() { cd "${srcdir}/wxPython-src-${pkgver}" @@ -22,6 +22,7 @@ build() { --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys cd "${srcdir}/wxPython-src-${pkgver}/wxPython" + patch -p2 -i "${srcdir}/wxpython-cairo.patch" python2 setup.py WXPORT=gtk2 UNICODE=1 build } diff --git a/extra/wxpython/wxpython-cairo.patch b/extra/wxpython/wxpython-cairo.patch new file mode 100644 index 000000000..f3fc6fba0 --- /dev/null +++ b/extra/wxpython/wxpython-cairo.patch @@ -0,0 +1,51 @@ +--- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894 ++++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181 +@@ -401,6 +401,48 @@ + ctypes.py_object)), + ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] + ++ # This structure is known good with pycairo 1.10.0. The keep adding stuff ++ # to the middle of the structure instead of only adding to the end! ++ elif cairo.version_info < (1,11): ++ _fields_ = [ ++ ('Context_Type', ctypes.py_object), ++ ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object, ++ ctypes.py_object)), ++ ('FontFace_Type', ctypes.py_object), ++ ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4 ++ ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('FontOptions_Type', ctypes.py_object), ++ ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Matrix_Type', ctypes.py_object), ++ ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Path_Type', ctypes.py_object), ++ ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Pattern_Type', ctypes.py_object), ++ ('SolidPattern_Type', ctypes.py_object), ++ ('SurfacePattern_Type', ctypes.py_object), ++ ('Gradient_Type', ctypes.py_object), ++ ('LinearGradient_Type', ctypes.py_object), ++ ('RadialGradient_Type', ctypes.py_object), ++ ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p, ++ ctypes.py_object)), #** changed in 1.8.4 ++ ('ScaledFont_Type', ctypes.py_object), ++ ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)), ++ ('Surface_Type', ctypes.py_object), ++ ('ImageSurface_Type', ctypes.py_object), ++ ('PDFSurface_Type', ctypes.py_object), ++ ('PSSurface_Type', ctypes.py_object), ++ ('SVGSurface_Type', ctypes.py_object), ++ ('Win32Surface_Type', ctypes.py_object), ++ ('Win32PrintingSurface_Type', ctypes.py_object), ++ ('XCBSurface_Type', ctypes.py_object), ++ ('XlibSurface_Type', ctypes.py_object), ++ ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object, ++ ctypes.c_void_p, ++ ctypes.py_object)), ++ ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))] ++ + + def _loadPycairoAPI(): + global pycairoAPI diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index cfa7bfb72..78a9bf82e 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $ +# $Id: PKGBUILD 142608 2011-11-12 17:14:58Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20111001 +pkgver=20111030 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') +md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 0a6fe5e38..7c8fa0ab0 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 140358 2011-10-11 21:29:48Z jgc $ +# $Id: PKGBUILD 142923 2011-11-18 09:36:49Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.10.99.902') -conflicts=('xorg-server<1.10.99.902') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch 50-joystick.conf) sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' + '7812a34013a2333641bd7c5d044c46179490cb32' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make } diff --git a/extra/xf86-input-joystick/git-fixes.patch b/extra/xf86-input-joystick/git-fixes.patch new file mode 100644 index 000000000..b3afa06cc --- /dev/null +++ b/extra/xf86-input-joystick/git-fixes.patch @@ -0,0 +1,399 @@ +From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001 +From: Terry Lambert <tlambert@chromium.org> +Date: Sat, 16 Jul 2011 00:23:22 +0000 +Subject: Return proper default for unknown values in pInfo->device_control. + +Signed-off-by: Terry Lambert <tlambert@chromium.org> +Reviewed-by: Stephane Marchesin <marcheu@chromium.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/jstk.c b/src/jstk.c +index ec6b79a..6db0e7c 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + + default: + ErrorF("unsupported mode=%d\n", what); +- return !Success; +- break; ++ return BadValue; + } /* switch (what) */ + return Success; + } +diff --git a/src/jstk_key.c b/src/jstk_key.c +index 3c471ce..d699dcd 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr dev, + DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n")); + dev->public.on = FALSE; + break; ++ default: ++ return BadValue; + } + + return Success; +-- +cgit v0.9.0.2-2-gbebe +From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001 +From: Devin J. Pohly <djpohly+xorg@gmail.com> +Date: Sat, 03 Sep 2011 23:00:07 +0000 +Subject: unify capitalization of joystick properties + +the axis keys high/low properties were inconsistently capitalized, +leading to potential confusion as to why one works but not the other. + +Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/include/joystick-properties.h b/include/joystick-properties.h +index 49ef800..36f4082 100644 +--- a/include/joystick-properties.h ++++ b/include/joystick-properties.h +@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING { + + /** Scancodes for axis in high position */ + /* 8 bit, 4 per axis */ +-#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)" ++#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)" + + /** Set the mapping of each button to + none, x, y, zx, zy, button, key, speed_multiply, +-- +cgit v0.9.0.2-2-gbebe +From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sat, 15 Oct 2011 22:47:52 +0000 +Subject: label buttons and axes + +Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping. +Mapping can be changed while running so the labels will be constant. + +Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator +data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X" +and "Rel Y", representing the aggregated post-calculation data from all axes. + +Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de> +--- +diff --git a/man/joystick.man b/man/joystick.man +index da92ceb..b401de5 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -140,7 +140,11 @@ Neither + .B mode + nor + .B axis +-needs to be set to generate extra valuator events. ++needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with ++.I 1 ++, i.e. ++.I \*qAxis 1\*q ++for the first axis (being the 3rd valuator). + Default: not set. + .TP 7 + .BI "\*qaxis="[<factor>]<axis> \*q +@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys + The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis. + The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings. + ++.SH "XI2 Events" ++If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons: ++ ++.nf ++.BI " Option \*qMapAxis1\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis2\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis3\*q \*q" "mode=none valuator" \*q ++.BI " Option \*qMapAxis4\*q \*q" "mode=none valuator" \*q ++\ \ ... ++.BI " Option \*qMapButton1\*q \*q" "button=1" \*q ++.BI " Option \*qMapButton2\*q \*q" "button=2" \*q ++.BI " Option \*qMapButton3\*q \*q" "button=3" \*q ++.BI " Option \*qMapButton4\*q \*q" "button=4" \*q ++.BI " Option \*qMapButton5\*q \*q" "button=5" \*q ++\ \ ... ++.fi ++ ++You might also want to set the device "floating" to stop it from reporting core events: ++.nf ++.BI " Option \*qFloating\*q \*q" "true" \*q ++.fi ++ + .SH "NOTES" + Configuration through + .I InputClass +diff --git a/src/jstk.c b/src/jstk.c +index 6db0e7c..772683f 100644 +--- a/src/jstk.c ++++ b/src/jstk.c +@@ -1,5 +1,5 @@ + /* +- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> ++ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org> + * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> + * + * Permission to use, copy, modify, distribute, and sell this software and its +@@ -21,7 +21,6 @@ + * PERFORMANCE OF THIS SOFTWARE. + */ + +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + switch (what) { + case DEVICE_INIT: { + int m; ++ char str[32]; + CARD8 buttonmap[BUTTONMAP_SIZE+1]; + DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n")); + /* Probe device and return if error */ +@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + } + + for (m=0; m<=BUTTONMAP_SIZE; m++) { ++ sprintf(str, "Button %d", m); ++ + buttonmap[m] = m; +- } ++ btn_labels[m] = MakeAtom(str, strlen(str), TRUE); ++ } ++ ++ + +- +- + if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, + btn_labels, + buttonmap) == FALSE) { +@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk, + if (priv->axis[i].valuator != -1) + { + DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m)); ++ sprintf(str, "Axis %d", i + 1); + priv->axis[i].valuator = m++; ++ axes_labels[i] = MakeAtom(str, strlen(str), TRUE); + } + + if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels, +@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec = + /* a tool */ + }; + +- + /* + *************************************************************************** + * +@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = { + jstkDriverPlug, + jstkDriverUnplug + }; ++ ++/* vim: set filetype=c.doxygen ts=4 et: */ ++ +-- +cgit v0.9.0.2-2-gbebe +From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:27:22 +0000 +Subject: Fix option type for option duplication + +xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption +list. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index d699dcd..e842941 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *options; + InputOption *iopts = NULL, *tmp; + DeviceIntPtr dev; ++ XF86OptionPtr opts; + + /* duplicate option list, append to name */ +- options = xf86OptionListDuplicate(pInfo->options); ++ opts = xf86OptionListDuplicate(pInfo->options); + strcpy(name, pInfo->name); + strcat(name, " (keys)"); +- options = xf86ReplaceStrOption(options, "Name", name); +- options = xf86ReplaceStrOption(options, "_source", "_driver/joystick"); ++ opts = xf86ReplaceStrOption(opts, "Name", name); ++ opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); + +- while(options) ++ while(opts) + { + tmp = calloc(1, sizeof(InputOption)); + +- tmp->key = xf86OptionName(options); +- tmp->value = xf86OptionValue(options); ++ tmp->key = xf86OptionName(opts); ++ tmp->value = xf86OptionValue(opts); + tmp->next = iopts; + iopts = tmp; +- options = xf86NextOption(options); ++ opts = xf86NextOption(opts); + } + + /* duplicate attribute list */ +-- +cgit v0.9.0.2-2-gbebe +From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 31 Oct 2011 04:33:08 +0000 +Subject: Deal with opaque input option types. + +ABI 14 made the InputOption type opaque, move the existing code to ifdefs +and use the new function calls otherwise. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +Reviewed-by: Chase Douglas <chase.douglas@canonical.com> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index e842941..a71275a 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) + return Success; + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14 ++static InputOption* ++input_option_new(InputOption* list, char *key, char *value) ++{ ++ InputOption *tmp; ++ ++ tmp = calloc(1, sizeof(*tmp)); ++ tmp->key = key; ++ tmp->value = value; ++ tmp->next = list; ++ ++ return tmp; ++} ++ ++static void ++input_option_free_list(InputOption **list) ++{ ++ InputOption *iopts = *list; ++ ++ while(iopts) ++ { ++ InputOption *tmp = iopts->next; ++ free(iopts->key); ++ free(iopts->value); ++ free(iopts); ++ iopts = tmp; ++ } ++ ++ *list = NULL; ++} ++ ++#endif ++ + InputInfoPtr + jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + { + int rc; + char name[512] = {0}; + InputAttributes *attrs = NULL; +- InputOption *iopts = NULL, *tmp; ++ InputOption *iopts = NULL; + DeviceIntPtr dev; + XF86OptionPtr opts; + +@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + while(opts) + { +- tmp = calloc(1, sizeof(InputOption)); +- +- tmp->key = xf86OptionName(opts); +- tmp->value = xf86OptionValue(opts); +- tmp->next = iopts; +- iopts = tmp; ++ iopts = input_option_new(iopts, ++ xf86OptionName(opts), ++ xf86OptionValue(opts)); + opts = xf86NextOption(opts); + } + +@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + + rc = NewInputDeviceRequest(iopts, attrs, &dev); + +- while(iopts) +- { +- tmp = iopts->next; +- free(iopts->key); +- free(iopts->value); +- free(iopts); +- iopts = tmp; +- } ++ input_option_free_list(&iopts); + + FreeInputAttributes(attrs); + +-- +cgit v0.9.0.2-2-gbebe +From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 17:04:25 +0000 +Subject: man: valuators are not added automatically + +--- +diff --git a/man/joystick.man b/man/joystick.man +index b401de5..9f38ceb 100644 +--- a/man/joystick.man ++++ b/man/joystick.man +@@ -129,9 +129,6 @@ can be one of: + + .B none, relative, accelerated, absolute + +-Every axis which's mode is not +-.B none +-will be reported as an additional valuator. + .TP 7 + .B \*qvaluator\*q + Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always +-- +cgit v0.9.0.2-2-gbebe +From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001 +From: Sascha Hlusiak <saschahlusiak@arcor.de> +Date: Sun, 13 Nov 2011 19:36:07 +0000 +Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device + +udev does copy the Driver line to the list of options, but when manually +specifying the driver in xorg.conf, the option "Driver" is unset. Because we +do hotplug a sub-device from within the core device, we need the "Driver" +option to be present in the list. + +This should fix archlinux bug #23577: + https://bugs.archlinux.org/task/23577 + +Thanks to Malek for coming up with a fix. + +Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de> +--- +diff --git a/src/jstk_key.c b/src/jstk_key.c +index a71275a..241b15d 100644 +--- a/src/jstk_key.c ++++ b/src/jstk_key.c +@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags) + strcat(name, " (keys)"); + opts = xf86ReplaceStrOption(opts, "Name", name); + opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick"); ++ opts = xf86AddNewOption(opts, "Driver", pInfo->driver); + + while(opts) + { +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 1933dab48..24604d845 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 140370 2011-10-11 21:30:03Z jgc $ +# $Id: PKGBUILD 142834 2011-11-16 13:12:15Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.11.1 -pkgrel=3 +pkgver=0.12.0 +pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" license=('GPL') backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr') -makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi') -conflicts=('xorg-server<1.10.99.902') +depends=('libxi' 'libxrandr' 'libxinerama') +makedepends=('xorg-server-devel>=1.11.0' 'libxext') +conflicts=('xorg-server<1.11.0') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) -md5sums=('0aec4a338cc583ed497b6af68d6d80ab' +md5sums=('e1c41d143d5040982ae050c7ef9039e3' '10db4f8272286690255c1bcc18bfdd92') build() { diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index ce97f1169..d0783dedf 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 140344 2011-10-11 21:29:33Z jgc $ +# $Id: PKGBUILD 141740 2011-11-02 16:51:06Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati -pkgver=6.14.2 -pkgrel=2 +pkgver=6.14.3 +pkgrel=1 pkgdesc="X.org ati video driver" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=(libpciaccess libdrm udev pixman ati-dri) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49') +sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index 6b1f05cfe..fd626bdb8 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -3,7 +3,7 @@ pkgname=xf86-video-fbdev pkgver=0.4.2 -pkgrel=5 +pkgrel=6 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64 'mips64el') license=('custom') diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index b083bfe78..9be6210d3 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140328 2011-10-11 21:29:11Z jgc $ +# $Id: PKGBUILD 143035 2011-11-21 15:50:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.16.0 +pkgver=2.17.0 pkgrel=1 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy' options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf') +sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index 09da32575..e2e588c5c 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -4,7 +4,7 @@ pkgname=xf86-video-siliconmotion pkgver=1.7.5 -pkgrel=3 +pkgrel=5 pkgdesc="X.org siliconmotion video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -21,7 +21,7 @@ sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' build() { cd "${srcdir}/${pkgname}-${pkgver}" - [ "$CARCH" = "mips64el" ] && patch -Np0 -i ${srcdir}/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff + [ "$CARCH" = "mips64el" ] && patch -Np1 -i ${srcdir}/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install @@ -29,3 +29,5 @@ build() { install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } +sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' + 'b3cc8e8aaaabdf25857b781d6793c70815003f9b') diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD index edf4ef0bb..b1d9e01d6 100644 --- a/extra/xf86-video-sisimedia/PKGBUILD +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140378 2011-10-11 21:33:02Z jgc $ +# $Id: PKGBUILD 142261 2011-11-07 13:08:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisimedia pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org SiS 671 video driver" arch=(i686 x86_64) url="http://www.linuxconsulting.ro/xorg-drivers/" @@ -28,6 +28,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia- 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch 0005-Correct-bounds-check-of-blitClip-array-access.patch xserver19.patch + fix-xv-crash.patch COPYING) sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '61715bb86180decde55a56fad9a12d841c89fbb2' @@ -45,6 +46,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' '5e288526bfa2c534f1feabdb571da16da8a1c7a6' 'e86d702cb0b5e9bf43ff732696229965e176db7c' 'b5f260bed7e705808ec05620316e503ed5d52ee5' + '1fdd74a2aef9455ac5c37d1fe0146d81aa905d2d' 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') build() { @@ -64,6 +66,7 @@ build() { patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" patch -Np1 -i "${srcdir}/xserver19.patch" + patch -Np0 -i "${srcdir}/fix-xv-crash.patch" sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h diff --git a/extra/xf86-video-sisimedia/fix-xv-crash.patch b/extra/xf86-video-sisimedia/fix-xv-crash.patch new file mode 100644 index 000000000..57e6adec5 --- /dev/null +++ b/extra/xf86-video-sisimedia/fix-xv-crash.patch @@ -0,0 +1,11 @@ +--- src/sis_video.c 2008-10-01 09:44:01.000000000 +0200 ++++ src/sis_video.c.new 2011-10-17 14:23:07.000000000 +0200 +@@ -1121,7 +1121,7 @@ + adapt->GetPortAttribute = SISGetPortAttribute; + adapt->QueryBestSize = SISQueryBestSize; + adapt->PutImage = SISPutImage; +- adapt->ReputImage = SISReputImage; ++ adapt->ReputImage = NULL; + adapt->QueryImageAttributes = SISQueryImageAttributes; + + /* gotta uninit this someplace */ diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD index 2e7aec3bf..3566c2582 100755 --- a/extra/xfburn/PKGBUILD +++ b/extra/xfburn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119475 2011-04-11 17:44:33Z andyrtr $ +# $Id: PKGBUILD 141077 2011-10-23 09:32:55Z andyrtr $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> # Contributor: Alois Nespor alois.nespor@gmail.com pkgname=xfburn pkgver=0.4.3 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64' 'mips64el') pkgdesc="a simple CD/DVD burning tool based on libburnia libraries" url="http://goodies.xfce.org/projects/applications/xfburn" @@ -14,11 +14,17 @@ install=${pkgname}.install depends=('libburn>=1.0.6.pl00' 'libisofs>=1.0.6' 'libxfcegui4>=4.8.1' 'exo>=0.6.0' 'gstreamer0.10-base>=0.10.26' 'hicolor-icon-theme' 'desktop-file-utils' 'librsvg') makedepends=('intltool') -source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2) -md5sums=('147cdc2d909e751125be16103b8dc81f') +source=(http://www.xfce.org/archive/src/apps/xfburn/0.4/$pkgname-$pkgver.tar.bz2 + fix_empty_dir_segfault.diff) +md5sums=('147cdc2d909e751125be16103b8dc81f' + '82a85be2442c42ab93de95e21c6c11b0') build() { cd ${srcdir}/$pkgname-$pkgver + + # fix https://bugs.archlinux.org/task/26121 + patch -Np0 -i ${srcdir}/fix_empty_dir_segfault.diff + ./configure --prefix=/usr \ --enable-gstreamer \ --enable-dbus \ diff --git a/extra/xfburn/fix_empty_dir_segfault.diff b/extra/xfburn/fix_empty_dir_segfault.diff new file mode 100644 index 000000000..af3fe07c8 --- /dev/null +++ b/extra/xfburn/fix_empty_dir_segfault.diff @@ -0,0 +1,48 @@ +--- xfburn/xfburn-data-composition.c 2011-02-17 16:37:03.000000000 +0100 ++++ xfburn/xfburn-data-composition_patched.c 2011-02-17 16:40:40.000000000 +0100 +@@ -1874,26 +1874,29 @@ + g_error ("Failed adding %s as a node to the image: code %X!", src, r); + } + +- basename = g_path_get_basename (src); ++ /* Check names only for items not manually created (#613563) */ ++ if (type != DATA_COMPOSITION_TYPE_DIRECTORY || src != NULL) { ++ basename = g_path_get_basename (src); ++ ++ /* check if the file has been renamed */ ++ if (strcmp (basename, name) != 0) { ++ /* rename the iso_node */ ++ r = iso_node_set_name (node, name); ++ ++ if (r == 0) { ++ /* The first string is the renamed name, the second one the original name */ ++ xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); ++ ++ g_free (basename); ++ g_free (name); ++ g_free (src); + +- /* check if the file has been renamed */ +- if (strcmp (basename, name) != 0) { +- /* rename the iso_node */ +- r = iso_node_set_name (node, name); +- +- if (r == 0) { +- /* The first string is the renamed name, the second one the original name */ +- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src); +- +- g_free (basename); +- g_free (name); +- g_free (src); +- +- continue; ++ continue; ++ } + } ++ g_free (basename); + } + +- g_free (basename); + g_free (name); + g_free (src); + diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD index 0c6eb27fe..864caf53c 100644 --- a/extra/xfce4-clipman-plugin/PKGBUILD +++ b/extra/xfce4-clipman-plugin/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 105771 2011-01-11 17:17:59Z andyrtr $ +# $Id: PKGBUILD 141959 2011-11-03 17:33:58Z eric $ # Maintainer: tobias <tobias at archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-clipman-plugin -pkgver=1.1.3 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 pkgdesc="A clipboard plugin for the Xfce4 panel" -arch=(i686 x86_64 'mips64el') -license=('custom') +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin" groups=('xfce4-goodies') -depends=('libxfcegui4' 'xfce4-panel' 'libunique' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool') +depends=('xfce4-panel' 'libunique' 'libxtst') +makedepends=('intltool') options=('!libtool') install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2ba70c6bd710e2a18cba5add66d297dc') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('60df7769a8271d7fcab177210f4291e8') build() { - cd ${srcdir}/${pkgname}-${pkgver} - # fix for exo 0.5.6 - sed -i -e "s/exo-0.3/exo-1/g" configure + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|$(TARGET_DIR)/C/media|$(docdir)/html/C/media|' doc/Makefile.in ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -32,7 +31,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD new file mode 100644 index 000000000..0b56b17ac --- /dev/null +++ b/extra/xfce4-dev-tools/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 142012 2011-11-04 02:41:52Z eric $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tobias Kieslich <tobias funnychar archlinux.org> + +pkgname=xfce4-dev-tools +pkgver=4.9.0 +pkgrel=1 +pkgdesc="Xfce developer tools" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.xfce.org/" +depends=('gtk-doc' 'automake' 'automake' 'make' 'intltool' 'pkg-config') +options=('!libtool') +source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('325047a072f5599ec7fda9f970c47091') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD index dfdf4695b..41d99d932 100644 --- a/extra/xfce4-notifyd/PKGBUILD +++ b/extra/xfce4-notifyd/PKGBUILD @@ -1,37 +1,38 @@ -# $Id: PKGBUILD 134711 2011-08-07 16:35:59Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 141355 2011-10-29 18:34:46Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-notifyd pkgver=0.2.2 -pkgrel=1 -pkgdesc="notification daemon for the xfce desktop" +pkgrel=2 +pkgdesc="Notification daemon for the Xfce desktop" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://goodies.xfce.org/projects/applications/xfce4-notifyd" +license=('GPL2') groups=('xfce4-goodies') depends=('libxfce4ui' 'hicolor-icon-theme') makedepends=('intltool') provides=('notification-daemon') -conflicts=('notification-daemon' 'notification-daemon-xfce') -replaces=('notification-daemon-xfce') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.2/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8687fb7a0f270231ada265e363b6ffcc') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2) +sha1sums=('31888132d949cc7b47d12889b8aaf5dabc546d8b') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./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-notifyd/xfce4-notifyd.install b/extra/xfce4-notifyd/xfce4-notifyd.install index fee9e5d11..abf924aa2 100644 --- a/extra/xfce4-notifyd/xfce4-notifyd.install +++ b/extra/xfce4-notifyd/xfce4-notifyd.install @@ -3,10 +3,12 @@ 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-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index 13b2ef273..d61157a7d 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -4,7 +4,7 @@ pkgname=xfce4-power-manager pkgver=1.0.10 -pkgrel=2 +pkgrel=2.1 pkgdesc="power manager for xfce4 desktop" arch=(i686 x86_64 'mips64el') license=('GPL2') diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD index 1b4d93b60..ebfd8fb82 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 'mips64el') -license=('GPL2') +pkgrel=2 +pkgdesc="Plugin that makes screenshots for the Xfce panel" +arch=('i686' 'x86_64' 'mips64el') 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-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 89a8afcc3..af21e0cef 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,60 +1,50 @@ -# $Id: PKGBUILD 138127 2011-09-17 02:26:42Z allan $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 141722 2011-11-02 15:10:56Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') url="http://www.xfce.org/" +license=('GPL2') groups=('xfce4') - # keep xorg-server-utils for https://bugs.archlinux.org/task/21096 'xorg-server-utils' - # upower and consolekit for reboot/shutdown/hibernate/suspend -depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme' ) +# keep xorg-server-utils for https://bugs.archlinux.org/task/21096 +# upower and consolekit for reboot/shutdown/hibernate/suspend +depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm' + 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme') makedepends=('intltool') optdepends=('fortune-mod: for xfce4-tips') replaces=('xfce4-toys') -backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla - etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla) options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 - org.freedesktop.consolekit.pkla - org.freedesktop.upower.pkla) -md5sums=('48780cbcf784ab64debc9312f17765f2' - '2e2519950d8c591dc9440ed8957a49ed' - '5fa270637b5e685f033863d8664795a2') +install=$pkgname.install +source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-hal \ - --enable-gnome \ - --enable-libgnome-keyring \ - --enable-session-screenshots \ - --enable-upower \ - --enable-consolekit \ - --enable-polkit \ - --enable-panel-plugin \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-hal \ + --enable-gnome \ + --enable-libgnome-keyring \ + --enable-session-screenshots \ + --enable-upower \ + --enable-consolekit \ + --enable-polkit \ + --enable-panel-plugin \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # install polkit/consolekit permission file needed for usage without a display manager - install -dm700 ${pkgdir}/etc/polkit-1/localauthority - install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d - install -m644 ${srcdir}/org.freedesktop.consolekit.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ - install -m644 ${srcdir}/org.freedesktop.upower.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/ + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-session/org.freedesktop.consolekit.pkla b/extra/xfce4-session/org.freedesktop.consolekit.pkla deleted file mode 100644 index 7f1d74ff6..000000000 --- a/extra/xfce4-session/org.freedesktop.consolekit.pkla +++ /dev/null @@ -1,31 +0,0 @@ -[Local restart] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.consolekit.system.restart -ResultAny=yes -ResultInactive=no -ResultActive=yes - -[Local shutdown] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.consolekit.system.stop -ResultAny=yes -ResultInactive=no -ResultActive=yes - -[Local restart - multiple] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.consolekit.system.restart-multiple-users -ResultAny=yes -ResultInactive=no -ResultActive=yes - -[Local shutdown - multiple] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.consolekit.system.stop-multiple-users -ResultAny=yes -ResultInactive=no -ResultActive=yes diff --git a/extra/xfce4-session/org.freedesktop.upower.pkla b/extra/xfce4-session/org.freedesktop.upower.pkla deleted file mode 100644 index 52c74f892..000000000 --- a/extra/xfce4-session/org.freedesktop.upower.pkla +++ /dev/null @@ -1,15 +0,0 @@ -[Local hibernate] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.upower.hibernate -ResultAny=yes -ResultInactive=no -ResultActive=yes - -[Local suspend] -#Identity=unix-user: your_username -Identity=unix-group:power -Action=org.freedesktop.upower.suspend -ResultAny=yes -ResultInactive=no -ResultActive=yes diff --git a/extra/xfce4-session/xfce4-session.install b/extra/xfce4-session/xfce4-session.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-session/xfce4-session.install +++ b/extra/xfce4-session/xfce4-session.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 bcbb88d46..4e0ac21a4 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' 'mips64el') -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/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch b/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch deleted file mode 100644 index c23e8ec78..000000000 --- a/extra/xfce4-smartbookmark-plugin/0001-Fix-problems-with-plugin-and-4.8-panel.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b1922538b26f9929bcd43df8728bf33afe06fbef Mon Sep 17 00:00:00 2001 -From: Nick Schermer <nick@xfce.org> -Date: Thu, 27 Jan 2011 22:29:16 +0100 -Subject: [PATCH] Fix problems with plugin and 4.8 panel. - ---- - configure.ac | 2 +- - src/smartbookmark.desktop.in.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1ba88d4..cb344f5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,7 @@ XDT_I18N([ca cs en_GB eu fr hu it pl pt_PT sq zh_TW]) - dnl Check for required packages - XDT_CHECK_LIBX11_REQUIRE() - XDT_CHECK_PACKAGE([GDK], [gdk-2.0], [2.0]) --XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfce4panel-1.0], [4.2]) -+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2]) - XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) - - XDT_FEATURE_DEBUG() -diff --git a/src/smartbookmark.desktop.in.in b/src/smartbookmark.desktop.in.in -index 83464ff..7bafece 100644 ---- a/src/smartbookmark.desktop.in.in -+++ b/src/smartbookmark.desktop.in.in -@@ -4,5 +4,5 @@ Encoding=UTF-8 - _Name=SmartBookmark - _Comment=Query websites from the Xfce panel - Icon=gtk-preferences --X-XFCE-Module=@INTERNAL_PLUGIN_PATH@/libsmartbookmark.so -+X-XFCE-Module=smartbookmark - X-XFCE-Unique=false --- -1.7.3.5 - diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD index ec817b2d2..1025303ce 100644 --- a/extra/xfce4-smartbookmark-plugin/PKGBUILD +++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD @@ -1,31 +1,26 @@ -# $Id: PKGBUILD 108103 2011-01-29 13:18:03Z andyrtr $ +# $Id: PKGBUILD 141671 2011-11-02 05:08:45Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-smartbookmark-plugin -pkgver=0.4.2 -pkgrel=9 -pkgdesc="plugin for the Xfce4 panel that let you quicksearch from selected websites" +pkgver=0.4.4 +pkgrel=1 +pkgdesc="Plugin for the Xfce4 panel that let you quicksearch from selected websites" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin" groups=('xfce4-goodies') depends=('xfce4-panel' 'libxfcegui4') -makedepends=('intltool' 'libxt' 'xfce4-dev-tools') +makedepends=('intltool' 'libxt') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.gz - xfce4-smartbookmark-plugin-archlinux.patch - 0001-Fix-problems-with-plugin-and-4.8-panel.patch) -md5sums=('284e26595637dd2e900b75534372496b' - '323ac898cfcfdb078f67f9ecd1905aec' - '6dc220fc41cd21678aad62c80a4c622f') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2 + xfce4-smartbookmark-plugin-archlinux.patch) +md5sums=('273e38306a82f14e1b8c2c5db912f6c3' + '323ac898cfcfdb078f67f9ecd1905aec') build() { - cd ${srcdir}/${pkgname}-${pkgver} - # fix panel4.8 http://bugzilla.xfce.org/show_bug.cgi - patch -Np1 -i ${srcdir}/0001-Fix-problems-with-plugin-and-4.8-panel.patch - patch -Np0 -i ${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch - xdt-autogen + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/xfce4-smartbookmark-plugin-archlinux.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -36,6 +31,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD index ecba2a317..5df951858 100644 --- a/extra/xfce4-weather-plugin/PKGBUILD +++ b/extra/xfce4-weather-plugin/PKGBUILD @@ -1,34 +1,44 @@ -# $Id: PKGBUILD 108785 2011-02-03 12:45:05Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 142430 2011-11-09 18:10:30Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Suzy Williams <suzanne.williams3@verizon.net> pkgname=xfce4-weather-plugin pkgver=0.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="A weather plugin for the Xfce4 panel" -arch=(i686 x86_64 'mips64el') -license=('GPL2') +arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel>=4.8.0' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme') +depends=('xfce4-panel' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -md5sums=('03c972d13eba5cd226432ff66e3ff282') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) +sha256sums=('3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + + # Switch to a working license key + # https://bugs.archlinux.org/task/26815 + sed -i \ + -e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \ + -e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \ + panel-plugin/weather.h + ./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-weather-plugin/xfce4-weather-plugin.install b/extra/xfce4-weather-plugin/xfce4-weather-plugin.install index b0b7f29d1..e4f8fd06c 100644 --- a/extra/xfce4-weather-plugin/xfce4-weather-plugin.install +++ b/extra/xfce4-weather-plugin/xfce4-weather-plugin.install @@ -1,13 +1,13 @@ -#!/bin/sh - post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } 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-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD index df9b426b5..2a516c7fc 100644 --- a/extra/xfce4-xkb-plugin/PKGBUILD +++ b/extra/xfce4-xkb-plugin/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 126312 2011-06-04 15:24:03Z andyrtr $ +# $Id: PKGBUILD 141039 2011-10-22 08:26:43Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-xkb-plugin -pkgver=0.5.4.1 +pkgver=0.5.4.2 pkgrel=1 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin" groups=('xfce4-goodies') @@ -14,7 +14,7 @@ depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg') makedepends=('intltool') options=('!libtool') source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('8512c0b180004e1150d8c05255c202d8') +md5sums=('b79f7c65f8155cb77d99dcf9716bb38b') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 4662ab34f..9eab2ca68 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 137999 2011-09-13 21:30:22Z eric $ +# $Id: PKGBUILD 142780 2011-11-15 05:34:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib -pkgver=1.1.19 -pkgrel=5 +pkgver=1.1.20 +pkgrel=1 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" license=('LGPL' 'GPL') -depends=('libgl' 'libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') +depends=('libxvmc' 'flac' 'ffmpeg' 'libxinerama' 'libmodplug') makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'smbclient' 'mesa' 'v4l-utils' 'vcdimager' 'jack' 'gdk-pixbuf2' 'libpulse' 'speex' 'aalib') optdepends=('imagemagick: for using the imagemagick plugin' \ @@ -25,28 +25,15 @@ optdepends=('imagemagick: for using the imagemagick plugin' \ 'libmng: for using the mng plugin' \ 'aalib: for using the aalib plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.bz2 - xine-lib-1.1.1-configure-no-mcpu-march.patch xine-lib-1.1.19-xvmc.patch) -md5sums=('a410a0f0617e1d6309f0cbe907f73f8a' - '9776df4eb54d2f1f68d8268adbc3b5c2' - '8662fb124870b1dd7effe4ff5e2a2e3d') -sha1sums=('5afcc28c5cf2bdaab99d951960f6587797e1e5a0' - '121a8358d7919b2e51067412373f52848290338a' - '920bf27e6e3523dfe4cc9c802ff713e9688a3f34') +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz) +sha1sums=('1dbd48e14113739101429391d45f65ebbf6519fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p0 < ../xine-lib-1.1.1-configure-no-mcpu-march.patch - patch -p0 < ../xine-lib-1.1.19-xvmc.patch sed -i 's|linux/videodev.h|libv4l1-videodev.h|' \ - configure.ac src/input/input_v4l.c src/video_out/video_out_syncfb.h - - libtoolize --force --copy - aclocal -I m4 - autoconf - automake --add-missing - - ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad + configure src/input/input_v4l.c src/video_out/video_out_syncfb.h + ./configure --prefix=/usr --with-wavpack --with-external-ffmpeg --with-external-libfaad \ + --disable-optimizations make } diff --git a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch b/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch deleted file mode 100644 index 4b6ba9e35..000000000 --- a/extra/xine-lib/xine-lib-1.1.1-configure-no-mcpu-march.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 -+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 -@@ -161,10 +161,6 @@ - ;; - - esac -- if test x"$archopt_val" != x; then -- CFLAGS="$sarchopt=$archopt_val $CFLAGS" -- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" -- fi - fi - else - dnl we have the Intel compiler diff --git a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch b/extra/xine-lib/xine-lib-1.1.19-xvmc.patch deleted file mode 100644 index bef8b0bac..000000000 --- a/extra/xine-lib/xine-lib-1.1.19-xvmc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Quoting ChangeLog of X11's videoproto package: -vldXvMC.h: stop uselessly including XvMClib.h - ---- src/video_out/xxmc.h -+++ src/video_out/xxmc.h -@@ -77,10 +77,10 @@ - #include <X11/extensions/XShm.h> - #include <X11/extensions/Xv.h> - #include <X11/extensions/Xvlib.h> -+#include <X11/extensions/XvMClib.h> - #ifdef HAVE_VLDXVMC - #include <X11/extensions/vldXvMC.h> - #else -- #include <X11/extensions/XvMClib.h> - #include <X11/extensions/XvMC.h> - #endif - diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 29fa8a40d..5be04a4a5 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 140277 2011-10-11 21:28:03Z jgc $ +# $Id: PKGBUILD 142918 2011-11-18 09:17:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'udev' 'libgcrypt') +[ "$CARCH" = "mips64el" ] || makedepends+=('xf86driproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-nvidia.patch autoconfig-sis.patch revert-trapezoids.patch git-fixes.patch + xserver-1.11.2-record-crasher.patch + Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd' - '0249b892f27243d8fe6fe6d226bf4c2391cedf49' - '962fecc159c128728f14e8ba231c5b00391ff4ac' - 'd9f7d9553e772c2682c15079019d30c658a4f83b' - 'd73125bf93aea09b0beb55e75c510b9f72f5d21a' - 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' - '6838fc00ef4618c924a77e0fb03c05346080908a' - '993798f3d22ad672d769dae5f48d1fa068d5578f') +md5sums=('8796fff441e5435ee36a72579008af24' + '6c7e87d63ac4b535e19a80c89d0cf091' + 'f8194638ca4872c2b0a67862a70bcebf' + 'f6c84f4936f8e00abdfbd9fb4eda83fb' + '6fb42ec979ecd6125b6599f54dc00d14' + '3f9de4dbfee2da90167192d8ca9eb2b4' + '47f9b979fe38043b42ff86eeee6fd0d0' + '52fd3effd80d7bc6c1660d4ecf23d31c' + '376c70308715cd2643f7bff936d9934b' + 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -42,7 +47,43 @@ build() { # Add post-release patches from 1.11 branch patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf + # From Fedora. + # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ + patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" + + # From Fedora. + # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 + patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" + + autoreconf -fi + if [ "$CARCH" = "mips64el" ]; then + ./configure --prefix=/usr \ + --enable-ipv6 \ + --disable-dri \ + --disable-dri2 \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-composite \ + --enable-xcsecurity \ + --enable-xorg \ + --enable-xephyr \ + --disable-glx \ + --disable-glx-tls \ + --enable-kdrive \ + --enable-install-setuid \ + --enable-config-udev \ + --disable-config-dbus \ + --enable-record \ + --disable-xfbdev \ + --disable-xfake \ + --disable-static \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-fontrootdir=/usr/share/fonts + else ./configure --prefix=/usr \ --enable-ipv6 \ --enable-dri \ @@ -67,6 +108,7 @@ build() { --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --with-fontrootdir=/usr/share/fonts + fi make # Disable subdirs for make install rule to make splitting easier @@ -110,9 +152,11 @@ package_xorg-server() { rmdir "${pkgdir}/usr/share/X11" + if [ "$CARCH" != "mips64el" ]; then # Needed for non-mesa drivers, libgl will restore it mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" + fi rm -rf "${pkgdir}/var" @@ -176,7 +220,8 @@ package_xorg-server-xdmx() { package_xorg-server-devel() { pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto xineramaproto xorg-util-macros pixman libpciaccess) +[ "$CARCH" = "mips64el" ] || depends+=('dri2proto') cd "${srcdir}/${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch new file mode 100644 index 000000000..8bddb2945 --- /dev/null +++ b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch @@ -0,0 +1,31 @@ +From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 27 Oct 2011 11:03:39 +1000 +Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake + devices + +They don't have a KeyClassRec, but we must still allow passive grabs on +them. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Tested-by: Bastien Nocera <hadess@hadess.net> +--- + Xi/exevents.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index 053c76f..edf2c39 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, + rc = CheckGrabValues(client, param); + if (rc != Success) + return rc; +- if (k == NULL) ++ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL) + return BadMatch; + if (grabtype == GRABTYPE_XI) + { +-- +1.7.7 + diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch index 3c59c27c9..27da61eca 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/git-fixes.patch @@ -1,288 +1,161 @@ -From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001 -From: Jamey Sharp <jamey@minilop.net> -Date: Wed, 15 Sep 2010 01:35:21 +0000 -Subject: Fix pixmap double-frees on error paths. +From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Thu, 20 Oct 2011 13:43:01 +0000 +Subject: xf86Crtc: handle no outputs with no modes harder. -If AddResource fails, it will automatically free the object that was -passed to it by calling the appropriate deleteFunc; and of course -FreeResource also calls the deleteFunc. In both cases it's wrong to call -the destroy hook manually. +If you started an X server with no connected outputs, we pick a default +1024x768 mode, however if you then ran an xvidmode using app against that +server it would segfault the server due to not finding any valid modes. -Commit by Jamey Sharp and Josh Triplett. +This was due to the no output mode set code, only adding the modes to the +scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would +get called and remove all the modes and we'd end up with 0. -Signed-off-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Josh Triplett <josh@joshtriplett.org> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Aaron Plattner <aplattner@nvidia.com> -(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467) +This change fixes xf86SetScrnInfoModes to always report a scrn mode of at +least 1024x768, and pushes the initial configuration to just call it instead +of setting up the mode itself. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 + +I've seen other bugs like this on other distros so it might also actually fix them. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Keith Packard <keithp@keithp.com> +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) --- -diff --git a/Xext/shm.c b/Xext/shm.c -index b08af82..4141a8f 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -991,7 +991,6 @@ CreatePmap: - pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pMap->drawable.id = newPix->info[j].id; - if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) { -- (*pScreen->DestroyPixmap)(pMap); - result = BadAlloc; +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index d75cd77..8906806 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) break; - } -@@ -1002,10 +1001,8 @@ CreatePmap: } - if(result == BadAlloc) { -- while(j--) { -- (*pScreen->DestroyPixmap)(pMap); -+ while(j--) - FreeResource(newPix->info[j].id, RT_NONE); +- if (scrn->modes != NULL) { +- /* For some reason, scrn->modes is circular, unlike the other mode +- * lists. How great is that? +- */ +- for (last = scrn->modes; last && last->next; last = last->next) +- ; +- last->next = scrn->modes; +- scrn->modes->prev = last; +- if (mode) { +- while (scrn->modes != mode) +- scrn->modes = scrn->modes->next; - } - free(newPix); - } else - AddResource(stuff->pid, XRT_PIXMAP, newPix); -@@ -1110,7 +1107,6 @@ CreatePmap: - { - return Success; - } -- pDraw->pScreen->DestroyPixmap(pMap); ++ if (!scrn->modes) { ++ scrn->modes = xf86ModesAdd(scrn->modes, ++ xf86CVTMode(scrn->display->virtualX, ++ scrn->display->virtualY, ++ 60, 0, 0)); ++ } ++ ++ /* For some reason, scrn->modes is circular, unlike the other mode ++ * lists. How great is that? ++ */ ++ for (last = scrn->modes; last && last->next; last = last->next) ++ ; ++ last->next = scrn->modes; ++ scrn->modes->prev = last; ++ if (mode) { ++ while (scrn->modes != mode) ++ scrn->modes = scrn->modes->next; } - return BadAlloc; - } -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 192c8c3..f8200b1 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -1419,7 +1419,6 @@ CreatePmap: - } - if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) - return Success; -- (*pDraw->pScreen->DestroyPixmap)(pMap); ++ + scrn->currentMode = scrn->modes; + #ifdef XFreeXDGA + if (scrn->pScreen) +@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + width, height); } - return BadAlloc; - } --- -cgit v0.9.0.2-2-gbebe -From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho <carlosg@gnome.org> -Date: Tue, 30 Aug 2011 22:46:52 +0000 -Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices - -The corresponding DeviceIntPtr wasn't being gotten properly, -resulting in BadDevice from dixLookupDevice(). - -Signed-off-by: Carlos Garnacho <carlosg@gnome.org> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8) ---- -diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c -index ae43433..5cdd8ac 100644 ---- a/Xi/xipassivegrab.c -+++ b/Xi/xipassivegrab.c -@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client) - REQUEST(xXIPassiveUngrabDeviceReq); - REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq); -- rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); -- if (rc != Success) -- return rc; -+ if (stuff->deviceid == XIAllDevices) -+ dev = inputInfo.all_devices; -+ else if (stuff->deviceid == XIAllMasterDevices) -+ dev = inputInfo.all_master_devices; -+ else -+ { -+ rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); -+ if (rc != Success) -+ return rc; -+ } +- if (have_outputs) { +- /* Mirror output modes to scrn mode list */ +- xf86SetScrnInfoModes (scrn); +- } else { +- /* Clear any existing modes from scrn->modes */ +- while (scrn->modes != NULL) +- xf86DeleteMode(&scrn->modes, scrn->modes); +- scrn->modes = xf86ModesAdd(scrn->modes, +- xf86CVTMode(width, height, 60, 0, 0)); +- } ++ xf86SetScrnInfoModes (scrn); - if (stuff->grab_type != XIGrabtypeButton && - stuff->grab_type != XIGrabtypeKeycode && + success = TRUE; + bailout: -- cgit v0.9.0.2-2-gbebe -From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001 -From: Sam Spilsbury <sam.spilsbury@canonical.com> -Date: Wed, 14 Sep 2011 01:58:34 +0000 -Subject: Remove the SendEvent bit (0x80) before doing range checks on event type. +From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 +From: Christopher Yeleighton <giecrilj@stegny.2a.pl> +Date: Tue, 25 Oct 2011 01:47:06 +0000 +Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 -Some extension libraries may set this bit before converting the event to -wire protocol and as such range checking the event will cause an invalid -BadValue error to result. As the documentation suggests the the bit -should be "forced on", remove it before doing range checks and continue -to force it on in the server. +https://bugs.freedesktop.org/show_bug.cgi?id=38420 -Reviewed-by: Jamey Sharp <jamey@minilop.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39) ---- -diff --git a/dix/events.c b/dix/events.c -index 8a4c6b9..9e58edb 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5224,6 +5224,8 @@ CloseDownEvents(void) - InputEventList = NULL; - } - -+#define SEND_EVENT_BIT 0x80 -+ - /** - * Server-side protocol handling for SendEvent request. - * -@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client) - - REQUEST_SIZE_MATCH(xSendEventReq); - -+ /* libXext and other extension libraries may set the bit indicating -+ * that this event came from a SendEvent request so remove it -+ * since otherwise the event type may fail the range checks -+ * and cause an invalid BadValue error to be returned. -+ * -+ * This is safe to do since we later add the SendEvent bit (0x80) -+ * back in once we send the event to the client */ -+ -+ stuff->event.u.u.type &= ~(SEND_EVENT_BIT); -+ - /* The client's event type must be a core event type or one defined by an - extension. */ - -@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->propagate; - return BadValue; - } -- stuff->event.u.u.type |= 0x80; -+ stuff->event.u.u.type |= SEND_EVENT_BIT; - if (stuff->propagate) - { - for (;pWin; pWin = pWin->parent) --- -cgit v0.9.0.2-2-gbebe -From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001 -From: Alan Hourihane <alanh@vmware.com> -Date: Wed, 05 Oct 2011 02:42:46 +0000 -Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized. +Exit with fatal error message, not segfault. -Signed-off-by: Alan Hourihane <alanh@vmware.com> +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e) +Signed-off-by: Keith Packard <keithp@keithp.com> +(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) --- -diff --git a/dix/dixfonts.c b/dix/dixfonts.c -index fbac124..d2bcb84 100644 ---- a/dix/dixfonts.c -+++ b/dix/dixfonts.c -@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c) - goto bail; - } - *new_closure = *c; -- c = new_closure; - -- len = c->endReq - c->pElt; -- c->data = malloc(len); -- if (!c->data) -+ len = new_closure->endReq - new_closure->pElt; -+ new_closure->data = malloc(len); -+ if (!new_closure->data) - { -- free(c); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -- memmove(c->data, c->pElt, len); -- c->pElt = c->data; -- c->endReq = c->pElt + len; -+ memmove(new_closure->data, new_closure->pElt, len); -+ new_closure->pElt = new_closure->data; -+ new_closure->endReq = new_closure->pElt + len; - - /* Step 2 */ - -- pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen); -+ pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen); - if (!pGC) - { -- free(c->data); -- free(c); -+ free(new_closure->data); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -- if ((err = CopyGC(c->pGC, pGC, GCFunction | -+ if ((err = CopyGC(new_closure->pGC, pGC, GCFunction | - GCPlaneMask | GCForeground | - GCBackground | GCFillStyle | - GCTile | GCStipple | -@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c) - Success) - { - FreeScratchGC(pGC); -- free(c->data); -- free(c); -+ free(new_closure->data); -+ free(new_closure); - err = BadAlloc; - goto bail; - } -+ c = new_closure; - origGC = c->pGC; - c->pGC = pGC; - ValidateGC(c->pDraw, c->pGC); -- -+ - ClientSleep(client, (ClientSleepProcPtr)doPolyText, c); +diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c +index 31ed505..dce3f84 100644 +--- a/hw/vfb/InitOutput.c ++++ b/hw/vfb/InitOutput.c +@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) + (1 << DirectColor)), + 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); + break; ++ default: ++ return FALSE; + } - /* Set up to perform steps 3 and 4 */ + miSetPixmapDepths (); -- cgit v0.9.0.2-2-gbebe -From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001 -From: Kirill Elagin <kirelagin@gmail.com> -Date: Tue, 04 Oct 2011 19:02:20 +0000 -Subject: Fix server crash due to invalid images +From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 24 Oct 2011 02:00:32 +0000 +Subject: dix: block signals when closing all devices -See https://bugs.freedesktop.org/show_bug.cgi?id=39383 +When closing down all devices, we manually unset master for all attached +devices, but the device's sprite info still points to the master's sprite +info. This leaves us a window where the master is freed already but the +device isn't yet. A signal during that window causes dereference of the +already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. -Signed-off-by: Kirill Elagin <kirelagin@gmail.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78) ---- -diff --git a/fb/fbpict.c b/fb/fbpict.c -index d1fd0cb..57c93fd 100644 ---- a/fb/fbpict.c -+++ b/fb/fbpict.c -@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict, - (pixman_format_code_t)pict->format, - pixmap->drawable.width, pixmap->drawable.height, - (uint32_t *)bits, stride * sizeof (FbStride)); -- -+ -+ if (!image) -+ return NULL; - - #ifdef FB_ACCESS_WRAPPER - #if FB_SHIFT==5 --- -cgit v0.9.0.2-2-gbebe -From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001 -From: vdb@picaros.org <vdb@picaros.org> -Date: Sat, 17 Sep 2011 16:55:47 +0000 -Subject: Fix a rare memory leak +Simply block signals when removing all devices. It's not like we're really +worrying about high-responsive input at this stage. -Signed-off-by: Servaas Vandenberghe <vdb@picaros.org> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd) +https://bugzilla.redhat.com/show_bug.cgi?id=737031 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Julien Cristau <jcristau@debian.org> +(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) --- -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index c2814d4..3fae039 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn, - crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr)); - if (!crtcs) - { -+ free(crtc->gamma_red); - free(crtc); - return NULL; - } +diff --git a/dix/devices.c b/dix/devices.c +index 0ccf252..cbdd4ea 100644 +--- a/dix/devices.c ++++ b/dix/devices.c +@@ -982,6 +982,8 @@ CloseDownDevices(void) + { + DeviceIntPtr dev; + ++ OsBlockSignals(); ++ + /* Float all SDs before closing them. Note that at this point resources + * (e.g. cursors) have been freed already, so we can't just call + * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master +@@ -1004,6 +1006,8 @@ CloseDownDevices(void) + inputInfo.keyboard = NULL; + inputInfo.pointer = NULL; + XkbDeleteRulesDflts(); ++ ++ OsReleaseSignals(); + } + + /** -- cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/xserver-1.11.2-record-crasher.patch b/extra/xorg-server/xserver-1.11.2-record-crasher.patch new file mode 100644 index 000000000..3af207bb9 --- /dev/null +++ b/extra/xorg-server/xserver-1.11.2-record-crasher.patch @@ -0,0 +1,241 @@ +From patchwork Tue Nov 8 18:22:13 2011 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: Save major/minor opcodes in ClientRec for RecordAReply +Date: Tue, 08 Nov 2011 18:22:13 -0000 +From: Keith Packard <keithp@keithp.com> +X-Patchwork-Id: 7866 +Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> +To: xorg-devel@lists.freedesktop.org + +The record extension needs the major and minor opcodes in the reply +hook, but the request buffer may have been freed by the time the hook +is invoked. Saving the request major and minor codes as the request is +executed avoids fetching from the defunct request buffer. + +This patch also eliminates the public MinorOpcodeOfRequest function, +making it static to dispatch. Usages of that function have been +replaced with direct access to the new ClientRec field. + +Signed-off-by: Keith Packard <keithp@keithp.com> +Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi> + +--- +Here's what I was thinking of to fix this -- just record the major and +minor opcodes of the request in the ClientRec during Dispatch and then +using those fields in RecordAReply instead of fetching the discarded +request buffer. + +This is entirely untested; I don't know how to make the old code break. + + Xext/security.c | 4 +--- + Xext/xselinux_hooks.c | 4 ++-- + dix/dispatch.c | 31 ++++++++++++++++++++++--------- + dix/extension.c | 14 -------------- + include/dixstruct.h | 1 + + include/extension.h | 2 -- + record/record.c | 8 +++----- + 7 files changed, 29 insertions(+), 35 deletions(-) + +[ fedora: technically this is an ABI breaker since it's changing ClientRec, + but hopefully not in a way that matters. If it does matter, easiest thing + to do is have Record add a hook for XaceHookDispatch. - ajax ] + +diff --git a/Xext/security.c b/Xext/security.c +index 08d8158..b0d82ab 100644 +--- a/Xext/security.c ++++ b/Xext/security.c +@@ -148,9 +148,7 @@ SecurityLabelInitial(void) + static _X_INLINE const char * + SecurityLookupRequestName(ClientPtr client) + { +- int major = ((xReq *)client->requestBuffer)->reqType; +- int minor = MinorOpcodeOfRequest(client); +- return LookupRequestName(major, minor); ++ return LookupRequestName(client->majorOp, client->minorOp); + } + + +diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c +index f1d8e5d..0d4c9ab 100644 +--- a/Xext/xselinux_hooks.c ++++ b/Xext/xselinux_hooks.c +@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, + if (client) { + REQUEST(xReq); + if (stuff) { +- major = stuff->reqType; +- minor = MinorOpcodeOfRequest(client); ++ major = client->majorOp; ++ minor = client->minorOp; + } + } + if (audit->id) +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 6e33615..3600acd 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) + SmartScheduleLatencyLimited = 0; + } + +-#define MAJOROP ((xReq *)client->requestBuffer)->reqType ++static inline unsigned short ++MinorOpcodeOfRequest(ClientPtr client) ++{ ++ unsigned char major; ++ ExtensionEntry *ext; ++ ++ major = ((xReq *)client->requestBuffer)->reqType; ++ if (major < EXTENSION_BASE) ++ return 0; ++ ext = GetExtensionEntry(major); ++ if (!ext) ++ return 0; ++ return ext->MinorOpcode (client); ++} + + void + Dispatch(void) +@@ -419,21 +432,23 @@ Dispatch(void) + } + + client->sequence++; ++ client->majorOp = ((xReq *)client->requestBuffer)->reqType; ++ client->minorOp = MinorOpcodeOfRequest(client); + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, + ((xReq *)client->requestBuffer)->length, + client->index, client->requestBuffer); + #endif + if (result > (maxBigRequestSize << 2)) + result = BadLength; + else { +- result = XaceHookDispatch(client, MAJOROP); ++ result = XaceHookDispatch(client, client->majorOp); + if (result == Success) +- result = (* client->requestVector[MAJOROP])(client); ++ result = (* client->requestVector[client->majorOp])(client); + XaceHookAuditEnd(client, result); + } + #ifdef XSERVER_DTRACE +- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, ++ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, + client->sequence, client->index, result); + #endif + +@@ -444,8 +459,8 @@ Dispatch(void) + } + else if (result != Success) + { +- SendErrorToClient(client, MAJOROP, +- MinorOpcodeOfRequest(client), ++ SendErrorToClient(client, client->majorOp, ++ client->minorOp, + client->errorValue, result); + break; + } +@@ -466,8 +481,6 @@ Dispatch(void) + SmartScheduleLatencyLimited = 0; + } + +-#undef MAJOROP +- + static int VendorRelease = VENDOR_RELEASE; + static char *VendorString = VENDOR_NAME; + +diff --git a/dix/extension.c b/dix/extension.c +index c7bbac5..b677cdb 100644 +--- a/dix/extension.c ++++ b/dix/extension.c +@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) + return ((xReq *)client->requestBuffer)->data; + } + +-unsigned short +-MinorOpcodeOfRequest(ClientPtr client) +-{ +- unsigned char major; +- +- major = ((xReq *)client->requestBuffer)->reqType; +- if (major < EXTENSION_BASE) +- return 0; +- major -= EXTENSION_BASE; +- if (major >= NumExtensions) +- return 0; +- return (*extensions[major]->MinorOpcode)(client); +-} +- + void + CloseDownExtensions(void) + { +diff --git a/include/dixstruct.h b/include/dixstruct.h +index 6cc9614..0a85f40 100644 +--- a/include/dixstruct.h ++++ b/include/dixstruct.h +@@ -122,6 +122,7 @@ typedef struct _Client { + + DeviceIntPtr clientPtr; + ClientIdPtr clientIds; ++ unsigned short majorOp, minorOp; + } ClientRec; + + /* +diff --git a/include/extension.h b/include/extension.h +index 29a11c3..9249951 100644 +--- a/include/extension.h ++++ b/include/extension.h +@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN + + extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); + +-extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); +- + extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); + + extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); +diff --git a/record/record.c b/record/record.c +index 68311ac..4a0fe23 100644 +--- a/record/record.c ++++ b/record/record.c +@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; + +@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + RecordContextPtr pContext; + RecordClientsAndProtocolPtr pRCAP; + int eci; +- int majorop; + ReplyInfoRec *pri = (ReplyInfoRec *)calldata; + ClientPtr client = pri->client; +- REQUEST(xReq); + +- majorop = stuff->reqType; + for (eci = 0; eci < numEnabledContexts; eci++) + { + pContext = ppAllContexts[eci]; +@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + NULL); + if (pRCAP) + { ++ int majorop = client->majorOp; + if (pContext->continuedReply) + { + RecordAProtocolElement(pContext, client, XRecordFromServer, +@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) + } + else /* extension, check minor opcode */ + { +- int minorop = MinorOpcodeOfRequest(client); ++ int minorop = client->minorOp; + int numMinOpInfo; + RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; + assert (pMinorOpInfo); diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD index 9b1f56573..e7b850a1d 100644 --- a/extra/xorg-sessreg/PKGBUILD +++ b/extra/xorg-sessreg/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113683 2011-03-10 14:43:23Z jgc $ +# $Id: PKGBUILD 141120 2011-10-24 12:17:34Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-sessreg -pkgver=1.0.6 -pkgrel=2 +pkgver=1.0.7 +pkgrel=1 pkgdesc="Register X sessions in system utmp/utmpx databases" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=('xorg-util-macros' 'xproto') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/sessreg-${pkgver}.tar.bz2) -sha1sums=('6f260f1ddc366da070a6d60301b9fb64a99c119a') +sha256sums=('8734ee580264ab92e984d8f84611dada89906d6b548334a5e7d4b0ddba7c2e52') build() { cd "${srcdir}/sessreg-${pkgver}" diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD index 084e22b54..48c4b5ae9 100644 --- a/extra/xorg-xdpyinfo/PKGBUILD +++ b/extra/xorg-xdpyinfo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113736 2011-03-10 15:06:24Z jgc $ +# $Id: PKGBUILD 141118 2011-10-24 12:15:25Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdpyinfo -pkgver=1.2.0 -pkgrel=2 +pkgver=1.3.0 +pkgrel=1 pkgdesc="Display information utility for X" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11' 'libxext' 'libxtst' 'libxxf86vm' 'libxxf86dga' 'libxrender' 'l makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xdpyinfo-${pkgver}.tar.bz2) -sha1sums=('5d53cd31afd40bdc4575b5347f2cda67f135f5f2') +sha256sums=('23ee4944a32b5701b4379cb420729eb7a4dde54de2b5b006d4747855efd6d73f') build() { cd "${srcdir}/xdpyinfo-${pkgver}" diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index b39be4f56..53196d886 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,51 +1,51 @@ -# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $ +# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=7.0 -_ffoxver=7.0 -pkgrel=1 -pkgver=2.0 -pkgrel=2 # hold ver +pkgver=8.0 +_ffoxver=8.0 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify') -makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') +depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz mozconfig mips.patch mozilla-pkgconfig.patch) -options=('!emptydirs' '!buildflags') +options=('!emptydirs') replaces=('xulrunner-oss') +md5sums=('9395a5be13da119bd8d53c3225e5d17c' + '8dfb78c5bd0581c8cf4753813132bf0b' + '639ea80e823543dd415b90c0ee804186') build() { - cd "${srcdir}/icecat-${_ffoxver}/" - cp "${srcdir}/mozconfig" .mozconfig - - #fix libdir/sdkdir - fedora + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig [[ "$CARCH" == "mips64el" ]] && { echo "ac_add_options --disable-ipc" >> .mozconfig patch -Np0 -i "${srcdir}/mips.patch" } - patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch" - export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed" + #fix libdir/sdkdir - fedora + patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } package() { - cd "${srcdir}/icecat-${_ffoxver}/" - make -j1 -f client.mk DESTDIR="${pkgdir}" install + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install # add xulrunner library path to ld.so.conf - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf - #wtf mozilla! chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" - sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" } diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig index 96e8a6bd9..82a6ae512 100644 --- a/extra/xulrunner/mozconfig +++ b/extra/xulrunner/mozconfig @@ -2,6 +2,8 @@ ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib + +# System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg @@ -9,47 +11,28 @@ ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-png ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman ac_add_options --with-pthreads -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Features ac_add_options --enable-safe-browsing -ac_add_options --enable-extensions=default ac_add_options --enable-startup-notification -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-smil -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-shared-js -ac_add_options --enable-url-classifier - -ac_add_options --enable-optimize -ac_add_options --enable-strip -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-xterm-updates -ac_add_options --enable-printing -ac_add_options --enable-xinerama +ac_add_options --enable-gio -ac_add_options --disable-javaxpcom +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests -ac_add_options --disable-xprint ac_add_options --disable-mochitest -ac_add_options --disable-debug ac_add_options --disable-installer -ac_add_options --disable-pedantic -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-libnotify +# Optimization +ac_add_options --enable-optimize -export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD index 16ec9e273..88c6e535b 100644 --- a/extra/yasm/PKGBUILD +++ b/extra/yasm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 98381 2010-11-08 19:21:18Z andrea $ -# Maintainer: +# $Id: PKGBUILD 142979 2011-11-19 15:19:43Z roman $ +# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=yasm -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=1 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.tortall.net/projects/yasm/" depends=('glibc') source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('8392e5f2235c2c2a981e1a633f2698cb') +md5sums=('4cfc0686cf5350dd1305c4d905eb55a6') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 7fa89decf..bcc94143e 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 139457 2011-10-01 19:02:12Z ibiru $ +# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64' 'mips64el') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' - 'xz' 'bzip2' 'desktop-file-utils' 'dconf') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc') groups=('gnome') license=('GPL') @@ -15,7 +14,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6c33bb608614cc81b1c6d9009621a0618beb39e75bf14da0f091871edcd03172') +sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index 364b40255..505c92c23 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -4,7 +4,7 @@ pkgname=zile pkgver=2.4.2 -pkgrel=1 +pkgrel=1.1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/zile/" diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD new file mode 100644 index 000000000..e60a143e9 --- /dev/null +++ b/kde-unstable/kactivities/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143306 2011-11-24 16:13:52Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=kactivities +pkgver=4.7.80 +pkgrel=2 +arch=('i686' 'x86_64') +pkgdesc='API for using and interacting with Activities' +url='http://kde.org/' +license=('GPL' 'FDL') +depends=('kdelibs') +makedepends=('cmake' 'automoc4') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'fix-activities.patch') +sha1sums=('c619c5d6e3e2ef79d0cebf52bf18d1b467dc24f9' + '6eb890958726856cf4ddb172acd46ba08f7a5088') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fix-activities.patch + + 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/kde-unstable/kactivities/fix-activities.patch b/kde-unstable/kactivities/fix-activities.patch new file mode 100644 index 000000000..5cf62c48c --- /dev/null +++ b/kde-unstable/kactivities/fix-activities.patch @@ -0,0 +1,156 @@ +--- kactivities-4.7.80/service/ActivityManager.cpp~ 2011-11-24 16:05:52.777981854 +0000 ++++ kactivities-4.7.80/service/ActivityManager.cpp 2011-11-24 16:06:32.721637122 +0000 +@@ -75,14 +75,14 @@ + QHash < WId, SharedInfo::WindowData > & _windows, + QHash < KUrl, SharedInfo::ResourceData > & _resources + ) +- : haveSessions(false), +- config("activitymanagerrc"), +- windows(_windows), +- resources(_resources), ++ : config("activitymanagerrc"), ++ windows(_windows), ++ resources(_resources), + #ifdef HAVE_NEPOMUK +- m_nepomukInitCalled(false), ++ m_nepomukInitCalled(false), + #endif +- q(parent) ++ q(parent), ++ ksmserverInterface(0) + { + // Initializing config + connect(&configSyncTimer, SIGNAL(timeout()), +@@ -116,20 +116,26 @@ + this, SLOT(activeWindowChanged(WId))); + + //listen to ksmserver for starting/stopping ++ QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.ksmserver", ++ QDBusConnection::sessionBus(), ++ QDBusServiceWatcher::WatchForRegistration); ++ connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(sessionServiceRegistered())); ++ sessionServiceRegistered(); ++} ++ ++void ActivityManagerPrivate::sessionServiceRegistered() ++{ ++ delete ksmserverInterface; + ksmserverInterface = new QDBusInterface("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface"); + if (ksmserverInterface->isValid()) { + ksmserverInterface->setParent(this); + connect(ksmserverInterface, SIGNAL(subSessionOpened()), this, SLOT(startCompleted())); + connect(ksmserverInterface, SIGNAL(subSessionClosed()), this, SLOT(stopCompleted())); + connect(ksmserverInterface, SIGNAL(subSessionCloseCanceled()), this, SLOT(stopCancelled())); //spelling fail :) +- haveSessions = true; + } else { +- kDebug() << "couldn't connect to ksmserver! session stuff won't work"; +- //note: in theory it's nice to try again later +- //but in practice, ksmserver is either there or it isn't (killing it logs you out) +- //so in this case there's no point. :) +- ksmserverInterface->deleteLater(); ++ delete ksmserverInterface; + ksmserverInterface = 0; ++ kDebug() << "couldn't connect to ksmserver! session stuff won't work"; + } + } + +@@ -519,26 +525,24 @@ + { + bool called = false; + // start the starting :) +- if (haveSessions) { +- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin"); +- if (kwin.isValid()) { +- QDBusMessage reply = kwin.call("startActivity", id); +- if (reply.type() == QDBusMessage::ErrorMessage) { +- kDebug() << "dbus error:" << reply.errorMessage(); ++ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin"); ++ if (kwin.isValid()) { ++ QDBusMessage reply = kwin.call("startActivity", id); ++ if (reply.type() == QDBusMessage::ErrorMessage) { ++ kDebug() << "dbus error:" << reply.errorMessage(); ++ } else { ++ QList<QVariant> ret = reply.arguments(); ++ if (ret.length() == 1 && ret.first().toBool()) { ++ called = true; + } else { +- QList<QVariant> ret = reply.arguments(); +- if (ret.length() == 1 && ret.first().toBool()) { +- called = true; +- } else { +- kDebug() << "call returned false; probably ksmserver is busy"; +- setActivityState(transitioningActivity, ActivityManager::Stopped); +- transitioningActivity.clear(); +- return; //assume we're mid-logout and just don't touch anything +- } ++ kDebug() << "call returned false; probably ksmserver is busy"; ++ setActivityState(transitioningActivity, ActivityManager::Stopped); ++ transitioningActivity.clear(); ++ return; //assume we're mid-logout and just don't touch anything + } +- } else { +- kDebug() << "couldn't get kwin interface"; + } ++ } else { ++ kDebug() << "couldn't get kwin interface"; + } + + if (!called) { +@@ -585,25 +589,23 @@ + { + bool called = false; + // start the stopping :) +- if (haveSessions) { +- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin"); +- if (kwin.isValid()) { +- QDBusMessage reply = kwin.call("stopActivity", id); +- if (reply.type() == QDBusMessage::ErrorMessage) { +- kDebug() << "dbus error:" << reply.errorMessage(); ++ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin"); ++ if (kwin.isValid()) { ++ QDBusMessage reply = kwin.call("stopActivity", id); ++ if (reply.type() == QDBusMessage::ErrorMessage) { ++ kDebug() << "dbus error:" << reply.errorMessage(); ++ } else { ++ QList<QVariant> ret = reply.arguments(); ++ if (ret.length() == 1 && ret.first().toBool()) { ++ called = true; + } else { +- QList<QVariant> ret = reply.arguments(); +- if (ret.length() == 1 && ret.first().toBool()) { +- called = true; +- } else { +- kDebug() << "call returned false; probably ksmserver is busy"; +- stopCancelled(); +- return; //assume we're mid-logout and just don't touch anything +- } ++ kDebug() << "call returned false; probably ksmserver is busy"; ++ stopCancelled(); ++ return; //assume we're mid-logout and just don't touch anything + } +- } else { +- kDebug() << "couldn't get kwin interface"; + } ++ } else { ++ kDebug() << "couldn't get kwin interface"; + } + + if (!called) { +--- kactivities-4.7.80/service/ActivityManager_p.h~ 2011-11-24 16:06:01.618054620 +0000 ++++ kactivities-4.7.80/service/ActivityManager_p.h 2011-11-24 16:06:32.721637122 +0000 +@@ -68,7 +68,6 @@ + + //opening/closing activity (ksmserver can only handle one at a time) + QString transitioningActivity; +- bool haveSessions; //whether ksmserver's available + + // Configuration + QTimer configSyncTimer; +@@ -106,6 +105,7 @@ + + void backstoreAvailable(); + void syncActivitiesWithNepomuk(); ++ void sessionServiceRegistered(); + + private: + ActivityManager * const q; diff --git a/kde-unstable/kdeaccessibility-jovie/PKGBUILD b/kde-unstable/kdeaccessibility-jovie/PKGBUILD new file mode 100644 index 000000000..c57d0deef --- /dev/null +++ b/kde-unstable/kdeaccessibility-jovie/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143326 2011-11-24 16:14:16Z 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/kde-unstable/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/kde-unstable/kdeaccessibility-jovie/kdeaccessibility-jovie.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD b/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD new file mode 100644 index 000000000..0e90b4e79 --- /dev/null +++ b/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143328 2011-11-24 16:14:18Z 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/kde-unstable/kdeaccessibility-kmag/PKGBUILD b/kde-unstable/kdeaccessibility-kmag/PKGBUILD new file mode 100644 index 000000000..084ce52af --- /dev/null +++ b/kde-unstable/kdeaccessibility-kmag/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143330 2011-11-24 16:14:20Z 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/kde-unstable/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/kde-unstable/kdeaccessibility-kmag/kdeaccessibility-kmag.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD b/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD new file mode 100644 index 000000000..f052a35a8 --- /dev/null +++ b/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143332 2011-11-24 16:14:23Z 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/kde-unstable/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/kde-unstable/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeaccessibility-kmouth/PKGBUILD b/kde-unstable/kdeaccessibility-kmouth/PKGBUILD new file mode 100644 index 000000000..72c7247b4 --- /dev/null +++ b/kde-unstable/kdeaccessibility-kmouth/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143334 2011-11-24 16:14:25Z 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/kde-unstable/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/kde-unstable/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeadmin/PKGBUILD b/kde-unstable/kdeadmin/PKGBUILD new file mode 100644 index 000000000..da2c8b6de --- /dev/null +++ b/kde-unstable/kdeadmin/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 143336 2011-11-24 16:14:27Z 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/kde-unstable/kdeadmin/kdeadmin.install b/kde-unstable/kdeadmin/kdeadmin.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeadmin/syslog-path.patch b/kde-unstable/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeartwork/PKGBUILD b/kde-unstable/kdeartwork/PKGBUILD new file mode 100644 index 000000000..4113014a1 --- /dev/null +++ b/kde-unstable/kdeartwork/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 143338 2011-11-24 16:14:29Z 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/kde-unstable/kdebase-konsole/PKGBUILD b/kde-unstable/kdebase-konsole/PKGBUILD new file mode 100644 index 000000000..9b0e14d2b --- /dev/null +++ b/kde-unstable/kdebase-konsole/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143340 2011-11-24 16:14:32Z 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/kde-unstable/kdebase-runtime/PKGBUILD b/kde-unstable/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..d329f4d40 --- /dev/null +++ b/kde-unstable/kdebase-runtime/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 143284 2011-11-24 16:13:21Z 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/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdebase/PKGBUILD b/kde-unstable/kdebase/PKGBUILD new file mode 100644 index 000000000..70263f6aa --- /dev/null +++ b/kde-unstable/kdebase/PKGBUILD @@ -0,0 +1,120 @@ +# $Id: PKGBUILD 143310 2011-11-24 16:13:59Z 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/kde-unstable/kdebase/kdebase-dolphin.install b/kde-unstable/kdebase/kdebase-dolphin.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdebase/kdebase-konqueror.install b/kde-unstable/kdebase/kdebase-konqueror.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdebase/kdebase.install b/kde-unstable/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdebindings-kimono/PKGBUILD b/kde-unstable/kdebindings-kimono/PKGBUILD new file mode 100644 index 000000000..e09b59b09 --- /dev/null +++ b/kde-unstable/kdebindings-kimono/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143342 2011-11-24 16:14:33Z 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/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD new file mode 100644 index 000000000..3348d88f6 --- /dev/null +++ b/kde-unstable/kdebindings-kross/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 143344 2011-11-24 16:14:36Z 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/kde-unstable/kdebindings-perlkde/PKGBUILD b/kde-unstable/kdebindings-perlkde/PKGBUILD new file mode 100644 index 000000000..ff15152b2 --- /dev/null +++ b/kde-unstable/kdebindings-perlkde/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143346 2011-11-24 16:14:39Z 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/kde-unstable/kdebindings-perlqt/PKGBUILD b/kde-unstable/kdebindings-perlqt/PKGBUILD new file mode 100644 index 000000000..bed48ab40 --- /dev/null +++ b/kde-unstable/kdebindings-perlqt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143298 2011-11-24 16:13:43Z 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/kde-unstable/kdebindings-python/PKGBUILD b/kde-unstable/kdebindings-python/PKGBUILD new file mode 100644 index 000000000..021c5ee02 --- /dev/null +++ b/kde-unstable/kdebindings-python/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143300 2011-11-24 16:13:45Z 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/kde-unstable/kdebindings-qtruby/PKGBUILD b/kde-unstable/kdebindings-qtruby/PKGBUILD new file mode 100644 index 000000000..b3976602d --- /dev/null +++ b/kde-unstable/kdebindings-qtruby/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143304 2011-11-24 16:13:50Z 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/kde-unstable/kdebindings-qyoto/PKGBUILD b/kde-unstable/kdebindings-qyoto/PKGBUILD new file mode 100644 index 000000000..cfb9d378d --- /dev/null +++ b/kde-unstable/kdebindings-qyoto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143302 2011-11-24 16:13:48Z 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/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD new file mode 100644 index 000000000..ac12f5f64 --- /dev/null +++ b/kde-unstable/kdebindings-smokegen/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143288 2011-11-24 16:13:26Z 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/kde-unstable/kdebindings-smokekde/PKGBUILD b/kde-unstable/kdebindings-smokekde/PKGBUILD new file mode 100644 index 000000000..63ca984c4 --- /dev/null +++ b/kde-unstable/kdebindings-smokekde/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143296 2011-11-24 16:13:40Z 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/kde-unstable/kdebindings-smokeqt/PKGBUILD b/kde-unstable/kdebindings-smokeqt/PKGBUILD new file mode 100644 index 000000000..2490b2493 --- /dev/null +++ b/kde-unstable/kdebindings-smokeqt/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143290 2011-11-24 16:13:28Z 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/kde-unstable/kdeedu-analitza/PKGBUILD b/kde-unstable/kdeedu-analitza/PKGBUILD new file mode 100644 index 000000000..7ddcbb258 --- /dev/null +++ b/kde-unstable/kdeedu-analitza/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143324 2011-11-24 16:14:14Z 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/kde-unstable/kdeedu-blinken/PKGBUILD b/kde-unstable/kdeedu-blinken/PKGBUILD new file mode 100644 index 000000000..f39a11290 --- /dev/null +++ b/kde-unstable/kdeedu-blinken/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143348 2011-11-24 16:14:42Z 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/kde-unstable/kdeedu-blinken/kdeedu-blinken.install b/kde-unstable/kdeedu-blinken/kdeedu-blinken.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-cantor/PKGBUILD b/kde-unstable/kdeedu-cantor/PKGBUILD new file mode 100644 index 000000000..2d6dbeb81 --- /dev/null +++ b/kde-unstable/kdeedu-cantor/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143350 2011-11-24 16:14:44Z 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/kde-unstable/kdeedu-cantor/kdeedu-cantor.install b/kde-unstable/kdeedu-cantor/kdeedu-cantor.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kalgebra/PKGBUILD b/kde-unstable/kdeedu-kalgebra/PKGBUILD new file mode 100644 index 000000000..fb5280713 --- /dev/null +++ b/kde-unstable/kdeedu-kalgebra/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143352 2011-11-24 16:14:47Z 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/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install b/kde-unstable/kdeedu-kalgebra/kdeedu-kalgebra.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kalzium/PKGBUILD b/kde-unstable/kdeedu-kalzium/PKGBUILD new file mode 100644 index 000000000..7604114fd --- /dev/null +++ b/kde-unstable/kdeedu-kalzium/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143354 2011-11-24 16:14:49Z 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/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install b/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD new file mode 100644 index 000000000..7924b79b3 --- /dev/null +++ b/kde-unstable/kdeedu-kanagram/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143356 2011-11-24 16:14:52Z 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/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install b/kde-unstable/kdeedu-kanagram/kdeedu-kanagram.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kbruch/PKGBUILD b/kde-unstable/kdeedu-kbruch/PKGBUILD new file mode 100644 index 000000000..7ab43f309 --- /dev/null +++ b/kde-unstable/kdeedu-kbruch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143358 2011-11-24 16:14:54Z 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/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install b/kde-unstable/kdeedu-kbruch/kdeedu-kbruch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kgeography/PKGBUILD b/kde-unstable/kdeedu-kgeography/PKGBUILD new file mode 100644 index 000000000..6aca74f87 --- /dev/null +++ b/kde-unstable/kdeedu-kgeography/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143360 2011-11-24 16:14:56Z 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/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install b/kde-unstable/kdeedu-kgeography/kdeedu-kgeography.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-khangman/PKGBUILD b/kde-unstable/kdeedu-khangman/PKGBUILD new file mode 100644 index 000000000..5f450e478 --- /dev/null +++ b/kde-unstable/kdeedu-khangman/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143362 2011-11-24 16:15:00Z 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/kde-unstable/kdeedu-khangman/kdeedu-khangman.install b/kde-unstable/kdeedu-khangman/kdeedu-khangman.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kig/PKGBUILD b/kde-unstable/kdeedu-kig/PKGBUILD new file mode 100644 index 000000000..f83a2bf20 --- /dev/null +++ b/kde-unstable/kdeedu-kig/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143364 2011-11-24 16:15:03Z 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/kde-unstable/kdeedu-kig/kdeedu-kig.install b/kde-unstable/kdeedu-kig/kdeedu-kig.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kiten/PKGBUILD b/kde-unstable/kdeedu-kiten/PKGBUILD new file mode 100644 index 000000000..98bb48051 --- /dev/null +++ b/kde-unstable/kdeedu-kiten/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143366 2011-11-24 16:15:06Z 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/kde-unstable/kdeedu-kiten/kdeedu-kiten.install b/kde-unstable/kdeedu-kiten/kdeedu-kiten.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-klettres/PKGBUILD b/kde-unstable/kdeedu-klettres/PKGBUILD new file mode 100644 index 000000000..0a13bd752 --- /dev/null +++ b/kde-unstable/kdeedu-klettres/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143368 2011-11-24 16:15:10Z 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/kde-unstable/kdeedu-klettres/kdeedu-klettres.install b/kde-unstable/kdeedu-klettres/kdeedu-klettres.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kmplot/PKGBUILD b/kde-unstable/kdeedu-kmplot/PKGBUILD new file mode 100644 index 000000000..75fc53cba --- /dev/null +++ b/kde-unstable/kdeedu-kmplot/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143370 2011-11-24 16:15:14Z 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/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install b/kde-unstable/kdeedu-kmplot/kdeedu-kmplot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kstars/PKGBUILD b/kde-unstable/kdeedu-kstars/PKGBUILD new file mode 100644 index 000000000..38d5b4939 --- /dev/null +++ b/kde-unstable/kdeedu-kstars/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143372 2011-11-24 16:15:18Z 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/kde-unstable/kdeedu-kstars/kdeedu-kstars.install b/kde-unstable/kdeedu-kstars/kdeedu-kstars.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-ktouch/PKGBUILD b/kde-unstable/kdeedu-ktouch/PKGBUILD new file mode 100644 index 000000000..62f000d1e --- /dev/null +++ b/kde-unstable/kdeedu-ktouch/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143374 2011-11-24 16:15:21Z 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/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install b/kde-unstable/kdeedu-ktouch/kdeedu-ktouch.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kturtle/PKGBUILD b/kde-unstable/kdeedu-kturtle/PKGBUILD new file mode 100644 index 000000000..06635be37 --- /dev/null +++ b/kde-unstable/kdeedu-kturtle/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143376 2011-11-24 16:15:26Z 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/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install b/kde-unstable/kdeedu-kturtle/kdeedu-kturtle.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-kwordquiz/PKGBUILD b/kde-unstable/kdeedu-kwordquiz/PKGBUILD new file mode 100644 index 000000000..3e2415ee6 --- /dev/null +++ b/kde-unstable/kdeedu-kwordquiz/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143378 2011-11-24 16:15:29Z 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/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/kde-unstable/kdeedu-kwordquiz/kdeedu-kwordquiz.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD new file mode 100644 index 000000000..cd5efacfd --- /dev/null +++ b/kde-unstable/kdeedu-marble/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143314 2011-11-24 16:14:04Z 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/kde-unstable/kdeedu-marble/kdeedu-marble.install b/kde-unstable/kdeedu-marble/kdeedu-marble.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-parley/PKGBUILD b/kde-unstable/kdeedu-parley/PKGBUILD new file mode 100644 index 000000000..51199cf74 --- /dev/null +++ b/kde-unstable/kdeedu-parley/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143380 2011-11-24 16:15:34Z 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/kde-unstable/kdeedu-parley/kdeedu-parley.install b/kde-unstable/kdeedu-parley/kdeedu-parley.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeedu-rocs/PKGBUILD b/kde-unstable/kdeedu-rocs/PKGBUILD new file mode 100644 index 000000000..33e77fd6a --- /dev/null +++ b/kde-unstable/kdeedu-rocs/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143382 2011-11-24 16:15:38Z 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/kde-unstable/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD new file mode 100644 index 000000000..df3186e81 --- /dev/null +++ b/kde-unstable/kdeedu-step/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143384 2011-11-24 16:15:43Z 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/kde-unstable/kdeedu-step/kdeedu-step.install b/kde-unstable/kdeedu-step/kdeedu-step.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/PKGBUILD b/kde-unstable/kdegames/PKGBUILD new file mode 100644 index 000000000..5ef47f9ca --- /dev/null +++ b/kde-unstable/kdegames/PKGBUILD @@ -0,0 +1,515 @@ +# $Id: PKGBUILD 143386 2011-11-24 16:15:52Z 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/kde-unstable/kdegames/kdegames-kbattleship.install b/kde-unstable/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ac4516ed0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kfourinline.install b/kde-unstable/kdegames/kdegames-kfourinline.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kigo.install b/kde-unstable/kdegames/kdegames-kigo.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kolf.install b/kde-unstable/kdegames/kdegames-kolf.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kpatience.install b/kde-unstable/kdegames/kdegames-kpatience.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kreversi.install b/kde-unstable/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-kspaceduel.install b/kde-unstable/kdegames/kdegames-kspaceduel.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-ksquares.install b/kde-unstable/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-ktuberling.install b/kde-unstable/kdegames/kdegames-ktuberling.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-lskat.install b/kde-unstable/kdegames/kdegames-lskat.install new file mode 100644 index 000000000..9b20edb30 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames-palapeli.install b/kde-unstable/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegames/kdegames.install b/kde-unstable/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-gwenview/PKGBUILD b/kde-unstable/kdegraphics-gwenview/PKGBUILD new file mode 100644 index 000000000..377064424 --- /dev/null +++ b/kde-unstable/kdegraphics-gwenview/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143388 2011-11-24 16:15:56Z 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/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install b/kde-unstable/kdegraphics-gwenview/kdegraphics-gwenview.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-kamera/PKGBUILD b/kde-unstable/kdegraphics-kamera/PKGBUILD new file mode 100644 index 000000000..ab9286568 --- /dev/null +++ b/kde-unstable/kdegraphics-kamera/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 143390 2011-11-24 16:15:58Z 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/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD new file mode 100644 index 000000000..d907e2a73 --- /dev/null +++ b/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143392 2011-11-24 16:16:00Z 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/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/kde-unstable/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-kgamma/PKGBUILD b/kde-unstable/kdegraphics-kgamma/PKGBUILD new file mode 100644 index 000000000..4bc017e9d --- /dev/null +++ b/kde-unstable/kdegraphics-kgamma/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143394 2011-11-24 16:16:03Z 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/kde-unstable/kdegraphics-kolourpaint/PKGBUILD b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD new file mode 100644 index 000000000..4be57e33d --- /dev/null +++ b/kde-unstable/kdegraphics-kolourpaint/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143396 2011-11-24 16:16:05Z 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/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/kde-unstable/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-kruler/PKGBUILD b/kde-unstable/kdegraphics-kruler/PKGBUILD new file mode 100644 index 000000000..cc36025a5 --- /dev/null +++ b/kde-unstable/kdegraphics-kruler/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143398 2011-11-24 16:16:06Z 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/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install b/kde-unstable/kdegraphics-kruler/kdegraphics-kruler.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD new file mode 100644 index 000000000..d084c5851 --- /dev/null +++ b/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143400 2011-11-24 16:16:09Z 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/kde-unstable/kdegraphics-ksnapshot/PKGBUILD b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD new file mode 100644 index 000000000..1efef8d49 --- /dev/null +++ b/kde-unstable/kdegraphics-ksnapshot/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143402 2011-11-24 16:16:11Z 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/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/kde-unstable/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-mobipocket/PKGBUILD b/kde-unstable/kdegraphics-mobipocket/PKGBUILD new file mode 100644 index 000000000..77dd2876a --- /dev/null +++ b/kde-unstable/kdegraphics-mobipocket/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143404 2011-11-24 16:16:13Z 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/kde-unstable/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/kde-unstable/kdegraphics-mobipocket/kdegraphics-mobipocket.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD new file mode 100644 index 000000000..554ca1f62 --- /dev/null +++ b/kde-unstable/kdegraphics-okular/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143292 2011-11-24 16:13:32Z 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/kde-unstable/kdegraphics-okular/kdegraphics-okular.install b/kde-unstable/kdegraphics-okular/kdegraphics-okular.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD new file mode 100644 index 000000000..cab45048e --- /dev/null +++ b/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143406 2011-11-24 16:16:15Z 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/kde-unstable/kdegraphics-svgpart/PKGBUILD b/kde-unstable/kdegraphics-svgpart/PKGBUILD new file mode 100644 index 000000000..930d12fa0 --- /dev/null +++ b/kde-unstable/kdegraphics-svgpart/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143408 2011-11-24 16:16:17Z 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/kde-unstable/kdegraphics-thumbnailers/PKGBUILD b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD new file mode 100644 index 000000000..d6a0d8de2 --- /dev/null +++ b/kde-unstable/kdegraphics-thumbnailers/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143410 2011-11-24 16:16:19Z 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/kde-unstable/kdelibs/PKGBUILD b/kde-unstable/kdelibs/PKGBUILD new file mode 100644 index 000000000..86a31d841 --- /dev/null +++ b/kde-unstable/kdelibs/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 143279 2011-11-24 16:13:15Z 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/kde-unstable/kdelibs/archlinux-menu.patch b/kde-unstable/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdelibs/kde-applications-menu.patch b/kde-unstable/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdelibs/kdelibs.install b/kde-unstable/kdelibs/kdelibs.install new file mode 100644 index 000000000..c77e68041 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdemultimedia/PKGBUILD b/kde-unstable/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..29264c7ee --- /dev/null +++ b/kde-unstable/kdemultimedia/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 143412 2011-11-24 16:16:21Z 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/kde-unstable/kdemultimedia/kdemultimedia-dragonplayer.install b/kde-unstable/kdemultimedia/kdemultimedia-dragonplayer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdemultimedia/kdemultimedia.install b/kde-unstable/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdemultimedia/mplayerthumbs.config b/kde-unstable/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/kde-unstable/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD new file mode 100644 index 000000000..4b0cc1dc1 --- /dev/null +++ b/kde-unstable/kdenetwork/PKGBUILD @@ -0,0 +1,110 @@ +# $Id: PKGBUILD 143414 2011-11-24 16:16:24Z 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/kde-unstable/kdenetwork/kdenetwork-kget.install b/kde-unstable/kdenetwork/kdenetwork-kget.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdenetwork/kdenetwork-kopete.install b/kde-unstable/kdenetwork/kdenetwork-kopete.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdenetwork/kdenetwork-kppp.install b/kde-unstable/kdenetwork/kdenetwork-kppp.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdenetwork/kdenetwork.install b/kde-unstable/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD new file mode 100644 index 000000000..51dc56b29 --- /dev/null +++ b/kde-unstable/kdepim-runtime/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143286 2011-11-24 16:13:23Z 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/kde-unstable/kdepim-runtime/kdepim-runtime.install b/kde-unstable/kdepim-runtime/kdepim-runtime.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD new file mode 100644 index 000000000..d29e3c7f6 --- /dev/null +++ b/kde-unstable/kdepim/PKGBUILD @@ -0,0 +1,253 @@ +# $Id: PKGBUILD 143416 2011-11-24 16:16:27Z 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/kde-unstable/kdepim/kdepim-kleopatra.install b/kde-unstable/kdepim/kdepim-kleopatra.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepim/kdepim-kmail.install b/kde-unstable/kdepim/kdepim-kmail.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepim/kdepim-korganizer.install b/kde-unstable/kdepim/kdepim-korganizer.install new file mode 100644 index 000000000..5787df72f --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepim/kdepim.install b/kde-unstable/kdepim/kdepim.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdepimlibs/PKGBUILD b/kde-unstable/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..d706eecbb --- /dev/null +++ b/kde-unstable/kdepimlibs/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143281 2011-11-24 16:13:17Z 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/kde-unstable/kdepimlibs/kdepimlibs.install b/kde-unstable/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..21270b2f6 --- /dev/null +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -0,0 +1,619 @@ +# $Id: PKGBUILD 143418 2011-11-24 16:16:32Z 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/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/kde-unstable/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/kde-unstable/calligra/calligra-plan.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install index c2179f6e2..c4ef46ba8 100644 --- a/kde-unstable/calligra/calligra-plan.install +++ b/kde-unstable/kdeplasma-addons/kdeplasma-addons-applets.install @@ -1,6 +1,5 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q } post_upgrade() { diff --git a/kde-unstable/kdesdk-kate/PKGBUILD b/kde-unstable/kdesdk-kate/PKGBUILD new file mode 100644 index 000000000..84619e271 --- /dev/null +++ b/kde-unstable/kdesdk-kate/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 143294 2011-11-24 16:13:37Z 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/kde-unstable/kdesdk-kate/kdebase-kwrite.install b/kde-unstable/kdesdk-kate/kdebase-kwrite.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk-kate/kdesdk-kate.install b/kde-unstable/kdesdk-kate/kdesdk-kate.install new file mode 100644 index 000000000..a9c01ef06 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch b/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch new file mode 100644 index 000000000..27729d1ad --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/PKGBUILD b/kde-unstable/kdesdk/PKGBUILD new file mode 100644 index 000000000..87d3ca27d --- /dev/null +++ b/kde-unstable/kdesdk/PKGBUILD @@ -0,0 +1,258 @@ +# $Id: PKGBUILD 143420 2011-11-24 16:16:37Z 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/kde-unstable/kdesdk/fix-python2-path.patch b/kde-unstable/kdesdk/fix-python2-path.patch new file mode 100644 index 000000000..720487031 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-cervisia.install b/kde-unstable/kdesdk/kdesdk-cervisia.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-kcachegrind.install b/kde-unstable/kdesdk/kdesdk-kcachegrind.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-kompare.install b/kde-unstable/kdesdk/kdesdk-kompare.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-kuiviewer.install b/kde-unstable/kdesdk/kdesdk-kuiviewer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-lokalize.install b/kde-unstable/kdesdk/kdesdk-lokalize.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-okteta.install b/kde-unstable/kdesdk/kdesdk-okteta.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk-umbrello.install b/kde-unstable/kdesdk/kdesdk-umbrello.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdesdk/kdesdk.install b/kde-unstable/kdesdk/kdesdk.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdetoys/PKGBUILD b/kde-unstable/kdetoys/PKGBUILD new file mode 100644 index 000000000..7c515243d --- /dev/null +++ b/kde-unstable/kdetoys/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 143422 2011-11-24 16:16:40Z 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/kde-unstable/kdetoys/kdetoys.install b/kde-unstable/kdetoys/kdetoys.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-filelight/PKGBUILD b/kde-unstable/kdeutils-filelight/PKGBUILD new file mode 100644 index 000000000..85976db3b --- /dev/null +++ b/kde-unstable/kdeutils-filelight/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 143426 2011-11-24 16:16:44Z 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/kde-unstable/kdeutils-filelight/kdeutils-filelight.install b/kde-unstable/kdeutils-filelight/kdeutils-filelight.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kcalc/PKGBUILD b/kde-unstable/kdeutils-kcalc/PKGBUILD new file mode 100644 index 000000000..c5ec6c1e4 --- /dev/null +++ b/kde-unstable/kdeutils-kcalc/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143428 2011-11-24 16:16:47Z 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/kde-unstable/kdeutils-kcalc/kdeutils-kcalc.install b/kde-unstable/kdeutils-kcalc/kdeutils-kcalc.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kcharselect/PKGBUILD b/kde-unstable/kdeutils-kcharselect/PKGBUILD new file mode 100644 index 000000000..478a59212 --- /dev/null +++ b/kde-unstable/kdeutils-kcharselect/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143430 2011-11-24 16:16:50Z 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/kde-unstable/kdeutils-kdf/PKGBUILD b/kde-unstable/kdeutils-kdf/PKGBUILD new file mode 100644 index 000000000..7d27cec82 --- /dev/null +++ b/kde-unstable/kdeutils-kdf/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143432 2011-11-24 16:16: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/kde-unstable/kdeutils-kdf/kdeutils-kdf.install b/kde-unstable/kdeutils-kdf/kdeutils-kdf.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kfloppy/PKGBUILD b/kde-unstable/kdeutils-kfloppy/PKGBUILD new file mode 100644 index 000000000..213d1a741 --- /dev/null +++ b/kde-unstable/kdeutils-kfloppy/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143434 2011-11-24 16:16:54Z 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/kde-unstable/kdeutils-kfloppy/kdeutils-kfloppy.install b/kde-unstable/kdeutils-kfloppy/kdeutils-kfloppy.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kgpg/PKGBUILD b/kde-unstable/kdeutils-kgpg/PKGBUILD new file mode 100644 index 000000000..9c6f639a7 --- /dev/null +++ b/kde-unstable/kdeutils-kgpg/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143436 2011-11-24 16:16:56Z 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/kde-unstable/kdeutils-kgpg/kdeutils-kgpg.install b/kde-unstable/kdeutils-kgpg/kdeutils-kgpg.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kremotecontrol/PKGBUILD b/kde-unstable/kdeutils-kremotecontrol/PKGBUILD new file mode 100644 index 000000000..51c1c9397 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/kde-unstable/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-ktimer/PKGBUILD b/kde-unstable/kdeutils-ktimer/PKGBUILD new file mode 100644 index 000000000..37886965e --- /dev/null +++ b/kde-unstable/kdeutils-ktimer/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143440 2011-11-24 16:17:00Z 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/kde-unstable/kdeutils-ktimer/kdeutils-ktimer.install b/kde-unstable/kdeutils-ktimer/kdeutils-ktimer.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-kwallet/PKGBUILD b/kde-unstable/kdeutils-kwallet/PKGBUILD new file mode 100644 index 000000000..b48789a39 --- /dev/null +++ b/kde-unstable/kdeutils-kwallet/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143442 2011-11-24 16:17:02Z 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/kde-unstable/kdeutils-kwallet/kdeutils-kwallet.install b/kde-unstable/kdeutils-kwallet/kdeutils-kwallet.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-printer-applet/PKGBUILD b/kde-unstable/kdeutils-printer-applet/PKGBUILD new file mode 100644 index 000000000..43f4f2a39 --- /dev/null +++ b/kde-unstable/kdeutils-printer-applet/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 143444 2011-11-24 16:17:04Z 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/kde-unstable/kdeutils-superkaramba/PKGBUILD b/kde-unstable/kdeutils-superkaramba/PKGBUILD new file mode 100644 index 000000000..e7b4a7039 --- /dev/null +++ b/kde-unstable/kdeutils-superkaramba/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143446 2011-11-24 16:17:06Z 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/kde-unstable/kdeutils-superkaramba/kdeutils-superkaramba.install b/kde-unstable/kdeutils-superkaramba/kdeutils-superkaramba.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdeutils-sweeper/PKGBUILD b/kde-unstable/kdeutils-sweeper/PKGBUILD new file mode 100644 index 000000000..9225f5813 --- /dev/null +++ b/kde-unstable/kdeutils-sweeper/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 143448 2011-11-24 16:17:08Z 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/kde-unstable/kdewebdev/PKGBUILD b/kde-unstable/kdewebdev/PKGBUILD new file mode 100644 index 000000000..a3638ccd0 --- /dev/null +++ b/kde-unstable/kdewebdev/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 143450 2011-11-24 16:17:10Z 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/kde-unstable/kdewebdev/kdewebdev-kimagemapeditor.install b/kde-unstable/kdewebdev/kdewebdev-kimagemapeditor.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/kde-unstable/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/kde-unstable/kdewebdev/kdewebdev.install b/kde-unstable/kdewebdev/kdewebdev.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/libkdcraw/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD new file mode 100644 index 000000000..5abf08e05 --- /dev/null +++ b/kde-unstable/libkdcraw/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143316 2011-11-24 16:14:06Z 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/kde-unstable/libkdcraw/libkdcraw.install b/kde-unstable/libkdcraw/libkdcraw.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/libkdeedu/PKGBUILD b/kde-unstable/libkdeedu/PKGBUILD new file mode 100644 index 000000000..15624153e --- /dev/null +++ b/kde-unstable/libkdeedu/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143312 2011-11-24 16:14:02Z 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/kde-unstable/libkdeedu/libkdeedu.install b/kde-unstable/libkdeedu/libkdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD new file mode 100644 index 000000000..aaf47b893 --- /dev/null +++ b/kde-unstable/libkexiv2/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 143318 2011-11-24 16:14:08Z 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/kde-unstable/libkipi/PKGBUILD b/kde-unstable/libkipi/PKGBUILD new file mode 100644 index 000000000..0e45757c6 --- /dev/null +++ b/kde-unstable/libkipi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143320 2011-11-24 16:14:10Z 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/kde-unstable/libkipi/libkipi.install b/kde-unstable/libkipi/libkipi.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD new file mode 100644 index 000000000..58f01f20a --- /dev/null +++ b/kde-unstable/libksane/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 143322 2011-11-24 16:14:12Z 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/kde-unstable/libksane/libksane.install b/kde-unstable/libksane/libksane.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/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/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 0b6af2cd2..e0607a940 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,33 +1,48 @@ # $Id$ -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> +# Arch Contributor: Alexander Fehr <pizzapunk gmail com> +# Arch Contributor: William Rea <sillywilly@gmail.com> +# Arch maintainer: Gaetan Bisson <bisson@archlinux.org> +# Parabola maintainer: Brendan Tildesley pkgname=audacious-plugins-libre -pkgver=2.5.1 -pkgrel=2 +pkgver=3.1 +pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' -arch=('i686' 'x86_64' 'mips64el') url='http://audacious-media-player.org/' -license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'GPL3' 'LGPL' 'custom') + +# Licensing issues: +# The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice +# but I've been informed by an upstream dev, <nenolod>, that they are all GPL of some type. +# +# The plugin 'psf' is currently BSD+noncommercial, but is apparently being changed to GPL. +# However, 'psf' is apparently an emulator for running non-free code, so I'll leave it out. +# +# All the other custom licensed plugins I think are mostly modified BSD or ISC. + provides=("audacious-plugins=$pkgver") replaces=("${pkgname%-libre}") conflicts=("${pkgname%-libre}") makedepends=("audacious>=${pkgver}" - 'alsa-lib' 'pulseaudio' 'jack' 'lame' 'libvorbis' 'flac' - 'faad2' 'ffmpeg' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' + 'oss' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio' 'libsidplay' 'wavpack' 'libnotify' 'lirc-utils' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') -optdepends=('alsa-lib: Advanced Linux Sound Arch. output' +optdepends=('oss: Open Sound System v4 output' + 'alsa-lib: Advanced Linux Sound Arch. output' 'pulseaudio: PulseAudio output' - 'jack: Jack Audio Connection Kit output' + 'jack2: Jack Audio Connection Kit output' 'lame: FileWriter MP3 output' 'libvorbis: Vorbis input, FileWriter Vorbis output' 'flac: FLAC input, FileWriter FLAC output' + 'mpg123: MP3 input' 'faad2: AAC input' 'ffmpeg: ffaudio input' + 'libmodplug: modplug input' 'fluidsynth: MIDI FluidSynth backend input' 'libcdio: CD Digital Audio input' 'libsidplay: Commodore 64 audio input' @@ -42,44 +57,77 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output' 'libmms: libmms-based mms transport' 'libcue: CUE playlist format') -source=("http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz") +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz") +sha1sums=('d5f2ef19cda220d6fa7dd26c514c5c22c8dd7b42') -# Source PKGBUILD and run this function from the shell +# Retrieve upstream & remove plugins 'psf' & 'usf' due to issues mentioned above. Repackage as -libre mksource(){ - tmpdir=$(mktemp -d /tmp/audacious-XXXX) - pushd $tmpdir >/dev/null - wget "http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tgz" -O - -q | tar xzf - - - rm -rvf ${pkgname%-libre}-$pkgver/src/{u,p}sf/ + [ -f ${pkgname%-libre}-$pkgver.tar.gz ] || wget http://distfiles.atheme.org/${pkgname%-libre}-$pkgver.tar.gz + tar xzf ${pkgname%-libre}-${pkgver}.tar.gz - mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver + rm -rvf ${pkgname%-libre}-$pkgver/src/{p,u}usf/ + sed -i s/enable_psf=yes/enable_psf=no/ ${pkgname%-libre}-$pkgver/configure - tar czf ${pkgname}-${pkgver}.tar.gz ${pkgname}-${pkgver}/ + mv -v ${pkgname%-libre}-$pkgver ${pkgname}-$pkgver + tar cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/ + rm -rf ${pkgname}-${pkgver} + echo "${pkgname}-${pkgver}.tar.xz is your new -libre source package." - echo "You can find the sources at $tmpdir" - - popd >/dev/null } build() { - cd "$srcdir/$pkgname-$pkgver" - - sed 's/libavcore >= 0.12.0//g' -i configure # FS#23549 - - [[ $CARCH == x86_64 ]] && extraopts='' || extraopts='--disable-sse2' - ./configure \ - --prefix=/usr \ - --enable-chardet \ - --enable-amidiplug \ - --disable-adplug \ - --disable-psf \ - $extraopts \ + cd "${srcdir}/${pkgname}-${pkgver}" + + # hack to enable global hotkeys with gtk3 + sed -e 's/gdk-x11-2.0/gdk-x11-3.0/g' -i configure + + # Get license notices out of custom-licensed packages + cd src + tmpdir=$(mktemp -d /tmp/${pkgname}-${pkgver}-XXXX) + head -n 18 albumart/albumart.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.albumart + head -n 17 alsa/alsa.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.alsa + head -n 18 cairo-spectrum/cairo-spectrum.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.cairo-spectrum + head -n 17 compressor/compressor.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.compressor + head -n 17 crossfade/crossfade.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.crossfade + head -n 18 crystalizer/crystalizer.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.crystalizer + head -n 22 dockalbumart/dockalbumart.c | cut -c 4- | tail -n 21 > ${tmpdir}/LICENSE.dockalbumart + head -n 18 lyricwiki/lyricwiki.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.lyricwiki + head -n 19 mpg123/mpg123.c | cut -c 4- | tail -n 18 > ${tmpdir}/LICENSE.mpg123 + head -n 17 openal/openal.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.openal + head -n 17 resample/resample.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.resample + head -n 18 roaraudio-vio/roaraudio-vio.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.roaraudio-vio + head -n 17 unix-io/unix-io.c | cut -c 4- | tail -n 16 > ${tmpdir}/LICENSE.unix-io + head -n 18 voice_removal/voice_removal.c | cut -c 4- | tail -n 17 > ${tmpdir}/LICENSE.voice_removal + head -n 25 xsf/corlett.c | cut -c 2- | tail -n 23 > ${tmpdir}/LICENSE.xfs + l=${pkgdir}/usr/share/licenses/${pkgname}/ + install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname} + cd .. + pushd $tmpdir + install -m644 LICENSE.albumart $l + install -m644 LICENSE.alsa $l + install -m644 LICENSE.cairo-spectrum $l + install -m644 LICENSE.compressor $l + install -m644 LICENSE.crossfade $l + install -m644 LICENSE.crystalizer $l + install -m644 LICENSE.dockalbumart $l + install -m644 LICENSE.lyricwiki $l + install -m644 LICENSE.mpg123 $l + install -m644 LICENSE.openal $l + install -m644 LICENSE.resample $l + install -m644 LICENSE.roaraudio-vio $l + install -m644 LICENSE.unix-io $l + install -m644 LICENSE.voice_removal $l + install -m644 LICENSE.xfs $l + popd + + ./configure --prefix=/usr \ + --enable-amidiplug \ + --disable-adplug make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('510b325eb3b13621b6f0e6745f6d0961') diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD index e59e1b037..c836e7a24 100644 --- a/libre/crosstool-ng/PKGBUILD +++ b/libre/crosstool-ng/PKGBUILD @@ -2,22 +2,21 @@ # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> pkgname=crosstool-ng -pkgver=1.11.3 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)" arch=('i686' 'x86_64' 'mips64el') url="http://crosstool-ng.org/" license=(GPL2) -depends=('cvs') +depends=('cvs' 'curl') +makedepends=('libtool') optdepends=('subversion: for retrieving eglibc sources') -source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - libc_ports_short_name.patch) -md5sums=('3830cbdcc7e1a60c93caeaf98f718187' - '0a95af7e6ba35e02e38c71a3121b4448') +source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2) + #libc_ports_short_name.patch) build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/libc_ports_short_name.patch + #patch -Np1 -i $srcdir/libc_ports_short_name.patch ./configure --prefix=/usr make @@ -27,3 +26,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } +md5sums=('55fba9f37b9f9ed0aeb6c50fbd8b6429') diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch index e077a15cf..e077a15cf 100644 --- a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch +++ b/libre/epdfview-libre/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch diff --git a/community/epdfview/PKGBUILD b/libre/epdfview-libre/PKGBUILD index f5f895e03..9923ad1cf 100644 --- a/community/epdfview/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -1,41 +1,49 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> # $Id: PKGBUILD 57042 2011-10-19 06:13:49Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Tom K <tomk@runbox.com> # Contributor: Thayer Williams <thayer@archlinux.org> -pkgname=epdfview +pkgname=epdfview-libre +_pkgname=epdfview pkgver=0.1.8 pkgrel=3 pkgdesc="A free lightweight PDF document viewer." url="http://www.emma-soft.com/projects/epdfview/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2') +depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2' 'xdg-utils') makedepends=('pkgconfig') +provides=('epdfview') +conflicts=('epdfview') +replaces=('epdfview') install='epdfview.install' -source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2" - "${pkgname}.desktop.patch" +source=("http://www.emma-soft.com/projects/${_pkgname}/chrome/site/releases/${_pkgname}-${pkgver}.tar.bz2" + "${_pkgname}.desktop.patch" "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch") md5sums=('e50285b01612169b2594fea375f53ae4' 'fbf22bbabdbb7544db615ac5775d57e2' '7f9ea101a41f5b4e999fd024f423d41f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch" + patch -Np0 -i "${srcdir}/${_pkgname}.desktop.patch" patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch" + # Use xdg-open as default browser. + sed -r '/DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE/s/firefox[^ ]*/xdg-open/' -i src/Config.cxx + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install for size in 24 32 48; do - install -Dm644 data/icon_${pkgname}-${size}.png \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" + install -Dm644 data/icon_${_pkgname}-${size}.png \ + "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${_pkgname}.png" done } diff --git a/community/epdfview/epdfview.desktop.patch b/libre/epdfview-libre/epdfview.desktop.patch index d86fc3088..d86fc3088 100644 --- a/community/epdfview/epdfview.desktop.patch +++ b/libre/epdfview-libre/epdfview.desktop.patch diff --git a/community/epdfview/epdfview.install b/libre/epdfview-libre/epdfview.install index c317fbaca..c317fbaca 100644 --- a/community/epdfview/epdfview.install +++ b/libre/epdfview-libre/epdfview.install diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index 80a61b2af..81796c041 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -3,12 +3,12 @@ # Maintainer (Parabola): xihh pkgname=ghostscript-libre -pkgver=9.02 -pkgrel=2 +pkgver=9.04 +pkgrel=5 pkgdesc="An interpreter for the PostScript language without non-free files" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') #non free files removed -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng' 'libjpeg' 'libtiff' 'lcms') # 'lcms2' won't get used) # move in libpaper from community? makedepends=('gtk2' 'gnutls') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') @@ -16,17 +16,18 @@ conflicts=('ghostscript') replaces=('ghostscript-lrpng' 'ghostscript') provides=('ghostscript-lprng' "ghostscript=$pkgver") url="http://www.ghostscript.com/" -source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz + ghostscript-cups-rgbw.patch) options=('!libtool' '!makeflags') -md5sums=('f67151444bd56a7904579fc75a083dd6') build() { cd ${srcdir}/ghostscript-${pkgver} + + # fix broken color printing https://bugs.archlinux.org/task/25519 + patch -Np1 -i ${srcdir}/ghostscript-cups-rgbw.patch # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff - # delete non-free packages - grep -l "are not altered" Resource/CMap/* | xargs rm -fv + rm -rf jpeg libpng zlib jasper expat tiff freetype lcms ./configure --prefix=/usr \ --enable-dynamic \ @@ -36,7 +37,11 @@ build() { --with-x \ --with-drivers=ALL\ --with-fontpath=/usr/share/fonts/Type1:/usr/share/fonts \ - --disable-compile-inits # needed for linking with system-zlib + --with-install-cups \ + --enable-fontconfig \ + --enable-freetype \ + --without-luratech \ + --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS @@ -65,3 +70,5 @@ package() { cd ${srcdir}/ghostscript-${pkgver}/ijs make DESTDIR=${pkgdir} install } +md5sums=('ac8f77c94a6b5d5f0170c2e6db38c6bb' + 'fd89baafac6589dc93ba71a48c2ba9b4') diff --git a/libre/ghostscript-libre/SRCBUILD b/libre/ghostscript-libre/SRCBUILD new file mode 100644 index 000000000..dc28e857e --- /dev/null +++ b/libre/ghostscript-libre/SRCBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer (Parabola): xihh + +pkgname=ghostscript-libre +pkgver=9.04 +pkgrel=5 +pkgdesc="An interpreter for the PostScript language without non-free files" +arch=('any') +license=('GPL3') #non free files removed +url="http://www.ghostscript.com/" +source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) +md5sums=('9f6899e821ab6d78ab2c856f10fa3023') +options=(!strip !docs !libtool !emptydirs !zipman !purge) + +build() { + cd ${srcdir}/ghostscript-${pkgver} + + export PKGEXT=.src.tar.xz + + # delete non-free packages + grep -l "are not altered" Resource/CMap/* | xargs rm -fv +} + +package() { + cd ${srcdir} + export PKGEXT=.src.tar.xz + export PKGDEST=${startdir} + + mv ghostscript-${pkgver} ${pkgdir}/ + +} diff --git a/libre/ghostscript-libre/ghostscript-cups-rgbw.patch b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch new file mode 100644 index 000000000..00f99c844 --- /dev/null +++ b/libre/ghostscript-libre/ghostscript-cups-rgbw.patch @@ -0,0 +1,264 @@ +diff -up ghostscript-9.04/cups/gdevcups.c.cups-rgbw ghostscript-9.04/cups/gdevcups.c +--- ghostscript-9.04/cups/gdevcups.c.cups-rgbw 2011-08-05 12:12:21.000000000 +0100 ++++ ghostscript-9.04/cups/gdevcups.c 2011-08-22 10:54:24.614010581 +0100 +@@ -225,6 +225,7 @@ typedef struct gx_device_cups_s + unsigned short EncodeLUT[gx_max_color_value + 1];/* RGB value to output color LUT */ + int Density[CUPS_MAX_VALUE + 1];/* Density LUT */ + int Matrix[3][3][CUPS_MAX_VALUE + 1];/* Color transform matrix LUT */ ++ int user_icc; + int cupsRasterVersion; + + /* Used by cups_put_params(): */ +@@ -426,6 +427,7 @@ gx_device_cups gs_cups_device = + {0x00}, /* EncodeLUT */ + {0x00}, /* Density */ + {0x00}, /* Matrix */ ++ 0, + 3 /* cupsRasterVersion */ + }; + +@@ -1182,15 +1184,18 @@ cups_map_cmyk(gx_device *pdev, /* I - D + + case CUPS_CSPACE_RGB : + case CUPS_CSPACE_RGBW : ++ c0 = c + k; ++ c1 = m + k; ++ c2 = y + k; + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- c0 = c; +- c1 = m; +- c2 = y; +- c3 = k; +- } else { +- c0 = c + k; +- c1 = m + k; +- c2 = y + k; ++ if ((k >= frac_1 - 1) || ++ ((c0 >= frac_1) && (c1 >= frac_1) && (c2 >= frac_1))) { ++ c0 = frac_1; ++ c1 = frac_1; ++ c2 = frac_1; ++ c3 = frac_1; ++ } else ++ c3 = 0; + } + + if (c0 < 0) +@@ -1212,11 +1217,12 @@ cups_map_cmyk(gx_device *pdev, /* I - D + out[2] = frac_1 - (frac)cups->Density[c2]; + + if (cups->header.cupsColorSpace == CUPS_CSPACE_RGBW) { +- if (c3 < 0) +- c3 = 0; +- else if (c3 > frac_1) +- c3 = frac_1; +- out[3] = frac_1 - (frac)cups->Density[c3]; ++ if (c3 == 0) ++ out[3] = frac_1; ++ else if (c3 == frac_1) ++ out[3] = 0; ++ else ++ out[3] = frac_1; + } + break; + +@@ -2034,10 +2040,15 @@ cups_map_color_rgb(gx_device *pdev, + * cups->DecodeLUT actually maps to RGBW, not CMYK... + */ + +- k = cups->DecodeLUT[c3]; +- c = cups->DecodeLUT[c0] + k - gx_max_color_value; +- m = cups->DecodeLUT[c1] + k - gx_max_color_value; +- y = cups->DecodeLUT[c2] + k - gx_max_color_value; ++ if (c3 == 0) { ++ c = 0; ++ m = 0; ++ y = 0; ++ } else { ++ c = cups->DecodeLUT[c0]; ++ m = cups->DecodeLUT[c1]; ++ y = cups->DecodeLUT[c2]; ++ } + + if (c > gx_max_color_value) + prgb[0] = gx_max_color_value; +@@ -2282,20 +2293,20 @@ cups_map_rgb_color(gx_device *pdev, + switch (cups->header.cupsBitsPerColor) + { + default : +- i = 0x0e; ++ i = 0x00; + break; + case 2 : +- i = 0xfc; ++ i = 0x00; + break; + case 4 : +- i = 0xfff0; ++ i = 0x0000; + break; + case 8 : +- i = 0xffffff00; ++ i = 0x00000000; + break; + #ifdef GX_COLOR_INDEX_TYPE + case 16 : +- i = 0xffffffffffff0000; ++ i = 0x0000000000000000; + break; + #endif /* GX_COLOR_INDEX_TYPE */ + } +@@ -2929,7 +2940,10 @@ cups_put_params(gx_device *pdev, /* + int xflip = 0, + yflip = 0; + int found = 0; +- ++ gs_param_string icc_pro_dummy; ++ int old_cmps = cups->color_info.num_components; ++ int old_depth = cups->color_info.depth; ++ + #ifdef DEBUG + dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist); + #endif /* DEBUG */ +@@ -3024,6 +3038,11 @@ cups_put_params(gx_device *pdev, /* + margins_set = param_read_float_array(plist, "Margins", &arrayval) == 0; + color_set = param_read_int(plist, "cupsColorSpace", &intval) == 0 || + param_read_int(plist, "cupsBitsPerColor", &intval) == 0; ++ ++ if (!cups->user_icc) { ++ cups->user_icc = param_read_string(plist, "OutputICCProfile", &icc_pro_dummy) == 0; ++ } ++ + /* We set the old dimensions to 1 if we have a color depth change, so + that memory reallocation gets forced. This is perhaps not the correct + approach to prevent crashes like in bug 690435. We keep it for the +@@ -3134,12 +3153,20 @@ cups_put_params(gx_device *pdev, /* + if ((code = gdev_prn_put_params(pdev, plist)) < 0) + return (code); + ++ /* If cups_set_color_info() changed the color model of the device we want to ++ * force the raster memory to be recreated/reinitialized ++ */ ++ if (cups->color_info.num_components != old_cmps || cups->color_info.depth != old_depth) { ++ width_old = 0; ++ height_old = 0; ++ } ++ else { + /* pdev->width/height may have been changed by the call to + * gdev_prn_put_params() + */ +- width_old = pdev->width; +- height_old = pdev->height; +- ++ width_old = pdev->width; ++ height_old = pdev->height; ++ } + /* + * Update margins/sizes as needed... + */ +@@ -4044,22 +4071,88 @@ cups_set_color_info(gx_device *pdev) /* + for (k = 0; k <= CUPS_MAX_VALUE; k ++) + cups->Density[k] = k; + } +- /* Set up the ICC profile for ghostscript to use based upon the color space. +- This is different than the PPD profile above which appears to be some sort +- of matrix based TRC profile */ +- switch (cups->header.cupsColorSpace) { +- /* Use RGB profile for this */ +- case CUPS_CSPACE_RGBW: +- if (pdev->icc_struct == NULL) { +- pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); +- } +- if (pdev->icc_struct->device_profile[gsDEFAULTPROFILE] == NULL) { +- code = gsicc_set_device_profile(pdev, pdev->memory, +- DEFAULT_RGB_ICC, gsDEFAULTPROFILE); +- } +- break; +- default: +- break; ++ if (!cups->user_icc) { ++ /* Set up the ICC profile for ghostscript to use based upon the color space. ++ This is different than the PPD profile above which appears to be some sort ++ of matrix based TRC profile */ ++ switch (cups->header.cupsColorSpace) ++ { ++ default : ++ case CUPS_CSPACE_RGBW : ++ case CUPS_CSPACE_RGB : ++ case CUPS_CSPACE_RGBA : ++ case CUPS_CSPACE_CMY : ++ case CUPS_CSPACE_YMC : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIELab : ++ case CUPS_CSPACE_ICC1 : ++ case CUPS_CSPACE_ICC2 : ++ case CUPS_CSPACE_ICC3 : ++ case CUPS_CSPACE_ICC4 : ++ case CUPS_CSPACE_ICC5 : ++ case CUPS_CSPACE_ICC6 : ++ case CUPS_CSPACE_ICC7 : ++ case CUPS_CSPACE_ICC8 : ++ case CUPS_CSPACE_ICC9 : ++ case CUPS_CSPACE_ICCA : ++ case CUPS_CSPACE_ICCB : ++ case CUPS_CSPACE_ICCC : ++ case CUPS_CSPACE_ICCD : ++ case CUPS_CSPACE_ICCE : ++ case CUPS_CSPACE_ICCF : ++# endif /* CUPS_RASTER_HAVE_COLORIMETRIC */ ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsRGB)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_RGB_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ ++ case CUPS_CSPACE_W : ++ case CUPS_CSPACE_WHITE : ++ case CUPS_CSPACE_K : ++ case CUPS_CSPACE_GOLD : ++ case CUPS_CSPACE_SILVER : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsGRAY)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory->non_gc_memory, ++ (char *)DEFAULT_GRAY_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ case CUPS_CSPACE_KCMYcm : ++# ifdef CUPS_RASTER_HAVE_COLORIMETRIC ++ case CUPS_CSPACE_CIEXYZ : ++#endif ++ case CUPS_CSPACE_CMYK : ++ case CUPS_CSPACE_YMCK : ++ case CUPS_CSPACE_KCMY : ++ case CUPS_CSPACE_GMCK : ++ case CUPS_CSPACE_GMCS : ++ if (!pdev->icc_struct || (pdev->icc_struct && ++ pdev->icc_struct->device_profile[gsDEFAULTPROFILE]->data_cs != gsCMYK)) { ++ ++ if (pdev->icc_struct) { ++ rc_decrement(pdev->icc_struct, "cups_set_color_info"); ++ } ++ pdev->icc_struct = gsicc_new_device_profile_array(pdev->memory); ++ ++ code = gsicc_set_device_profile(pdev, pdev->memory, ++ (char *)DEFAULT_CMYK_ICC, gsDEFAULTPROFILE); ++ } ++ break; ++ } + } + } + + diff --git a/libre/gnustep-base-libre/PKGBUILD b/libre/gnustep-base-libre/PKGBUILD new file mode 100644 index 000000000..9017c71b4 --- /dev/null +++ b/libre/gnustep-base-libre/PKGBUILD @@ -0,0 +1,39 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# $Id: PKGBUILD 56058 2011-09-29 17:45:33Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +_pkgname=gnustep-base +pkgname=gnustep-base-libre +pkgver=1.23.0 +pkgrel=1 +pkgdesc="The GNUstep base package with exceptions enabled" +arch=('i686' 'x86_64') +url="http://www.gnustep.org/" +license=("GPL" "LGPL") +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make-libre gnutls) +makedepends=(gcc-objc) +conflicts=('gnustep-base-svn' 'gnustep-base') +provides=('gnustep-base') +groups=('gnustep-core') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/$_pkgname-$pkgver.tar.gz) +md5sums=('c898a1b6cdc98e83639f319876bdbba6') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + source /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep \ + --with-ffi-include=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ + # fix file ownership + sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble + sed -i 's|.*gnutls_transport_set_lowat.*||' Source/GSSocketStream.m + make VERBOSE=1 +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown -R root.root "$pkgdir/" +} diff --git a/libre/gnustep-make-libre/PKGBUILD b/libre/gnustep-make-libre/PKGBUILD new file mode 100644 index 000000000..dedf944a3 --- /dev/null +++ b/libre/gnustep-make-libre/PKGBUILD @@ -0,0 +1,31 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# $Id: PKGBUILD 56053 2011-09-29 17:24:54Z spupykin $ +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> + +_pkgname=gnustep-make +pkgname=gnustep-make-libre +pkgver=2.6.1 +pkgrel=1 +pkgdesc="The GNUstep make package with exceptions enabled" +arch=('any') +url="http://www.gnustep.org/" +license=('GPL') +depends=('glibc') +conflicts=('gnustep-make-svn' 'gnustep-make') +provides=('gnustep-make') +groups=('gnustep-core') +source=(ftp://ftp.gnustep.org/pub/gnustep/core/${_pkgname}-$pkgver.tar.gz) +md5sums=('071b3a807ca3ec93cda75ac210adc263') + +build() { + cd $srcdir/${_pkgname}-$pkgver + # The option is not needed, but makes clear why we rebuild this. + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep \ + --enable-native-objc-exceptions + make + make DESTDIR=$pkgdir install + install -D -m755 \ + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh +} diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 7828e7eb4..3c5212895 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $ +# $Id: PKGBUILD 140751 2011-10-18 16:38:38Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.06.4 -pkgrel=2 +pkgver=2011.10.3 +pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64' 'mips64el') url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=173' 'iproute2' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'net-tools: legacy network support' 'wireless_tools: Wireless networking') +makedepends=(asciidoc) install=initscripts.install -source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" +source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" 'wireless.conf.d') -md5sums=('df73e4c4043d4eaf6502ca6738c549aa' - '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('4783d7297925bc0722367b0eed8cb53a' + '027576534885b8d5dded9be546057b12') diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install index 56f69248a..963713bee 100644 --- a/libre/initscripts/initscripts.install +++ b/libre/initscripts/initscripts.install @@ -8,4 +8,12 @@ post_upgrade() { echo "Blacklisting of modules is no longer supported in rc.conf," echo "please add blacklist entries to /etc/modprobe.d/ instead." fi + if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then + echo "VERBOSE= in rc.conf no longer has any effect." + echo "Please append 'quiet' to your kernel command line." + fi + if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then + echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf," + echo "as LOCALE in /etc/rc.conf no longer works." + fi } diff --git a/libre/initscripts/parabola-branding.patch b/libre/initscripts/parabola-branding.patch deleted file mode 100644 index a309f9a4c..000000000 --- a/libre/initscripts/parabola-branding.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -auN initscripts-2011.02.1/PKGBUILD initscripts-2011.02.1-parabola//PKGBUILD ---- initscripts-2011.02.1/PKGBUILD 2011-02-01 15:34:45.000000000 -0300 -+++ initscripts-2011.02.1-parabola//PKGBUILD 2011-02-28 11:06:11.000000000 -0300 -@@ -1,9 +1,9 @@ - pkgname=initscripts-git - pkgver=$(date +%s) - pkgrel=$(git log --pretty=format:%h |head -n 1) --pkgdesc="System initialization/bootup scripts" -+pkgdesc="System initialization/bootup scripts, rebranded for Parabola" - arch=('i686' 'x86_64') --url="http://www.archlinux.org" -+url="http://parabolagnulinux.org" - license=('GPL') - groups=('base') - conflicts=('initscripts') -diff -auN initscripts-2011.02.1/functions initscripts-2011.02.1-parabola//functions ---- initscripts-2011.02.1/functions 2011-02-01 15:34:45.000000000 -0300 -+++ initscripts-2011.02.1-parabola//functions 2011-02-28 11:13:46.000000000 -0300 -@@ -53,7 +53,7 @@ - if [[ $USECOLOR = YES || $USECOLOR = yes ]]; then - C_MAIN="\033[1;37;40m" # main text - -- C_OTHER="\033[1;34;40m" # prefix & brackets -+ C_OTHER="\033[0;35;40m" # prefix & brackets - C_SEPARATOR="\033[1;30;40m" # separator - - C_BUSY="\033[0;36;40m" # busy -diff -auN initscripts-2011.02.1/rc.conf initscripts-2011.02.1-parabola//rc.conf ---- initscripts-2011.02.1/rc.conf 2011-02-01 15:34:45.000000000 -0300 -+++ initscripts-2011.02.1-parabola//rc.conf 2011-02-28 11:06:37.000000000 -0300 -@@ -1,5 +1,5 @@ - # --# /etc/rc.conf - Main Configuration for Arch Linux -+# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre - # - - # ----------------------------------------------------------------------- -diff -auN initscripts-2011.02.1/rc.sysinit initscripts-2011.02.1-parabola//rc.sysinit ---- initscripts-2011.02.1/rc.sysinit 2011-02-01 15:34:45.000000000 -0300 -+++ initscripts-2011.02.1-parabola//rc.sysinit 2011-02-28 11:08:29.000000000 -0300 -@@ -7,8 +7,9 @@ - . /etc/rc.d/functions - - echo " " --printhl "Arch Linux\n" --printhl "${C_H2}http://www.archlinux.org" -+printhl "Parabola GNU/Linux-Libre\n" -+printhl "${C_H2}http://parabolagnulinux.org\n" -+printhl "You're booting into a libre version of Archlinux." - printsep - - run_hook sysinit_start diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index f77102426..45e458d5e 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -8,8 +8,8 @@ pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} -_basekernel=3.0 -pkgver=${_basekernel}.7 +_basekernel=3.1 +pkgver=${_basekernel}.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -26,8 +26,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'Kbuild' 'Kbuild.platforms' 'boot-logo.patch' - 'fix-i915.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}" @@ -37,8 +39,23 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix #19234 i1915 display size - patch -Np1 -i "${srcdir}/fix-i915.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 @@ -48,7 +65,7 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" - patch -Np1 -i "${srcdir}/${_basekernel}-*-loongson-community.patch" + patch -Np1 -i ${srcdir}/${_basekernel}-*-loongson-community.patch patch -Np0 -i "${srcdir}/lxo-config.patch" # ensure N32 @@ -62,15 +79,8 @@ build() { sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config fi - # remove the "-libre" extraversion from Makefile - sed -i 's|^EXTRAVERSION =.*$|EXTRAVERSION =|g' Makefile - sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|# CONFIG_LOCALVERSION_AUTO is not set|g" ./.config - - # remove the sublevel from Makefile - # this ensures our kernel version is always 3.X-LIBRE - # this way, minor kernel updates will not break external modules - # we need to change this soon, see FS#16702 - sed -ri 's|^(SUBLEVEL =).*|\1|' Makefile + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile # get kernel version make prepare @@ -156,8 +166,13 @@ package_linux-libre() { rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf "${pkgdir}/lib/firmware" - # gzip -9 all modules to safe 100MB of space + # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + # make room for external modules + ln -s "../extramodules-${_basekernel}${_kernelname:--LIBRE}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + # add real version for building modules and running depmod from post_install/upgrade + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--LIBRE}/version" } package_linux-libre-headers() { @@ -320,18 +335,10 @@ package_linux-libre-docs() { cd "${srcdir}/linux-${_basekernel}" mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" - cp -r Documentation "${pkgdir}/usr/src/linux-${_kernver}" + cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" find "${pkgdir}" -type f -exec chmod 444 {} \; find "${pkgdir}" -type d -exec chmod 755 {} \; # 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') diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 4cc6d10cc..43bf1d3c3 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # -# Automatically generated make config: don't edit -# Linux/i386 3.0 Kernel Configuration +# Automatically generated file; DO NOT EDIT. +# Linux/i386 3.1.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -164,6 +164,7 @@ CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -210,6 +211,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y # # GCOV-based kernel profiling @@ -223,12 +225,13 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBDAF=y CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set CONFIG_BLK_DEV_THROTTLING=y @@ -291,6 +294,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_CLOCK=y CONFIG_KVM_GUEST=y @@ -330,6 +334,7 @@ CONFIG_X86_GENERIC=y CONFIG_X86_INTERNODE_CACHE_SHIFT=6 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y +CONFIG_CMPXCHG_DOUBLE=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set @@ -354,7 +359,6 @@ CONFIG_HPET_TIMER=y CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set -CONFIG_IOMMU_API=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y @@ -362,6 +366,7 @@ CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -469,10 +474,10 @@ CONFIG_CAN_PM_TRACE=y # CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_PROC_EVENT=y +# CONFIG_ACPI_PROC_EVENT is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -491,11 +496,12 @@ CONFIG_ACPI_PCI_SLOT=m CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=m +CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_SFI=y @@ -511,7 +517,7 @@ CONFIG_APM_DO_ENABLE=y # CPU Frequency scaling # CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_TABLE=m CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y @@ -568,9 +574,6 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_OLPC=y CONFIG_PCI_DOMAINS=y # CONFIG_PCI_CNB20LE_QUIRK is not set -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_FLOPPY_WA=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -593,7 +596,10 @@ CONFIG_ISA=y # CONFIG_MCA is not set # CONFIG_SCx200 is not set CONFIG_OLPC=y -CONFIG_OLPC_XO1=m +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y +CONFIG_OLPC_XO15_SCI=y CONFIG_AMD_NB=y CONFIG_PCCARD=m CONFIG_PCMCIA=m @@ -854,6 +860,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m # CONFIG_IP_VS_IPV6 is not set @@ -1245,6 +1252,13 @@ CONFIG_CAIF=m CONFIG_CAIF_NETDEV=m CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_NFC=m + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m # # Device Drivers @@ -1264,6 +1278,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set @@ -1410,6 +1426,7 @@ CONFIG_OF_NET=y CONFIG_OF_SPI=y CONFIG_OF_MDIO=m CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m @@ -1440,6 +1457,7 @@ CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set @@ -1488,6 +1506,7 @@ CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=m # CONFIG_PCH_PHUB is not set +CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1499,6 +1518,7 @@ CONFIG_EEPROM_AT25=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -1512,89 +1532,7 @@ CONFIG_IWMC3200TOP=m CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -CONFIG_IDE_LEGACY=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_CS5535=m -CONFIG_BLK_DEV_CS5536=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m - -# -# Other IDE chipsets support -# - -# -# Note: most of these also require special kernel boot parameters -# -CONFIG_BLK_DEV_4DRIVES=m -CONFIG_BLK_DEV_ALI14XX=m -CONFIG_BLK_DEV_DTC2278=m -CONFIG_BLK_DEV_HT6560B=m -CONFIG_BLK_DEV_QD65XX=m -CONFIG_BLK_DEV_UMC8672=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1671,6 +1609,7 @@ CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_IN2000=m @@ -1888,8 +1827,8 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m CONFIG_LOOPBACK_TARGET=m -# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -2067,6 +2006,7 @@ CONFIG_R8169=m CONFIG_SIS190=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_VIA_VELOCITY=m @@ -2153,10 +2093,13 @@ CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2260,6 +2203,7 @@ CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m @@ -2372,6 +2316,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m CONFIG_RIONET=m CONFIG_RIONET_TX_SIZE=128 CONFIG_RIONET_RX_SIZE=128 @@ -2713,12 +2658,16 @@ CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_WISTRON_BTNS=m CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m @@ -2988,13 +2937,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m CONFIG_GPIO_MAX730X=m # # Memory mapped GPIO drivers: # -CONFIG_GPIO_BASIC_MMIO_CORE=m -CONFIG_GPIO_BASIC_MMIO=m +CONFIG_GPIO_GENERIC_PLATFORM=m CONFIG_GPIO_IT8761E=m CONFIG_GPIO_SCH=m CONFIG_GPIO_VX855=m @@ -3006,13 +2955,14 @@ CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPS65912=m CONFIG_GPIO_WM831X=m CONFIG_GPIO_ADP5588=m # # PCI GPIO expanders: # -CONFIG_GPIO_CS5535=m +CONFIG_GPIO_CS5535=y CONFIG_GPIO_LANGWELL=y CONFIG_GPIO_PCH=m CONFIG_GPIO_ML_IOH=m @@ -3144,18 +3094,22 @@ CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m @@ -3172,7 +3126,9 @@ CONFIG_SENSORS_EMC6W201=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -3207,6 +3163,7 @@ CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -3292,6 +3249,7 @@ CONFIG_BCMA_POSSIBLE=y # Broadcom specific AMBA # CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DEBUG is not set @@ -3304,6 +3262,8 @@ CONFIG_UCB1400_CORE=m CONFIG_TPS6105X=m CONFIG_TPS65010=m CONFIG_TPS6507X=m +CONFIG_MFD_TPS65912=y +CONFIG_MFD_TPS65912_SPI=y # CONFIG_MFD_TMIO is not set CONFIG_MFD_WM8400=m CONFIG_MFD_WM831X=y @@ -3348,6 +3308,7 @@ CONFIG_REGULATOR_MC13892=m CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_ISL6271A=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_AB8500=y @@ -3362,6 +3323,7 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y CONFIG_VIDEO_MEDIA=m # @@ -3378,6 +3340,7 @@ CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_LIRC_CODEC=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m @@ -3406,6 +3369,7 @@ CONFIG_MEDIA_TUNER_MT2131=m CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m @@ -3424,6 +3388,7 @@ CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -3502,6 +3467,11 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_TCM825X=m # +# Flash devices +# +CONFIG_VIDEO_ADP1653=m + +# # Video improvement chips # CONFIG_VIDEO_UPD64031A=m @@ -3567,6 +3537,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV5642=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m @@ -3595,6 +3566,7 @@ CONFIG_USB_GSPCA_OV534_9=m CONFIG_USB_GSPCA_PAC207=m CONFIG_USB_GSPCA_PAC7302=m CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m @@ -3626,6 +3598,7 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=y CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y @@ -3782,6 +3755,11 @@ CONFIG_DVB_HOPPER=m CONFIG_DVB_NGENE=m # +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# # Supported DVB Frontends # # CONFIG_DVB_FE_CUSTOMISE is not set @@ -3795,6 +3773,12 @@ CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m # +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m @@ -4033,6 +4017,7 @@ CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m @@ -4074,7 +4059,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y +# CONFIG_LOGO is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -4159,6 +4144,7 @@ CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m CONFIG_SND_MSND_PINNACLE=m CONFIG_SND_MSND_CLASSIC=m +CONFIG_SND_TEA575X=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -4208,8 +4194,8 @@ CONFIG_SND_ES1968_INPUT=y CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_TEA575X=m CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y @@ -4217,6 +4203,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1 CONFIG_SND_HDA_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y @@ -4224,6 +4211,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4293,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 @@ -4305,6 +4293,8 @@ CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m @@ -4342,6 +4332,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4352,6 +4343,7 @@ CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_WIIMOTE=m CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m @@ -4421,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 @@ -4547,20 +4540,20 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_FUSB300 is not set -# CONFIG_USB_GADGET_R8A66597 is not set -# CONFIG_USB_GADGET_PXA_U2O is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_CI13XXX_PCI is not set -CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_FUSB300=m +CONFIG_USB_R8A66597=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_CI13XXX_PCI=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LANGWELL is not set -# CONFIG_USB_GADGET_EG20T is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GOKU=m +CONFIG_USB_LANGWELL=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m @@ -4618,7 +4611,6 @@ CONFIG_SDIO_UART=m CONFIG_MMC_SDHCI=m CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=y -CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m CONFIG_MMC_TIFM_SD=m @@ -4650,12 +4642,9 @@ CONFIG_LEDS_CLASS=y # CONFIG_LEDS_LM3530=m CONFIG_LEDS_NET5501=m -CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_GPIO_OF=y CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m @@ -4675,7 +4664,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m @@ -4684,8 +4672,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # -CONFIG_NFC_DEVICES=y -CONFIG_PN544_NFC=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -4824,11 +4810,15 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_RING=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m CONFIG_STAGING=y -# CONFIG_DIGIEPCA is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_COMPUTONE is not set CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set CONFIG_SLICOSS=m @@ -4941,6 +4931,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m CONFIG_COMEDI_AMPLC_PCI230=m CONFIG_COMEDI_CONTEC_PCI_DIO=m CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m CONFIG_COMEDI_UNIOXX5=m CONFIG_COMEDI_GSC_HPDI=m CONFIG_COMEDI_ICP_MULTI=m @@ -5033,7 +5024,6 @@ CONFIG_HYPERV_MOUSE=m # CONFIG_VME_BUS is not set CONFIG_DX_SEP=m # CONFIG_IIO is not set -CONFIG_CS5535_GPIO=m CONFIG_XVMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set @@ -5043,6 +5033,7 @@ CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m CONFIG_LIRC_STAGING=y @@ -5057,12 +5048,9 @@ CONFIG_LIRC_SIR=m CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m CONFIG_EASYCAP=m -CONFIG_EASYCAP_SND=y -# CONFIG_EASYCAP_OSS is not set # CONFIG_EASYCAP_DEBUG is not set CONFIG_SOLO6X10=m CONFIG_ACPI_QUICKSTART=m -CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_ATH6K_LEGACY=m CONFIG_AR600x_SD31_XXX=y # CONFIG_AR600x_WB31_XXX is not set @@ -5109,10 +5097,9 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_DRM_PSB=m - -# -# Altera FPGA firmware download module -# +CONFIG_DRM_PSB_MRST=y +CONFIG_DRM_PSB_MFLD=y +CONFIG_DRM_PSB_CDV=y CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_X86_PLATFORM_DEVICES=y @@ -5160,7 +5147,17 @@ CONFIG_XO15_EBOOK=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y +CONFIG_VIRT_DRIVERS=y # # Firmware Drivers @@ -5326,6 +5323,7 @@ CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_EMBEDDED is not set @@ -5341,6 +5339,7 @@ CONFIG_PSTORE=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +CONFIG_ORE=m CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -5354,7 +5353,6 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set CONFIG_NFSD=m -# CONFIG_NFSD_DEPRECATED is not set CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y @@ -5503,7 +5501,7 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set @@ -5631,6 +5629,11 @@ CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SELINUX is not set # CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_IMA is not set @@ -5776,10 +5779,6 @@ CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y CONFIG_VHOST_NET=m CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m CONFIG_BINARY_PRINTF=y # @@ -5795,6 +5794,7 @@ CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m +CONFIG_CRC8=m CONFIG_AUDIT_GENERIC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m @@ -5814,6 +5814,7 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y @@ -5829,3 +5830,5 @@ CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CORDIC=m +CONFIG_LLIST=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index de4d3a424..6011a797a 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # -# Automatically generated make config: don't edit -# Linux/x86_64 3.0 Kernel Configuration +# Automatically generated file; DO NOT EDIT. +# Linux/x86_64 3.1.1-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -12,6 +12,7 @@ CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_CLOCKSOURCE_WATCHDOG=y CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y @@ -165,6 +166,7 @@ CONFIG_PRINTK=y CONFIG_BUG=y CONFIG_ELF_CORE=y CONFIG_PCSPKR_PLATFORM=y +CONFIG_HAVE_PCSPKR_PLATFORM=y CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -211,6 +213,7 @@ CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y CONFIG_HAVE_PERF_EVENTS_NMI=y CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y # # GCOV-based kernel profiling @@ -224,11 +227,12 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_BLK_DEV_BSG=y +# CONFIG_BLK_DEV_BSGLIB is not set # CONFIG_BLK_DEV_INTEGRITY is not set CONFIG_BLK_DEV_THROTTLING=y CONFIG_BLOCK_COMPAT=y @@ -290,6 +294,7 @@ CONFIG_X86_MPPARSE=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PRIVILEGED_GUEST=y @@ -314,6 +319,7 @@ CONFIG_GENERIC_CPU=y CONFIG_X86_INTERNODE_CACHE_SHIFT=7 CONFIG_X86_CMPXCHG=y CONFIG_CMPXCHG_LOCAL=y +CONFIG_CMPXCHG_DOUBLE=y CONFIG_X86_L1_CACHE_SHIFT=6 CONFIG_X86_XADD=y CONFIG_X86_WP_WORKS_OK=y @@ -331,11 +337,8 @@ CONFIG_DMI=y CONFIG_GART_IOMMU=y CONFIG_CALGARY_IOMMU=y CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y -CONFIG_AMD_IOMMU=y -# CONFIG_AMD_IOMMU_STATS is not set CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y -CONFIG_IOMMU_API=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y @@ -344,6 +347,7 @@ CONFIG_SCHED_MC=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -457,10 +461,10 @@ CONFIG_CAN_PM_TRACE=y # CONFIG_PM_TRACE_RTC is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y +# CONFIG_ACPI_PROCFS is not set # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m -CONFIG_ACPI_PROC_EVENT=y +# CONFIG_ACPI_PROC_EVENT is not set CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m CONFIG_ACPI_BUTTON=m @@ -481,11 +485,12 @@ CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_HOTPLUG_MEMORY=m CONFIG_ACPI_SBS=m -CONFIG_ACPI_HED=m +CONFIG_ACPI_HED=y CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_GHES=m +CONFIG_ACPI_APEI_GHES=y CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_EINJ=m CONFIG_ACPI_APEI_ERST_DEBUG=m CONFIG_SFI=y @@ -540,10 +545,6 @@ CONFIG_PCI_MMCONFIG=y CONFIG_PCI_XEN=y CONFIG_PCI_DOMAINS=y # CONFIG_PCI_CNB20LE_QUIRK is not set -CONFIG_DMAR=y -# CONFIG_DMAR_DEFAULT_ON is not set -CONFIG_DMAR_FLOPPY_WA=y -# CONFIG_INTR_REMAP is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m CONFIG_PCIEAER=y @@ -822,6 +823,7 @@ CONFIG_IP_SET_HASH_IPPORTIP=m CONFIG_IP_SET_HASH_IPPORTNET=m CONFIG_IP_SET_HASH_NET=m CONFIG_IP_SET_HASH_NETPORT=m +CONFIG_IP_SET_HASH_NETIFACE=m CONFIG_IP_SET_LIST_SET=m CONFIG_IP_VS=m # CONFIG_IP_VS_IPV6 is not set @@ -1210,6 +1212,13 @@ CONFIG_CAIF=m CONFIG_CAIF_NETDEV=m CONFIG_CEPH_LIB=m # CONFIG_CEPH_LIB_PRETTYDEBUG is not set +CONFIG_NFC=m + +# +# Near Field Communication (NFC) devices +# +CONFIG_PN544_NFC=m +CONFIG_NFC_PN533=m # # Device Drivers @@ -1229,6 +1238,8 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set @@ -1383,6 +1394,7 @@ CONFIG_BLK_DEV_DAC960=m # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_DRBD=m # CONFIG_DRBD_FAULT_INJECTION is not set @@ -1433,6 +1445,7 @@ CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m CONFIG_BMP085=m CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1444,6 +1457,7 @@ CONFIG_EEPROM_AT25=m CONFIG_EEPROM_LEGACY=m CONFIG_EEPROM_MAX6875=m CONFIG_EEPROM_93CX6=m +CONFIG_EEPROM_93XX46=m CONFIG_CB710_CORE=m # CONFIG_CB710_DEBUG is not set CONFIG_CB710_DEBUG_ASSUMPTIONS=y @@ -1457,72 +1471,7 @@ CONFIG_IWMC3200TOP=m CONFIG_TI_ST=m CONFIG_SENSORS_LIS3_I2C=m CONFIG_HAVE_IDE=y -CONFIG_IDE=m - -# -# Please see Documentation/ide/ide.txt for help/info on IDE drives -# -CONFIG_IDE_XFER_MODE=y -CONFIG_IDE_TIMINGS=y -CONFIG_IDE_ATAPI=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=m -CONFIG_IDE_GD_ATA=y -CONFIG_IDE_GD_ATAPI=y -CONFIG_BLK_DEV_IDECS=m -CONFIG_BLK_DEV_DELKIN=m -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_BLK_DEV_IDEACPI=y -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=m -CONFIG_BLK_DEV_PLATFORM=m -CONFIG_BLK_DEV_CMD640=m -# CONFIG_BLK_DEV_CMD640_ENHANCED is not set -CONFIG_BLK_DEV_IDEPNP=m -CONFIG_BLK_DEV_IDEDMA_SFF=y - -# -# PCI IDE chipsets support -# -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=m -CONFIG_BLK_DEV_OPTI621=m -CONFIG_BLK_DEV_RZ1000=m -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_AEC62XX=m -CONFIG_BLK_DEV_ALI15X3=m -CONFIG_BLK_DEV_AMD74XX=m -CONFIG_BLK_DEV_ATIIXP=m -CONFIG_BLK_DEV_CMD64X=m -CONFIG_BLK_DEV_TRIFLEX=m -CONFIG_BLK_DEV_CS5520=m -CONFIG_BLK_DEV_CS5530=m -CONFIG_BLK_DEV_HPT366=m -CONFIG_BLK_DEV_JMICRON=m -CONFIG_BLK_DEV_SC1200=m -CONFIG_BLK_DEV_PIIX=m -CONFIG_BLK_DEV_IT8172=m -CONFIG_BLK_DEV_IT8213=m -CONFIG_BLK_DEV_IT821X=m -CONFIG_BLK_DEV_NS87415=m -CONFIG_BLK_DEV_PDC202XX_OLD=m -CONFIG_BLK_DEV_PDC202XX_NEW=m -CONFIG_BLK_DEV_SVWKS=m -CONFIG_BLK_DEV_SIIMAGE=m -CONFIG_BLK_DEV_SIS5513=m -CONFIG_BLK_DEV_SLC90E66=m -CONFIG_BLK_DEV_TRM290=m -CONFIG_BLK_DEV_VIA82CXXX=m -CONFIG_BLK_DEV_TC86C001=m -CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDE is not set # # SCSI device support @@ -1596,6 +1545,7 @@ CONFIG_SCSI_AIC94XX=m # CONFIG_AIC94XX_DEBUG is not set CONFIG_SCSI_MVSAS=m # CONFIG_SCSI_MVSAS_DEBUG is not set +CONFIG_SCSI_MVSAS_TASKLET=y CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_ARCMSR=m @@ -1791,8 +1741,8 @@ CONFIG_TCM_IBLOCK=m CONFIG_TCM_FILEIO=m CONFIG_TCM_PSCSI=m CONFIG_LOOPBACK_TARGET=m -# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m CONFIG_FUSION=y CONFIG_FUSION_SPI=m CONFIG_FUSION_FC=m @@ -1940,6 +1890,7 @@ CONFIG_R8169=m CONFIG_SIS190=m CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y CONFIG_SKY2=m # CONFIG_SKY2_DEBUG is not set CONFIG_VIA_VELOCITY=m @@ -2026,10 +1977,13 @@ CONFIG_CARL9170=m CONFIG_CARL9170_LEDS=y CONFIG_CARL9170_WPC=y CONFIG_B43=m +CONFIG_B43_BCMA=y +CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2133,6 +2087,7 @@ CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_RTL8192CE=m CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m CONFIG_RTL8192CU=m CONFIG_RTLWIFI=m CONFIG_RTL8192C_COMMON=m @@ -2245,6 +2200,7 @@ CONFIG_IEEE802154_FAKEHARD=m CONFIG_CAIF_TTY=m CONFIG_CAIF_SPI_SLAVE=m CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m CONFIG_XEN_NETDEV_FRONTEND=m CONFIG_XEN_NETDEV_BACKEND=m CONFIG_RIONET=m @@ -2566,11 +2522,15 @@ CONFIG_INPUT_AD714X=m CONFIG_INPUT_AD714X_I2C=m CONFIG_INPUT_AD714X_SPI=m CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m CONFIG_INPUT_APANEL=m CONFIG_INPUT_ATLAS_BTNS=m CONFIG_INPUT_ATI_REMOTE=m CONFIG_INPUT_ATI_REMOTE2=m CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m @@ -2833,13 +2793,13 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y CONFIG_GPIOLIB=y # CONFIG_DEBUG_GPIO is not set CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_GENERIC=m CONFIG_GPIO_MAX730X=m # # Memory mapped GPIO drivers: # -CONFIG_GPIO_BASIC_MMIO_CORE=m -CONFIG_GPIO_BASIC_MMIO=m +CONFIG_GPIO_GENERIC_PLATFORM=m CONFIG_GPIO_IT8761E=m CONFIG_GPIO_SCH=m CONFIG_GPIO_VX855=m @@ -2851,6 +2811,7 @@ CONFIG_GPIO_MAX7300=m CONFIG_GPIO_MAX732X=m CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPS65912=m CONFIG_GPIO_WM831X=m CONFIG_GPIO_ADP5588=m @@ -2988,18 +2949,22 @@ CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m CONFIG_SENSORS_LTC4261=m CONFIG_SENSORS_LM95241=m +CONFIG_SENSORS_LM95245=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX16065=m CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m CONFIG_SENSORS_MAX6639=m CONFIG_SENSORS_MAX6642=m CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m CONFIG_PMBUS=m CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_LM25066=m CONFIG_SENSORS_MAX16064=m CONFIG_SENSORS_MAX34440=m CONFIG_SENSORS_MAX8688=m @@ -3016,7 +2981,9 @@ CONFIG_SENSORS_EMC6W201=m CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47M192=m CONFIG_SENSORS_SMSC47B397=m +CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_ADS1015=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m @@ -3051,6 +3018,7 @@ CONFIG_SENSORS_ATK0110=m CONFIG_THERMAL=y CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y # CONFIG_WATCHDOG_NOWAYOUT is not set # @@ -3129,6 +3097,7 @@ CONFIG_BCMA_POSSIBLE=y # Broadcom specific AMBA # CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y CONFIG_BCMA_HOST_PCI_POSSIBLE=y CONFIG_BCMA_HOST_PCI=y # CONFIG_BCMA_DEBUG is not set @@ -3141,6 +3110,8 @@ CONFIG_UCB1400_CORE=m CONFIG_TPS6105X=m CONFIG_TPS65010=m CONFIG_TPS6507X=m +CONFIG_MFD_TPS65912=y +CONFIG_MFD_TPS65912_SPI=y # CONFIG_MFD_TMIO is not set CONFIG_MFD_WM8400=m CONFIG_MFD_WM831X=y @@ -3185,6 +3156,7 @@ CONFIG_REGULATOR_MC13892=m CONFIG_REGULATOR_TPS6105X=m CONFIG_REGULATOR_TPS65023=m CONFIG_REGULATOR_TPS6507X=m +CONFIG_REGULATOR_TPS65912=m CONFIG_REGULATOR_ISL6271A=m CONFIG_REGULATOR_AD5398=m CONFIG_REGULATOR_AB8500=y @@ -3199,6 +3171,7 @@ CONFIG_VIDEO_DEV=m CONFIG_VIDEO_V4L2_COMMON=m CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y CONFIG_VIDEO_MEDIA=m # @@ -3215,6 +3188,7 @@ CONFIG_IR_RC6_DECODER=m CONFIG_IR_JVC_DECODER=m CONFIG_IR_SONY_DECODER=m CONFIG_IR_RC5_SZ_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m CONFIG_IR_LIRC_CODEC=m CONFIG_IR_ENE=m CONFIG_IR_IMON=m @@ -3243,6 +3217,7 @@ CONFIG_MEDIA_TUNER_MT2131=m CONFIG_MEDIA_TUNER_QT1010=m CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m +CONFIG_MEDIA_TUNER_XC4000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m CONFIG_MEDIA_TUNER_MC44S803=m @@ -3261,6 +3236,7 @@ CONFIG_VIDEO_TUNER=m CONFIG_V4L2_MEM2MEM_DEV=m CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_ADV_DEBUG is not set @@ -3339,6 +3315,11 @@ CONFIG_VIDEO_MT9V032=m CONFIG_VIDEO_TCM825X=m # +# Flash devices +# +CONFIG_VIDEO_ADP1653=m + +# # Video improvement chips # CONFIG_VIDEO_UPD64031A=m @@ -3403,6 +3384,7 @@ CONFIG_SOC_CAMERA_RJ54N1=m CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_SOC_CAMERA_OV2640=m +CONFIG_SOC_CAMERA_OV5642=m CONFIG_SOC_CAMERA_OV6650=m CONFIG_SOC_CAMERA_OV772X=m CONFIG_SOC_CAMERA_OV9640=m @@ -3431,6 +3413,7 @@ CONFIG_USB_GSPCA_OV534_9=m CONFIG_USB_GSPCA_PAC207=m CONFIG_USB_GSPCA_PAC7302=m CONFIG_USB_GSPCA_PAC7311=m +CONFIG_USB_GSPCA_SE401=m CONFIG_USB_GSPCA_SN9C2028=m CONFIG_USB_GSPCA_SN9C20X=m CONFIG_USB_GSPCA_SONIXB=m @@ -3462,6 +3445,7 @@ CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=y CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y @@ -3606,6 +3590,11 @@ CONFIG_DVB_HOPPER=m CONFIG_DVB_NGENE=m # +# Supported ddbridge ('Octopus') Adapters +# +CONFIG_DVB_DDBRIDGE=m + +# # Supported DVB Frontends # # CONFIG_DVB_FE_CUSTOMISE is not set @@ -3619,6 +3608,12 @@ CONFIG_DVB_STV090x=m CONFIG_DVB_STV6110x=m # +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=m + +# # DVB-S (satellite) frontends # CONFIG_DVB_CX24110=m @@ -3850,6 +3845,7 @@ CONFIG_LCD_VGG2432A4=m CONFIG_LCD_PLATFORM=m CONFIG_LCD_S6E63M0=m CONFIG_LCD_LD9040=m +CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m @@ -3890,7 +3886,7 @@ CONFIG_FONT_8x16=y # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_10x18 is not set -CONFIG_LOGO=y +# CONFIG_LOGO is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -3939,6 +3935,7 @@ CONFIG_SND_AC97_POWER_SAVE=y CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 CONFIG_SND_SB_COMMON=m CONFIG_SND_SB16_DSP=m +CONFIG_SND_TEA575X=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -3988,8 +3985,8 @@ CONFIG_SND_ES1968_INPUT=y CONFIG_SND_ES1968_RADIO=y CONFIG_SND_FM801=m CONFIG_SND_FM801_TEA575X_BOOL=y -CONFIG_SND_TEA575X=m CONFIG_SND_HDA_INTEL=m +CONFIG_SND_HDA_PREALLOC_SIZE=4096 CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_RECONFIG=y CONFIG_SND_HDA_INPUT_BEEP=y @@ -3997,6 +3994,7 @@ CONFIG_SND_HDA_INPUT_BEEP_MODE=1 CONFIG_SND_HDA_INPUT_JACK=y CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y CONFIG_SND_HDA_CODEC_VIA=y @@ -4004,6 +4002,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y +CONFIG_SND_HDA_CODEC_CA0132=y CONFIG_SND_HDA_CODEC_CMEDIA=y CONFIG_SND_HDA_CODEC_SI3054=y CONFIG_SND_HDA_GENERIC=y @@ -4072,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 @@ -4084,6 +4083,8 @@ CONFIG_DRAGONRISE_FF=y CONFIG_HID_EMS_FF=m CONFIG_HID_ELECOM=m CONFIG_HID_EZKEY=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y CONFIG_HID_KEYTOUCH=m CONFIG_HID_KYE=m CONFIG_HID_UCLOGIC=m @@ -4121,6 +4122,7 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m CONFIG_HID_ROCCAT_PYRA=m CONFIG_HID_SAMSUNG=m CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m CONFIG_HID_SUNPLUS=m CONFIG_HID_GREENASIA=m CONFIG_GREENASIA_FF=y @@ -4131,6 +4133,7 @@ CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m CONFIG_HID_WACOM_POWER_SUPPLY=y +CONFIG_HID_WIIMOTE=m CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m @@ -4200,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 @@ -4326,20 +4330,18 @@ CONFIG_USB_GADGET=m # CONFIG_USB_GADGET_DEBUG_FILES is not set # CONFIG_USB_GADGET_DEBUG_FS is not set CONFIG_USB_GADGET_VBUS_DRAW=2 -CONFIG_USB_GADGET_SELECTED=y -# CONFIG_USB_GADGET_FUSB300 is not set -# CONFIG_USB_GADGET_R8A66597 is not set -# CONFIG_USB_GADGET_PXA_U2O is not set -# CONFIG_USB_GADGET_M66592 is not set -# CONFIG_USB_GADGET_AMD5536UDC is not set -# CONFIG_USB_GADGET_CI13XXX_PCI is not set -CONFIG_USB_GADGET_NET2280=y +CONFIG_USB_R8A66597=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_CI13XXX_PCI=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2280=m -# CONFIG_USB_GADGET_GOKU is not set -# CONFIG_USB_GADGET_LANGWELL is not set -# CONFIG_USB_GADGET_EG20T is not set -# CONFIG_USB_GADGET_DUMMY_HCD is not set +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m CONFIG_USB_GADGET_DUALSPEED=y +CONFIG_USB_GADGET_SUPERSPEED=y # CONFIG_USB_ZERO is not set CONFIG_USB_AUDIO=m CONFIG_USB_ETH=m @@ -4433,7 +4435,6 @@ CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA9532_GPIO=y CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y CONFIG_LEDS_LP3944=m CONFIG_LEDS_LP5521=m CONFIG_LEDS_LP5523=m @@ -4453,7 +4454,6 @@ CONFIG_LEDS_TRIGGERS=y # LED Triggers # CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_GPIO=m @@ -4462,8 +4462,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m # # iptables trigger is under Netfilter config (LED target) # -CONFIG_NFC_DEVICES=y -CONFIG_PN544_NFC=m CONFIG_ACCESSIBILITY=y CONFIG_A11Y_BRAILLE_CONSOLE=y # CONFIG_INFINIBAND is not set @@ -4599,11 +4597,21 @@ CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m CONFIG_UIO_PCI_GENERIC=m CONFIG_UIO_NETX=m +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m # # Xen driver support # CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y CONFIG_XEN_SCRUB_PAGES=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y @@ -4615,11 +4623,9 @@ CONFIG_XEN_GNTDEV=m CONFIG_XEN_GRANT_DEV_ALLOC=m CONFIG_XEN_PLATFORM_PCI=m CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=y +CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_STAGING=y -# CONFIG_DIGIEPCA is not set -# CONFIG_RISCOM8 is not set -# CONFIG_SPECIALIX is not set -# CONFIG_COMPUTONE is not set CONFIG_ET131X=m # CONFIG_ET131X_DEBUG is not set CONFIG_SLICOSS=m @@ -4690,6 +4696,7 @@ CONFIG_COMEDI_AMPLC_PCI224=m CONFIG_COMEDI_AMPLC_PCI230=m CONFIG_COMEDI_CONTEC_PCI_DIO=m CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m CONFIG_COMEDI_UNIOXX5=m CONFIG_COMEDI_GSC_HPDI=m CONFIG_COMEDI_ICP_MULTI=m @@ -4788,6 +4795,7 @@ CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m CONFIG_VIDEO_DT3155=m CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y CONFIG_CRYSTALHD=m CONFIG_FB_XGI=m CONFIG_LIRC_STAGING=y @@ -4802,12 +4810,9 @@ CONFIG_LIRC_SIR=m CONFIG_LIRC_TTUSBIR=m CONFIG_LIRC_ZILOG=m CONFIG_EASYCAP=m -CONFIG_EASYCAP_SND=y -# CONFIG_EASYCAP_OSS is not set # CONFIG_EASYCAP_DEBUG is not set CONFIG_SOLO6X10=m CONFIG_ACPI_QUICKSTART=m -CONFIG_MACH_NO_WESTBRIDGE=y CONFIG_ATH6K_LEGACY=m CONFIG_AR600x_SD31_XXX=y # CONFIG_AR600x_WB31_XXX is not set @@ -4854,10 +4859,9 @@ CONFIG_SPEAKUP_SYNTH_DUMMY=m CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m CONFIG_DRM_PSB=m - -# -# Altera FPGA firmware download module -# +CONFIG_DRM_PSB_MRST=y +CONFIG_DRM_PSB_MFLD=y +CONFIG_DRM_PSB_CDV=y CONFIG_ALTERA_STAPL=m CONFIG_INTEL_MEI=m CONFIG_X86_PLATFORM_DEVICES=y @@ -4903,6 +4907,19 @@ CONFIG_XO15_EBOOK=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_MXM_WMI=m CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_DMAR=y +# CONFIG_DMAR_DEFAULT_ON is not set +CONFIG_DMAR_FLOPPY_WA=y +# CONFIG_INTR_REMAP is not set +CONFIG_VIRT_DRIVERS=y # # Firmware Drivers @@ -5069,6 +5086,7 @@ CONFIG_LOGFS=m CONFIG_CRAMFS=m CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y # CONFIG_SQUASHFS_EMBEDDED is not set @@ -5084,6 +5102,7 @@ CONFIG_PSTORE=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +CONFIG_ORE=m CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set CONFIG_NETWORK_FILESYSTEMS=y @@ -5097,7 +5116,6 @@ CONFIG_NFS_FSCACHE=y CONFIG_NFS_USE_KERNEL_DNS=y # CONFIG_NFS_USE_NEW_IDMAPPER is not set CONFIG_NFSD=m -# CONFIG_NFSD_DEPRECATED is not set CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y CONFIG_NFSD_V3_ACL=y @@ -5245,7 +5263,7 @@ CONFIG_DEBUG_MUTEXES=y # CONFIG_PROVE_LOCKING is not set # CONFIG_SPARSE_RCU_POINTER is not set # CONFIG_LOCK_STAT is not set -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_ATOMIC_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set CONFIG_STACKTRACE=y # CONFIG_DEBUG_STACK_USAGE is not set @@ -5372,6 +5390,11 @@ CONFIG_SECURITY_PATH=y # CONFIG_SECURITY_SELINUX is not set # CONFIG_SECURITY_SMACK is not set CONFIG_SECURITY_TOMOYO=y +CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 # CONFIG_IMA is not set @@ -5516,10 +5539,6 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_MMU_AUDIT=y CONFIG_VHOST_NET=m -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m CONFIG_BINARY_PRINTF=y # @@ -5535,6 +5554,7 @@ CONFIG_CRC_ITU_T=m CONFIG_CRC32=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m +CONFIG_CRC8=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=y @@ -5553,6 +5573,7 @@ CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y CONFIG_DECOMPRESS_XZ=y CONFIG_DECOMPRESS_LZO=y +CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y CONFIG_TEXTSEARCH=y @@ -5568,3 +5589,5 @@ CONFIG_CPU_RMAP=y CONFIG_NLATTR=y CONFIG_LRU_CACHE=m CONFIG_AVERAGE=y +CONFIG_CORDIC=m +CONFIG_LLIST=y 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 6f7ae815a..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.0-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/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 8798778d5..d5f6be604 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') -pkgver=34174 +pkgver=34344 pkgrel=1 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' @@ -18,9 +18,9 @@ makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass') license=('GPL') url="http://www.mplayerhq.hu/" -options=(!buildflags !emptydirs !distcc) +options=(!buildflags !emptydirs) source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop) -md5sums=('73225e0be6c5db51d7cbf2a0dd1d25a2' +md5sums=('e4016248418b8f9d55b540d68b6cfee2' 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { @@ -39,6 +39,7 @@ build() { --disable-mga \ --disable-ass-internal \ --enable-xvmc \ + --enable-radio \ --language=all \ --confdir=/etc/mplayer [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index 29d7d2b9c..c8b423486 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -3,7 +3,7 @@ pkgname=pacman pkgver=3.5.4 -pkgrel=4 +pkgrel=4.2 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -61,7 +61,7 @@ package() { mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - myldflags="" + myldflags="-Wl,--as-needed" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -80,9 +80,9 @@ package() { } # vim: set ts=2 sw=2 et: -md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' - 'c7e6dbee04b7c492febea4366519b91d' - '8809642ed398d2b9b98c5974b8b5e348' - '3b2e740853e3d1463885675809d4c6ff' +md5sums=('2dd3a85d55ee3dd89abd349aa837447c' + 'ba85525fe868f030bef209b0487dd5a5' + '7aaccf24479f396d4a5987c8ccd2f3a2' + '150a2854816cd67b1608e00f99701c1c' 'be10d3d2e533515a0470237761415568' - '15d09319fae475f20ba11dd56e832c65') + '749a4ddc6d8418d8d031f1c9b4e09d6f') diff --git a/libre/sqlite3/PKGBUILD b/libre/sqlite3/PKGBUILD index 9cf45373a..9e380bd73 100644 --- a/libre/sqlite3/PKGBUILD +++ b/libre/sqlite3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ +# $Id: PKGBUILD 138719 2011-09-27 17:41:55Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> @@ -8,10 +8,10 @@ pkgbase="sqlite3" pkgname=('sqlite3' 'sqlite3-tcl') -_amalgamationver=3070603 +_amalgamationver=3070800 _amalgamationver2=${_amalgamationver/00/} pkgver=${_amalgamationver2//0/.} -pkgrel=1 +pkgrel=2 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -21,6 +21,10 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') +md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542' + 'c1cdbc5544034d9012e421e75a5e4890') +sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724' + 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 48ec8778d..dd1c32a40 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,15 +5,15 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=2 +pkgrel=4 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') -depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') -makedepends=('perl' 'clisp' 'ffcall') +depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') +makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam') +conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -24,7 +24,8 @@ source=('texmf.cnf' 'archlinux-build.patch' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20110724.tar.xz' 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20110724.tar.xz' - "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" + # "http://foundry.supelec.fr/gf/download/frsrelease/392/1730/luatex-beta-${_luatex_ver}.tar.bz2" + 'http://ftp.archlinux.org/other/texlive/luatex-svn4356.tar.xz' ) backup=(etc/texmf/web2c/texmf.cnf \ etc/texmf/chktex/chktexrc \ @@ -46,7 +47,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147' '94ef5571a54262790ab64d6d044dd10c' '58e8ab64188eaf15897b7acf472dca9f' '9f7ae1aa24afd9e34289ac10a8f9e87b' - 'c9348d4381170204b1a1b0440d8b6918') + 'e7f0197559ef865d8c01683dab3b8526') build() { cd $srcdir @@ -55,7 +56,8 @@ build() { rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog} rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler} # Building LuaTeX - cd luatex-beta-${_luatex_ver} + # cd luatex-beta-${_luatex_ver} + cd luatex patch -p0 -i ../fix-fontforge-encoding.patch (cd source && ./texk/web2c/luatexdir/getluatexsvnversion.sh) mkdir build @@ -73,6 +75,7 @@ build() { --without-system-icu \ --without-system-kpathsea \ --with-system-freetype2 \ + --with-system-xpdf \ --with-system-poppler \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ @@ -234,7 +237,7 @@ package() { rm -rf ${pkgdir}/usr/{texmf,texmf-dist} ## install luatex binary - cd $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c + cd $srcdir/luatex/build/texk/web2c ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/ cd $pkgdir/usr/bin /bin/ln -s luatex texlua diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 36928ad2c..84bab9c17 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -6,7 +6,7 @@ pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686' 'mips64el') url="http://wakaba.c3.cx/s/apps/unarchiver.html" license=('LGPL2.1') -depends=('gnustep-base>=1.23.0-1.1' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') +depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') conflicts=('gnustep-base>=1.24') makedepends=('gcc-objc') source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip) diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD new file mode 100644 index 000000000..050cfb484 --- /dev/null +++ b/libre/ununrar/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Michał Masłowski <mtjm@mtjm.eu> + +pkgname=ununrar +pkgver=0.0a0dev20110715 +pkgrel=1 +pkgdesc="An unrar-compatible interface to Unarchiver" +arch=('any') +url="http://hg.mtjm.eu/ununrar/" +license=('AGPL') +depends=('python2' 'python2-distribute' 'unarchiver') +provides=('unrar' 'unrar-libre') +conflicts=('unrar' 'unrar-libre') +options=(!emptydirs) +source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") +sha512sums=('ea2a6805c16be3aad81b18e5e9e044d73ca2f8f87ce078c35e64cdffb12d5f0e4c96e66901af54f388349edbb88c6252ed0e0329e9813cce5e7b9b480802cf44') + +package() { + cd "$srcdir/Ununrar-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules index a6cfe0a05..37403ae2f 100644 --- a/libre/virtualbox/10-vboxdrv.rules +++ b/libre/virtualbox-libre/10-vboxdrv.rules @@ -3,4 +3,3 @@ SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSB SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" - diff --git a/libre/virtualbox/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch index baca4bc5b..baca4bc5b 100644 --- a/libre/virtualbox/18-system-xorg.patch +++ b/libre/virtualbox-libre/18-system-xorg.patch diff --git a/libre/virtualbox/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules index d64575709..d64575709 100644 --- a/libre/virtualbox/60-vboxguest.rules +++ b/libre/virtualbox-libre/60-vboxguest.rules diff --git a/libre/virtualbox/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk index 97123a296..e5cbcebcd 100644 --- a/libre/virtualbox/LocalConfig.kmk +++ b/libre/virtualbox-libre/LocalConfig.kmk @@ -17,4 +17,3 @@ VBOX_BLD_PYTHON = python2 VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = - diff --git a/libre/virtualbox/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index bfd784c0d..45b870e64 100644 --- a/libre/virtualbox/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -7,29 +7,27 @@ # * Package with --pkg "virtualbox-parabola-additions virtualbox-parabola-modules" # Based on #Maintainer: Ionut Biru <ibiru@archlinux.org> -pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-parabola-additions' 'virtualbox-parabola-modules' 'virtualbox-sdk') +pkgbase=virtualbox-libre +pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source') pkgver=4.1.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2' -'xorg-server-devel' 'xf86driproto' 'libxcomposite' 'pkgconfig') +'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild change_default_driver_dir.patch vbox-service.conf vbox-service.rc) -_kernver=3.0-LIBRE -options=(!distcc) + +_extramodules=extramodules-3.1-LIBRE +_kernver="$(cat /lib/modules/${_extramodules}/version)" build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" - patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" - patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/change_default_driver_dir.patch" @@ -38,22 +36,24 @@ build() { ./configure --disable-docs \ --enable-webservice \ --enable-vde \ + --enable-vnc \ + --nofatal \ --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all - - export KERN_DIR=/usr/src/linux-${_kernver} - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" } -package_virtualbox() { +package_virtualbox-libre() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make') + depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: developer kit') + 'virtualbox-sdk: developer kit' + 'virtualbox-source: host kernel source modules for non-stock kernels') + replaces=('virtualbox') + conflicts=('virtualbox') + provides=("virtualbox=$pkgver") replaces=('virtualbox-ose') conflicts=('virtualbox-ose') @@ -113,6 +113,17 @@ package_virtualbox() { "$pkgdir/usr/share/licenses/virtualbox/LICENSE" install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" +} + +package_virtualbox-source() { + pkgdesc="VirtualBox kernel modules source" + depends=(linux-libre-headers gcc make) + install=virtualbox-source.install + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + mkdir -p $pkgdir/usr/lib/virtualbox + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" #sources for modules cp -r src ${pkgdir}/usr/lib/virtualbox @@ -121,7 +132,7 @@ package_virtualbox() { } package_virtualbox-sdk() { - pkgdesc=" VirtualBox Software Developer Kit (SDK)" + pkgdesc="VirtualBox Software Developer Kit (SDK)" depends=('python2') mkdir -p "$pkgdir/usr/lib/virtualbox" @@ -170,43 +181,23 @@ package_virtualbox-parabola-additions(){ # install sample config install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } - -package_virtualbox-parabola-modules(){ - pkgdesc="Additions only for Parabola guests (kernel modules)" - license=('GPL') - install=virtualbox-parabola-modules.install - depends=('linux-libre>=3.0' 'linux-libre<3.1') - replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') - conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') - provides=("virtualbox-archlinux-modules=${pkgver}") - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - install -D -m644 vboxguest.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - - install -D -m644 vboxsf.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - - install -D -m644 vboxvideo.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-parabola-modules.install" -} +md5sums=('dc6e6801b3823332b6ca2e9915221aae' + 'bc048d1e58d84ece4a186199ee48d4c8' + '5f85710e0b8606de967716ded7b2d351' + 'cc3f278bc273011aa95277500a76f677' + '78ffa67ff131680f1d2b6f06d4325c5b' + 'a82d698e7868315cdf876cfb02fd2268' + '97e193f050574dd272a38e5ee5ebe62b' + '3c08ad30b89add47d3f45121200a5360' + '778d865e56e31cc592fbfa257fdcfce7') md5sums=('dc6e6801b3823332b6ca2e9915221aae' 'a9f22ccaacb207e0e1c5450fede82d06' 'b7cbcf89a30c712fed4435dea28d1703' - 'cee0c968c923760181ae060eab1c2e58' - '13ff08388a54fd48cc04523380f26af6' - '47349d711ecb5fbc105a18f9f936953b' - '0d91f80ce6a4985db8d2f8f65a61458e' - '47d6ee4f673bf31babbb7b4edb61e547' - '6df8eb5173c4f84faedb4962c4d5f0ef' - 'b978dfdbff377e00ddecb24cb3218ed2' - '2460dedb8bdce85f9d7e075742e94d24') + '5f85710e0b8606de967716ded7b2d351' + 'cc3f278bc273011aa95277500a76f677' + '78ffa67ff131680f1d2b6f06d4325c5b' + 'a82d698e7868315cdf876cfb02fd2268' + '97e193f050574dd272a38e5ee5ebe62b' + '3c08ad30b89add47d3f45121200a5360' + '778d865e56e31cc592fbfa257fdcfce7') diff --git a/libre/virtualbox/change_default_driver_dir.patch b/libre/virtualbox-libre/change_default_driver_dir.patch index f6dc7e1a0..d8531499d 100644 --- a/libre/virtualbox/change_default_driver_dir.patch +++ b/libre/virtualbox-libre/change_default_driver_dir.patch @@ -16,4 +16,3 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_d #ifdef DEBUG_DRI_CALLS #define SWDRI_SHOWNAME(pext, func) \ - diff --git a/libre/virtualbox/vbox-service.conf b/libre/virtualbox-libre/vbox-service.conf index 31262af37..9d4ec629f 100644 --- a/libre/virtualbox/vbox-service.conf +++ b/libre/virtualbox-libre/vbox-service.conf @@ -1,3 +1,2 @@ # VBoxService -h VBOX_SERVICE_OPTION="" - diff --git a/libre/virtualbox/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc index 381e3d751..c1af2134d 100644 --- a/libre/virtualbox/vbox-service.rc +++ b/libre/virtualbox-libre/vbox-service.rc @@ -37,4 +37,3 @@ esac exit 0 # vim:set ts=2 sw=2 ft=sh et: - diff --git a/libre/virtualbox/vboxbuild b/libre/virtualbox-libre/vboxbuild index 66f5812ab..cfc3c0a66 100644 --- a/libre/virtualbox/vboxbuild +++ b/libre/virtualbox-libre/vboxbuild @@ -29,7 +29,7 @@ if (( ${#MODLIST[*]} )); then modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail fi -for kdir in /lib/modules/*; do +for kdir in /lib/modules/[2-3]*; do if [[ ! -d $kdir/kernel ]]; then # found a stale kernel mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*) @@ -76,4 +76,3 @@ if (( ${#MODLIST[*]} )); then modprobe -a "${MODLIST[@]}" && stat_done || stat_fail fi - diff --git a/libre/virtualbox/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 14e26d114..c310dbc8d 100644 --- a/libre/virtualbox/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -43,4 +43,3 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. - diff --git a/libre/virtualbox/virtualbox-4-makeself-check.patch b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch index 57862b41e..57862b41e 100644 --- a/libre/virtualbox/virtualbox-4-makeself-check.patch +++ b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch diff --git a/libre/virtualbox/virtualbox-4-mkisofs-check.patch b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch index d43962148..d43962148 100644 --- a/libre/virtualbox/virtualbox-4-mkisofs-check.patch +++ b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch diff --git a/libre/virtualbox/virtualbox-parabola-modules.install b/libre/virtualbox-libre/virtualbox-parabola-modules.install index 75d28784a..75d28784a 100644 --- a/libre/virtualbox/virtualbox-parabola-modules.install +++ b/libre/virtualbox-libre/virtualbox-parabola-modules.install diff --git a/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install new file mode 100644 index 000000000..14537f23d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-source.install @@ -0,0 +1,13 @@ +post_install() { +/bin/cat << EOF +===> To compile the modules do /usr/bin/vboxbuild +EOF + +} + +post_upgrade() { +/bin/cat << EOF +===> To recompile the modules do /usr/bin/vboxbuild +EOF +} + diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install new file mode 100644 index 000000000..b2d2e8858 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox.install @@ -0,0 +1,34 @@ +utils() { + if [ -x usr/bin/update-mime-database ]; then + update-mime-database usr/share/mime > /dev/null 2>&1 + fi + + if [ -x usr/bin/xdg-icon-resource ]; then + xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 + fi + + if [ -x usr/bin/update-desktop-database ]; then + usr/bin/update-desktop-database -q + fi +} + +post_install() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + utils +} + +post_upgrade() { + getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers + utils + if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then +/bin/cat << EOF +===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules. +===> Use virtualbox-source package if you don't use our stock linux package. +EOF + fi +} + +post_remove() { + groupdel vboxusers >/dev/null 2>&1 || true + utils +} diff --git a/libre/virtualbox-parabola-modules/60-vboxguest.rules b/libre/virtualbox-parabola-modules/60-vboxguest.rules new file mode 100644 index 000000000..6285f7249 --- /dev/null +++ b/libre/virtualbox-parabola-modules/60-vboxguest.rules @@ -0,0 +1,2 @@ +ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" +ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/libre/virtualbox-parabola-modules/LocalConfig.kmk b/libre/virtualbox-parabola-modules/LocalConfig.kmk new file mode 100644 index 000000000..af79f90cd --- /dev/null +++ b/libre/virtualbox-parabola-modules/LocalConfig.kmk @@ -0,0 +1,19 @@ +VBOX_WITH_ADDITION_DRIVERS = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = +VBOX_WITH_TESTCASES = +VBOX_WITH_TESTSUITE = +VBOX_WITH_ORIGIN := +VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox +VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) +VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox +VBOX_PATH_APP_DOCS := /usr/share/virtualbox +VBOX_WITH_REGISTRATION_REQUEST = +VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_VNC := 1 +VBOX_BLD_PYTHON = python2 +VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/libre/virtualbox-parabola-modules/PKGBUILD b/libre/virtualbox-parabola-modules/PKGBUILD new file mode 100644 index 000000000..d077c092a --- /dev/null +++ b/libre/virtualbox-parabola-modules/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 57345 2011-10-26 09:57:11Z ibiru $ +#Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgbase=virtualbox-modules +pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') +pkgver=4.1.4 +pkgrel=3.1 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers' 'linux-libre') +[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') +source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 + LocalConfig.kmk 60-vboxguest.rules) +md5sums=('dc6e6801b3823332b6ca2e9915221aae' + '4c88bd122677a35f68abd76eb01b378b' + 'ed1341881437455d9735875ddf455fbe') + +_extramodules=extramodules-3.1-LIBRE + +build() { + _kernver="$(cat /lib/modules/${_extramodules}/version)" + + export KERN_DIR=/lib/modules/${_kernver}/build + export KERN_INCL=/usr/src/linux-${_kernver}/include/ + + cd "$srcdir/VirtualBox-${pkgver}_OSE" + + cp "$srcdir/LocalConfig.kmk" . + + ./configure \ + --with-linux=/usr/src/linux-${_kernver} \ + --disable-java \ + --disable-docs \ + --disable-xpcom \ + --disable-python \ + --disable-sdl-ttf \ + --disable-alsa \ + --disable-pulse \ + --disable-dbus \ + --disable-opengl \ + --build-headless \ + --nofatal + source ./env.sh + kmk all + + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" +} + +package_virtualbox-parabola-modules(){ + pkgdesc="Additions only for Parabola guests (kernel modules)" + license=('GPL') + install=virtualbox-parabola-modules.install + depends=('linux>=3.1' 'linux<3.2') + replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') + conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules') + provides=("virtualbox-archlinux-modules=$pkgver") + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + + for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do + install -D -m644 ${module} \ + "$pkgdir/lib/modules/${_extramodules}/${module}" + done + + install -D -m 0644 "$srcdir/60-vboxguest.rules" \ + "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-parabola-modules.install" +} + +package_virtualbox-modules(){ + pkgdesc="Kernel modules for VirtualBox" + license=('GPL') + install=virtualbox-modules.install + depends=('linux>=3.1' 'linux<3.2') + + source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" + + + cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" + + install -D -m644 vboxdrv.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko" + + install -D -m644 vboxnetadp.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko" + + install -D -m644 vboxnetflt.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko" + + install -D -m644 vboxpci.ko \ + "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko" + + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" +} diff --git a/libre/virtualbox-parabola-modules/virtualbox-modules.install b/libre/virtualbox-parabola-modules/virtualbox-modules.install new file mode 100644 index 000000000..b57135999 --- /dev/null +++ b/libre/virtualbox-parabola-modules/virtualbox-modules.install @@ -0,0 +1,19 @@ +post_install() { +/bin/cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) + rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install b/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install new file mode 100644 index 000000000..8801d8c49 --- /dev/null +++ b/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.1-LIBRE' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} diff --git a/libre/virtualbox/virtualbox.install b/libre/virtualbox/virtualbox.install deleted file mode 100644 index 238b0561f..000000000 --- a/libre/virtualbox/virtualbox.install +++ /dev/null @@ -1,52 +0,0 @@ -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi -} - -post_install() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF - -===> In order to run VirtualBox, you have to be in the 'vboxusers' group. -===> -===> If you want to be able to install guest additions, you have to install -===> 'virtualbox-additions' package. -===> -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> For networking you must load vboxnetflt or vboxnetadp. -===> -===> For PCI passthrough support load vboxpci module. -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To compile the modules do /usr/bin/vboxbuild *** - -EOF - utils -} - -post_upgrade() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF -*** To recompile the modules do /usr/bin/vboxbuild *** -EOF - utils -} - -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} - diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD deleted file mode 100644 index 223d703e6..000000000 --- a/multilib-testing/libtool-multilib/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 57023 2011-10-18 18:23:33Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -# NOTE: requires rebuild with each new gcc version - -pkgbase=libtool-multilib -pkgname=(libtool-multilib lib32-libltdl) -pkgver=2.4.2 -pkgrel=1 -pkgdesc="A generic library support script for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/libtool" -license=('GPL') -_gccver=4.6.1 -makedepends=("gcc-multilib=$_gccver") -options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig}) -md5sums=('2ec8997e0c07249eb4cbd072417d70fe' - '1e6ba57420c82c663c85e745d11c7eed') - -build() { - cd "$srcdir" - - rm -rf libtool-64 libtool-32 - mv libtool-$pkgver libtool-64 - cp -a libtool-64 libtool-32 - - msg2 "Building libtool-64..." - cd "$srcdir/libtool-64" - ./configure --prefix=/usr - make - - msg2 "Building libtool-32..." - export CC="gcc -m32" - export CXX="g++ -m32" - - cd "$srcdir/libtool-32" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -check() { - cd "$srcdir/libtool-64" - make check - cd "$srcdir/libtool-32" - make check -} - -package_libtool-multilib() { - depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver") - groups=('multilib-devel') - install=libtool.install - provides=("libtool=$pkgver-$pkgrel") - conflicts=(libtool) - - cd "$srcdir/libtool-64" - make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ - install-data-local - rm -rf ${pkgdir}/usr/share/libtool/libltdl/ -} - -package_lib32-libltdl() { - pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)" - depends=(lib32-glibc libltdl) - replaces=(lib32-libtool) - provides=("lib32-libtool=$pkgver-$pkgrel") - conflicts=(lib32-libtool) - - cd "$srcdir/libtool-32" - make DESTDIR="$pkgdir" install-libLTLIBRARIES -} diff --git a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch b/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch deleted file mode 100644 index 3ad8b418a..000000000 --- a/multilib/lib32-glibc/glibc-2.13-dlclose-search-reset.patch +++ /dev/null @@ -1,196 +0,0 @@ -From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Wed, 26 May 2010 18:28:59 +0200 -Subject: [PATCH] Fix scope handling during dl_close - ---- - ChangeLog | 12 ++++++++++++ - elf/Makefile | 10 +++++++++- - elf/dl-close.c | 7 +++++++ - elf/unload8.c | 33 +++++++++++++++++++++++++++++++++ - elf/unload8mod1.c | 7 +++++++ - elf/unload8mod1x.c | 1 + - elf/unload8mod2.c | 7 +++++++ - elf/unload8mod3.c | 27 +++++++++++++++++++++++++++ - 8 files changed, 103 insertions(+), 1 deletions(-) - create mode 100644 elf/unload8.c - create mode 100644 elf/unload8mod1.c - create mode 100644 elf/unload8mod1x.c - create mode 100644 elf/unload8mod2.c - create mode 100644 elf/unload8mod3.c - -diff --git a/elf/Makefile b/elf/Makefile -index 59e835f..65b6deb 100644 ---- a/elf/Makefile -+++ b/elf/Makefile -@@ -89,6 +89,7 @@ distribute := rtld-Rules \ - unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ - unload6mod1.c unload6mod2.c unload6mod3.c \ - unload7mod1.c unload7mod2.c \ -+ unload8mod1.c unload8mod1x.c unload8mod2.c unload8mod3.c \ - tst-audit1.c tst-audit2.c tst-audit3.c tst-audit4.c \ - tst-auditmod1.c tst-auditmod3a.c tst-auditmod3b.c \ - tst-auditmod4a.c tst-auditmod4b.c \ -@@ -196,7 +197,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ - tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ - tst-dlmodcount tst-dlopenrpath tst-deep1 \ - tst-dlmopen1 tst-dlmopen2 tst-dlmopen3 \ -- unload3 unload4 unload5 unload6 unload7 tst-global1 order2 \ -+ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ - tst-audit1 tst-audit2 \ - tst-stackguard1 tst-addr1 tst-thrlock \ - tst-unique1 tst-unique2 -@@ -247,6 +248,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ - unload4mod1 unload4mod2 unload4mod3 unload4mod4 \ - unload6mod1 unload6mod2 unload6mod3 \ - unload7mod1 unload7mod2 \ -+ unload8mod1 unload8mod1x unload8mod2 unload8mod3 \ - order2mod1 order2mod2 order2mod3 order2mod4 \ - tst-unique1mod1 tst-unique1mod2 \ - tst-unique2mod1 tst-unique2mod2 -@@ -522,6 +524,9 @@ $(objpfx)unload6mod2.so: $(libdl) - $(objpfx)unload6mod3.so: $(libdl) - $(objpfx)unload7mod1.so: $(libdl) - $(objpfx)unload7mod2.so: $(objpfx)unload7mod1.so -+$(objpfx)unload8mod1.so: $(objpfx)unload8mod2.so -+$(objpfx)unload8mod2.so: $(objpfx)unload8mod3.so -+$(objpfx)unload8mod3.so: $(libdl) - $(objpfx)tst-initordera2.so: $(objpfx)tst-initordera1.so - $(objpfx)tst-initorderb2.so: $(objpfx)tst-initorderb1.so $(objpfx)tst-initordera2.so - $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb1.so -@@ -823,6 +828,9 @@ $(objpfx)unload7: $(libdl) - $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so - unload7-ENV = MALLOC_PERTURB_=85 - -+$(objpfx)unload8: $(libdl) -+$(objpfx)unload8.out: $(objpfx)unload8mod1.so $(objpfx)unload8mod1x.so -+ - ifdef libdl - $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a - $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 700e765..f47d5f8 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) - - imap->l_scope_max = new_size; - } -+ else if (new_list != NULL) -+ { -+ /* We didn't change the scope array, so reset the search -+ list. */ -+ imap->l_searchlist.r_list = NULL; -+ imap->l_searchlist.r_nlist = 0; -+ } - - /* The loader is gone, so mark the object as not having one. - Note: l_idx != IDX_STILL_USED -> object will be removed. */ -diff --git a/elf/unload8.c b/elf/unload8.c -new file mode 100644 -index 0000000..f984a38 ---- /dev/null -+++ b/elf/unload8.c -@@ -0,0 +1,33 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+ -+int -+main (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod1.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod1.so failed"); -+ return 1; -+ } -+ -+ void *h2 = dlopen ("$ORIGIN/unload8mod1x.so", RTLD_LAZY); -+ if (h2 == NULL) -+ { -+ puts ("dlopen unload8mod1x.so failed"); -+ return 1; -+ } -+ dlclose (h2); -+ -+ int (*mod1) (void) = dlsym (h, "mod1"); -+ if (mod1 == NULL) -+ { -+ puts ("dlsym failed"); -+ return 1; -+ } -+ -+ mod1 (); -+ dlclose (h); -+ -+ return 0; -+} -diff --git a/elf/unload8mod1.c b/elf/unload8mod1.c -new file mode 100644 -index 0000000..fe7e81c ---- /dev/null -+++ b/elf/unload8mod1.c -@@ -0,0 +1,7 @@ -+extern void mod2 (void); -+ -+void -+mod1 (void) -+{ -+ mod2 (); -+} -diff --git a/elf/unload8mod1x.c b/elf/unload8mod1x.c -new file mode 100644 -index 0000000..835b634 ---- /dev/null -+++ b/elf/unload8mod1x.c -@@ -0,0 +1 @@ -+int mod1x; -diff --git a/elf/unload8mod2.c b/elf/unload8mod2.c -new file mode 100644 -index 0000000..2fd8b67 ---- /dev/null -+++ b/elf/unload8mod2.c -@@ -0,0 +1,7 @@ -+extern void mod3 (void); -+ -+void -+mod2 (void) -+{ -+ mod3 (); -+} -diff --git a/elf/unload8mod3.c b/elf/unload8mod3.c -new file mode 100644 -index 0000000..d49e22b ---- /dev/null -+++ b/elf/unload8mod3.c -@@ -0,0 +1,27 @@ -+#include <dlfcn.h> -+#include <stdio.h> -+#include <stdlib.h> -+ -+void -+mod3_fini2 (void) -+{ -+} -+ -+void -+mod3_fini (void) -+{ -+ mod3_fini2 (); -+} -+ -+void -+mod3 (void) -+{ -+ void *h = dlopen ("$ORIGIN/unload8mod2.so", RTLD_LAZY); -+ if (h == NULL) -+ { -+ puts ("dlopen unload8mod2.so failed"); -+ exit (1); -+ } -+ -+ atexit (mod3_fini); -+} --- -1.7.3.4 - diff --git a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch deleted file mode 100644 index ef91116e5..000000000 --- a/multilib/lib32-glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 1 Sep 2011 10:46:14 +0200 -Subject: [PATCH] Avoid assertion failure when first DNS answer was empty - ---- - ChangeLog | 4 ++++ - resolv/res_query.c | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/resolv/res_query.c b/resolv/res_query.c -index 2f7cfaa..2ded9fb 100644 ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp, - && *resplen2 > (int) sizeof (HEADER)) - { - /* Special case of partial answer. */ -- assert (hp != hp2); -+ assert (n == 0 || hp != hp2); - hp = hp2; - } - else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) --- -1.7.3.4 - diff --git a/multilib/lib32-gmp/538dfce27f41.patch b/multilib/lib32-gmp/538dfce27f41.patch new file mode 100644 index 000000000..2e0a1af50 --- /dev/null +++ b/multilib/lib32-gmp/538dfce27f41.patch @@ -0,0 +1,38 @@ + +# HG changeset patch +# User Torbjorn Granlund <tege@gmplib.org> +# Date 1310730221 -7200 +# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 +# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 +(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. + +diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c +--- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 ++++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 +@@ -7,7 +7,7 @@ + SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST + GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. + +-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. ++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + + This file is part of the GNU MP Library. + +@@ -28,7 +28,6 @@ + #include "gmp-impl.h" + + +- + mp_size_t + mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) + { +@@ -130,7 +129,7 @@ + qn = nn - qn; + while (qn > dn) + { +- mpn_sub_1 (np + dn, np + dn, qn, cy); ++ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); + cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); + qp += dn; + np += dn; + diff --git a/multilib/lib32-gmp/PKGBUILD b/multilib/lib32-gmp/PKGBUILD new file mode 100644 index 000000000..e936bf098 --- /dev/null +++ b/multilib/lib32-gmp/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 135478 2011-08-14 09:26:08Z allan $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: josephgbr <rafael.f.f1 at gmail dot com> + +_pkgbasename=gmp +pkgname=lib32-$_pkgbasename +pkgver=5.0.2 +pkgrel=4 +pkgdesc="A free library for arbitrary precision arithmetic (32-bit)" +arch=('i686' 'x86_64') +url="http://gmplib.org/" +depends=('lib32-gcc-libs' $_pkgbasename) +makedepends=(gcc-multilib) +license=('LGPL3') +options=(!libtool) +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 + 538dfce27f41.patch) +md5sums=('0bbaedc82fb30315b06b1588b9077cd3' + 'a769be9c41618ca9c35d83375e7097d0') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + patch -Np1 -i $srcdir/538dfce27f41.patch + + export ABI=32 + ./configure \ + --prefix=/usr --infodir=/usr/share/info \ + --enable-cxx --libdir=/usr/lib32 + + #Put gmp.h in the same folder as gmpxx.h + sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile + + make +} + +check() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib/lib32-json-c/PKGBUILD b/multilib/lib32-json-c/PKGBUILD deleted file mode 100644 index 07670938e..000000000 --- a/multilib/lib32-json-c/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: congyiwu <congyiwu AT gmail DOT com> - -_pkgbasename=json-c -pkgname=lib32-$_pkgbasename -pkgver=0.9 -pkgrel=1 -pkgdesc="A JSON implementation in C (32-bit)" -url="http://oss.metaparadigm.com/json-c/" -license=("MIT") -arch=('x86_64') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib' 'libtool-multilib') -source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('3a13d264528dcbaf3931b0cede24abae') -options=(!libtool) -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install - - rm -r "$pkgdir/usr/include" - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpulse/version-number.patch b/multilib/lib32-libpulse/version-number.patch deleted file mode 100644 index 473b252a9..000000000 --- a/multilib/lib32-libpulse/version-number.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 7563e0bbb54fbac54e77f3a62d9761a70f3a559c -Author: Colin Guthrie <colin@mageia.org> -Date: Sat Oct 1 12:03:44 2011 +0100 - - libpulse: Always return a three part version number in API calls. - - For both the headers and the library we should provide clean, three part - strings as this has been what we've previously done in the past - and some external systems apparently rely on this format. While it's not - something we've officially commented on before, there is no real advantage - to us to change it so let's not try to tidy things up too much - considering some third party apps (e.g. Skype) seem to dislike a two - part version string. - -diff --git a/src/pulse/context.c b/src/pulse/context.c -index 25d04a1..af144aa 100644 ---- a/src/pulse/context.c -+++ b/src/pulse/context.c -@@ -1281,7 +1281,7 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su - } - - const char* pa_get_library_version(void) { -- return PACKAGE_VERSION; -+ return pa_get_headers_version(); - } - - const char* pa_context_get_server(pa_context *c) { -diff --git a/src/pulse/version.h.in b/src/pulse/version.h.in -index 7e00c5e..1be4c75 100644 ---- a/src/pulse/version.h.in -+++ b/src/pulse/version.h.in -@@ -35,7 +35,7 @@ PA_C_DECL_BEGIN - /** Return the version of the header files. Keep in mind that this is - a macro and not a function, so it is impossible to get the pointer of - it. */ --#define pa_get_headers_version() ("@PACKAGE_VERSION@") -+#define pa_get_headers_version() ("@PA_MAJOR@.@PA_MINOR@.0") - - /** Return the version of the library the current application is - * linked to. */ diff --git a/multilib/lib32-nettle/PKGBUILD b/multilib/lib32-nettle/PKGBUILD new file mode 100644 index 000000000..6b226d319 --- /dev/null +++ b/multilib/lib32-nettle/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 58144 2011-11-06 22:21:54Z bluewind $ +# Maintainer: Florian Pritz <flo@xssn.at> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: bender02 at gmx dot com + +_pkgbasename=nettle +pkgname=lib32-$_pkgbasename +pkgver=2.4 +pkgrel=1 +pkgdesc="A low-level cryptographic library (32-bit)" +arch=('i686' 'x86_64') +url="http://www.lysator.liu.se/~nisse/nettle/" +license=('GPL2') +depends=('lib32-gmp' $_pkgbasename) +makedepends=(gcc-multilib) +source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$_pkgbasename-$pkgver.tar.gz) +md5sums=(''450be8c4886d46c09f49f568ad6fa013'') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --enable-shared \ + --disable-static # <-- seems not working now + make +} + +check() { + cd "$srcdir/$_pkgbasename-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir/" install + + find $pkgdir + + # remove static libs + rm -f ${pkgdir}/usr/lib32/{libhogweed,libnettle}.a + + rm -rf "${pkgdir}"/usr/{include,share,bin} +} diff --git a/multilib/lib32-nss/distrust-diginotar.patch b/multilib/lib32-nss/distrust-diginotar.patch deleted file mode 100644 index 60c63fc68..000000000 --- a/multilib/lib32-nss/distrust-diginotar.patch +++ /dev/null @@ -1,1675 +0,0 @@ -Index: security/nss/lib/ckfw/builtins/certdata.c -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v -retrieving revision 1.67.2.10 -retrieving revision 1.67.2.11 -diff -u -r1.67.2.10 -r1.67.2.11 ---- security/nss/lib/ckfw/builtins/certdata.c 1 Aug 2011 06:40:03 -0000 1.67.2.10 -+++ security/nss/lib/ckfw/builtins/certdata.c 30 Aug 2011 20:04:39 -0000 1.67.2.11 -@@ -35,7 +35,7 @@ - * - * ***** END LICENSE BLOCK ***** */ - #ifdef DEBUG --static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $"; -+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $"; - #endif /* DEBUG */ - - #ifndef BUILTINS_H -@@ -1039,12 +1039,6 @@ - static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = { - CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED - }; --static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = { -- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE --}; --static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = { -- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED --}; - #ifdef DEBUG - static const NSSItem nss_builtins_items_0 [] = { - { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -@@ -1053,7 +1047,7 @@ - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"CVS ID", (PRUint32)7 }, - { (void *)"NSS", (PRUint32)4 }, -- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 } -+ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 } - }; - #endif /* DEBUG */ - static const NSSItem nss_builtins_items_1 [] = { -@@ -12506,151 +12500,6 @@ - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)"DigiNotar Root CA", (PRUint32)18 }, -- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, -- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" --"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" --"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" --"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" --"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" --"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" --"\154" --, (PRUint32)97 }, -- { (void *)"0", (PRUint32)2 }, -- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" --"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" --"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" --"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" --"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" --"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" --"\154" --, (PRUint32)97 }, -- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" --"\074\114" --, (PRUint32)18 }, -- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014" --"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060" --"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137" --"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060" --"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141" --"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151" --"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060" --"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156" --"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060" --"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132" --"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060" --"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022" --"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164" --"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147" --"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040" --"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151" --"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154" --"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001" --"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001" --"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126" --"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201" --"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300" --"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177" --"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330" --"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213" --"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337" --"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045" --"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123" --"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007" --"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043" --"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042" --"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041" --"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324" --"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313" --"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110" --"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114" --"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376" --"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344" --"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357" --"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346" --"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314" --"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351" --"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154" --"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262" --"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042" --"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077" --"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102" --"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323" --"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176" --"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147" --"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216" --"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035" --"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125" --"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125" --"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153" --"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206" --"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002" --"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004" --"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257" --"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362" --"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203" --"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302" --"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150" --"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307" --"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050" --"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350" --"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013" --"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075" --"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114" --"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313" --"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273" --"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235" --"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146" --"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160" --"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007" --"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351" --"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134" --"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045" --"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113" --"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174" --"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304" --"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012" --"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330" --"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124" --"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163" --"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056" --"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175" --"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163" --"\262\345\214\360\206\231\270\345\305\337\204\301\267\353" --, (PRUint32)1422 } --}; --static const NSSItem nss_builtins_items_187 [] = { -- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)"DigiNotar Root CA", (PRUint32)18 }, -- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317" --"\201\147\107\214" --, (PRUint32)20 }, -- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230" --, (PRUint32)16 }, -- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061" --"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157" --"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151" --"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061" --"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021" --"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156" --"\154" --, (PRUint32)97 }, -- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223" --"\074\114" --, (PRUint32)18 }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, -- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } --}; --static const NSSItem nss_builtins_items_188 [] = { -- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, -- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)"Network Solutions Certificate Authority", (PRUint32)40 }, - { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) }, - { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061" -@@ -12738,7 +12587,7 @@ - "\244\140\114\260\125\240\240\173\127\262" - , (PRUint32)1002 } - }; --static const NSSItem nss_builtins_items_189 [] = { -+static const NSSItem nss_builtins_items_187 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12765,7 +12614,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_190 [] = { -+static const NSSItem nss_builtins_items_188 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12874,7 +12723,7 @@ - "\333" - , (PRUint32)1217 } - }; --static const NSSItem nss_builtins_items_191 [] = { -+static const NSSItem nss_builtins_items_189 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12902,7 +12751,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_192 [] = { -+static const NSSItem nss_builtins_items_190 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -12976,7 +12825,7 @@ - "\334\335\363\377\035\054\072\026\127\331\222\071\326" - , (PRUint32)653 } - }; --static const NSSItem nss_builtins_items_193 [] = { -+static const NSSItem nss_builtins_items_191 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13005,7 +12854,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_194 [] = { -+static const NSSItem nss_builtins_items_192 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13097,7 +12946,7 @@ - "\321\236\164\310\166\147" - , (PRUint32)1078 } - }; --static const NSSItem nss_builtins_items_195 [] = { -+static const NSSItem nss_builtins_items_193 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13122,7 +12971,7 @@ - { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_196 [] = { -+static const NSSItem nss_builtins_items_194 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13219,7 +13068,7 @@ - "\253\205\322\140\126\132" - , (PRUint32)1030 } - }; --static const NSSItem nss_builtins_items_197 [] = { -+static const NSSItem nss_builtins_items_195 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13247,7 +13096,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_198 [] = { -+static const NSSItem nss_builtins_items_196 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13332,7 +13181,7 @@ - "\164" - , (PRUint32)897 } - }; --static const NSSItem nss_builtins_items_199 [] = { -+static const NSSItem nss_builtins_items_197 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13358,7 +13207,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_200 [] = { -+static const NSSItem nss_builtins_items_198 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13455,7 +13304,7 @@ - "\374\276\337\012\015" - , (PRUint32)1013 } - }; --static const NSSItem nss_builtins_items_201 [] = { -+static const NSSItem nss_builtins_items_199 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13484,7 +13333,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_202 [] = { -+static const NSSItem nss_builtins_items_200 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13595,7 +13444,7 @@ - "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224" - , (PRUint32)1151 } - }; --static const NSSItem nss_builtins_items_203 [] = { -+static const NSSItem nss_builtins_items_201 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13627,7 +13476,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_204 [] = { -+static const NSSItem nss_builtins_items_202 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13781,7 +13630,7 @@ - "\103\307\003\340\067\116\135\012\334\131\040\045" - , (PRUint32)1964 } - }; --static const NSSItem nss_builtins_items_205 [] = { -+static const NSSItem nss_builtins_items_203 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13809,7 +13658,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_206 [] = { -+static const NSSItem nss_builtins_items_204 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13890,7 +13739,7 @@ - "\300\226\130\057\352\273\106\327\273\344\331\056" - , (PRUint32)940 } - }; --static const NSSItem nss_builtins_items_207 [] = { -+static const NSSItem nss_builtins_items_205 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -13913,7 +13762,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_208 [] = { -+static const NSSItem nss_builtins_items_206 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14047,7 +13896,7 @@ - "\005\211\374\170\326\134\054\046\103\251" - , (PRUint32)1642 } - }; --static const NSSItem nss_builtins_items_209 [] = { -+static const NSSItem nss_builtins_items_207 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14075,7 +13924,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_210 [] = { -+static const NSSItem nss_builtins_items_208 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14180,7 +14029,7 @@ - "\334\144\047\027\214\132\267\332\164\050\315\227\344\275" - , (PRUint32)1198 } - }; --static const NSSItem nss_builtins_items_211 [] = { -+static const NSSItem nss_builtins_items_209 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14207,7 +14056,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_212 [] = { -+static const NSSItem nss_builtins_items_210 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14312,7 +14161,7 @@ - "\016\121\075\157\373\226\126\200\342\066\027\321\334\344" - , (PRUint32)1198 } - }; --static const NSSItem nss_builtins_items_213 [] = { -+static const NSSItem nss_builtins_items_211 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14339,7 +14188,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_214 [] = { -+static const NSSItem nss_builtins_items_212 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14432,7 +14281,7 @@ - "\230" - , (PRUint32)993 } - }; --static const NSSItem nss_builtins_items_215 [] = { -+static const NSSItem nss_builtins_items_213 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14459,7 +14308,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_216 [] = { -+static const NSSItem nss_builtins_items_214 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14548,7 +14397,7 @@ - "\126\144\127" - , (PRUint32)931 } - }; --static const NSSItem nss_builtins_items_217 [] = { -+static const NSSItem nss_builtins_items_215 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14575,7 +14424,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_218 [] = { -+static const NSSItem nss_builtins_items_216 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14656,7 +14505,7 @@ - "\000\147\240\161\000\202\110" - , (PRUint32)919 } - }; --static const NSSItem nss_builtins_items_219 [] = { -+static const NSSItem nss_builtins_items_217 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14680,7 +14529,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_220 [] = { -+static const NSSItem nss_builtins_items_218 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14762,7 +14611,7 @@ - "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217" - , (PRUint32)943 } - }; --static const NSSItem nss_builtins_items_221 [] = { -+static const NSSItem nss_builtins_items_219 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14786,7 +14635,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_222 [] = { -+static const NSSItem nss_builtins_items_220 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14867,7 +14716,7 @@ - "\246\210\070\316\125" - , (PRUint32)933 } - }; --static const NSSItem nss_builtins_items_223 [] = { -+static const NSSItem nss_builtins_items_221 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -14890,7 +14739,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_224 [] = { -+static const NSSItem nss_builtins_items_222 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15009,7 +14858,7 @@ - "\201\370\021\234" - , (PRUint32)1460 } - }; --static const NSSItem nss_builtins_items_225 [] = { -+static const NSSItem nss_builtins_items_223 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15035,7 +14884,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_226 [] = { -+static const NSSItem nss_builtins_items_224 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15169,7 +15018,7 @@ - "\311\234\220\332\354\251\102\074\255\266\002" - , (PRUint32)1307 } - }; --static const NSSItem nss_builtins_items_227 [] = { -+static const NSSItem nss_builtins_items_225 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15207,7 +15056,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_228 [] = { -+static const NSSItem nss_builtins_items_226 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15285,7 +15134,7 @@ - "\366\324\357\277\114\210\150" - , (PRUint32)855 } - }; --static const NSSItem nss_builtins_items_229 [] = { -+static const NSSItem nss_builtins_items_227 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15309,7 +15158,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_230 [] = { -+static const NSSItem nss_builtins_items_228 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15387,7 +15236,7 @@ - "\246\347\313\100\003\335\171" - , (PRUint32)855 } - }; --static const NSSItem nss_builtins_items_231 [] = { -+static const NSSItem nss_builtins_items_229 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15411,7 +15260,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_232 [] = { -+static const NSSItem nss_builtins_items_230 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15538,7 +15387,7 @@ - "\320\352\111\242\034\215\122\024\246\012\223" - , (PRUint32)1515 } - }; --static const NSSItem nss_builtins_items_233 [] = { -+static const NSSItem nss_builtins_items_231 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15566,7 +15415,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_234 [] = { -+static const NSSItem nss_builtins_items_232 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15640,7 +15489,7 @@ - "\366\356\260\132\116\111\104\124\130\137\102\203" - , (PRUint32)828 } - }; --static const NSSItem nss_builtins_items_235 [] = { -+static const NSSItem nss_builtins_items_233 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15663,7 +15512,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_236 [] = { -+static const NSSItem nss_builtins_items_234 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15739,7 +15588,7 @@ - "\011\333\212\101\202\236\146\233\021" - , (PRUint32)857 } - }; --static const NSSItem nss_builtins_items_237 [] = { -+static const NSSItem nss_builtins_items_235 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15762,7 +15611,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_238 [] = { -+static const NSSItem nss_builtins_items_236 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15845,7 +15694,7 @@ - "\262\033\211\124" - , (PRUint32)932 } - }; --static const NSSItem nss_builtins_items_239 [] = { -+static const NSSItem nss_builtins_items_237 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15869,7 +15718,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_240 [] = { -+static const NSSItem nss_builtins_items_238 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15969,7 +15818,7 @@ - "\021\055" - , (PRUint32)1026 } - }; --static const NSSItem nss_builtins_items_241 [] = { -+static const NSSItem nss_builtins_items_239 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -15999,7 +15848,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_242 [] = { -+static const NSSItem nss_builtins_items_240 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16073,7 +15922,7 @@ - "\367\130\077\056\162\002\127\243\217\241\024\056" - , (PRUint32)652 } - }; --static const NSSItem nss_builtins_items_243 [] = { -+static const NSSItem nss_builtins_items_241 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16102,7 +15951,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_244 [] = { -+static const NSSItem nss_builtins_items_242 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16208,7 +16057,7 @@ - "\061\324\100\032\142\064\066\077\065\001\256\254\143\240" - , (PRUint32)1070 } - }; --static const NSSItem nss_builtins_items_245 [] = { -+static const NSSItem nss_builtins_items_243 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16240,7 +16089,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_246 [] = { -+static const NSSItem nss_builtins_items_244 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16319,7 +16168,7 @@ - "\017\212" - , (PRUint32)690 } - }; --static const NSSItem nss_builtins_items_247 [] = { -+static const NSSItem nss_builtins_items_245 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16349,7 +16198,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_248 [] = { -+static const NSSItem nss_builtins_items_246 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16464,7 +16313,7 @@ - "\354\315\202\141\361\070\346\117\227\230\052\132\215" - , (PRUint32)1213 } - }; --static const NSSItem nss_builtins_items_249 [] = { -+static const NSSItem nss_builtins_items_247 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16496,7 +16345,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_250 [] = { -+static const NSSItem nss_builtins_items_248 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16594,7 +16443,7 @@ - "\055\247\330\206\052\335\056\020" - , (PRUint32)904 } - }; --static const NSSItem nss_builtins_items_251 [] = { -+static const NSSItem nss_builtins_items_249 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16627,7 +16476,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_252 [] = { -+static const NSSItem nss_builtins_items_250 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16729,7 +16578,7 @@ - "\330\316\304\143\165\077\131\107\261" - , (PRUint32)1049 } - }; --static const NSSItem nss_builtins_items_253 [] = { -+static const NSSItem nss_builtins_items_251 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16759,7 +16608,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_254 [] = { -+static const NSSItem nss_builtins_items_252 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16878,7 +16727,7 @@ - "\370\161\012\334\271\374\175\062\140\346\353\257\212\001" - , (PRUint32)1486 } - }; --static const NSSItem nss_builtins_items_255 [] = { -+static const NSSItem nss_builtins_items_253 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16903,7 +16752,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_256 [] = { -+static const NSSItem nss_builtins_items_254 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -16993,7 +16842,7 @@ - "\315\345\250" - , (PRUint32)1043 } - }; --static const NSSItem nss_builtins_items_257 [] = { -+static const NSSItem nss_builtins_items_255 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17017,7 +16866,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_258 [] = { -+static const NSSItem nss_builtins_items_256 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17122,7 +16971,7 @@ - "\115\273\306\104\333\066\313\052\234\216" - , (PRUint32)1258 } - }; --static const NSSItem nss_builtins_items_259 [] = { -+static const NSSItem nss_builtins_items_257 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17147,7 +16996,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_260 [] = { -+static const NSSItem nss_builtins_items_258 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17223,7 +17072,7 @@ - "\002\153\331\132" - , (PRUint32)820 } - }; --static const NSSItem nss_builtins_items_261 [] = { -+static const NSSItem nss_builtins_items_259 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17247,7 +17096,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_262 [] = { -+static const NSSItem nss_builtins_items_260 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17329,7 +17178,7 @@ - "\362" - , (PRUint32)881 } - }; --static const NSSItem nss_builtins_items_263 [] = { -+static const NSSItem nss_builtins_items_261 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17354,7 +17203,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_264 [] = { -+static const NSSItem nss_builtins_items_262 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17470,7 +17319,7 @@ - "\113\076\053\070\007\125\230\136\244" - , (PRUint32)1465 } - }; --static const NSSItem nss_builtins_items_265 [] = { -+static const NSSItem nss_builtins_items_263 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17494,7 +17343,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_266 [] = { -+static const NSSItem nss_builtins_items_264 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17559,7 +17408,7 @@ - "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133" - , (PRUint32)576 } - }; --static const NSSItem nss_builtins_items_267 [] = { -+static const NSSItem nss_builtins_items_265 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17586,7 +17435,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_268 [] = { -+static const NSSItem nss_builtins_items_266 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17651,7 +17500,7 @@ - "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220" - , (PRUint32)576 } - }; --static const NSSItem nss_builtins_items_269 [] = { -+static const NSSItem nss_builtins_items_267 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17678,7 +17527,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_270 [] = { -+static const NSSItem nss_builtins_items_268 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17775,7 +17624,7 @@ - "\202\042\055\172\124\253\160\303\175\042\145\202\160\226" - , (PRUint32)1038 } - }; --static const NSSItem nss_builtins_items_271 [] = { -+static const NSSItem nss_builtins_items_269 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17803,7 +17652,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_272 [] = { -+static const NSSItem nss_builtins_items_270 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17894,7 +17743,7 @@ - "\336\102\343\055\202\361\017\345\372\227" - , (PRUint32)954 } - }; --static const NSSItem nss_builtins_items_273 [] = { -+static const NSSItem nss_builtins_items_271 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -17922,7 +17771,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_274 [] = { -+static const NSSItem nss_builtins_items_272 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18001,7 +17850,7 @@ - "\130\077\137" - , (PRUint32)867 } - }; --static const NSSItem nss_builtins_items_275 [] = { -+static const NSSItem nss_builtins_items_273 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18025,7 +17874,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_276 [] = { -+static const NSSItem nss_builtins_items_274 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18118,7 +17967,7 @@ - "\045\361\224\264\146" - , (PRUint32)997 } - }; --static const NSSItem nss_builtins_items_277 [] = { -+static const NSSItem nss_builtins_items_275 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18145,7 +17994,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_278 [] = { -+static const NSSItem nss_builtins_items_276 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18269,7 +18118,7 @@ - "\156\117\022\176\012\074\235\225" - , (PRUint32)1560 } - }; --static const NSSItem nss_builtins_items_279 [] = { -+static const NSSItem nss_builtins_items_277 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18294,7 +18143,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_280 [] = { -+static const NSSItem nss_builtins_items_278 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18413,7 +18262,7 @@ - "\333\374\046\210\307" - , (PRUint32)1525 } - }; --static const NSSItem nss_builtins_items_281 [] = { -+static const NSSItem nss_builtins_items_279 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18437,7 +18286,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_282 [] = { -+static const NSSItem nss_builtins_items_280 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18593,7 +18442,7 @@ - "\167\110\320" - , (PRUint32)1875 } - }; --static const NSSItem nss_builtins_items_283 [] = { -+static const NSSItem nss_builtins_items_281 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18624,7 +18473,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_284 [] = { -+static const NSSItem nss_builtins_items_282 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18777,7 +18626,7 @@ - "\351\233\256\325\124\300\164\200\321\013\102\237\301" - , (PRUint32)1869 } - }; --static const NSSItem nss_builtins_items_285 [] = { -+static const NSSItem nss_builtins_items_283 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18807,7 +18656,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_286 [] = { -+static const NSSItem nss_builtins_items_284 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18943,7 +18792,7 @@ - "\242\355\264\324\265\145\103\267\223\106\212\323" - , (PRUint32)1532 } - }; --static const NSSItem nss_builtins_items_287 [] = { -+static const NSSItem nss_builtins_items_285 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -18973,7 +18822,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_288 [] = { -+static const NSSItem nss_builtins_items_286 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19124,7 +18973,7 @@ - "\264" - , (PRUint32)1761 } - }; --static const NSSItem nss_builtins_items_289 [] = { -+static const NSSItem nss_builtins_items_287 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19154,7 +19003,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_290 [] = { -+static const NSSItem nss_builtins_items_288 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19290,7 +19139,7 @@ - "\111\043" - , (PRUint32)1522 } - }; --static const NSSItem nss_builtins_items_291 [] = { -+static const NSSItem nss_builtins_items_289 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19320,7 +19169,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_292 [] = { -+static const NSSItem nss_builtins_items_290 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19455,7 +19304,7 @@ - "\172\244\047\023\326\117\364\151" - , (PRUint32)1512 } - }; --static const NSSItem nss_builtins_items_293 [] = { -+static const NSSItem nss_builtins_items_291 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19485,7 +19334,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_294 [] = { -+static const NSSItem nss_builtins_items_292 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19621,7 +19470,7 @@ - "\302\021\254" - , (PRUint32)1523 } - }; --static const NSSItem nss_builtins_items_295 [] = { -+static const NSSItem nss_builtins_items_293 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19651,7 +19500,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_296 [] = { -+static const NSSItem nss_builtins_items_294 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19787,7 +19636,7 @@ - "\147\024\060" - , (PRUint32)1523 } - }; --static const NSSItem nss_builtins_items_297 [] = { -+static const NSSItem nss_builtins_items_295 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19817,7 +19666,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_298 [] = { -+static const NSSItem nss_builtins_items_296 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19951,7 +19800,7 @@ - "\217\116\235\306\066\347\134\246\253\022\017\326\317" - , (PRUint32)1501 } - }; --static const NSSItem nss_builtins_items_299 [] = { -+static const NSSItem nss_builtins_items_297 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -19981,7 +19830,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_300 [] = { -+static const NSSItem nss_builtins_items_298 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20115,7 +19964,7 @@ - "\130\113\161\203\237\146\346\254\171\110\376\376\107" - , (PRUint32)1501 } - }; --static const NSSItem nss_builtins_items_301 [] = { -+static const NSSItem nss_builtins_items_299 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20145,7 +19994,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_302 [] = { -+static const NSSItem nss_builtins_items_300 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20280,7 +20129,7 @@ - "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352" - , (PRUint32)1520 } - }; --static const NSSItem nss_builtins_items_303 [] = { -+static const NSSItem nss_builtins_items_301 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20310,7 +20159,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_304 [] = { -+static const NSSItem nss_builtins_items_302 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20438,7 +20287,7 @@ - "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221" - , (PRUint32)1392 } - }; --static const NSSItem nss_builtins_items_305 [] = { -+static const NSSItem nss_builtins_items_303 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20468,7 +20317,7 @@ - { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_306 [] = { -+static const NSSItem nss_builtins_items_304 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20561,7 +20410,7 @@ - "\342\342\104\276\134\367\352\034\365" - , (PRUint32)969 } - }; --static const NSSItem nss_builtins_items_307 [] = { -+static const NSSItem nss_builtins_items_305 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20589,7 +20438,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_308 [] = { -+static const NSSItem nss_builtins_items_306 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20686,7 +20535,7 @@ - "\364" - , (PRUint32)993 } - }; --static const NSSItem nss_builtins_items_309 [] = { -+static const NSSItem nss_builtins_items_307 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20715,7 +20564,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_310 [] = { -+static const NSSItem nss_builtins_items_308 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20813,7 +20662,7 @@ - "\261\050\272" - , (PRUint32)1011 } - }; --static const NSSItem nss_builtins_items_311 [] = { -+static const NSSItem nss_builtins_items_309 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20842,7 +20691,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_312 [] = { -+static const NSSItem nss_builtins_items_310 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20919,7 +20768,7 @@ - "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357" - , (PRUint32)848 } - }; --static const NSSItem nss_builtins_items_313 [] = { -+static const NSSItem nss_builtins_items_311 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -20943,7 +20792,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_314 [] = { -+static const NSSItem nss_builtins_items_312 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21020,7 +20869,7 @@ - "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333" - , (PRUint32)848 } - }; --static const NSSItem nss_builtins_items_315 [] = { -+static const NSSItem nss_builtins_items_313 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21044,7 +20893,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_316 [] = { -+static const NSSItem nss_builtins_items_314 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21153,7 +21002,7 @@ - "\051\340\266\270\011\150\031\034\030\103" - , (PRUint32)1354 } - }; --static const NSSItem nss_builtins_items_317 [] = { -+static const NSSItem nss_builtins_items_315 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21177,7 +21026,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_318 [] = { -+static const NSSItem nss_builtins_items_316 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21234,7 +21083,7 @@ - "\214\171" - , (PRUint32)514 } - }; --static const NSSItem nss_builtins_items_319 [] = { -+static const NSSItem nss_builtins_items_317 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21258,7 +21107,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_320 [] = { -+static const NSSItem nss_builtins_items_318 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21348,7 +21197,7 @@ - "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054" - , (PRUint32)959 } - }; --static const NSSItem nss_builtins_items_321 [] = { -+static const NSSItem nss_builtins_items_319 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21375,7 +21224,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_322 [] = { -+static const NSSItem nss_builtins_items_320 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21493,7 +21342,7 @@ - "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171" - , (PRUint32)1440 } - }; --static const NSSItem nss_builtins_items_323 [] = { -+static const NSSItem nss_builtins_items_321 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21519,7 +21368,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_324 [] = { -+static const NSSItem nss_builtins_items_322 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21652,7 +21501,7 @@ - "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303" - , (PRUint32)1679 } - }; --static const NSSItem nss_builtins_items_325 [] = { -+static const NSSItem nss_builtins_items_323 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21678,7 +21527,7 @@ - { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_326 [] = { -+static const NSSItem nss_builtins_items_324 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21772,7 +21621,7 @@ - "\204\232\315" - , (PRUint32)979 } - }; --static const NSSItem nss_builtins_items_327 [] = { -+static const NSSItem nss_builtins_items_325 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21800,7 +21649,7 @@ - { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) } - }; --static const NSSItem nss_builtins_items_328 [] = { -+static const NSSItem nss_builtins_items_326 [] = { - { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -21884,7 +21733,7 @@ - "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257" - , (PRUint32)895 } - }; --static const NSSItem nss_builtins_items_329 [] = { -+static const NSSItem nss_builtins_items_327 [] = { - { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) }, - { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) }, - { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }, -@@ -22242,13 +22091,11 @@ - { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} }, - { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} }, - { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} }, -- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }, -- { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} }, -- { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} } -+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} } - }; - const PRUint32 - #ifdef DEBUG -- nss_builtins_nObjects = 329+1; -+ nss_builtins_nObjects = 327+1; - #else -- nss_builtins_nObjects = 329; -+ nss_builtins_nObjects = 327; - #endif /* DEBUG */ -Index: security/nss/lib/ckfw/builtins/certdata.txt -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v -retrieving revision 1.64.2.10 -retrieving revision 1.64.2.11 -diff -u -r1.64.2.10 -r1.64.2.11 ---- security/nss/lib/ckfw/builtins/certdata.txt 1 Aug 2011 06:40:04 -0000 1.64.2.10 -+++ security/nss/lib/ckfw/builtins/certdata.txt 30 Aug 2011 20:04:39 -0000 1.64.2.11 -@@ -34,7 +34,7 @@ - # the terms of any one of the MPL, the GPL or the LGPL. - # - # ***** END LICENSE BLOCK ***** --CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $" -+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $" - - # - # certdata.txt -@@ -12461,161 +12461,6 @@ - CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE - - # --# Certificate "DigiNotar Root CA" --# --CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE --CKA_TOKEN CK_BBOOL CK_TRUE --CKA_PRIVATE CK_BBOOL CK_FALSE --CKA_MODIFIABLE CK_BBOOL CK_FALSE --CKA_LABEL UTF8 "DigiNotar Root CA" --CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509 --CKA_SUBJECT MULTILINE_OCTAL --\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 --\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 --\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 --\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 --\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 --\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 --\154 --END --CKA_ID UTF8 "0" --CKA_ISSUER MULTILINE_OCTAL --\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 --\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 --\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 --\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 --\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 --\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 --\154 --END --CKA_SERIAL_NUMBER MULTILINE_OCTAL --\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 --\074\114 --END --CKA_VALUE MULTILINE_OCTAL --\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014 --\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060 --\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137 --\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060 --\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141 --\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151 --\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060 --\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156 --\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060 --\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132 --\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060 --\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022 --\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164 --\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147 --\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040 --\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151 --\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154 --\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001 --\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001 --\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126 --\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201 --\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300 --\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177 --\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330 --\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213 --\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337 --\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045 --\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123 --\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007 --\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043 --\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042 --\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041 --\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324 --\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313 --\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110 --\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114 --\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376 --\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344 --\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357 --\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346 --\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314 --\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351 --\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154 --\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262 --\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042 --\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077 --\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102 --\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323 --\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176 --\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147 --\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216 --\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035 --\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125 --\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125 --\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153 --\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206 --\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002 --\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004 --\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257 --\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362 --\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203 --\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302 --\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150 --\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307 --\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050 --\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350 --\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013 --\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075 --\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114 --\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313 --\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273 --\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235 --\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146 --\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160 --\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007 --\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351 --\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134 --\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045 --\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113 --\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174 --\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304 --\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012 --\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330 --\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124 --\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163 --\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056 --\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175 --\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163 --\262\345\214\360\206\231\270\345\305\337\204\301\267\353 --END -- --# Trust for Certificate "DigiNotar Root CA" --CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST --CKA_TOKEN CK_BBOOL CK_TRUE --CKA_PRIVATE CK_BBOOL CK_FALSE --CKA_MODIFIABLE CK_BBOOL CK_FALSE --CKA_LABEL UTF8 "DigiNotar Root CA" --CKA_CERT_SHA1_HASH MULTILINE_OCTAL --\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317 --\201\147\107\214 --END --CKA_CERT_MD5_HASH MULTILINE_OCTAL --\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230 --END --CKA_ISSUER MULTILINE_OCTAL --\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061 --\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157 --\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151 --\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061 --\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021 --\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156 --\154 --END --CKA_SERIAL_NUMBER MULTILINE_OCTAL --\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223 --\074\114 --END --CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN --CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR --CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE -- --# - # Certificate "Network Solutions Certificate Authority" - # - CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE -Index: security/nss/lib/ckfw/builtins/nssckbi.h -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v -retrieving revision 1.24.2.5 -retrieving revision 1.24.2.6 -diff -u -r1.24.2.5 -r1.24.2.6 ---- security/nss/lib/ckfw/builtins/nssckbi.h 1 Aug 2011 06:40:04 -0000 1.24.2.5 -+++ security/nss/lib/ckfw/builtins/nssckbi.h 30 Aug 2011 20:04:40 -0000 1.24.2.6 -@@ -77,8 +77,8 @@ - * of the comment in the CK_VERSION type definition. - */ - #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1 --#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84 --#define NSS_BUILTINS_LIBRARY_VERSION "1.84" -+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85 -+#define NSS_BUILTINS_LIBRARY_VERSION "1.85" - - /* These version numbers detail the semantic changes to the ckfw engine. */ - #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1 diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD new file mode 100644 index 000000000..7318e71dc --- /dev/null +++ b/social/asterisk/PKGBUILD @@ -0,0 +1,41 @@ +# Contributor: Alessio Biancalana <dottorblaster@gmail.com> + +pkgname=asterisk +pkgver=1.8.7.0 +pkgrel=1 +pkgdesc="A complete PBX solution" +arch=('i686' 'x86_64') +url="http://www.asterisk.org" +license=('GPL') +depends=('alsa-lib' 'speex' 'popt' 'libvorbis' 'curl') +makedepends=('postgresql' 'unixodbc' 'sqlite3') +optdepends=('libpri' 'libss7' 'openr2') +backup=(etc/asterisk/asterisk.conf) +source=(http://downloads.digium.com/pub/asterisk/releases/asterisk-$pkgver.tar.gz \ + asterisk \ + asterisk.logrotated) +install=$pkgname.install +md5sums=('5c6616a53fa3f300420ea17fd23abae9' + '59146273738605f1e011d8e7bed3561a' + '486e07a0a1405ea25ec5b1736034653e') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} samples + + (cd ${pkgdir}/etc/asterisk +# for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done +ls -I asterisk.conf | xargs -I '{}' mv '{}' '{}.default') +# cp ${srcdir}/modules.conf modules.conf + sed -i -e "s/\/var\/run/\/var\/run\/asterisk/" $startdir/pkg/etc/asterisk/asterisk.conf + + install -D -m 755 ${srcdir}/asterisk ${pkgdir}/etc/rc.d/asterisk + install -D -m 644 ${srcdir}/asterisk.logrotated ${pkgdir}/etc/logrotate.d/asterisk + } diff --git a/social/asterisk/asterisk b/social/asterisk/asterisk new file mode 100644 index 000000000..f823caefc --- /dev/null +++ b/social/asterisk/asterisk @@ -0,0 +1,38 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/asterisk` +case "$1" in + start) + stat_busy "Starting Asterisk" + [ -z "$PID" ] && cd /var/lib/asterisk && /usr/sbin/asterisk -G asterisk -U asterisk + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon asterisk + stat_done + fi + ;; + stop) + stat_busy "Stopping Asterisk" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/asterisk/asterisk.pid &>/dev/null + rm_daemon asterisk + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/social/asterisk/asterisk.install b/social/asterisk/asterisk.install new file mode 100644 index 000000000..1a3b998b7 --- /dev/null +++ b/social/asterisk/asterisk.install @@ -0,0 +1,38 @@ +post_install() { + echo -n "adding asterisk system group... " + groupadd -g 5060 asterisk && echo "done." + echo -n "adding asterisk system user... " + useradd -c "Asterisk daemon" -u 5060 -d /var/lib/asterisk -g asterisk -s /bin/false asterisk \ + && echo "done." + passwd -l asterisk &>/dev/null + chown -R asterisk:asterisk /var/run/asterisk + chown -R asterisk:asterisk /var/log/asterisk + chown -R asterisk:asterisk /var/spool/asterisk + chown -R asterisk:asterisk /var/lib/asterisk + +cat << EOF +>>> +>>> To get Music on Hold working do pacman -S mpg123 +>>> To get the postgresql, unixodbc or sqlite2 modules working +>>> download the respective package and modify modules.conf to reflect +>>> your changes. +>>> +EOF + +} + +post_upgrade() { + if grep asterisk /etc/passwd &>/dev/null; then + /bin/true + else + post_install $1 + fi +} + +post_remove() { + echo -n -e "\nremoving asterisk system user... " + userdel asterisk && echo "done." +} +op=$1 +shift +$op $* diff --git a/social/asterisk/asterisk.logrotated b/social/asterisk/asterisk.logrotated new file mode 100644 index 000000000..f03d0acd3 --- /dev/null +++ b/social/asterisk/asterisk.logrotated @@ -0,0 +1,10 @@ +/var/log/asterisk/*_log /var/log/asterisk/messages { + create 640 asterisk asterisk + compress + missingok + notifempty + postrotate + /usr/sbin/asterisk -rx "logger reload" 1>/dev/null || true + endscript +} + diff --git a/social/batctl/PKGBUILD b/social/batctl/PKGBUILD index b37c0f666..912011781 100644 --- a/social/batctl/PKGBUILD +++ b/social/batctl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=batctl pkgver=2011.3.0 pkgrel=1 pkgdesc="B.A.T.M.A.N. advanced control and management tool" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mesh.net/" license=('GPL') depends=('glibc') diff --git a/social/dropbear/PKGBUILD b/social/dropbear/PKGBUILD new file mode 100644 index 000000000..2df24cb15 --- /dev/null +++ b/social/dropbear/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`> +# Contributor: Jeremy Cowgar <jeremy@cowgar.com> + +pkgname=dropbear +pkgver=0.53.1 +pkgrel=1 +pkgdesc="Lightweight replacement for sshd" +arch=('i686' 'x86_64') +url="http://matt.ucc.asn.au/dropbear/dropbear.html" +license=('custom:BSD' 'custom:PD') +depends=('zlib') +source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \ + $pkgname-conf.d \ + $pkgname-rc.d) +sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393' + 'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c' + '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8') + +build() { + cd ${srcdir}/$pkgname-$pkgver + + sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h + + ./configure --prefix=/usr + LIBS="-lcrypt" make +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + + make prefix=${pkgdir}/usr install + +#man pages + install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1 + install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8 + install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8 + +#configuration files + install -d ${pkgdir}/etc/$pkgname + install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname + install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname + +#license file + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE +} diff --git a/social/dropbear/dropbear-conf.d b/social/dropbear/dropbear-conf.d new file mode 100644 index 000000000..6f3b8f0c5 --- /dev/null +++ b/social/dropbear/dropbear-conf.d @@ -0,0 +1,15 @@ +# the TCP port that Dropbear listens on +DROPBEAR_PORT="127.0.0.1:22" # Default to local-only. + +# any additional arguments for Dropbear +DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins. + +# specify an optional banner file containing a message to be +# sent to clients before they connect, such as "/etc/issue.net" +DROPBEAR_BANNER="" + +# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key) +#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key" + +# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key) +DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key" diff --git a/social/dropbear/dropbear-rc.d b/social/dropbear/dropbear-rc.d new file mode 100644 index 000000000..011880b3b --- /dev/null +++ b/social/dropbear/dropbear-rc.d @@ -0,0 +1,88 @@ +#!/bin/bash +daemon_name=dropbear + +. /etc/rc.conf +. /etc/rc.d/functions + +. /etc/conf.d/$daemon_name + +for port in $DROPBEAR_PORT; do + daemon_args="$daemon_args -p $port" +done + +[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER" +[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY" +[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY" +[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS" +[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid" +daemon_args="$daemon_args -P $DROPBEAR_PIDFILE" + +get_pid() { + PID='' + if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then + if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent" + PID="`< $DROPBEAR_PIDFILE`" + else # may not send signals to dropbear, because it's probably not running => remove pidfile + rm -f $DROPBEAR_PIDFILE + fi + fi +} + +case "$1" in + start) + stat_busy "Starting $daemon_name" + get_pid + if [ -z "$PID" ]; then + printhl "Checking for hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY + fi; + + $daemon_name $daemon_args # Make it Go Joe! + if [ $? -gt 0 ]; then + stat_die + else + add_daemon $daemon_name + stat_done + fi + else + stat_die + fi + ;; + + stop) + stat_busy "Stopping $daemon_name" + + get_pid + [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say! + if [ $? -gt 0 ]; then + stat_die + else + rm_daemon $daemon_name + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + + fingerprint) + stat_busy "Fingerprinting $daemon_name hostkeys" + if [ ! -z $DROPBEAR_DSSKEY ]; then + printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)" + fi; + if [ ! -z $DROPBEAR_RSAKEY ]; then + printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)" + fi; + ;; + + *) + echo "usage: $0 {start|stop|restart|fingerprint}" +esac +exit 0 diff --git a/social/ffingerd/PKGBUILD b/social/ffingerd/PKGBUILD index 4e312232b..dd87137ab 100644 --- a/social/ffingerd/PKGBUILD +++ b/social/ffingerd/PKGBUILD @@ -2,7 +2,7 @@ pkgname=ffingerd pkgver=1.28 pkgrel=2 pkgdesc="Secure finger daemon" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.fefe.de/ffingerd/" license=('GPL2') depends=('glibc' 'xinetd') diff --git a/social/liblockfile/PKGBUILD b/social/liblockfile/PKGBUILD index ef18a4109..8d7c70484 100644 --- a/social/liblockfile/PKGBUILD +++ b/social/liblockfile/PKGBUILD @@ -19,11 +19,12 @@ build() { patch -p1 < ../debian/patches/$p done - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make || return 1 + ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared --disable-static + sed -i "/ldconfig/d" Makefile + make - mkdir -p $startdir/pkg/usr/{lib,bin,include,share/man/man1,share/man/man3} - make install prefix=$startdir/pkg/usr mandir=$startdir/pkg/usr/share/man || return 1 + mkdir -p $pkgdir/usr/{lib,bin,include,share/man/man1,share/man/man3} + make install prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man } md5sums=('c24e2dfb4a2aab0263fe5ac1564d305e' diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD index ea43adfab..677b12f39 100644 --- a/social/libowfat/PKGBUILD +++ b/social/libowfat/PKGBUILD @@ -7,7 +7,7 @@ pkgname=libowfat pkgver=0.28 pkgrel=4 pkgdesc='GPL reimplementation of libdjb' -arch=(i686 x86_64) +arch=(i686 x86_64 mips64el) url=http://www.fefe.de/libowfat/ depends=() license=(GPL) diff --git a/social/lockfile-progs/PKGBUILD b/social/lockfile-progs/PKGBUILD index 5bf4ec95b..5e404c684 100644 --- a/social/lockfile-progs/PKGBUILD +++ b/social/lockfile-progs/PKGBUILD @@ -12,9 +12,11 @@ makedepends=('liblockfile') source=(http://ftp.debian.org/debian/pool/main/l/lockfile-progs/${pkgname}_${pkgver}.tar.gz) build() { - cd $startdir/src/sid + cd $srcdir/sid - make || return 1 + [ "$CARCH" = "mips64el" ] && sed -i "s/-Werror//" Makefile + + make mkdir -p $startdir/pkg/usr/bin install -s bin/* $startdir/pkg/usr/bin diff --git a/social/monkeysphere/PKGBUILD b/social/monkeysphere/PKGBUILD index 24985ac99..60e4d0b8e 100644 --- a/social/monkeysphere/PKGBUILD +++ b/social/monkeysphere/PKGBUILD @@ -4,7 +4,7 @@ # $Id: PKGBUILD 264 2010-11-10 00:57:53Z shtrom $ pkgname=monkeysphere pkgver=0.35 -pkgrel=1 +pkgrel=2 pkgdesc="Leverage the OpenPGP web of trust for OpenSSH and Web authentication" arch=('i686' 'x86_64' 'mips64el') url="http://web.monkeysphere.info/" diff --git a/social/monkeysphere/monkeysphere.install b/social/monkeysphere/monkeysphere.install index cc31e728d..2013f9f41 100644 --- a/social/monkeysphere/monkeysphere.install +++ b/social/monkeysphere/monkeysphere.install @@ -12,7 +12,9 @@ post_install() { echo ">>> Creating monkeysphere user and group and setting permissions..." getent group monkeysphere >/dev/null || usr/sbin/groupadd monkeysphere getent passwd monkeysphere >/dev/null || usr/sbin/useradd -c 'Monkeysphere WoT server identification tool' -g monkeysphere -d '/var/lib/monkeysphere' -s /bin/bash monkeysphere - chown monkeysphere:monkeysphere /var/lib/monkeysphere + +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere } # arg 1: the new package version @@ -24,7 +26,8 @@ pre_upgrade() { # arg 1: the new package version # arg 2: the old package version post_upgrade() { - /bin/true +# Should be root:root for sshd to work + chown root:root /var/lib/monkeysphere } # arg 1: the old package version diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD new file mode 100644 index 000000000..b60ca8401 --- /dev/null +++ b/social/openswan/PKGBUILD @@ -0,0 +1,46 @@ +# Contributor: Jan Fader <jan.fader@web.de> +pkgname=openswan +pkgver=2.6.36 +pkgrel=1 +pkgdesc="Open Source implementation of IPsec for the Linux operating system" +url="http://www.openswan.org" +license=('GPL' 'custom') +arch=('i686' 'x86_64') +depends=('iproute' 'gmp' 'perl') +backup=(etc/ipsec.conf \ + etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) +source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz + openswan.rc.d + compile.patch) + +build() { + # Create /etc/rc.d for init script, and license directory + mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} + + cd $srcdir/openswan-$pkgver + patch -p1 -i $srcdir/compile.patch + + # Change install paths to Arch defaults + sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc + + make USE_XAUTH=true USE_OBJDIR=true programs +} + +package(){ + cd $srcdir/openswan-$pkgver + make DESTDIR=$pkgdir install + + # Change permissions in /var + chmod 755 $pkgdir/var/run/pluto + + # Copy License + cp LICENSE $pkgdir/usr/share/licenses/openswan + + # Install init script + install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan + # fix manpages + mv $pkgdir/usr/man $pkgdir/usr/share/ +} +md5sums=('b3a1733493520bb18729633b62ef8247' + '543d84162761b9cc9ec319e938c4dd2a' + '5540437bb334873da646e21ac9caa963') diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch new file mode 100644 index 000000000..8ddff67f2 --- /dev/null +++ b/social/openswan/compile.patch @@ -0,0 +1,11 @@ +--- openswan-2.6.23/Makefile 2009-09-09 02:42:54.000000000 +0200 ++++ Makefile 2009-12-30 10:13:53.000000000 +0100 +@@ -12,6 +12,8 @@ + # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + # for more details. + # ++CFLAGS=-fno-strict-aliasing ++CXXFLAGS=-fno-strict-aliasing + + + OPENSWANSRCDIR?=$(shell pwd) diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d new file mode 100755 index 000000000..30bd0d56e --- /dev/null +++ b/social/openswan/openswan.rc.d @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting Openswan IPsec" + /etc/rc.d/ipsec --start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + stop) + stat_busy "Stopping Openswan IPsec" + /etc/rc.d/ipsec --stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon openswan + fi + ;; + restart) + stat_busy "Restarting Openswan IPsec" + /etc/rc.d/ipsec --restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon openswan + fi + ;; + status) + /etc/rc.d/ipsec --status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD index 61702974c..355af768c 100644 --- a/social/opentracker/PKGBUILD +++ b/social/opentracker/PKGBUILD @@ -1,19 +1,20 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=opentracker -pkgver=20110831 +pkgver=20111020 pkgrel=1 -pkgdesc='An open and free bittorrent tracker' -arch=('i686' 'x86_64') +pkgdesc='An open and free bittorrent tracker (open mode)' +arch=('i686' 'x86_64' 'mips64el') url='http://erdgeist.org/arts/software/opentracker/' license=('custom:Beer' 'GPL') -makedepends=('libowfat' 'cvs') +makedepends=('libowfat') # 'cvs') depends=('bash' 'zlib') backup=('etc/opentracker/config') +#install=${pkgname}.install source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" 'opentracker.rc.d' 'license.txt') -md5sums=('ad992e0b7e8f84ddab391da5307e67c6' +md5sums=('1dbace4895b4e1d290790f8ebacb2a2f' '390bde9d010e79ab1309c02dcf9972e8' '865211941e882c0aff5d36a22ac9efaa') @@ -41,20 +42,26 @@ build() { cd "${srcdir}/${_cvsmod}" msg 'Starting make...' - sed -e 's#PREFIX?=..#PREFIX?=/usr#' \ - -e 's#LIBOWFAT_HEADERS=$(PREFIX)/libowfat#LIBOWFAT_HEADERS=$(PREFIX)/include#' \ - -e 's#LIBOWFAT_LIBRARY=$(PREFIX)/libowfat#LIBOWFAT_LIBRARY=$(PREFIX)/lib#' \ - -e 's/#FEATURES+=-DWANT_ACCESSLIST_WHITE/FEATURES+=-DWANT_ACCESSLIST_WHITE/' \ - -e 's/#FEATURES+=-DWANT_RESTRICT_STATS/FEATURES+=-DWANT_RESTRICT_STATS/' \ - -e 's/FEATURES+=-DWANT_FULLSCRAPE/#FEATURES+=-DWANT_FULLSCRAPE/' \ - -i Makefile - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ + + sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ -i opentracker.conf.sample - make || return 1 +# See Makefile for available features + make PREFIX=/usr \ + LIBOWFAT_HEADERS=/usr/includes \ + LIBOWFAT_LIBRARY=/usr/lib \ + FEATURES="-DWANT_SYSLOGS -DDEBUG_HTTPERROR" +} + +package(){ + cd "${srcdir}/${_cvsmod}" + install -D -m 755 opentracker $pkgdir/usr/bin/opentracker install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt } +md5sums=('98cd42bcf1d61329195e6612d8d8d341' + '390bde9d010e79ab1309c02dcf9972e8' + '865211941e882c0aff5d36a22ac9efaa') diff --git a/social/poco/PKGBUILD b/social/poco/PKGBUILD new file mode 100644 index 000000000..be15eea8a --- /dev/null +++ b/social/poco/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer: Rodrigo Grumiche Silva <grumiche at integrityit dot com dot br> +# Contributor: nozog +# Contributor: davidhjelm +# Contributor: Ray Kohler <ataraxia937 at gmail dot com> +# Contributor: Nathan Owe < ndowens04 at gmail dot com> + +pkgname=poco +pkgver=1.4.2p1 +pkgrel=1 +pkgdesc="C++ class libraries for network-centric, portable applications, +complete edition" +arch=('i686' 'x86_64') +url="http://www.pocoproject.org/" +license=('custom:boost') +depends=('unixodbc' 'libmysqlclient' 'openssl') +makedepends=('gcc' 'make' 'unixodbc' 'libmysqlclient' 'openssl' 'chrpath') +options=() +source=(http://downloads.sourceforge.net/poco/$pkgname-$pkgver-all.tar.bz2) + +build() { + cd $srcdir/$pkgname-$pkgver-all + ./configure --prefix=/usr --no-samples --no-tests + make +} + + +package() { + cd $srcdir/$pkgname-$pkgver-all + + make DESTDIR=$pkgdir install + + install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + + #removing rpath information from binaries + chrpath -d $pkgdir/usr/bin/cpspc + chrpath -d $pkgdir/usr/bin/cpspcd + chrpath -d $pkgdir/usr/bin/f2cpspd + chrpath -d $pkgdir/usr/bin/f2cpsp + + #removing debugging libraries + rm $pkgdir/usr/lib/libPoco*d.so* +} + +md5sums=('752e5f5545377be24ee7c7b6b479fbbe') diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD new file mode 100644 index 000000000..98191c8d5 --- /dev/null +++ b/social/sipwitch/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Dan Serban +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: David Zaragoza <david@zaragoza.com.ve> + +pkgname=sipwitch +pkgver=1.1.2 +pkgrel=1 +pkgdesc="A call and registration server for the SIP protocol" +arch=(i686 x86_64) +url=http://www.gnutelephony.org/index.php/GNU_SIP_Witch +license=(GPL) +depends=(libexosip2 ucommon) +makedepends=(pkg-config) +options=('!libtool') +source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") + +build() +{ + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() +{ + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + mkdir -p "${pkgdir}"/etc/rc.d + touch "${pkgdir}"/etc/rc.d/"${pkgname}" +} +md5sums=('08a235ddc0f75238c3670e857a30ae0b') diff --git a/social/sobby/PKGBUILD b/social/sobby/PKGBUILD new file mode 100644 index 000000000..644c74aec --- /dev/null +++ b/social/sobby/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Thomas Jost <schnouki@schnouki.net> +pkgname=sobby +pkgver=0.4.7 +pkgrel=1 +pkgdesc="Standalone obby server" +url="http://gobby.0x539.de/trac/" +license="GPL" +depends=('obby>=0.4.7' 'libxml++') +makedepends=('pkgconfig' 'net6>=1.3.12') +arch=('i686' 'x86_64') +source=(http://releases.0x539.de/sobby/sobby-$pkgver.tar.gz) +md5sums=('816ac9e2ecf2ac79306f9bbb80699464') +sha1sums=('ca20369eabce1657d090b310d78d4a35d697f28b') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/social/spectrum/PKGBUILD b/social/spectrum/PKGBUILD new file mode 100644 index 000000000..95040efb6 --- /dev/null +++ b/social/spectrum/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Sonny Piers <sonny.piers@gmail.com> +# Contributor: Tim Besard <tim.besard@gmail.com> + +pkgname=spectrum +pkgver=1.4.8 +pkgrel=1 +pkgdesc="XMPP libpurple transport/gateway." +arch=('i686' 'x86_64') +url="http://spectrum.im" +license=('GPL') +depends=('gloox' 'libpurple-minimal' 'poco' 'python2' 'libev') +makedepends=('cmake' 'gettext' 'pkg-config') +optdepends=('mysql: MySQL database backend support' + 'postgresql-libs: PostgreSQL database backend support' + 'sqlite3: SQLite database backend support' + 'libevent: support for libevent' + 'imagemagick: support for avatars synchronization with legacy networks' + + # Protocols plugins + 'mbpurple-svn: microblogging services support (like Twitter or identi.ca/StatusNet)' + 'msn-pecan: a different implementation of the MSN protocol for libpurple' + 'pidgin-facebookchat: Facebook support, with more features than Facebook XMPP server' + 'pidgin-sipe: SIPE protocol support' +) +backup=('etc/conf.d/spectrum') +source=('http://spectrum.im/attachments/download/43/spectrum-1.4.8.tar.gz' + 'logrotate.spectrum') +md5sums=('edd88e1e70f86fe9aa4b43d787529a47' + '4f9cbfe3878fe5f4137d1bb5acc9e850') + +install='spectrum.install' + + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + msg "Starting make..." + + cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr . + make + + cd spectrumctl + python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Various needed folders -- correct permissions are set in spectrum.install + install -d "${pkgdir}/etc/spectrum" + install -d "${pkgdir}/var/log/spectrum" + install -d "${pkgdir}/var/run/spectrum" + install -d "${pkgdir}/var/lib/spectrum" + + # Install binaries and Python control script + make DESTDIR="${pkgdir}" install + + cd spectrumctl + python2 setup.py install --root="${pkgdir}" + + # Install initscript and logrotate config + install -Dm755 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-rc.d" "${pkgdir}/etc/rc.d/spectrum" + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/initscripts/archlinux/spectrum-conf.d" "${pkgdir}/etc/conf.d/spectrum" + install -Dm644 "${srcdir}/logrotate.spectrum" "${pkgdir}/etc/logrotate.d/spectrum" + + # Patch to use python2 + sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/spectrumctl" +} diff --git a/social/spectrum/logrotate.spectrum b/social/spectrum/logrotate.spectrum new file mode 100644 index 000000000..ae52ff156 --- /dev/null +++ b/social/spectrum/logrotate.spectrum @@ -0,0 +1,10 @@ +/var/log/spectrum/*.log { + notifempty + missingok + sharedscripts + postrotate + for P in /var/run/spectrum/*.pid; do + /bin/kill -HUP `cat "$P" 2>/dev/null` 2>/dev/null || true + done + endscript +} diff --git a/social/spectrum/spectrum.install b/social/spectrum/spectrum.install new file mode 100644 index 000000000..738fc5bbe --- /dev/null +++ b/social/spectrum/spectrum.install @@ -0,0 +1,47 @@ +# arg 1: the new package version +post_install() { + if [ -z "`grep '^spectrum:' /etc/group`" ]; then + groupadd -g 417 spectrum + fi + if [ -z "`grep '^spectrum:' /etc/passwd`" ]; then + useradd -u 417 -d /etc/spectrum -g spectrum -s /bin/false spectrum + fi + + chown spectrum:spectrum var/lib/spectrum + chown spectrum:spectrum var/log/spectrum + chown spectrum:spectrum var/run/spectrum + +cat << EOF + +==> Documentation: http://spectrum.im/ + +==> You must now customize the configuration file located in /etc/spectrum/. Copy and reconfigure for each seperate protocol. + +EOF + +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +post_remove() { + userdel spectrum + + paths=(/etc/spectrum /var/lib/spectrum /var/log/spectrum + /var/run/spectrum) + + first=true + for path in ${paths[@]}; do + if [ -d $path ]; then + if $first; then + first=false + echo "==> Leftover Paths:" + fi + echo "==> $path" + fi + done +} diff --git a/social/strongswan/PKGBUILD b/social/strongswan/PKGBUILD new file mode 100644 index 000000000..8c5e42885 --- /dev/null +++ b/social/strongswan/PKGBUILD @@ -0,0 +1,50 @@ +# Contributor: Jason Begley <jayray at digitalgoat dot com> +# Contributor: Ray Kohler <ataraxia937 at gmail dot com> +# Maintainer: Daniel Riedemann <daniel.riedemann [at] googlemail [dot] com> +# Maintainer: Dhruv Desai <svenskaparadox [at] gmail dot com> + +pkgname=strongswan +pkgver=4.5.3 +pkgrel=1 +pkgdesc="open source IPsec implementation" +url='http://www.strongswan.org' +license=("GPL") +arch=('i686' 'x86_64') +depends=('curl' 'gmp' 'iproute2' 'openssl' 'sqlite3' 'networkmanager') +conflicts=('openswan') +options=(!libtool) +backup=(etc/ipsec.conf etc/strongswan.conf) +source=(http://download.strongswan.org/${pkgname}-${pkgver}.tar.bz2 + strongswan.rc) +md5sums=('ee7c50a90c91307b111e8085f2479890' + '667ea2367cbe07c57721696e6b7e39df') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --with-ipsecdir=/usr/lib/strongswan \ + --enable-sqlite --enable-smartcard --enable-cisco-quirks \ + --enable-openssl --enable-nm --enable-curl \ + --enable-sql --enable-attr-sql \ + --enable-farp --enable-dhcp \ + --enable-eap-sim --enable-eap-sim-file --enable-eap-simaka-pseudonym \ + --enable-eap-simaka-reauth --enable-eap-identity --enable-eap-md5 \ + --enable-eap-gtc --enable-eap-aka --enable-eap-aka-3gpp2 \ + --enable-eap-mschapv2 --enable-eap-radius \ + --enable-ha \ + --disable-mysql --disable-ldap \ + --disable-static --enable-shared + + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + install -d ${pkgdir}/etc/rc.d + ln -s /usr/sbin/ipsec ${pkgdir}/etc/rc.d/ipsec + install -Dm755 ${srcdir}/strongswan.rc ${pkgdir}/etc/rc.d/strongswan +} + diff --git a/social/strongswan/strongswan.rc b/social/strongswan/strongswan.rc new file mode 100755 index 000000000..58c99c092 --- /dev/null +++ b/social/strongswan/strongswan.rc @@ -0,0 +1,43 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting strongSwan IPsec" + /usr/sbin/ipsec start + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon strongswan + fi + ;; + stop) + stat_busy "Stopping strongSwan IPsec" + /usr/sbin/ipsec stop + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + rm_daemon strongswan + fi + ;; + restart) + stat_busy "Restarting strongSwan IPsec" + /usr/sbin/ipsec restart + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + add_daemon strongswan + fi + ;; + status) + /usr/sbin/ipsec status + ;; + *) + echo "usage: $0 {start|stop|restart|status}" +esac + diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index fdf89a41c..87d3415e9 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,17 +1,18 @@ pkgname=tinc pkgver=1.0.16 -pkgrel=1 +pkgrel=3 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64 mips64el) url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') +backup=(etc/conf.d/tincd.conf) source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz tincd.conf tincd.rcd) md5sums=('f1c7ed94878725fb2cf4efb02bf160da' - '9b40646cd898709e90ae3c32baecb075' - '75516d05803ee6c6b22516e10129ad99') + 'd4a42b4a474448c64dc8f5100480f569' + '89a91a80c1dee4b365958bd9e6242d5a') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,5 +29,5 @@ package() { install -d $pkgdir/etc/{tinc,rc.d,conf.d} install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd - install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd + install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd.conf } diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf index 84547936c..e86139b44 100644 --- a/social/tinc/tincd.conf +++ b/social/tinc/tincd.conf @@ -1 +1,2 @@ NETNAME=yournetname +OPTIONS="-R -U nobody -L" diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd index f0a456e17..d790ef86f 100644 --- a/social/tinc/tincd.rcd +++ b/social/tinc/tincd.rcd @@ -13,6 +13,7 @@ case "$1" in stat_busy "Starting ${daemon_name}" [ -z "$PID" ] && \ /usr/sbin/tincd -n ${NETNAME} \ + ${OPTIONS} \ --pidfile=/var/run/tinc.${NETNAME} &> /dev/null if [ $? -gt 0 ]; then diff --git a/social/ucommon/PKGBUILD b/social/ucommon/PKGBUILD new file mode 100644 index 000000000..240fcc3db --- /dev/null +++ b/social/ucommon/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Dan Serban +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: David Zaragoza <david@zaragoza.com.ve> + +pkgname=ucommon +pkgver=5.0.6 +pkgrel=1 +pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" +arch=(i686 x86_64) +url="http://www.gnutelephony.org/index.php/GNU_uCommon_C%2B%2B" +license=(GPL) +depends=(openssl) +options=('!libtool') +source=("http://ftp.gnu.org/gnu/commoncpp/${pkgname}-${pkgver}.tar.gz") + +build() +{ + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() +{ + cd "${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} +md5sums=('86958df511e66bb6ea099b6ca3c3b582') 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/avahi/PKGBUILD b/staging/avahi/PKGBUILD new file mode 100644 index 000000000..ef93bd3be --- /dev/null +++ b/staging/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 143032 2011-11-21 14:01:14Z bisson $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=avahi +pkgver=0.6.30 +pkgrel=6 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/staging/avahi/gnome-nettool.png b/staging/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/staging/avahi/gnome-nettool.png diff --git a/staging/avahi/install b/staging/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/staging/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/staging/avahi/rc.d.patch b/staging/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/staging/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then 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/gdbm/PKGBUILD b/staging/gdbm/PKGBUILD new file mode 100644 index 000000000..f803182bc --- /dev/null +++ b/staging/gdbm/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 142942 2011-11-19 00:37:18Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=gdbm +pkgver=1.10 +pkgrel=1 +pkgdesc="GNU database library" +url="http://www.gnu.org/software/gdbm/gdbm.html" +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc' 'sh') +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.10-zeroheaders.patch) +options=('!libtool' '!makeflags') +install=gdbm.install +md5sums=('88770493c2559dc80b561293e39d3570' + 'ac255b10452005237836cd2d3a470733') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat + + make prefix=/usr +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h +} diff --git a/staging/gdbm/gdbm-1.10-zeroheaders.patch b/staging/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 000000000..a268f6bdf --- /dev/null +++ b/staging/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/staging/gdbm/gdbm.install b/staging/gdbm/gdbm.install new file mode 100644 index 000000000..2d1ce2c5a --- /dev/null +++ b/staging/gdbm/gdbm.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gdbm.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD new file mode 100644 index 000000000..af979e2b7 --- /dev/null +++ b/staging/hugin/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 143262 2011-11-24 07:45:07Z eric $ +# Maintainer: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Dominik Ryba <domryba@post.pl> + +pkgname=hugin +pkgver=2011.2.0 +pkgrel=2 +pkgdesc="A frontend to the panorama-tools" +arch=('i686' 'x86_64') +url="http://hugin.sourceforge.net/" +license=('GPL') +depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c' + 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') +makedepends=('zip' 'cmake' 'boost' 'tclap') +install=hugin.install +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('79dfdac229b4e58f50c893c1238bdd0921ad9da6') + +build() { + cd "${srcdir}" + mkdir build && cd build + cmake "${srcdir}/${pkgname}-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ + -DENABLE_LAPACK=yes + make +} + +package(){ + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install new file mode 100644 index 000000000..362749233 --- /dev/null +++ b/staging/hugin/hugin.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/gnome + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} 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/lighttpd/PKGBUILD b/staging/lighttpd/PKGBUILD new file mode 100644 index 000000000..0608d34ce --- /dev/null +++ b/staging/lighttpd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 142958 2011-11-19 06:20:53Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=lighttpd +pkgver=1.4.29 +pkgrel=3 +pkgdesc='a secure, fast, compliant and very flexible web-server' +license=('custom') +arch=('i686' 'x86_64') +url="http://www.lighttpd.net/" +depends=('pcre' 'bzip2' 'libldap' 'util-linux') +makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') +optdepends=('libxml2: mod_webdav' + 'lua: mod_cml/mod_magnet' + 'libmysqlclient: mod_mysql_vhost' + 'sqlite3: mod_webdav') +backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') +options=('!libtool' 'emptydirs') +source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" + "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc" + 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') +md5sums=('e6e67b09986cb504db630b5a86b2dd76' + 'de2afb4ed6a088fd7fa5f13c387a08f0' + '268386e71f5748dc1d887b9a0ab65589' + '913e2157fa78d990c32146f387d44c2b' + 'acdaa94299e6299cb5085e6d88babeca') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/lighttpd/modules \ + --sysconfdir=/etc/lighttpd \ + --with-mysql \ + --with-ldap \ + --with-attr \ + --with-openssl \ + --with-kerberos5 \ + --without-fam \ + --with-webdav-props \ + --with-webdav-locks \ + --with-gdbm \ + --with-memcache \ + --with-lua + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd + install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd + install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf + install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ + + pushd doc/config >/dev/null + find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; + popd >/dev/null + + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING +} diff --git a/staging/lighttpd/lighttpd.conf b/staging/lighttpd/lighttpd.conf new file mode 100644 index 000000000..4ca1b23a4 --- /dev/null +++ b/staging/lighttpd/lighttpd.conf @@ -0,0 +1,12 @@ +# This is a minimal example config +# See /usr/share/doc/lighttpd +# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +server.port = 80 +server.username = "http" +server.groupname = "http" +server.document-root = "/srv/http" +server.errorlog = "/var/log/lighttpd/error.log" +dir-listing.activate = "enable" +index-file.names = ( "index.html" ) +mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" ) diff --git a/staging/lighttpd/lighttpd.logrotate.d b/staging/lighttpd/lighttpd.logrotate.d new file mode 100644 index 000000000..5ff32a0c5 --- /dev/null +++ b/staging/lighttpd/lighttpd.logrotate.d @@ -0,0 +1,6 @@ +/var/log/lighttpd/*log { + missingok + postrotate + /etc/rc.d/lighttpd reload >/dev/null || true + endscript +} diff --git a/staging/lighttpd/lighttpd.rc.d b/staging/lighttpd/lighttpd.rc.d new file mode 100644 index 000000000..88f0a1474 --- /dev/null +++ b/staging/lighttpd/lighttpd.rc.d @@ -0,0 +1,132 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +pid_file='/var/run/lighttpd/lighttpd-angel.pid' + +get_pid() { + if [ -r "${pid_file}" ]; then + cat "${pid_file}" + else + pgrep -f /usr/sbin/lighttpd-angel + fi +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/lighttpd/lighttpd.conf ]; then + stat_append '(/etc/lighttpd/lighttpd.conf not found)' + stat_die + fi + + /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_append '(error in /etc/lighttpd/lighttpd.conf)' + stat_die + fi + + local piddir=$(dirname "${pid_file}") + if [ ! -d "${piddir}" ]; then + install -d -m755 -o http -g http "${piddir}" + fi + + stat_done +} + +start() { + stat_busy 'Starting lighttpd' + + local PID=$(get_pid) + if [ -z "$PID" ]; then + nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & + if [ $? -gt 0 ]; then + stat_die + else + echo $! > "${pid_file}" + add_daemon lighttpd + stat_done + fi + else + stat_die + fi +} + +stop() { + stat_busy 'Stopping lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +gracefull-stop() { + stat_busy 'Stopping lighttpd gracefully' + local PID=$(get_pid) + [ -n "$PID" ] && kill -INT $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +reload() { + stat_busy 'Reloading lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_die + else + stat_done + fi +} + + +case "$1" in + start) + test_config + start + ;; + stop) + test_config + stop + ;; + gracefull-stop) + test_config + stop + ;; + reload) + test_config + reload + ;; + restart) + test_config + stop + while [ -n "$(get_pid)" ]; do + sleep 1 + done + start + ;; + status) + stat_busy 'Checking lighttpd status' + ck_status lighttpd + ;; + *) + echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" +esac + +exit 0 diff --git a/staging/man-db/1361_1360.diff b/staging/man-db/1361_1360.diff new file mode 100644 index 000000000..c93856980 --- /dev/null +++ b/staging/man-db/1361_1360.diff @@ -0,0 +1,25 @@ +=== modified file 'src/straycats.c' +--- src/straycats.c 2011-01-10 20:08:22 +0000 ++++ src/straycats.c 2011-06-04 06:34:51 +0000 +@@ -177,6 +177,7 @@ + char *lang, *page_encoding; + char *mandir_base; + pipecmd *col_cmd; ++ char *col_locale; + char *fullpath; + + /* we have a straycat. Need to filter it and get +@@ -226,6 +227,12 @@ + col_cmd = pipecmd_new_argstr + (get_def_user ("col", COL)); + pipecmd_arg (col_cmd, "-bx"); ++ col_locale = find_charset_locale ("UTF-8"); ++ if (col_locale) { ++ pipecmd_setenv (col_cmd, "LC_CTYPE", ++ col_locale); ++ free (col_locale); ++ } + pipeline_command (decomp, col_cmd); + + fullpath = canonicalize_file_name (catdir); + diff --git a/staging/man-db/PKGBUILD b/staging/man-db/PKGBUILD new file mode 100644 index 000000000..bf40ab863 --- /dev/null +++ b/staging/man-db/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 143008 2011-11-20 15:57:42Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> + +pkgname=man-db +pkgver=2.6.0.2 +pkgrel=3 +pkgdesc="A utility for reading man pages" +arch=('i686' 'x86_64') +url="http://www.nongnu.org/man-db/" +license=('GPL' 'LGPL') +groups=('base') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') +optdepends=('less' 'gzip') +backup=('etc/man_db.conf' + 'etc/cron.daily/man-db') +conflicts=('man') +provides=('man') +replaces=('man') +install=${pkgname}.install +source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz + 1361_1360.diff + #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz + convert-mans man-db.cron.daily) +options=('!libtool') +md5sums=('2b41c96efec032d2b74ccbf2e401f93e' + '08b76b1f924c5493a280b79fc0aebde4' + '2b7662a7d5b33fe91f9f3e034361a2f6' + 'd30c39ae47560304471b5461719e0f03') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # https://bugs.archlinux.org/task/18722 + patch -Np0 -i $srcdir/1361_1360.diff + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ + --with-sections="1 n l 8 3 0 2 5 4 9 6 7" + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # part of groff pkg + rm -f ${pkgdir}/usr/bin/zsoelim + + # script from LFS to convert manpages, see + # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html + install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans + + #install whatis cron script + install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db +} + diff --git a/staging/man-db/convert-mans b/staging/man-db/convert-mans new file mode 100644 index 000000000..58a0224b0 --- /dev/null +++ b/staging/man-db/convert-mans @@ -0,0 +1,11 @@ +#!/bin/sh -e +FROM="$1" +TO="$2" +shift ; shift +while [ $# -gt 0 ] +do + FILE="$1" + shift + iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv + mv .tmp.iconv "$FILE" +done diff --git a/staging/man-db/man-db.cron.daily b/staging/man-db/man-db.cron.daily new file mode 100755 index 000000000..53e66e1e9 --- /dev/null +++ b/staging/man-db/man-db.cron.daily @@ -0,0 +1,39 @@ +#!/bin/sh + +# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) +NICE=19 + +# 0 for none, 1 for real time, 2 for best-effort, 3 for idle +IONICE_CLASS=2 + +# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest +IONICE_PRIORITY=7 + +UPDATEMANDB="/usr/bin/mandb --quiet" + +# Update the "whatis" database +#/usr/sbin/makewhatis -u -w + +# taken from Debian +# man-db cron daily +set -e + +if ! [ -d /var/cache/man ]; then + # Recover from deletion, per FHS. + mkdir -p /var/cache/man + chmod 755 /var/cache/man +fi + +# regenerate man database + +if [ -x /usr/bin/nice ]; then + UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}" +fi + +if [ -x /usr/bin/ionice ]; then + UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}" +fi + +${UPDATEMANDB} + +exit 0 diff --git a/staging/man-db/man-db.install b/staging/man-db/man-db.install new file mode 100644 index 000000000..f6f0f27a6 --- /dev/null +++ b/staging/man-db/man-db.install @@ -0,0 +1,22 @@ +post_install() { + echo "it's recommended to create an initial" + echo "database running as root:" + echo "\"/usr/bin/mandb --quiet\"" +} + +post_upgrade() { + if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then + echo "systemuser \"man\" is no more required" + echo "run \"userdel man\". please also" + echo "chown root:root /var/cache/man" + fi + # force database rebuild to get rid off badly imported pages + if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then + echo "(re)building database..." + mandb -c --quiet + fi +} + +post_remove() { + rm -rf /var/cache/man +} diff --git a/staging/mutt/PKGBUILD b/staging/mutt/PKGBUILD new file mode 100644 index 000000000..27f213111 --- /dev/null +++ b/staging/mutt/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 142948 2011-11-19 03:29:27Z bisson $ +# Contributor: tobias [tobias [at] archlinux.org] +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=mutt +pkgver=1.5.21 +pkgrel=6 +pkgdesc='Small but very powerful text-based mail client' +url='http://www.mutt.org/' +license=('GPL') +backup=('etc/Muttrc') +arch=('i686' 'x86_64') +optdepends=('smtp-forwarder: to send mail') +depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-gpgme \ + --enable-pop \ + --enable-imap \ + --enable-smtp \ + --enable-hcache \ + --with-curses=/usr \ + --with-regex \ + --with-gss=/usr \ + --with-ssl=/usr \ + --with-sasl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/bin/{flea,muttbug} + rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1 + rm "${pkgdir}"/etc/mime.types{,.dist} + install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist +} diff --git a/staging/mutt/install b/staging/mutt/install new file mode 100644 index 000000000..d65675c06 --- /dev/null +++ b/staging/mutt/install @@ -0,0 +1,8 @@ +post_install() { + cat <<EOF + +==> For GPG support, add the following to your muttrc: +==> source /etc/Muttrc.gpg.dist + +EOF +} 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/staging/php/PKGBUILD b/staging/php/PKGBUILD new file mode 100644 index 000000000..732d0d577 --- /dev/null +++ b/staging/php/PKGBUILD @@ -0,0 +1,365 @@ +# $Id: PKGBUILD 142956 2011-11-19 06:17:19Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=5 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' + '08582e502fed8221c6577042ca45ddb8' + '5bf4473f658404aa9a97bf026ecef8e9' + '65606c606df97a0760dfe5aaf9893afc' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '09005dabd90c48ddd392b3dbf05f8a82' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/staging/php/apache.conf b/staging/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/staging/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/staging/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b4dd32f96 --- /dev/null +++ b/staging/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -102,7 +102,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -121,9 +122,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -163,23 +164,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -333,7 +334,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch new file mode 100644 index 000000000..46c842921 --- /dev/null +++ b/staging/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/staging/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD new file mode 100644 index 000000000..544b2ea51 --- /dev/null +++ b/staging/python/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 143041 2011-11-21 17:38:43Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=python +pkgver=3.2.2 +pkgrel=2 +_pybasever=3.2 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite3' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite3') +provides=('python3') +replaces=('python3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + gdbm-magic-values.patch) +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' + '43bfbe3e23360f412b95cb284ff29b2cbe338be9') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-wide-unicode \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi + + make +} + +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -sf python3 "${pkgdir}/usr/bin/python" + ln -sf python3-config "${pkgdir}/usr/bin/python-config" + ln -sf idle3 "${pkgdir}/usr/bin/idle" + ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}mu.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/python/gdbm-magic-values.patch b/staging/python/gdbm-magic-values.patch new file mode 100644 index 000000000..e8ce828cf --- /dev/null +++ b/staging/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py +--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 ++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 +@@ -166,7 +166,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "dbm.gnu" + + # Later versions of Berkeley db hash file have a 12-byte pad in +diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS diff --git a/staging/ruby/PKGBUILD b/staging/ruby/PKGBUILD new file mode 100644 index 000000000..b922793b6 --- /dev/null +++ b/staging/ruby/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 142960 2011-11-19 07:06:33Z eric $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgbase=ruby +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p0 +pkgrel=2 +pkgdesc="An object-oriented language for quick and easy programming" +arch=('i686' 'x86_64') +url="http://www.ruby-lang.org/en/" +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shared --enable-pthread --disable-rpath + make +} + +package_ruby() { + depends=('openssl' 'libffi' 'libyaml') + provides=('rubygems' 'rake') + conflicts=('rake') + optdepends=('tk: for Ruby/TK') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-nodoc + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} + +package_ruby-docs() { + pkgdesc="Documentation files for ruby" + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-doc install-capi + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD new file mode 100644 index 000000000..de0ff770f --- /dev/null +++ b/staging/subversion/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 142970 2011-11-19 08:55:29Z pierre $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.6.17 +pkgrel=7 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('apache' 'bsd') +depends=('neon' 'apr-util' 'sqlite3') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool') +source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch + subversion.suppress.deprecation.warnings.patch + subversion-perl-bindings.patch) +md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'a6371baeda7e224504629ecdda2749b4' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe' + '0591aa39837931161b4d61ff35c7b147') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 + + # apply patches + patch -Np0 -i ../subversion.rpath.fix.patch + patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch + patch -Np1 -i ../subversion-perl-bindings.patch + + # configure + autoreconf + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + # build + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py CLEANUP=yes +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install + export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH + make DESTDIR=${pkgdir} install + + make DESTDIR=${pkgdir} swig-py + make install-swig-py DESTDIR=${pkgdir} + + install -d ${pkgdir}/usr/lib/python2.7 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages + + install -d ${pkgdir}/usr/share/subversion + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in + + make DESTDIR=${pkgdir} swig-pl + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf ${pkgdir}/usr/lib/perl5/core_perl + + make DESTDIR=${pkgdir} swig-rb + make install-swig-rb DESTDIR=${pkgdir} + + make DESTDIR=${pkgdir} javahl + make DESTDIR=${pkgdir} install-javahl + + install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} + + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge + install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # bash completion + install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ + ${pkgdir}/etc/bash_completion.d/subversion +} diff --git a/staging/subversion/subversion-perl-bindings.patch b/staging/subversion/subversion-perl-bindings.patch new file mode 100644 index 000000000..3c34daa47 --- /dev/null +++ b/staging/subversion/subversion-perl-bindings.patch @@ -0,0 +1,12 @@ +diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in +--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000 ++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000 +@@ -43,7 +43,7 @@ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => $cflags, ++ CCFLAGS => $Config{ccflags}, + INC => join(' ',$apr_cflags, $apu_cflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/staging/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/staging/subversion/subversion.suppress.deprecation.warnings.patch b/staging/subversion/subversion.suppress.deprecation.warnings.patch new file mode 100644 index 000000000..94ce89b18 --- /dev/null +++ b/staging/subversion/subversion.suppress.deprecation.warnings.patch @@ -0,0 +1,22 @@ +diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py +--- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 ++++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 +@@ -19,6 +19,7 @@ + from libsvn.core import * + import libsvn.core as _libsvncore + import atexit as _atexit ++import warnings + + class SubversionException(Exception): + def __init__(self, message=None, apr_err=None, child=None, +@@ -44,7 +45,9 @@ + Exception.__init__(self, *args) + + self.apr_err = apr_err +- self.message = message ++ with warnings.catch_warnings(): ++ warnings.simplefilter("ignore", DeprecationWarning) ++ self.message = message + self.child = child + self.file = file + self.line = line diff --git a/staging/subversion/svn b/staging/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/staging/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/staging/subversion/svnmerge.py b/staging/subversion/svnmerge.py new file mode 100644 index 000000000..d8931648f --- /dev/null +++ b/staging/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/staging/subversion/svnserve b/staging/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/staging/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/staging/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/staging/ypserv/PKGBUILD b/staging/ypserv/PKGBUILD new file mode 100644 index 000000000..afd58ede7 --- /dev/null +++ b/staging/ypserv/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 142950 2011-11-19 03:45:48Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ypserv +pkgver=2.26 +pkgrel=2 +pkgdesc='Linux NIS Server' +arch=('i686' 'x86_64') +url='http://www.linux-nis.org/nis/ypserv/' +license=('GPL2') +depends=('gdbm' 'openslp') +backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \ + 'yppasswd' + 'ypserv') +sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743' + '96192b628afe36709496e4801d016c4bff343f0e' + 'b625381bfa6cf62345377a7df30b8f45935206c5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup + install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf + install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets + install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv + install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd +} diff --git a/staging/ypserv/yppasswd b/staging/ypserv/yppasswd new file mode 100755 index 000000000..c2b00b2ca --- /dev/null +++ b/staging/ypserv/yppasswd @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Password Daemon" + /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon yppasswd + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Password Daemon" + killall -q /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon yppasswd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/gdm/gdm b/staging/ypserv/ypserv index c3e635a6d..c36e6901b 100755 --- a/testing/gdm/gdm +++ b/staging/ypserv/ypserv @@ -5,32 +5,30 @@ case "$1" in start) - stat_busy "Starting GDM" - /usr/sbin/gdm & + stat_busy "Starting NIS Server" + /usr/sbin/ypserv if [ $? -gt 0 ]; then stat_fail else - - add_daemon gdm + add_daemon ypserv stat_done fi ;; stop) - stat_busy "Stopping GDM" - [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null + stat_busy "Stopping NIS Server" + killall -q /usr/sbin/ypserv if [ $? -gt 0 ]; then stat_fail else - rm_daemon gdm + rm_daemon ypserv stat_done fi ;; restart) $0 stop - sleep 2 + sleep 1 $0 start ;; *) echo "usage: $0 {start|stop|restart}" esac -exit 0 diff --git a/staging/zsh/PKGBUILD b/staging/zsh/PKGBUILD new file mode 100644 index 000000000..7771ebbdf --- /dev/null +++ b/staging/zsh/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 142954 2011-11-19 06:05:35Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=zsh +pkgver=4.3.12 +pkgrel=3 +pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +depends=('pcre' 'libcap' 'gdbm') +install=zsh.install +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') +md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' + 'b367c1398b60242f7044a93a837227f9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # upstream patch to fix handling of compressed kernel modules + patch -p1 -i ${srcdir}/modules.patch + # FS#16360 + sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ + Doc/zsh.texi \ + Completion/Unix/Type/_services \ + Completion/Unix/Command/_init_d + ./configure --prefix=/usr \ + --bindir=/bin \ + --enable-etcdir=/etc/zsh \ + --enable-zshenv=/etc/zsh/zshenv \ + --enable-zlogin=/etc/zsh/zlogin \ + --enable-zlogout=/etc/zsh/zlogout \ + --enable-zprofile=/etc/profile \ + --enable-zshrc=/etc/zsh/zshrc \ + --enable-maildir-support \ + --with-term-lib='ncursesw' \ + --enable-multibyte \ + --enable-function-subdirs \ + --enable-fndir=/usr/share/zsh/functions \ + --enable-scriptdir=/usr/share/zsh/scripts \ + --with-tcsetpgrp \ + --enable-pcre \ + --enable-cap \ + --enable-zsh-secure-free + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + # This test wont work with the noatime mount option + rm Test/C02cond.ztst + HOME="${srcdir}" make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/staging/zsh/modules.patch b/staging/zsh/modules.patch new file mode 100644 index 000000000..315d40b98 --- /dev/null +++ b/staging/zsh/modules.patch @@ -0,0 +1,11 @@ +--- a/Completion/Linux/Command/_modutils ++++ b/Completion/Linux/Command/_modutils +@@ -107,7 +107,7 @@ case "$state" in + ! _retrieve_cache modules-$kver; + then + # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough? +- modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) ) ++ modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) ) + _store_cache modules-$kver modules + fi + diff --git a/staging/zsh/zsh.install b/staging/zsh/zsh.install new file mode 100644 index 000000000..e2a53bea8 --- /dev/null +++ b/staging/zsh/zsh.install @@ -0,0 +1,11 @@ +post_install() { + grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i '/^\/bin\/zsh/d' etc/shells +} diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD deleted file mode 100644 index e52e2410f..000000000 --- a/testing/aisleriot/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 140600 2011-10-17 12:27:47Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=aisleriot -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME Solitaire card games" -arch=(i686 x86_64) -license=(GPL) -url="http://www.gnome.org" -groups=('gnome-extra') -depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf) -makedepends=(gnome-doc-utils intltool itstool) -options=('!emptydirs' '!libtool') -install=aisleriot.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('86bbc131daf97d14f1587216d3e4c73db35126dddf393bfef4f7a67822f96529') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install deleted file mode 100644 index 713506dba..000000000 --- a/testing/aisleriot/aisleriot.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - usr/sbin/gconfpkg --install aisleriot -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall aisleriot -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -f -t usr/share/icons/hicolor -} diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD deleted file mode 100644 index b11156af0..000000000 --- a/testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 128111 2011-06-22 10:56:28Z vesa $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=2.3.5 -pkgrel=1.3 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.0.3') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} -md5sums=('5e08c688ded0dcff98eaad6fc03a9402') diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD deleted file mode 100644 index a8d8fcc35..000000000 --- a/testing/anjuta/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140802 2011-10-19 14:21:48Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Harley Laue <losinggeneration@yahoo.com> - -pkgname=anjuta -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME Integrated Development Environment (IDE)" -arch=('i686' 'x86_64') -license=('GPL') -depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://anjuta.sourceforge.net/" -install=anjuta.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('1e59aed63312e293c55f2934c4766411e9908fa512dd86e1422e3d906fe75613') - -build() { - cd "${srcdir}/anjuta-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package(){ - cd "${srcdir}/anjuta-${pkgver}" - - make DESTDIR="${pkgdir}" install - - sed -i "1s|#!/usr/bin/python$|&2|" \ - $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py -} diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install deleted file mode 100644 index c6fcfec11..000000000 --- a/testing/anjuta/anjuta.install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall anjuta - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/apr-util/PKGBUILD b/testing/apr-util/PKGBUILD new file mode 100644 index 000000000..5fc373942 --- /dev/null +++ b/testing/apr-util/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 143458 2011-11-24 17:02:48Z stephane $ +# 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/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD deleted file mode 100644 index e51cc71b4..000000000 --- a/testing/at-spi2-atk/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 140726 2011-10-18 14:45:19Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=at-spi2-atk -pkgver=2.2.1 -pkgrel=1 -pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" -arch=('i686' 'x86_64') -url="http://www.gnome.org" -license=('GPL2') -depends=('at-spi2-core' 'libx11' 'atk' 'dconf') -makedepends=('intltool') -install=at-spi2-atk.install -options=('!libtool') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6677def34b16c9a28d6ad96473ea56a3c0e13aa968e584df004cd44c8691ea1a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf --force --install - - ./configure --prefix=/usr --sysconfdir=/etc \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install deleted file mode 100644 index 2ef26aaa9..000000000 --- a/testing/at-spi2-atk/at-spi2-atk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD deleted file mode 100644 index 348a1e8a0..000000000 --- a/testing/at-spi2-core/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140724 2011-10-18 14:42:00Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=at-spi2-core -pkgver=2.2.1 -pkgrel=1 -pkgdesc="Protocol definitions and daemon for D-Bus at-spi" -arch=('i686' 'x86_64') -url="http://www.gnome.org" -license=('GPL2') -depends=('dbus-core' 'glib2' 'libxtst') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2a4129420decca3657e163a4dbb1a3cb28acafe32ea1292417fdd81084d48fac') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e '/AC_PATH_XTRA/d' configure.ac - autoreconf --force --install - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/at-spi2-core --disable-xevie - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD new file mode 100644 index 000000000..0d4d0bc97 --- /dev/null +++ b/testing/avahi/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 143460 2011-11-24 17:02:50Z stephane $ +# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=avahi +pkgver=0.6.30 +pkgrel=6 +pkgdesc='A multicast/unicast DNS-SD framework' +arch=('i686' 'x86_64') +url='http://www.avahi.org/' +license=('LGPL') +depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm') +optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc' + 'gtk2: gtk2 bindings' + 'qt3: qt3 bindings' + 'qt: qt bindings' + 'pygtk: avahi-bookmarks, avahi-discover' + 'twisted: avahi-bookmarks' + 'mono: mono bindings' + 'dbus-python: avahi-discover' + 'nss-mdns: NSS support for mDNS') +makedepends=('qt' 'qt3' 'pygtk' 'mono' 'intltool' 'dbus-python' + 'gtk-sharp-2' 'gobject-introspection' 'gtk3') +backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service) +install=install +conflicts=('howl' 'mdnsresponder') +provides=('howl' 'mdnsresponder') +replaces=('howl' 'mdnsresponder') +options=('!libtool') +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'gnome-nettool.png' + 'rc.d.patch') +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' + 'cf56387c88aed246b9f435efc182ef44de4d52f3' + '625ad7c131c0c1c383caeddef18fc7a32d8f3ab9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../rc.d.patch" + + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) +} diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png Binary files differnew file mode 100644 index 000000000..227d0678a --- /dev/null +++ b/testing/avahi/gnome-nettool.png diff --git a/testing/avahi/install b/testing/avahi/install new file mode 100644 index 000000000..7c75c3dd4 --- /dev/null +++ b/testing/avahi/install @@ -0,0 +1,21 @@ +post_install() { + getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null + getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null + + cat <<EOF +==> The following daemons may be added to DAEMONS in /etc/rc.conf: +==> avahi-daemon: the mdns responder, you probably want this. +==> dbus needs to be running when you start it. +==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns +==> configuration on dhcp-less networks. + +==> To use some of the client applications you will have to install python. +==> In addition, pygtk is required for the graphical ones and +==> twisted for avahi-bookmarks. +EOF +} + +post_remove() { + getent passwd avahi &>/dev/null && userdel avahi >/dev/null + getent group avahi &>/dev/null && groupdel avahi >/dev/null +} diff --git a/testing/avahi/rc.d.patch b/testing/avahi/rc.d.patch new file mode 100644 index 000000000..fd735734b --- /dev/null +++ b/testing/avahi/rc.d.patch @@ -0,0 +1,11 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2011-06-24 03:07:00.916170590 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-24 03:16:32.220596377 +0200 +@@ -33,6 +33,7 @@ + + case "$1" in + start) ++ ck_daemon dbus && { echo -n "Start dbus first." >&2; stat_die; } + stat_busy "Starting $DESC" + $DAEMON -D > /dev/null 2>&1 + if [ $? -gt 0 ]; then diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD new file mode 100644 index 000000000..ea49664d9 --- /dev/null +++ b/testing/bison/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 143498 2011-11-25 03:24:12Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> + +pkgname=bison +pkgver=2.5 +pkgrel=3 +pkgdesc="The GNU general-purpose parser generator" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/bison/bison.html" +depends=('glibc' 'm4' 'sh') +groups=('base-devel') +install=bison.install +source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2{,.sig} + bison-2.5-undefined-reference.patch) +md5sums=('9dba20116b13fc61a0846b0058fbe004' + '610b73db67bd4760209458efe7554ca3' + '2015c5421b2ad99032154f27bf5c4772') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # workaround for FS#26794 + patch -Np1 -i $srcdir/bison-2.5-undefined-reference.patch + + ./configure --prefix=/usr --datadir=/usr/share + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/bison/bison-2.5-undefined-reference.patch b/testing/bison/bison-2.5-undefined-reference.patch new file mode 100644 index 000000000..ea390259e --- /dev/null +++ b/testing/bison/bison-2.5-undefined-reference.patch @@ -0,0 +1,11 @@ +diff -Naur bison-2.5-orig/lib/yyerror.c bison-2.5/lib/yyerror.c +--- bison-2.5-orig/lib/yyerror.c 2011-01-04 00:50:42.000000000 +1000 ++++ bison-2.5/lib/yyerror.c 2011-11-09 22:01:48.725507079 +1000 +@@ -18,6 +18,7 @@ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + + #include <stdio.h> ++#undef fprintf + + int yyerror (char const *); + diff --git a/testing/bison/bison.install b/testing/bison/bison.install new file mode 100644 index 000000000..0081a194f --- /dev/null +++ b/testing/bison/bison.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file=bison.info.gz + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file $infodir/dir 2> /dev/null +} diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD deleted file mode 100644 index 0529e034c..000000000 --- a/testing/cabal-install/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -pkgname=cabal-install -pkgver=0.10.2 -pkgrel=1.1 -pkgdesc="The command-line interface for Cabal and Hackage." -url="http://hackage.haskell.org/package/cabal-install" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=('ghc=7.0.3' 'haskell-http>=4000.1.1' 'haskell-zlib') -depends=('gmp' zlib) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz) - -build() { - cd $srcdir/cabal-install-$pkgver - runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr - runhaskell Setup build -} - -package() { - cd $srcdir/cabal-install-$pkgver - runhaskell Setup copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -md5sums=('bc906ef0bed79cbb33fdb36b73514281') diff --git a/testing/caribou/PKGBUILD b/testing/caribou/PKGBUILD deleted file mode 100644 index 79b0ed9e8..000000000 --- a/testing/caribou/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 140734 2011-10-18 15:16:20Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Adam Hani Schakaki <krzd@krzd.net> - -pkgname=caribou -pkgver=0.4.1 -pkgrel=1 -pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Caribou" -license=('LGPL') -depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') -install=caribou.install -options=(!libtool !emptydirs) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/caribou \ - --disable-gtk2-module \ - --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/caribou/caribou.install b/testing/caribou/caribou.install deleted file mode 100644 index 22ca274a5..000000000 --- a/testing/caribou/caribou.install +++ /dev/null @@ -1,13 +0,0 @@ -pkgname=caribou - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD deleted file mode 100644 index 61a1e5054..000000000 --- a/testing/cheese/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140710 2011-10-18 13:35:55Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cheese -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" -arch=(i686 x86_64) -license=('GPL') -depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' - 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org/projects/cheese/" -install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0abc54aeaf1cec931b8a6e148f40341be4b2bc0e9a1164eba4fef7989499059c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install deleted file mode 100644 index c042fba42..000000000 --- a/testing/cheese/cheese.install +++ /dev/null @@ -1,20 +0,0 @@ -pkgname=cheese - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD deleted file mode 100644 index f64daa4e7..000000000 --- a/testing/clutter/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140607 2011-10-17 12:48:01Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=clutter -pkgver=1.8.2 -pkgrel=1 -pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" -arch=('i686' 'x86_64') -url="http://clutter-project.org/" -options=('!libtool') -license=('LGPL') -depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi') -makedepends=('gobject-introspection' 'mesa') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('dc899f26448f31cb31e72d80650b8c8ae05acacd5b5d5a44798eabaca0ddfa2f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-introspection - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD deleted file mode 100644 index 4fdf7ebe5..000000000 --- a/testing/cogl/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140619 2011-10-17 14:45:25Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=cogl -pkgver=1.8.2 -pkgrel=1 -pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" -arch=('i686' 'x86_64') -url="http://www.clutter-project.org/" -license=('GPL2') -depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') -makedepends=('mesa' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD deleted file mode 100644 index 03214f302..000000000 --- a/testing/curl/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 138498 2011-09-25 14:51:49Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=curl -pkgver=7.22.0 -pkgrel=2 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('libssh2' 'openssl' 'zlib') -makedepends=('perl-libwww') -options=('!libtool') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('e8c36126d21c893f085aca233906b5cc' - '1b061c348b63ea3e90c3f2c3af6a08d6' - '751bd433ede935c8fae727377625a8ae') - -ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') -case $ptrsize in - 8) _curlbuild=curlbuild-64.h ;; - 4) _curlbuild=curlbuild-32.h ;; - *) error "unknown pointer size for architecture: %s bytes" "$ptrsize" - exit 1 - ;; -esac - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --disable-dependency-tracking \ - --disable-ldap \ - --disable-ldaps \ - --enable-ipv6 \ - --enable-manual \ - --enable-versioned-symbols \ - --enable-threaded-resolver \ - --without-libidn \ - --with-random=/dev/urandom \ - --with-ca-bundle=/etc/ssl/certs/ca-bundle.crt - make - - perl lib/mk-ca-bundle.pl -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - # cert bundle - install -Dm644 ca-bundle.crt "$pkgdir/etc/ssl/certs/ca-bundle.crt" - - # devel - install -Dm644 docs/libcurl/libcurl.m4 "$pkgdir/usr/share/aclocal/libcurl.m4" - mv "$pkgdir/usr/include/curl/curlbuild.h" "$pkgdir/usr/include/curl/$_curlbuild" - install -m644 "$srcdir/curlbuild.h" "$pkgdir/usr/include/curl/curlbuild.h" -} diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h deleted file mode 100644 index b48862696..000000000 --- a/testing/curl/curlbuild.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "curlbuild-32.h" -#elif __WORDSIZE == 64 -#include "curlbuild-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD deleted file mode 100644 index de63b7027..000000000 --- a/testing/empathy/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 140627 2011-10-17 15:19:40Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=empathy -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' -'libcanberra' 'iso-codes' 'networkmanager') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') -optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' - 'telepathy-idle: IRC support' - 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' - 'telepathy-haze: libpurple support') -options=('!libtool') -groups=('gnome-extra') -install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d50e9b0e31df0e8d137c120c61c5aeaaad06fb24bb208d105b186a01b3f1de0a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install deleted file mode 100644 index c3f7abf13..000000000 --- a/testing/empathy/empathy.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "To use Empathy you need to install at least one Telepathy connection manager." -} - -post_upgrade() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD deleted file mode 100644 index 4d5d24726..000000000 --- a/testing/eog/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140706 2011-10-18 13:24:03Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=eog -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Eye of Gnome: An image viewing and cataloging program" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') -makedepends=('gtk-doc' 'intltool') -install=eog.install -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae20715790796061e51132804f5925c5a61a1e615527c7c746cd8b76a8f97c89') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # remove it from Xfce menu that ships its own thingy - echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop -} diff --git a/testing/eog/eog.install b/testing/eog/eog.install deleted file mode 100644 index 284b24b18..000000000 --- a/testing/eog/eog.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall eog - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD deleted file mode 100644 index 514415f54..000000000 --- a/testing/epiphany/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140730 2011-10-18 14:50:34Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=epiphany -pkgver=3.2.1 -pkgrel=1 -install=epiphany.install -pkgdesc="A GNOME web browser based on the WebKit rendering engine." -arch=('i686' 'x86_64') -license=('GPL') -depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' - 'hicolor-icon-theme' 'seed') -makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') -options=('!libtool' '!emptydirs') -groups=('gnome') -url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper \ - --enable-seed - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install deleted file mode 100644 index 00b1abb96..000000000 --- a/testing/epiphany/epiphany.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then - usr/sbin/gconfpkg --uninstall epiphany - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/erlang/PKGBUILD b/testing/erlang/PKGBUILD deleted file mode 100644 index b9da3fc65..000000000 --- a/testing/erlang/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 140452 2011-10-14 19:44:00Z ibiru $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> - -pkgname=erlang -pkgver=R14B04 -pkgrel=1 -pkgdesc="A small concurrent functional programming language developed by Ericsson." -arch=(i686 x86_64) -url="http://www.erlang.org/index.html" -license=('custom') -depends=('ncurses' 'glibc') -makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') -optdepends=('wxgtk: for wx support' 'unixodbc: database') - -options=('!makeflags') -source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz - http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) - -build() { - cd "$srcdir/otp_src_${pkgver/./-}" - ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) - ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) - - sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure - - CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs - make - make INSTALL_PREFIX="$pkgdir" install - -# fix prefix - cd "$pkgdir" - for i in usr/lib/erlang/bin/erl \ - usr/lib/erlang/bin/start \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ - usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ - usr/lib/erlang/releases/RELEASES ;do - sed -i "s#$pkgdir##" $i - done - -# fix symlinks - cd "$pkgdir/usr/lib/erlang/bin" - ln -sf ../erts-${ERTSVERSION}/bin/epmd - - cd "$pkgdir/usr/bin" - for file in *; do - ln -sfv ../lib/erlang/bin/$file - done - - ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" - -# install documentation - install -d "$pkgdir/usr/share/doc/erlang" - install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" - cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" - - install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" - -} -md5sums=('4b469729f103f52702bfb1fb24529dc0' - 'f31e72518daae4007f595c0b224dd59f') diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD deleted file mode 100644 index cd2a3c121..000000000 --- a/testing/evince/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 140637 2011-10-17 16:54:07Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evince -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Simply a document viewer" -url="http://projects.gnome.org/evince/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') -makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') -optdepends=('texlive-bin: DVI support') -groups=('gnome-extra') -install=evince.install -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/evince \ - --disable-static --enable-nautilus \ - --enable-pdf --enable-tiff \ - --enable-djvu --enable-dvi \ - --enable-t1lib --enable-comics \ - --disable-scrollkeeper --disable-schemas-compile \ - --enable-introspection - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/evince/evince.install b/testing/evince/evince.install deleted file mode 100644 index 9643a9ba0..000000000 --- a/testing/evince/evince.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall evince - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD deleted file mode 100644 index c17e13a81..000000000 --- a/testing/evolution-data-server/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 140535 2011-10-16 19:32:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-data-server -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Centralized access to appointments and contacts" -arch=('i686' 'x86_64') -depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') -makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') -options=('!libtool') -url="http://www.gnome.org" -license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --with-openldap=yes \ - --libexecdir=/usr/lib/evolution-data-server \ - --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD deleted file mode 100644 index eb765238b..000000000 --- a/testing/evolution-exchange/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140539 2011-10-16 20:16:23Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-exchange -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Ximian Connector Exchange plugin for Evolution" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.ximian.com" -depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') -makedepends=('intltool' 'evolution') -options=('!libtool' '!emptydirs') -install=evolution-exchange.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d9bebd1ab252e8568409fb1c50ba5a8f0c8236a8abf72ba697c95f9134d4cd9c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static \ - --with-libdb=/usr --with-krb5=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install deleted file mode 100644 index 1179887f9..000000000 --- a/testing/evolution-exchange/evolution-exchange.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=evolution-exchange - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/testing/evolution-groupwise/PKGBUILD b/testing/evolution-groupwise/PKGBUILD deleted file mode 100644 index 772d7d280..000000000 --- a/testing/evolution-groupwise/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140541 2011-10-16 20:19:02Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: György Balló <ballogy@freestart.hu> - -pkgname=evolution-groupwise -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GroupWise connector for evolution" -arch=(i686 x86_64) -url="http://projects.gnome.org/evolution/" -license=(LGPL) -depends=('evolution-data-server' 'gtkhtml4') -makedepends=(intltool evolution) -optdepends=('evolution: evolution plugin') -options=(!libtool) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3a5a1590b92144e465b09abc0fdaefc6d6bf9a5465d0b07e01171ddfef4aebbf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD deleted file mode 100644 index b4a733a75..000000000 --- a/testing/evolution/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 140537 2011-10-16 20:03:37Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Manage your email, contacts and schedule" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') -optdepends=('bogofilter: possible junk filter plugin' - 'spamassassin: possible junk filter plugin') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -install=evolution.install -url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('244d4fcf57d59b3fe0bcedddc65da5f508b253cb64159e6ddb2bddedf8d7e19a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --disable-scrollkeeper \ - --enable-nss=yes \ - --with-openldap=yes \ - --enable-smime=yes \ - --with-krb5=/usr \ - --disable-image-inline - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make - make -C plugins/tnef-attachments -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install deleted file mode 100644 index a2c3aaa54..000000000 --- a/testing/evolution/evolution.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=evolution - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD deleted file mode 100644 index 9fb6f52af..000000000 --- a/testing/folks/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140756 2011-10-18 17:59:10Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=folks -pkgver=0.6.4.1 -pkgrel=1 -pkgdesc="Library to aggregates people into metacontacts" -arch=(i686 x86_64) -url="http://telepathy.freedesktop.org/wiki/Folks" -license=('LGPL2.1') -depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') -makedepends=('gobject-introspection' 'vala' 'intltool') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b6cd5e982f4496cbe6370ca31cc85dcdeb6efccc95c1d940e654f8226cd95578') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gdbm/PKGBUILD b/testing/gdbm/PKGBUILD new file mode 100644 index 000000000..f5bf6c5ac --- /dev/null +++ b/testing/gdbm/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 143462 2011-11-24 17:02:53Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=gdbm +pkgver=1.10 +pkgrel=1 +pkgdesc="GNU database library" +url="http://www.gnu.org/software/gdbm/gdbm.html" +license=('GPL') +arch=('i686' 'x86_64') +depends=('glibc' 'sh') +source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz + gdbm-1.10-zeroheaders.patch) +options=('!libtool' '!makeflags') +install=gdbm.install +md5sums=('88770493c2559dc80b561293e39d3570' + 'ac255b10452005237836cd2d3a470733') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Prevent gdbm from storing uninitialized memory content + # to database files. This patch improves security, as the + # uninitialized memory might contain sensitive informations + # from other applications. + # https://bugzilla.redhat.com/show_bug.cgi?id=4457 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927 + patch -Np1 -i ../gdbm-1.10-zeroheaders.patch + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-libgdbm-compat + + make prefix=/usr +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}"/usr \ + manprefix="${pkgdir}"/usr/share/man \ + man3dir="${pkgdir}"/usr/share/man/man3 \ + infodir="${pkgdir}"/usr/share/info \ + install + + # create symlinks for compatibility + install -dm755 "${pkgdir}"/usr/include/gdbm + ln -sf ../gdbm.h "${pkgdir}"/usr/include/gdbm/gdbm.h + ln -sf ../ndbm.h "${pkgdir}"/usr/include/gdbm/ndbm.h + ln -sf ../dbm.h "${pkgdir}"/usr/include/gdbm/dbm.h +} diff --git a/testing/gdbm/gdbm-1.10-zeroheaders.patch b/testing/gdbm/gdbm-1.10-zeroheaders.patch new file mode 100644 index 000000000..a268f6bdf --- /dev/null +++ b/testing/gdbm/gdbm-1.10-zeroheaders.patch @@ -0,0 +1,33 @@ +diff -up gdbm-1.10/src/falloc.c.zeroheaders gdbm-1.10/src/falloc.c +--- gdbm-1.10/src/falloc.c.zeroheaders 2011-11-11 11:59:11.000000000 +0100 ++++ gdbm-1.10/src/falloc.c 2011-11-14 17:34:32.487604027 +0100 +@@ -255,7 +255,7 @@ push_avail_block (GDBM_FILE dbf) + + + /* Split the header block. */ +- temp = (avail_block *) malloc (av_size); ++ temp = (avail_block *) calloc (1, av_size); + if (temp == NULL) _gdbm_fatal (dbf, _("malloc error")); + /* Set the size to be correct AFTER the pop_avail_block. */ + temp->size = dbf->header->avail.size; +diff -up gdbm-1.10/src/gdbmopen.c.zeroheaders gdbm-1.10/src/gdbmopen.c +--- gdbm-1.10/src/gdbmopen.c.zeroheaders 2011-11-11 19:39:42.000000000 +0100 ++++ gdbm-1.10/src/gdbmopen.c 2011-11-14 17:33:24.867608650 +0100 +@@ -264,7 +264,7 @@ gdbm_open (const char *file, int block_s + (dbf->header->block_size - sizeof (hash_bucket)) + / sizeof (bucket_element) + 1; + dbf->header->bucket_size = dbf->header->block_size; +- dbf->bucket = (hash_bucket *) malloc (dbf->header->bucket_size); ++ dbf->bucket = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if (dbf->bucket == NULL) + { + gdbm_close (dbf); +@@ -456,7 +456,7 @@ _gdbm_init_cache(GDBM_FILE dbf, size_t s + for(index = 0; index < size; index++) + { + (dbf->bucket_cache[index]).ca_bucket +- = (hash_bucket *) malloc (dbf->header->bucket_size); ++ = (hash_bucket *) calloc (1, dbf->header->bucket_size); + if ((dbf->bucket_cache[index]).ca_bucket == NULL) + { + gdbm_errno = GDBM_MALLOC_ERROR; diff --git a/testing/gdbm/gdbm.install b/testing/gdbm/gdbm.install new file mode 100644 index 000000000..2d1ce2c5a --- /dev/null +++ b/testing/gdbm/gdbm.install @@ -0,0 +1,21 @@ +infodir=/usr/share/info +filelist=(gdbm.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} + diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD deleted file mode 100644 index 03c4713e4..000000000 --- a/testing/gdm/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 140814 2011-10-19 17:08:25Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gdm -pkgver=3.2.1.1 -pkgrel=1 -pkgdesc="Gnome Display Manager (a reimplementation of xdm)" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password' - 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf') -groups=('gnome-extra') -options=('!libtool') -depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') -makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') -optdepends=('gnome-shell: new login interface') -install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz - fix_external_program_directories.patch - gdm-vt-allocation-hack.patch - gdm - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' - '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' - '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' - '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' - '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' - 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' - 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gdm \ - --localstatedir=/var \ - --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ - --disable-scrollkeeper \ - --disable-static \ - --without-tcp-wrappers - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas - - for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do - install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}" - done - - install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" - - chmod 1770 "${pkgdir}/var/log/gdm" - chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf" - rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf" -} diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch deleted file mode 100644 index 997ea5405..000000000 --- a/testing/gdm/fix_external_program_directories.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c ---- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000 -+++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000 -@@ -131,7 +131,7 @@ - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); - - error = NULL; -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", -+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", - server->priv->display_name); - - g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in ---- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000 -+++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000 -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Display Manager - RequiredComponents=gnome-shell;gnome-settings-daemon; --IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' -+IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' - FallbackSession=gdm-fallback -diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000 -+++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam deleted file mode 100644 index c77c78917..000000000 --- a/testing/gdm/gdm-autologin.pam +++ /dev/null @@ -1,18 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_permit.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam deleted file mode 100644 index 5b74bf6d6..000000000 --- a/testing/gdm/gdm-fingerprint.pam +++ /dev/null @@ -1,18 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_fprintd.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam deleted file mode 100644 index aa4d4dd47..000000000 --- a/testing/gdm/gdm-password.pam +++ /dev/null @@ -1,20 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_unix.so nullok -auth optional pam_gnome_keyring.so - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_unix.so - -password required pam_unix.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam deleted file mode 100644 index baacb8bed..000000000 --- a/testing/gdm/gdm-smartcard.pam +++ /dev/null @@ -1,18 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so - -auth requisite pam_pkcs11.so wait_for_card card_only - -auth sufficient pam_succeed_if.so uid >= 1000 quiet -auth required pam_deny.so - -account required pam_unix.so - -password required pam_pkcs11.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so revoke -session required pam_limits.so -session required pam_unix.so diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch deleted file mode 100644 index 56fa5a151..000000000 --- a/testing/gdm/gdm-vt-allocation-hack.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c -index 39def47..03488fd 100644 ---- a/daemon/gdm-server.c -+++ b/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include <grp.h> - #include <signal.h> - #include <sys/resource.h> -+#include <sys/ioctl.h> -+#include <sys/vt.h> - - #include <glib.h> - #include <glib/gi18n.h> -@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) - return out; - } - -+#ifndef O_NOCTTY -+# define O_NOCTTY 0 -+#endif -+ -+static int -+open_vt (int vtno) -+{ -+ char *vtname; -+ int fd; -+ -+ vtname = g_strdup_printf ("/dev/tty%d", vtno); -+ -+ do { -+ errno = 0; -+ fd = open (vtname, O_RDWR | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ g_free (vtname); -+ return fd; -+} -+ -+static gint -+find_first_probably_free_vt (void) -+{ -+ int fd, fdv; -+ int vtno; -+ unsigned short vtmask; -+ struct vt_stat vtstat; -+ guint v_state; -+ -+ fdv = -1; -+ -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { -+ v_state = vtstat.v_state; -+ } else { -+ close (fd); -+ v_state = 0; -+ fd = -1; -+ } -+ } else { -+ v_state = 0; -+ } -+ -+ if (fd < 0) { -+ do { -+ errno = 0; -+ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); -+ } while (errno == EINTR); -+ -+ if (fd >= 0) { -+ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) -+ v_state = vtstat.v_state; -+ } -+ } -+ -+ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { -+ /* Is this console in use? */ -+ if (v_state & vtmask) -+ continue; -+ -+ /* No, try to open it */ -+ fdv = open_vt (vtno); -+ if (fdv >= 0) -+ break; -+ -+ /* If we're here, kernel indicated that the console was free, -+ * but we failed to open it. Just go on to higher VTs. */ -+ } -+ -+ if (fdv >= 0) -+ close (fdv); -+ else -+ vtno = -1; -+ -+ if (fd >= 0) -+ close (fd); -+ -+ return vtno; -+} -+ - char * - gdm_server_get_display_device (GdmServer *server) - { -@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, - - if (vtarg != NULL && ! gotvtarg) { - argv[len++] = g_strdup (vtarg); -+ } else if (!query_in_arglist && !gotvtarg) { -+ gint vtnum = find_first_probably_free_vt (); -+ -+ if (vtnum > 0) -+ argv [len++] = g_strdup_printf ("vt%d", vtnum); - } - - argv[len++] = NULL; diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam deleted file mode 100644 index cc3811c19..000000000 --- a/testing/gdm/gdm-welcome.pam +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 -auth required pam_env.so -auth required pam_permit.so - -account required pam_nologin.so -account required pam_unix.so - -password required pam_deny.so - -session required pam_loginuid.so --session optional pam_systemd.so -session optional pam_keyinit.so force revoke diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install deleted file mode 100644 index fda42d319..000000000 --- a/testing/gdm/gdm.install +++ /dev/null @@ -1,31 +0,0 @@ -pkgname=gdm - -post_install() { - getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm - getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm - passwd -l gdm > /dev/null - chown -R gdm:gdm /var/lib/gdm > /dev/null - - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gconfpkg --install ${pkgname} - glib-compile-schemas usr/share/glib-2.0/schemas - dconf update -} - -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas - dconf update - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - getent passwd gdm >/dev/null 2>&1 && userdel gdm - getent group gdm >/dev/null 2>&1 && groupdel gdm -} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam deleted file mode 100644 index 655299cb7..000000000 --- a/testing/gdm/gdm.pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -auth optional pam_gnome_keyring.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -session optional pam_gnome_keyring.so auto_start -password required pam_unix.so diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD deleted file mode 100644 index aabf27889..000000000 --- a/testing/gedit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140543 2011-10-16 20:26:14Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gedit -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A text editor for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gedit.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bdde2dae05bf08e67088c441eac3456d6861b5076d5f00d4c381291ef4c85651') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-scrollkeeper \ - --disable-updater --disable-schemas-compile \ - --enable-python - make -} - -package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install deleted file mode 100644 index 9d88a1341..000000000 --- a/testing/gedit/gedit.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/gedit.schemas ]; then - usr/sbin/gconfpkg --uninstall gedit - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD new file mode 100644 index 000000000..aef26d06e --- /dev/null +++ b/testing/ghc/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 142984 2011-11-19 18:41:40Z vesa $ +# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> +# Special note for devs looking to upgrade this package: +# ghc places a unique hash for each library when it is built. +# Libraries depend on versions specified by those hashes. +# This implies that all libraries need to be rebuilt when ghc is rebuilt. +# Also, due to dependency loop problems, haskell-ghc-paths and haddock +# do not carry version dependencies. You will have to remember to build them too. +pkgname=ghc +pkgver=7.2.2 +pkgrel=1 +pkgdesc="The Glasgow Haskell Compiler" +arch=(i686 x86_64) +url="http://www.haskell.org/ghc/" +license=("custom") +depends=('perl' 'gmp>=5.0' gcc) +makedepends=(ghc happy perl libxslt docbook-xsl) +install=ghc.install +options=(!strip) +groups=(haskell) +source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2" + build.mk) + +build() { + cd $srcdir/$pkgname-$pkgver + + cp $srcdir/build.mk mk/build.mk + + ./configure --prefix=/usr + make -j1 || return 1 +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license + install -d $pkgdir/usr/share/haskell +} + +md5sums=('fa19d9fe5049b7a1352b0b7c9880c141' + '5a3e0880c80b1dcecf779ff2e63a9c0d') diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk new file mode 100644 index 000000000..f918a0f16 --- /dev/null +++ b/testing/ghc/build.mk @@ -0,0 +1,150 @@ +# ----------------------------------------------------------------------------- +# A Sample build.mk +# +# Uncomment one of the following BuildFlavour settings to get the desired +# overall build type, and then tweak the options in the relevant section +# below. + +# Uncomment one of these to select a build profile below: + +# Full build with max optimisation (slow build) +BuildFlavour = perf + +# Fastest build (libs unoptimised): +#BuildFlavour = quickest + +# Fast build with optimised libraries: +#BuildFlavour = quick + +# Profile the stage2 compiler: +#BuildFlavour = prof + +# A development build, working on the stage 1 compiler: +#BuildFlavour = devel1 + +# A development build, working on the stage 2 compiler: +#BuildFlavour = devel2 + +GhcLibWays = v + +# -------- 1. A Performance/Distribution build-------------------------------- + +ifeq "$(BuildFlavour)" "perf" + +# perf matches the default settings, repeated here for comparison: + +SRC_HC_OPTS = -O -H64m +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O2 -fasm +GhcHcOpts = -Rghc-timing +GhcLibHcOpts = -O2 -XGenerics +GhcLibWays += p + +ifeq "$(PlatformSupportsSharedLibs)" "YES" +GhcLibWays += dyn +endif + +endif + +# -------- A Fast build ------------------------------------------------------ + +ifeq "$(BuildFlavour)" "quickest" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O0 -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Fast build with optimised libs ---------------------------------- + +ifeq "$(BuildFlavour)" "quick" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O0 -fasm +GhcLibHcOpts = -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- Profile the stage2 compiler --------------------------------------- + +ifeq "$(BuildFlavour)" "prof" + +SRC_HC_OPTS = -H64m -O0 -fasm +GhcStage1HcOpts = -O -fasm +GhcStage2HcOpts = -O -fasm +GhcLibHcOpts = -O -fasm + +GhcLibWays += p +GhcProfiled = YES + +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + + +# -------- A Development build (stage 1) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel1" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG +GhcStage2HcOpts = -Rghc-timing -O -fasm +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# -------- A Development build (stage 2) ------------------------------------- + +ifeq "$(BuildFlavour)" "devel2" + +SRC_HC_OPTS = -H64m -O -fasm +GhcLibHcOpts = -O -dcore-lint +GhcStage1HcOpts = -Rghc-timing -O -fasm +GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG +SplitObjs = NO +HADDOCK_DOCS = NO +BUILD_DOCBOOK_HTML = NO +BUILD_DOCBOOK_PS = NO +BUILD_DOCBOOK_PDF = NO + +endif + +# ----------------------------------------------------------------------------- +# Other settings that might be useful + +# profiled RTS +#GhcRtsCcOpts = -pg -g + +# Optimised/profiled RTS +#GhcRtsCcOpts = -O2 -pg + +#GhcRtsWithFrontPanel = YES +#SRC_HC_OPTS += `gtk-config --libs` + +# NoFib settings +NoFibWays = +STRIP=: + + diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install new file mode 100644 index 000000000..7d56083bc --- /dev/null +++ b/testing/ghc/ghc.install @@ -0,0 +1,19 @@ +pkgname=ghc + +pre_upgrade() { + cat << EOF + ==> Unregistering cabalized packages... +EOF + cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null ) + cat << EOF + ==> Done. +EOF + +} + +post_upgrade() { + cat << EOF + ==> All cabalized and yaourt-installed packages need to be reinstalled now. + ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages. +EOF +} diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD deleted file mode 100644 index da3209ed2..000000000 --- a/testing/glib-networking/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 140714 2011-10-18 13:43:46Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=glib-networking -pkgver=2.30.1 -pkgrel=1 -pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool') -options=('!libtool') -install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD deleted file mode 100644 index 6548be4af..000000000 --- a/testing/glib2/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 140483 2011-10-15 14:04:54Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=glib2 -pkgver=2.30.1 -pkgrel=1 -pkgdesc="Common C routines used by GTK+ and other libs" -url="http://www.gtk.org/" -arch=(i686 x86_64) -license=('LGPL') -depends=('pcre' 'libffi') -makedepends=('pkgconfig' 'python2') -optdepends=('python2: for gdbus-codegen') -options=('!libtool' '!docs' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz - glib2.sh - glib2.csh) -sha256sums=('82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9' - '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') - -build() { - cd "${srcdir}/glib-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/etc/profile.d" - install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/" - install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/" - - for _i in "${pkgdir}/etc/bash_completion.d/"*; do - chmod -x "${_i}" - done - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen -} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh deleted file mode 100644 index 7aa3a2ffa..000000000 --- a/testing/glib2/glib2.csh +++ /dev/null @@ -1 +0,0 @@ -setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh deleted file mode 100644 index 96a056e1e..000000000 --- a/testing/glib2/glib2.sh +++ /dev/null @@ -1 +0,0 @@ -export G_BROKEN_FILENAMES=1 diff --git a/testing/gnome-applets/PKGBUILD b/testing/gnome-applets/PKGBUILD deleted file mode 100644 index f3a788d52..000000000 --- a/testing/gnome-applets/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 140708 2011-10-18 13:30:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-applets -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME Applets" -arch=(i686 x86_64) -license=('GPL') -depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common') -options=(!emptydirs) -url="http://www.gnome.org" -groups=(gnome) -install=gnome-applets.install -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-install \ - --without-hal - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-applets/gnome-applets.install b/testing/gnome-applets/gnome-applets.install deleted file mode 100644 index dd9c34269..000000000 --- a/testing/gnome-applets/gnome-applets.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gnome-applets - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules deleted file mode 100644 index a76c1e73c..000000000 --- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules +++ /dev/null @@ -1,11 +0,0 @@ -# Get access to /dev/rfkill for users -# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 -# -# Updated for udev >= 154 -# http://bugs.debian.org/582188 -# https://bugzilla.redhat.com/show_bug.cgi?id=588660 - -ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" -ACTION!="add|change", GOTO="gnome_bluetooth_end" -KERNEL=="rfkill", TAG+="udev-acl" -LABEL="gnome_bluetooth_end" diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD deleted file mode 100644 index 1a76041ff..000000000 --- a/testing/gnome-bluetooth/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 140617 2011-10-17 13:37:28Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Roman Kyrylych <roman@archlinux.org> - -pkgname=gnome-bluetooth -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The GNOME Bluetooth Subsystem" -arch=('i686' 'x86_64') -url="http://live.gnome.org/GnomeBluetooth" -license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') -options=('!libtool' '!emptydirs') -install=gnome-bluetooth.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - 61-gnome-bluetooth-rfkill.rules) -sha256sums=('f67abc26e2a8003b5e3b58e1541ed3955e0ea05a08bfaa8d5dc4b2133d948df0' - 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-desktop-update \ - --disable-icon-update \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \ - "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf -} diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install deleted file mode 100644 index 927142ee0..000000000 --- a/testing/gnome-bluetooth/gnome-bluetooth.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD deleted file mode 100644 index d8d97e614..000000000 --- a/testing/gnome-color-manager/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 140598 2011-10-17 12:23:54Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=gnome-color-manager -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Color profile manager for the GNOME desktop" -arch=(i686 x86_64) -url="http://projects.gnome.org/gnome-color-manager/" -license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash') -makedepends=('intltool' 'gtk-doc') -install=gnome-color-manager.install -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc4651b58a4dc4b812803e8f81520488e6b452969028f04987cb463b8e218436') - -build(){ - cd "$srcdir/$pkgname-$pkgver" - - # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager \ - --disable-static --disable-man-pages - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install deleted file mode 100644 index 04fda0ddc..000000000 --- a/testing/gnome-color-manager/gnome-color-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-color-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-contacts/PKGBUILD b/testing/gnome-contacts/PKGBUILD deleted file mode 100644 index b32ca34f8..000000000 --- a/testing/gnome-contacts/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140748 2011-10-18 15:40:08Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gnome-contacts -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Contacts Manager for GNOME" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -groups=(gnome-extra) -depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') -makedepends=('intltool' 'vala') -install= -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('31c277a3db145c2353fffe33e613fb634e76fa5caf382e8f307a05e74a6a6eb9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD deleted file mode 100644 index dba6b22ef..000000000 --- a/testing/gnome-control-center/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 140631 2011-10-17 15:32:06Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-control-center -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The Control Center for GNOME" -arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') -optdepends=('mesa-demos: provides glxinfo for graphics information' - 'apg: adds password generation for user accounts' - 'gnome-color-manager: for color management tasks') -makedepends=('gnome-doc-utils' 'intltool') -url="http://www.gnome.org" -groups=('gnome') -install=gnome-control-center.install -license=('GPL') -options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bf354ea096ee7501cbdf53c42386355f19975b4206995e6110c180e7cb74a088') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb - - #https://bugzilla.gnome.org/show_bug.cgi?id=656229 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} - diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install deleted file mode 100644 index eb703319f..000000000 --- a/testing/gnome-control-center/gnome-control-center.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gnome-control-center - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD deleted file mode 100644 index 53611d625..000000000 --- a/testing/gnome-desktop/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 140521 2011-10-16 14:59:31Z heftig $ -# Maintainer: Jan de Groot <jan@archlinux.org> - -pkgname=gnome-desktop -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Library with common API for various GNOME modules" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --with-gnome-distributor="Arch Linux" \ - --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD deleted file mode 100644 index c7abe7b61..000000000 --- a/testing/gnome-documents/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 140635 2011-10-17 15:38:21Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=gnome-documents -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Documents Manager for GNOME" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL') -groups=('gnome-extra') -depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') -makedepends=('intltool' 'vala') -optdepends=('unoconv: Support for Libreoffice document types') -options=('!libtool') -install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-documents - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install deleted file mode 100644 index 95114273e..000000000 --- a/testing/gnome-documents/gnome-documents.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD deleted file mode 100644 index 9771eaf68..000000000 --- a/testing/gnome-games/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 140750 2011-10-18 16:34:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-games -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Some Games for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') -options=('!emptydirs' '!libtool') -install=gnome-games.install -url="http://www.gnome.org" -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static \ - --with-scores-user=root --with-scores-group=games \ - --enable-introspection=yes - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - # Remove all scores, we generate them from postinstall - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku -} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install deleted file mode 100644 index 1f67c2e01..000000000 --- a/testing/gnome-games/gnome-games.install +++ /dev/null @@ -1,153 +0,0 @@ -pkgname=gnome-games -scores=(glines.Large.scores - glines.Medium.scores - glines.Small.scores - gnibbles.1.0.scores - gnibbles.1.1.scores - gnibbles.2.0.scores - gnibbles.2.1.scores - gnibbles.3.0.scores - gnibbles.3.1.scores - gnibbles.4.0.scores - gnibbles.4.1.scores - gnobots2.classic_robots-safe.scores - gnobots2.classic_robots-super-safe.scores - gnobots2.classic_robots.scores - gnobots2.nightmare-safe.scores - gnobots2.nightmare-super-safe.scores - gnobots2.nightmare.scores - gnobots2.robots2-safe.scores - gnobots2.robots2-super-safe.scores - gnobots2.robots2.scores - gnobots2.robots2_easy-safe.scores - gnobots2.robots2_easy-super-safe.scores - gnobots2.robots2_easy.scores - gnobots2.robots_with_safe_teleport-safe.scores - gnobots2.robots_with_safe_teleport-super-safe.scores - gnobots2.robots_with_safe_teleport.scores - gnomine.Custom.scores - gnomine.Large.scores - gnomine.Medium.scores - gnomine.Small.scores - gnotravex.2x2.scores - gnotravex.3x3.scores - gnotravex.4x4.scores - gnotravex.5x5.scores - gnotravex.6x6.scores - gnotski.1.scores - gnotski.10.scores - gnotski.11.scores - gnotski.12.scores - gnotski.13.scores - gnotski.14.scores - gnotski.15.scores - gnotski.16.scores - gnotski.17.scores - gnotski.18.scores - gnotski.19.scores - gnotski.2.scores - gnotski.20.scores - gnotski.21.scores - gnotski.22.scores - gnotski.23.scores - gnotski.24.scores - gnotski.25.scores - gnotski.26.scores - gnotski.27.scores - gnotski.28.scores - gnotski.29.scores - gnotski.3.scores - gnotski.30.scores - gnotski.31.scores - gnotski.32.scores - gnotski.33.scores - gnotski.34.scores - gnotski.35.scores - gnotski.36.scores - gnotski.37.scores - gnotski.4.scores - gnotski.5.scores - gnotski.6.scores - gnotski.7.scores - gnotski.8.scores - gnotski.9.scores - gtali.Colors.scores - gtali.Regular.scores - mahjongg.bridges.scores - mahjongg.cloud.scores - mahjongg.confounding.scores - mahjongg.difficult.scores - mahjongg.dragon.scores - mahjongg.easy.scores - mahjongg.pyramid.scores - mahjongg.tictactoe.scores - mahjongg.ziggurat.scores - swell-foop.Large.scores - swell-foop.Medium.scores - swell-foop.Small.scores - quadrapassel.scores) - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - - for sz in Large Medium Small; do - if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then - mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - elif [ -e "var/games/same-gnome.${sz}.scores" ]; then - mv "var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - fi - done - if [ -e "opt/gnome/var/games/gnometris.scores" ]; then - mv "opt/gnome/var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - elif [ -e "var/games/gnometris.scores" ]; then - mv "var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - fi - - for score in "${scores[@]}" ; do - if [ -e "var/games/${score}" ]; then - continue - fi - if [ -e "opt/gnome/var/games/${score}" ]; then - mv "opt/gnome/var/games/${score}" var/games/ - else - touch "var/games/${score}" - fi - chown root:games "var/games/${score}" - chmod 664 "var/games/${score}" - done -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - - if [ -f usr/share/ggz/gnect-client.dsc ]; then - ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null - fi -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - - for score in "${scores[@]}" ; do - rm -f "var/games/${score}" - done -} diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD deleted file mode 100644 index 6a53ef70f..000000000 --- a/testing/gnome-keyring/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -#$Id: PKGBUILD 140713 2011-10-18 13:40:35Z ibiru $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gnome-keyring -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME Password Management daemon" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2') -groups=('gnome') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('49872dad0c22e495f65be226d6effa053605df9cdc7cb06781aa37d3ff36b8a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --disable-update-mime - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install deleted file mode 100644 index 37d76c56a..000000000 --- a/testing/gnome-keyring/gnome-keyring.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-mime-database usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD deleted file mode 100644 index 59690613a..000000000 --- a/testing/gnome-online-accounts/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140651 2011-10-17 18:33:53Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gnome-online-accounts -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME service to access online accounts" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL') -depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') -makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') -options=(!libtool) -install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD deleted file mode 100644 index 44e3c3efd..000000000 --- a/testing/gnome-panel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 140527 2011-10-16 15:11:02Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-panel -pkgver=3.2.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('GPL') -pkgdesc="The GNOME Panel" -url="http://www.gnome.org" -depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') -install=gnome-panel.install -groups=('gnome') -replaces=('gnome-panel-bonobo') -provides=("gnome-panel-bonobo=${pkgver}") -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-panel \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install deleted file mode 100644 index e3175df5e..000000000 --- a/testing/gnome-panel/gnome-panel.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gnome-panel - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD deleted file mode 100644 index 0fa540c65..000000000 --- a/testing/gnome-power-manager/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 140596 2011-10-17 12:20:23Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-power-manager -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Power management tools." -arch=(i686 x86_64) -url="http://www.gnome.org/projects/gnome-power-manager/" -license=('GPL') -depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -options=(!emptydirs) -install=gnome-power-manager.install -groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-power-manager \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install deleted file mode 100644 index 4666938db..000000000 --- a/testing/gnome-power-manager/gnome-power-manager.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.92) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-power-manager - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD deleted file mode 100644 index e3360ce13..000000000 --- a/testing/gnome-session/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 140525 2011-10-16 15:06:19Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-session -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The GNOME Session Handler" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') -makedepends=('intltool' 'mesa' 'xtrans') -options=('!emptydirs') -install=gnome-session.install -url="http://www.gnome.org" -groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install deleted file mode 100644 index 74cf4ed22..000000000 --- a/testing/gnome-session/gnome-session.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91.3-3) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-session - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD deleted file mode 100644 index 0e268879e..000000000 --- a/testing/gnome-settings-daemon/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 140621 2011-10-17 14:55:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-settings-daemon -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower') -makedepends=('intltool' 'gtk-doc' 'gnome-desktop') -options=('!emptydirs' '!libtool') -install=gnome-settings-daemon.install -url="http://www.gnome.org" -groups=('gnome') -replaces=(gnome-settings-daemon-pulse) -conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('1015b8a12483e91ddc67e891b66207a70339a341a051507aad9a6a15fbfcb78d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install deleted file mode 100644 index 483fb9450..000000000 --- a/testing/gnome-settings-daemon/gnome-settings-daemon.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-settings-daemon - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD deleted file mode 100644 index 4bce0b41e..000000000 --- a/testing/gnome-shell/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 140742 2011-10-18 15:33:56Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Flamelab <panosfilip@gmail.com - -pkgname=gnome-shell -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The next generation GNOME Shell" -arch=('i686' 'x86_64') -url="http://live.gnome.org/GnomeShell" -license=('GPL2') -depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control') -makedepends=('intltool' 'gnome-doc-utils') -optdepends=('network-manager-applet: shell integration for networkmanager') -options=('!libtool' '!emptydirs') -install=gnome-shell.install -groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('ac05e3133bd279c84812d8d3d8e362f8b33563cdc3e7a6aefa9c0b1c2aeab0eb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-shell \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install deleted file mode 100644 index a07105c24..000000000 --- a/testing/gnome-shell/gnome-shell.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gnome-shell - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD deleted file mode 100644 index 49f2b16f8..000000000 --- a/testing/gnome-system-monitor/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140736 2011-10-18 15:19:34Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-system-monitor -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A system monitor for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') -options=(!emptydirs) -url="http://www.gnome.org" -groups=('gnome-extra') -install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install deleted file mode 100644 index e2957a570..000000000 --- a/testing/gnome-system-monitor/gnome-system-monitor.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gnome-system-monitor - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD deleted file mode 100644 index 185140261..000000000 --- a/testing/gnome-terminal/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140609 2011-10-17 12:53:24Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-terminal -pkgver=3.2.1 -pkgrel=1 -pkgdesc="The GNOME Terminal Emulator" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm') -makedepends=('gnome-doc-utils' 'intltool' 'gtk2') -options=('!emptydirs') -url="http://www.gnome.org" -groups=('gnome') -install=gnome-terminal.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install deleted file mode 100644 index 04c2b3c2c..000000000 --- a/testing/gnome-terminal/gnome-terminal.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-terminal - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD deleted file mode 100644 index 121ce3398..000000000 --- a/testing/gnome-themes-standard/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 140722 2011-10-18 14:39:05Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=gnome-themes-standard -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Default themes for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://abattis.org/cantarell/" -license=('GPL2') -depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg') -makedepends=('intltool') -groups=('gnome') -replaces=('gnome-themes') -conflicts=('gnome-themes') -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD deleted file mode 100644 index 6467f24c9..000000000 --- a/testing/gnome-user-share/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140629 2011-10-17 15:25:55Z ibiru $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> - -pkgname=gnome-user-share -pkgver=3.0.1 -pkgrel=1 -pkgdesc="Easy to use user-level file sharing for GNOME." -arch=('i686' 'x86_64') -url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" -license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus') -options=('!emptydirs' '!libtool') -install=gnome-user-share.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-user-share \ - --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install deleted file mode 100644 index 3cc1b5286..000000000 --- a/testing/gnome-user-share/gnome-user-share.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gnome-user-share - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD deleted file mode 100644 index c9b7d60e9..000000000 --- a/testing/gnome-utils/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 140623 2011-10-17 15:11:03Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-utils -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files" -arch=(i686 x86_64) -license=('GPL') -depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf') -makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -groups=('gnome-extra') -install=gnome-utils.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-utils \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper \ - --disable-schemas-compile \ - --disable-schemas-install - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas - - # remove it also from Xfce menu that ships its own thingy - sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop - sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop -} diff --git a/testing/gnome-utils/gnome-utils.install b/testing/gnome-utils/gnome-utils.install deleted file mode 100644 index a04bda405..000000000 --- a/testing/gnome-utils/gnome-utils.install +++ /dev/null @@ -1,26 +0,0 @@ -pkgname=gnome-utils - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD deleted file mode 100644 index 9e6102502..000000000 --- a/testing/gtk2/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 140694 2011-10-18 06:32:41Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gtk2 -pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.7 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' - 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch) -sha256sums=('1fdc7605501bd2932ef9a3c4c3c9a406e505f18667aea9e73af650da28fff994' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xinput=yes - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package_gtk2() { - pkgdesc="GTK+ is a multi-platform toolkit (v2)" - install=gtk2.install - depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache') - backup=(etc/gtk-2.0/gtkrc) - - cd "${srcdir}/gtk+-${pkgver}" - - make DESTDIR="${pkgdir}" install - sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert - echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc" - #split this out to use with gtk3 too - rm ${pkgdir}/usr/bin/gtk-update-icon-cache -} -package_gtk-update-icon-cache() { - pkgdesc="The GTK+ update icon cache tool" - depends=('gdk-pixbuf2') - - cd "${srcdir}/gtk+-${pkgver}/gtk" - - install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache -} diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install deleted file mode 100644 index 4e2b72f1b..000000000 --- a/testing/gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null -} diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/testing/gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD deleted file mode 100644 index 0cad4b6e2..000000000 --- a/testing/gtk3/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 140485 2011-10-15 14:42:15Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtk3 -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GTK+ is a multi-platform toolkit (v3)" -arch=('i686' 'x86_64') -url="http://www.gtk.org/" -install=gtk3.install -depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord') -makedepends=('gobject-introspection') -options=('!libtool' '!docs') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-${pkgver}.tar.xz - settings.ini) -sha256sums=('f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') - -build() { - cd "${srcdir}/gtk+-${pkgver}" - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-gtk2-dependency \ - --disable-schemas-compile - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini" -} diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install deleted file mode 100644 index cd8965d1f..000000000 --- a/testing/gtk3/gtk3.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache -} -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini deleted file mode 100644 index 039000d38..000000000 --- a/testing/gtk3/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-fallback-icon-theme = gnome diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD deleted file mode 100644 index 62258440a..000000000 --- a/testing/gtkhtml4/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140533 2011-10-16 19:26:34Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtkhtml4 -_pkgbasename=gtkhtml -pkgver=4.2.1 -pkgrel=1 -pkgdesc="A lightweight HTML renderer/editor widget for GTK3" -arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') -makedepends=('intltool') -url="http://www.gnome.org" -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('e72fb264bae45f2a340818c645248c29eaa2acf3d2bb3c2316ae296a0d438558') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml4 \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD deleted file mode 100644 index bb7ed7b17..000000000 --- a/testing/gtksourceview3/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140529 2011-10-16 16:21:18Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtksourceview3 -_pkgbasename=gtksourceview -pkgver=3.2.2 -pkgrel=1 -pkgdesc="A text widget adding syntax highlighting and more to GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libxml2') -makedepends=('intltool' 'pkgconfig' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('52447d85b57b1413e699a4a27a8c4ba7df737347e9f5b4c5406e6393ca02982c') - -build() { - cd "${srcdir}/$_pkgbasename-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/$_pkgbasename-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD deleted file mode 100644 index 2c2b77bc7..000000000 --- a/testing/gucharmap/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140613 2011-10-17 13:17:00Z heftig $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gucharmap -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Gnome Unicode Charmap" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org" -depends=('gconf' 'hicolor-icon-theme') -makedepends=('gtk-doc' 'intltool' 'gobject-introspection') -options=('!libtool' '!emptydirs') -install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b06f376e5baaa41f0236d659bd6d03e3b38759198257a60affb6ddb2e111beff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --enable-introspection - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install deleted file mode 100644 index 4de3253f6..000000000 --- a/testing/gucharmap/gucharmap.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gucharmap - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD deleted file mode 100644 index a378f78d0..000000000 --- a/testing/gvfs/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 140615 2011-10-17 13:34:14Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') -url="http://www.gnome.org" -options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/etc/bash_completion.d - make -} - -package_gvfs() { - pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf') - optdepends=('gvfs-afc: AFC (mobile devices) support' - 'gvfs-smb: SMB/CIFS (Windows client) support' - 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' - 'gvfs-obexftp: ObexFTP (bluetooth) support' - 'gvfs-afp: Apple Filing Protocol (AFP) support') - install=gvfs.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^am__append_3/#am__append_3/' \ - -e 's/^am__append_4/#am__append_4/' \ - -i monitor/Makefile - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} - rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount - rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml - rm usr/share/GConf/gsettings/gvfs-smb.convert -} - -package_gvfs-smb() { - pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') - install=gvfs-smb.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" - - install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" - - install -Dm644 org.gnome.system.smb.gschema.xml \ - "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" - install -Dm644 gvfs-smb.convert \ - "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" -} - -package_gvfs-afc() { - pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=${pkgver}" 'libimobiledevice') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" - - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" - make DESTDIR="${pkgdir}" install -} - -package_gvfs-gphoto2() { - pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" - - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" - make DESTDIR="${pkgdir}" install -} - -package_gvfs-obexftp() { - pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') - install=gvfs-module.install - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" -} - -package_gvfs-afp() { - pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" - depends=("gvfs=${pkgver}") - install=gvfs-module.install - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" - -} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install deleted file mode 100644 index 09d1f11ec..000000000 --- a/testing/gvfs/gvfs-module.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install deleted file mode 100644 index 0b8783c7b..000000000 --- a/testing/gvfs/gvfs-smb.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install deleted file mode 100644 index 9458b1513..000000000 --- a/testing/gvfs/gvfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/testing/happy/PKGBUILD b/testing/happy/PKGBUILD deleted file mode 100644 index d5303e80e..000000000 --- a/testing/happy/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 128129 2011-06-22 11:27:01Z vesa $ -# Maintainer: simo <simo@archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=happy -pkgver=1.18.6 -pkgrel=1.2 -pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" -arch=('i686' 'x86_64') -license=("custom:BSD3") -depends=(gmp) -makedepends=(ghc=7.0.3 haskell-mtl=2.0.1.0) -options=(strip) -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('7d4d1425f5068633cd477a2b2216880d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - runhaskell Setup.lhs configure -O --prefix=/usr - runhaskell Setup.lhs build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup.lhs copy --destdir="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - diff --git a/testing/hplip/PKGBUILD b/testing/hplip/PKGBUILD deleted file mode 100644 index b94467fd7..000000000 --- a/testing/hplip/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 140428 2011-10-14 05:01:01Z eric $ -# Maintainer : Rémy Oudompheng <remy@archlinux.org> -# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> - -pkgname=hplip -pkgver=3.11.10 -pkgrel=1 -pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" -arch=('i686' 'x86_64') -url="http://hplipopensource.com" -license=('GPL') -depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'net-snmp>=5.7.1') -makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') -optdepends=('cups: for printing support' - 'dbus-python: for dbus support' - 'sane: for scanner support' - 'python-imaging: for commandline scanning support' - 'python-notify: for Desktop notification support' - 'rpcbind: for network support' - 'python2-qt: for running hp-toolbox' - 'python2-gobject2: for running hp-toolbox' - 'hplip-plugin: binary blobs for specific devices') -replaces=('hpijs') -options=('!libtool') -install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('6143f30f3b6905ef22105176a3b80db0' - '396bbd8c5cc92aa8295e5bcb508692f3') - -build() { - cd "$srcdir/$pkgname-$pkgver" - export PYTHON=python2 - find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + - sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - data/rules/56-hpmud_support.rules - - ./configure --prefix=/usr \ - --enable-qt4 \ - --enable-foomatic-rip-hplip-install \ - --enable-foomatic-ppd-install \ - --enable-hpcups-install \ - --enable-cups-drv-install \ - --enable-hpijs-install \ - --enable-foomatic-drv-install \ - --enable-pp-build \ - --enable-udev-acl-rules - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install - # remove config provided by sane and autostart of hp-daemon - rm -rf "$pkgdir"/etc/{sane.d,xdg} -} diff --git a/testing/hplip/hplip.install b/testing/hplip/hplip.install deleted file mode 100644 index cb0eaf8e8..000000000 --- a/testing/hplip/hplip.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - cat << EOF - -NOTE ----- -# If you want to use this driver with sane: -# echo "hpaio" >> /etc/sane.d/dll.conf - -EOF -} diff --git a/testing/htop/ChangeLog b/testing/htop/ChangeLog new file mode 100644 index 000000000..df71cf644 --- /dev/null +++ b/testing/htop/ChangeLog @@ -0,0 +1,22 @@ +2011-10-19 Andrea Scarpino <andrea@archlinux.org> + * Enable cgroup support (FS#26155) + * Add lsof and strace optional depends (FS#25778) + * Fix crash when column is less than 40 (closes FS#25823) + +2011-05-17 Angel Velasquez <angvp@archlinux.org> + * Added patch to fix --sort-key (closes FS#23224) + +2009-09-21 Eric Belanger <eric@archlinux.org> + + * htop 0.8.3-1 + * Upstream update + * Built with vserver and openvz support (close FS#12755) + +2008-12-09 Alexander Fehr <pizzapunk gmail com> + + * htop-0.8.1-1: + * New upstream release + * New maintainer + * Added patch to fix FS#12235 + * Enabled Unicode support + * Added ChangeLog diff --git a/testing/htop/PKGBUILD b/testing/htop/PKGBUILD new file mode 100644 index 000000000..8457c8f5a --- /dev/null +++ b/testing/htop/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 143084 2011-11-22 15:51:43Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=htop +pkgver=1.0 +pkgrel=1 +pkgdesc="Interactive process viewer" +arch=('i686' 'x86_64') +url="http://htop.sourceforge.net/" +license=('GPL') +depends=('ncurses') +makedepends=('python2') +optdepends=('lsof' 'strace') +options=('!emptydirs') +changelog=ChangeLog +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('325112ca7947ea1f6d6441f631e00384') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c configure + sed -i 's|python|python2|' scripts/MakeHeader.py + + ./configure --prefix=/usr \ + --enable-unicode \ + --enable-openvz \ + --enable-vserver \ + --enable-cgroup + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} 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/testing/kbd/PKGBUILD b/testing/kbd/PKGBUILD deleted file mode 100644 index ebc08f967..000000000 --- a/testing/kbd/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 139865 2011-10-05 14:29:41Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=kbd -pkgver=1.15.3 -pkgrel=2 -pkgdesc="Keytable files and keyboard utilities" -arch=('i686' 'x86_64') -url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" -license=('GPL') -depends=('glibc') -source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz - fix-es.po.patch) -md5sums=('8143e179a0f3c25646ce5085e8777200' - '4ded3edb50fb7a3277bae6a870cee812') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ../fix-es.po.patch - # rename keymap files with the same names - # this is needed because when only name of keymap is specified - # loadkeys loads the first keymap it can find, which is bad (see FS#13837) - # this should be removed when upstream adopts the change - mv data/keymaps/i386/qwertz/cz{,-qwertz}.map - mv data/keymaps/i386/olpc/es{,-olpc}.map - mv data/keymaps/i386/olpc/pt{,-olpc}.map - mv data/keymaps/i386/dvorak/no{,-dvorak}.map - mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map - mv data/keymaps/i386/colemak/{en-latin9,colemak}.map - - ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man - make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install - - # this is needed because initscripts call /bin/loadkeys - # remove this when next versions of kbd - # and initscripts with /usr/bin/loadkeys usage will be released - mkdir ${pkgdir}/bin - ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys -} diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch deleted file mode 100644 index 578f0a7b7..000000000 --- a/testing/kbd/fix-es.po.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kbd-1.15.3/po/es.old 2011-05-14 23:12:49.000000000 +0200 -+++ kbd-1.15.3/po/es.po 2011-05-15 21:07:02.120669404 +0200 -@@ -1363,7 +1363,7 @@ - #: src/setfont.c:682 - #, c-format - msgid "Saved %d-char %dx%d font file on %s\n" --msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n" -+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n" - - #: src/setkeycodes.c:21 - #, c-format diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD deleted file mode 100644 index 7228df9e7..000000000 --- a/testing/krb5/PKGBUILD +++ /dev/null @@ -1,91 +0,0 @@ -# $Id: PKGBUILD 140774 2011-10-19 02:08:36Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgname=krb5 -pkgver=1.9.1 -pkgrel=5 -pkgdesc="The Kerberos network authentication system" -arch=('i686' 'x86_64') -url="http://web.mit.edu/kerberos/" -license=('custom') -depends=('e2fsprogs' 'libldap' 'keyutils') -makedepends=('perl') -provides=('heimdal') -replaces=('heimdal') -conflicts=('heimdal') -backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') -source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar - krb5-kadmind - krb5-kdc - krb5-1.9.1-config-script.patch - krb5-1.9.1-canonicalize-fallback.patch - krb5-1.9.1-2011-006.patch) -sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066' - '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' - '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' - '7342410760cf44bfa01bb99bb4c49e12496cb46f' - '238c268fa6cb42fc7324ab54db9abda5cd77f833' - '0b0016b0e341dcf720f67925b0d451b328e02583') -options=('!emptydirs') - -build() { - tar zxvf ${pkgname}-${pkgver}.tar.gz - cd "${srcdir}/${pkgname}-${pkgver}/src" - - # - Make krb5-config suppress CFLAGS output when called with --libs - # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391 - # - # - Omit extra libraries because their interfaces are not exposed to applications - # by libkrb5, unless do_deps is set to 1, which indicates that the caller - # wants the whole list. - # - # Patch from upstream : - # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236 - patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch - - # FS#25515 - patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch - - # FS#25384 - sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 - - # KDC denial of service vulnerabilities - # http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-006.txt - patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-006.patch - - export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" - export CPPFLAGS+=" -I/usr/include/et" - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib \ - --enable-shared \ - --with-system-et \ - --with-system-ss \ - --disable-rpath \ - --without-tcl \ - --enable-dns-for-realm \ - --with-ldap - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install - - # Sample KDC config file - install -dm 755 "${pkgdir}"/var/lib/krb5kdc - install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf - - # Default configuration file - install -dm 755 "${pkgdir}"/etc - install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf - - install -dm 755 "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d - install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d - - install -dm 755 "${pkgdir}"/usr/share/aclocal - install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal - - install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch deleted file mode 100644 index e5a38498f..000000000 --- a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c ---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500 -+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400 -@@ -470,13 +470,10 @@ - - /***** STATE_REFERRALS *****/ - --/* -- * Possibly retry a request in the fallback realm after a referral request -- * failure in the local realm. Expects ctx->reply_code to be set to the error -- * from a referral request. -- */ -+/* Possibly try a non-referral request after a referral request failure. -+ * Expects ctx->reply_code to be set to the error from a referral request. */ - static krb5_error_code --try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx) -+try_fallback(krb5_context context, krb5_tkt_creds_context ctx) - { - krb5_error_code code; - char **hrealms; -@@ -485,9 +482,10 @@ - if (ctx->referral_count > 1) - return ctx->reply_code; - -- /* Only fall back if the original request used the referral realm. */ -+ /* If the request used a specified realm, make a non-referral request to -+ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */ - if (!krb5_is_referral_realm(&ctx->req_server->realm)) -- return ctx->reply_code; -+ return begin_non_referral(context, ctx); - - if (ctx->server->length < 2) { - /* We need a type/host format principal to find a fallback realm. */ -@@ -500,10 +498,10 @@ - if (code != 0) - return code; - -- /* Give up if the fallback realm isn't any different. */ -+ /* If the fallback realm isn't any different, use the existing TGT. */ - if (data_eq_string(ctx->server->realm, hrealms[0])) { - krb5_free_host_realm(context, hrealms); -- return ctx->reply_code; -+ return begin_non_referral(context, ctx); - } - - /* Rewrite server->realm to be the fallback realm. */ -@@ -540,9 +538,9 @@ - krb5_error_code code; - const krb5_data *referral_realm; - -- /* Possibly retry with the fallback realm on error. */ -+ /* Possibly try a non-referral fallback request on error. */ - if (ctx->reply_code != 0) -- return try_fallback_realm(context, ctx); -+ return try_fallback(context, ctx); - - if (krb5_principal_compare(context, ctx->reply_creds->server, - ctx->server)) { diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch deleted file mode 100644 index a72a75edf..000000000 --- a/testing/krb5/krb5-1.9.1-config-script.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in ---- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500 -+++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400 -@@ -186,7 +186,7 @@ - -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ -- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'` -+ -e 's#\$(CFLAGS)##'` - - if test $library = 'kdb'; then - lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB" -@@ -214,9 +214,13 @@ - fi - - if test $library = 'krb5'; then -- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB" -+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err" - fi - -+ # If we ever support a flag to generate output suitable for static -+ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB" -+ # here. -+ - echo $lib_flags - fi - diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind deleted file mode 100644 index 04df0dcff..000000000 --- a/testing/krb5/krb5-kadmind +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/kadmind` -case "$1" in - start) - stat_busy "Starting Kerberos Admin Daemon" - if [ -z "$PID" ]; then - /usr/sbin/kadmind - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon krb5-kadmind - stat_done - fi - ;; - stop) - stat_busy "Stopping Kerberos Admin Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon krb5-kadmind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD deleted file mode 100644 index 236ae0f44..000000000 --- a/testing/libarchive/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 140820 2011-10-19 19:30:28Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> -pkgname=libarchive -pkgver=2.8.5 -pkgrel=2 -pkgdesc="library that can create and read several streaming archive formats" -arch=('i686' 'x86_64') -url="http://libarchive.googlecode.com/" -license=('BSD') -depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" - release-2.8-fixes.patch) -md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90' - '14dbbf2d31d68d8eedb93ec5531f3b0c') -sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d' - 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np0 < ../release-2.8-fixes.patch - ./configure --prefix=/usr --without-xml2 - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING -} diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD deleted file mode 100644 index 32aabc8c9..000000000 --- a/testing/libevent/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 140766 2011-10-18 20:07:58Z eric $ -# Maintainer: -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=libevent -pkgver=2.0.15 -pkgrel=1 -pkgdesc="An event notification library" -arch=('i686' 'x86_64') -url="http://www.monkey.org/~provos/libevent/" -license=('GPL2') -depends=('openssl') -optdepends=('python2: to use event_rpcgen.py') -options=('!libtool') -source=(https://github.com/downloads/libevent/libevent/libevent-$pkgver-stable.tar.gz{,.asc}) -md5sums=('2643abe7ba242df15c08b2cc14ec8759' - '56e52e1b6bba54102d278da59af4495e') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - sed -i 's#python#python2#' event_rpcgen.py - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD deleted file mode 100644 index 09386a73f..000000000 --- a/testing/libffado/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 140411 2011-10-13 03:56:02Z schiv $ -# Maintainer: Ray Rashif <schivmeister@gmail.com> -# Contributor: galiyosha@gmail.com -# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com> - -pkgname=libffado -pkgver=2.0.1 -pkgrel=4 -pkgdesc="Driver for FireWire audio devices" -arch=('i686' 'x86_64') -url="http://www.ffado.org/" -license=('GPL') -depends=('libiec61883' 'libavc1394' 'libsigc++' - 'libxml++' 'alsa-lib' 'dbus') -makedepends=('scons' 'python2-qt') -optdepends=('python2-qt: mixer applet') -provides=('ffado') -source=("http://www.ffado.org/files/$pkgname-$pkgver.tar.gz" - '60-ffado.rules') -md5sums=('786f31facd417e6207e429f50af0e15e' - 'f03a3e950801c4405b8934084651bca8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # hack to use CFLAGS without optimising - sed -i 's/-O2//g' SConstruct - - if [ "$CARCH" = "x86_64" ]; then - sed -i "s/-m64/-m64 $CFLAGS/g" SConstruct - else - sed -i "s/-m32/-m32 $CFLAGS/g" SConstruct - fi - - # python2 fix - sed -i 's:python $SOURCE:python2 $SOURCE:' SConstruct - sed -i 's:python support/tools:python2 support/tools:' \ - support/tools/SConscript - - scons PREFIX=/usr #ENABLE_OPTIMIZATIONS=True -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - scons DESTDIR="$pkgdir/" WILL_DEAL_WITH_XDG_MYSELF="True" install - - # add audio device rules - # see https://bugs.archlinux.org/task/26342 - install -Dm644 "$srcdir/60-ffado.rules" \ - "$pkgdir/lib/udev/rules.d/60-ffado.rules" - - # python2 fix - for i in $(grep '^#!.*bin.*python' -R "$pkgdir" | sed 's/:.*//'); do - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' "$i" - done - - # desktop files & icons - install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \ - "$pkgdir/usr/share/applications/ffadomixer.desktop" - - install -Dm644 support/xdg/hi64-apps-ffado.png \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD deleted file mode 100644 index 8922e905d..000000000 --- a/testing/libsoup/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 140716 2011-10-18 14:22:05Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libsoup -pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.1 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -options=('!libtool' '!emptydirs') -sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package_libsoup() { - pkgdesc="GNOME HTTP Library - base library" - depends=('glib2' 'libxml2' 'glib-networking') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" - rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" -} - -package_libsoup-gnome() { - pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=${pkgver}" 'libgnome-keyring') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-2.4" - rm -rf "${pkgdir}/usr/share" - rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" -} diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD deleted file mode 100644 index 05e15a9ea..000000000 --- a/testing/libtool/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 140704 2011-10-18 13:20:12Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -# NOTE: requires rebuilt with each new gcc version - -pkgname=('libtool' 'libltdl') -pkgver=2.4.2 -pkgrel=1 -pkgdesc="A generic library support script" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libtool" -license=('GPL') -options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('2ec8997e0c07249eb4cbd072417d70fe' - '1e6ba57420c82c663c85e745d11c7eed') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - ./configure --prefix=/usr - make -} - -check() { - cd ${srcdir}/${pkgbase}-${pkgver} - make check -} - -package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1') - groups=('base-devel') - install=libtool.install - - cd ${srcdir}/${pkgbase}-${pkgver} - - make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ - install-data-local - rm -rf ${pkgdir}/usr/share/libtool/libltdl/ -} - -package_libltdl() { - pkgdesc="A system independent dlopen wrapper for GNU libtool" - - cd ${srcdir}/${pkgbase}-${pkgver} - make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \ - install-ltdlincludeHEADERS install-data-local - rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config} -} diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD deleted file mode 100644 index 04895a136..000000000 --- a/testing/libwnck3/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 140524 2011-10-16 15:04:26Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=libwnck3 -_pkgbasename=libwnck -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Window Navigator Construction Kit (GTK+3)" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('gtk3' 'startup-notification' 'libxres') -makedepends=('intltool' 'gobject-introspection') -options=('!libtool') -url="http://www.gnome.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/lighttpd/PKGBUILD b/testing/lighttpd/PKGBUILD new file mode 100644 index 000000000..1a41dd995 --- /dev/null +++ b/testing/lighttpd/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 143464 2011-11-24 17:02:56Z stephane $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=lighttpd +pkgver=1.4.29 +pkgrel=3 +pkgdesc='a secure, fast, compliant and very flexible web-server' +license=('custom') +arch=('i686' 'x86_64') +url="http://www.lighttpd.net/" +depends=('pcre' 'bzip2' 'libldap' 'util-linux') +makedepends=('fcgi' 'libmysqlclient' 'lua' 'libxml2' 'e2fsprogs' 'sqlite3' 'gdbm' 'pkgconfig') +optdepends=('libxml2: mod_webdav' + 'lua: mod_cml/mod_magnet' + 'libmysqlclient: mod_mysql_vhost' + 'sqlite3: mod_webdav') +backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd') +options=('!libtool' 'emptydirs') +source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" + "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2.asc" + 'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf') +md5sums=('e6e67b09986cb504db630b5a86b2dd76' + 'de2afb4ed6a088fd7fa5f13c387a08f0' + '268386e71f5748dc1d887b9a0ab65589' + '913e2157fa78d990c32146f387d44c2b' + 'acdaa94299e6299cb5085e6d88babeca') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/lighttpd/modules \ + --sysconfdir=/etc/lighttpd \ + --with-mysql \ + --with-ldap \ + --with-attr \ + --with-openssl \ + --with-kerberos5 \ + --without-fam \ + --with-webdav-props \ + --with-webdav-locks \ + --with-gdbm \ + --with-memcache \ + --with-lua + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + + install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd + install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd + install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf + install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/ + + pushd doc/config >/dev/null + find . -type f ! -name 'Makefile*' -exec install -D -m644 {} ${pkgdir}/usr/share/doc/lighttpd/config/{} \; + popd >/dev/null + + install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING +} diff --git a/testing/lighttpd/lighttpd.conf b/testing/lighttpd/lighttpd.conf new file mode 100644 index 000000000..4ca1b23a4 --- /dev/null +++ b/testing/lighttpd/lighttpd.conf @@ -0,0 +1,12 @@ +# This is a minimal example config +# See /usr/share/doc/lighttpd +# and http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +server.port = 80 +server.username = "http" +server.groupname = "http" +server.document-root = "/srv/http" +server.errorlog = "/var/log/lighttpd/error.log" +dir-listing.activate = "enable" +index-file.names = ( "index.html" ) +mimetype.assign = ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png" ) diff --git a/testing/lighttpd/lighttpd.logrotate.d b/testing/lighttpd/lighttpd.logrotate.d new file mode 100644 index 000000000..5ff32a0c5 --- /dev/null +++ b/testing/lighttpd/lighttpd.logrotate.d @@ -0,0 +1,6 @@ +/var/log/lighttpd/*log { + missingok + postrotate + /etc/rc.d/lighttpd reload >/dev/null || true + endscript +} diff --git a/testing/lighttpd/lighttpd.rc.d b/testing/lighttpd/lighttpd.rc.d new file mode 100644 index 000000000..88f0a1474 --- /dev/null +++ b/testing/lighttpd/lighttpd.rc.d @@ -0,0 +1,132 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +pid_file='/var/run/lighttpd/lighttpd-angel.pid' + +get_pid() { + if [ -r "${pid_file}" ]; then + cat "${pid_file}" + else + pgrep -f /usr/sbin/lighttpd-angel + fi +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/lighttpd/lighttpd.conf ]; then + stat_append '(/etc/lighttpd/lighttpd.conf not found)' + stat_die + fi + + /usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_append '(error in /etc/lighttpd/lighttpd.conf)' + stat_die + fi + + local piddir=$(dirname "${pid_file}") + if [ ! -d "${piddir}" ]; then + install -d -m755 -o http -g http "${piddir}" + fi + + stat_done +} + +start() { + stat_busy 'Starting lighttpd' + + local PID=$(get_pid) + if [ -z "$PID" ]; then + nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 & + if [ $? -gt 0 ]; then + stat_die + else + echo $! > "${pid_file}" + add_daemon lighttpd + stat_done + fi + else + stat_die + fi +} + +stop() { + stat_busy 'Stopping lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +gracefull-stop() { + stat_busy 'Stopping lighttpd gracefully' + local PID=$(get_pid) + [ -n "$PID" ] && kill -INT $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + [ -f "${pid_file}" ] && rm -f "${pid_file}" + rm_daemon lighttpd + stat_done + fi +} + +reload() { + stat_busy 'Reloading lighttpd' + local PID=$(get_pid) + [ -n "$PID" ] && kill -HUP $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_die + else + stat_done + fi +} + + +case "$1" in + start) + test_config + start + ;; + stop) + test_config + stop + ;; + gracefull-stop) + test_config + stop + ;; + reload) + test_config + reload + ;; + restart) + test_config + stop + while [ -n "$(get_pid)" ]; do + sleep 1 + done + start + ;; + status) + stat_busy 'Checking lighttpd status' + ck_status lighttpd + ;; + *) + echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}" +esac + +exit 0 diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD new file mode 100644 index 000000000..511ef96d3 --- /dev/null +++ b/testing/links/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 143456 2011-11-24 16:44:18Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=links +pkgver=2.4 +pkgrel=1 +pkgdesc="A text WWW browser, similar to Lynx" +arch=('i686' 'x86_64') +url="http://links.twibright.com/" +license=('GPL') +depends=('bzip2' 'zlib' 'openssl' 'gpm') +makedepends=('libtiff' 'libpng' 'libxt') +optdepends=('libx11: for using xlinks' 'libtiff: for using xlinks' 'libpng: for using xlinks') +provides=('links-g') +conflicts=('links-g') +replaces=('links-g') +source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) +sha1sums=('c09fcb03874b1d0586f582f73833bb2f4c9ed7ac' + 'f600e27c2a71184444f7dd07a10230aa44463a02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + (cd intl; ./gen-intl; ./synclang) + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --enable-graphics --with-x --with-fb + make + mv links xlinks + + ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \ + --disable-graphics --without-x --without-fb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 xlinks "${pkgdir}/usr/bin/xlinks" + ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz" + + install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop" + install -d "${pkgdir}/usr/share/pixmaps" + install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/" + + install -d "${pkgdir}/usr/share/doc/links/calibration" + install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/" +} diff --git a/testing/links/links.desktop b/testing/links/links.desktop new file mode 100644 index 000000000..9d6338a5b --- /dev/null +++ b/testing/links/links.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Links +Exec=xlinks -g +Icon=links_32x32.xpm +Type=Application +Terminal=false +Categories=Network;WebBrowser; diff --git a/testing/man-db/1361_1360.diff b/testing/man-db/1361_1360.diff new file mode 100644 index 000000000..c93856980 --- /dev/null +++ b/testing/man-db/1361_1360.diff @@ -0,0 +1,25 @@ +=== modified file 'src/straycats.c' +--- src/straycats.c 2011-01-10 20:08:22 +0000 ++++ src/straycats.c 2011-06-04 06:34:51 +0000 +@@ -177,6 +177,7 @@ + char *lang, *page_encoding; + char *mandir_base; + pipecmd *col_cmd; ++ char *col_locale; + char *fullpath; + + /* we have a straycat. Need to filter it and get +@@ -226,6 +227,12 @@ + col_cmd = pipecmd_new_argstr + (get_def_user ("col", COL)); + pipecmd_arg (col_cmd, "-bx"); ++ col_locale = find_charset_locale ("UTF-8"); ++ if (col_locale) { ++ pipecmd_setenv (col_cmd, "LC_CTYPE", ++ col_locale); ++ free (col_locale); ++ } + pipeline_command (decomp, col_cmd); + + fullpath = canonicalize_file_name (catdir); + diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD new file mode 100644 index 000000000..f2cdff3c3 --- /dev/null +++ b/testing/man-db/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 143466 2011-11-24 17:02:58Z stephane $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> + +pkgname=man-db +pkgver=2.6.0.2 +pkgrel=3 +pkgdesc="A utility for reading man pages" +arch=('i686' 'x86_64') +url="http://www.nongnu.org/man-db/" +license=('GPL' 'LGPL') +groups=('base') +depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline') +optdepends=('less' 'gzip') +backup=('etc/man_db.conf' + 'etc/cron.daily/man-db') +conflicts=('man') +provides=('man') +replaces=('man') +install=${pkgname}.install +source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.gz + 1361_1360.diff + #http://launchpad.net/man-db/main/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz + convert-mans man-db.cron.daily) +options=('!libtool') +md5sums=('2b41c96efec032d2b74ccbf2e401f93e' + '08b76b1f924c5493a280b79fc0aebde4' + '2b7662a7d5b33fe91f9f3e034361a2f6' + 'd30c39ae47560304471b5461719e0f03') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + # https://bugs.archlinux.org/task/18722 + patch -Np0 -i $srcdir/1361_1360.diff + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ + --with-db=gdbm --disable-setuid --enable-mandirs=GNU \ + --with-sections="1 n l 8 3 0 2 5 4 9 6 7" + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # part of groff pkg + rm -f ${pkgdir}/usr/bin/zsoelim + + # script from LFS to convert manpages, see + # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html + install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans + + #install whatis cron script + install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db +} + diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans new file mode 100644 index 000000000..58a0224b0 --- /dev/null +++ b/testing/man-db/convert-mans @@ -0,0 +1,11 @@ +#!/bin/sh -e +FROM="$1" +TO="$2" +shift ; shift +while [ $# -gt 0 ] +do + FILE="$1" + shift + iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv + mv .tmp.iconv "$FILE" +done diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily new file mode 100755 index 000000000..53e66e1e9 --- /dev/null +++ b/testing/man-db/man-db.cron.daily @@ -0,0 +1,39 @@ +#!/bin/sh + +# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable) +NICE=19 + +# 0 for none, 1 for real time, 2 for best-effort, 3 for idle +IONICE_CLASS=2 + +# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest +IONICE_PRIORITY=7 + +UPDATEMANDB="/usr/bin/mandb --quiet" + +# Update the "whatis" database +#/usr/sbin/makewhatis -u -w + +# taken from Debian +# man-db cron daily +set -e + +if ! [ -d /var/cache/man ]; then + # Recover from deletion, per FHS. + mkdir -p /var/cache/man + chmod 755 /var/cache/man +fi + +# regenerate man database + +if [ -x /usr/bin/nice ]; then + UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}" +fi + +if [ -x /usr/bin/ionice ]; then + UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}" +fi + +${UPDATEMANDB} + +exit 0 diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install new file mode 100644 index 000000000..f6f0f27a6 --- /dev/null +++ b/testing/man-db/man-db.install @@ -0,0 +1,22 @@ +post_install() { + echo "it's recommended to create an initial" + echo "database running as root:" + echo "\"/usr/bin/mandb --quiet\"" +} + +post_upgrade() { + if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then + echo "systemuser \"man\" is no more required" + echo "run \"userdel man\". please also" + echo "chown root:root /var/cache/man" + fi + # force database rebuild to get rid off badly imported pages + if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then + echo "(re)building database..." + mandb -c --quiet + fi +} + +post_remove() { + rm -rf /var/cache/man +} diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD deleted file mode 100644 index 707fb70fa..000000000 --- a/testing/mousetweaks/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=mousetweaks -pkgver=3.2.1 -pkgrel=1 -pkgdesc="Mouse accessibility enhancements for the GNOME desktop" -arch=(i686 x86_64) -license=('GPL3' 'FDL') -depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas') -makedepends=('gnome-doc-utils' 'intltool') -groups=('gnome-extra') -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -install=mousetweaks.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install deleted file mode 100644 index 1ae919322..000000000 --- a/testing/mousetweaks/mousetweaks.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall mousetweaks - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/mutt/PKGBUILD b/testing/mutt/PKGBUILD new file mode 100644 index 000000000..57b14432d --- /dev/null +++ b/testing/mutt/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 143468 2011-11-24 17:03:00Z stephane $ +# Contributor: tobias [tobias [at] archlinux.org] +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname=mutt +pkgver=1.5.21 +pkgrel=6 +pkgdesc='Small but very powerful text-based mail client' +url='http://www.mutt.org/' +license=('GPL') +backup=('etc/Muttrc') +arch=('i686' 'x86_64') +optdepends=('smtp-forwarder: to send mail') +depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-gpgme \ + --enable-pop \ + --enable-imap \ + --enable-smtp \ + --enable-hcache \ + --with-curses=/usr \ + --with-regex \ + --with-gss=/usr \ + --with-ssl=/usr \ + --with-sasl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}"/usr/bin/{flea,muttbug} + rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1 + rm "${pkgdir}"/etc/mime.types{,.dist} + install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist +} diff --git a/testing/mutt/install b/testing/mutt/install new file mode 100644 index 000000000..d65675c06 --- /dev/null +++ b/testing/mutt/install @@ -0,0 +1,8 @@ +post_install() { + cat <<EOF + +==> For GPG support, add the following to your muttrc: +==> source /etc/Muttrc.gpg.dist + +EOF +} diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD deleted file mode 100644 index fb414c89a..000000000 --- a/testing/mutter/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 140740 2011-10-18 15:24:55Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Michael Kanis <mkanis_at_gmx_dot_de> - -pkgname=mutter -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) -license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') -makedepends=('intltool' 'gnome-doc-utils') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=mutter.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d6135d5e6c0852f7dc996798e9455fc2e9cbe6d2672f3750fc9b8d27ab141294') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/mutter \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain mutter ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD deleted file mode 100644 index 1ba669de7..000000000 --- a/testing/nautilus/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 140720 2011-10-18 14:36:58Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=nautilus -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME file manager" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') -makedepends=('intltool' 'gobject-introspection') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/nautilus \ - --disable-nst-extension \ - --disable-update-mimedb \ - --disable-packagekit \ - --disable-schemas-compile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install deleted file mode 100644 index 631e38649..000000000 --- a/testing/nautilus/nautilus.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall nautilus - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/notification-daemon/PKGBUILD b/testing/notification-daemon/PKGBUILD deleted file mode 100644 index 9421f4d27..000000000 --- a/testing/notification-daemon/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 140649 2011-10-17 18:08:51Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Mark Rosenstand <mark@borkware.net> - -pkgname=notification-daemon -pkgver=0.7.3 -pkgrel=1 -pkgdesc="Notification daemon for the desktop notifications framework" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.galago-project.org/specs/notification/" -depends=('gtk3' 'libcanberra') -groups=('gnome') -makedepends=('pkgconfig' 'intltool') -options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c40931557c42cd12fdb04ab531fd7d5c5766641e76babdbff6079a6d88342704') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/notification-daemon-1.0 \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/testing/notification-daemon/notification-daemon.install b/testing/notification-daemon/notification-daemon.install deleted file mode 100644 index 8a1aa3433..000000000 --- a/testing/notification-daemon/notification-daemon.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=notification-daemon - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD deleted file mode 100644 index 5841142b4..000000000 --- a/testing/ntp/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 140053 2011-10-06 06:09:56Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> - -pkgname=ntp -pkgver=4.2.6.p4 -_realver=4.2.6p4 -pkgrel=1 -pkgdesc='Network Time Protocol reference implementation' -url='http://www.ntp.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('openssl' 'readline' 'libcap') -makedepends=('perl-html-parser') -backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf') -source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz" - 'ntpd' - 'ntpdate' - 'ntp.conf' - 'ntpd.conf') -sha1sums=('b53c4565c5d1c37494584d4fb826f82ffea285cf' - '97b41b8bc34f259f4e525ab2e58707c9724e72e2' - '63572457586379aa6bf75b6e899e71d651e643f4' - '6d2d234afb1db2dcb940747a62f70217246a3d13' - '6cfcb7bbd34499b30e31dffca2f3e1a036010271') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${_realver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-linux-caps \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-$_realver" - - make DESTDIR="${pkgdir}" install - - install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd - install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate - install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf - install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf - - cd html - ../scripts/html2man - install -d "${pkgdir}"/usr/share/man - mv man/man* "${pkgdir}"/usr/share/man - mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd - cd .. - - rmdir "${pkgdir}"/usr/{lib,sbin} - install -d "${pkgdir}/var/lib/ntp" - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf deleted file mode 100644 index 5f31fea83..000000000 --- a/testing/ntp/ntp.conf +++ /dev/null @@ -1,22 +0,0 @@ -# With the default settings below, ntpd will only synchronize your clock. -# -# For details, see: -# - the ntp.conf man page -# - http://support.ntp.org/bin/view/Support/GettingStarted -# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon - -# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/ -server 0.pool.ntp.org -server 1.pool.ntp.org -server 2.pool.ntp.org - -# Only allow read-only access from localhost -restrict default nomodify nopeer -restrict 127.0.0.1 - -# Location of drift and log files -driftfile /var/lib/ntp/ntp.drift -logfile /var/log/ntp.log - -# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing -# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd deleted file mode 100755 index a3e886e1f..000000000 --- a/testing/ntp/ntpd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/ntpd.conf - -PIDFILE="/var/run/ntpd/ntpd.pid" -PID=$(cat $PIDFILE 2> /dev/null) - -case "$1" in - start) - stat_busy "Starting NTP Daemon" - [ ! -d /var/run/ntpd ] && install -d /var/run/ntpd &>/dev/null - if [ -z "$PID" ]; then - /usr/bin/ntpd $NTPD_ARGS -p /var/run/ntpd/ntpd.pid &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - stop) - stat_busy "Stopping NTP Daemon" - if [ -n "$PID" ]; then - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm $PIDFILE &>/dev/null - rm_daemon ntpd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/ocaml/PKGBUILD b/testing/ocaml/PKGBUILD new file mode 100644 index 000000000..1ea6e5ccd --- /dev/null +++ b/testing/ocaml/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 143470 2011-11-24 17:03:04Z stephane $ +# 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/testing/ocaml/fix-ocaml-binutils-2.21.patch b/testing/ocaml/fix-ocaml-binutils-2.21.patch new file mode 100644 index 000000000..fa7664cec --- /dev/null +++ b/testing/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/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD deleted file mode 100644 index 1b4bc3612..000000000 --- a/testing/openssh/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 140605 2011-10-17 12:35:05Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=openssh -pkgver=5.9p1 -pkgrel=4 -pkgdesc='Free version of the SSH connectivity tools' -arch=('i686' 'x86_64') -license=('custom:BSD') -url='http://www.openssh.org/portable.html' -backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') -depends=('krb5' 'openssl' 'libedit') -optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') -source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" - 'sshd.confd' - 'sshd.pam' - 'sshd') -sha1sums=('ac4e0055421e9543f0af5da607a72cf5922dcc56' - 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' - '07fecd5880b1c4fdd8c94ddb2e89ddce88effdc1' - '21fa88de6cc1c7912e71655f50896ba17991a1c2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ssh \ - --sysconfdir=/etc/ssh \ - --with-privsep-user=nobody \ - --with-md5-passwords \ - --with-pam \ - --with-mantype=man \ - --with-xauth=/usr/bin/xauth \ - --with-kerberos5=/usr \ - --with-ssl-engine \ - --with-libedit=/usr/lib \ - --disable-strip # stripping is done by makepkg - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd - install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd - install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd - install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - rm "${pkgdir}"/usr/share/man/man1/slogin.1 - ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz - - # additional contrib scripts that we like - install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh - install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id - install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 - - # PAM is a common, standard feature to have - sed \ - -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ - -e '/^#UsePAM no$/c UsePAM yes' \ - -i "${pkgdir}"/etc/ssh/sshd_config -} diff --git a/testing/openssh/sshd b/testing/openssh/sshd deleted file mode 100755 index 1d68fb877..000000000 --- a/testing/openssh/sshd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sshd - -PIDFILE=/var/run/sshd.pid -PID=$(cat $PIDFILE 2>/dev/null) -if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then - PID= - rm $PIDFILE 2>/dev/null -fi - -case "$1" in - start) - stat_busy 'Starting Secure Shell Daemon' - /usr/bin/ssh-keygen -A - [[ -d /var/empty ]] || mkdir -p /var/empty - [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS - if [[ $? -gt 0 ]]; then - stat_fail - else - add_daemon sshd - stat_done - fi - ;; - stop) - stat_busy 'Stopping Secure Shell Daemon' - [[ ! -z $PID ]] && kill $PID &> /dev/null - if [[ $? -gt 0 ]]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd deleted file mode 100644 index 5ce7c0079..000000000 --- a/testing/openssh/sshd.confd +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to sshd -# -SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam deleted file mode 100644 index ff8829fe9..000000000 --- a/testing/openssh/sshd.pam +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -#auth required pam_securetty.so #Disable remote root -auth required pam_unix.so -auth required pam_env.so -account required pam_nologin.so -account required pam_unix.so -account required pam_time.so -password required pam_unix.so -session required pam_unix_session.so -session required pam_limits.so --session optional pam_ck_connector.so nox11 diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch new file mode 100644 index 000000000..1404460df --- /dev/null +++ b/testing/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/testing/perl/ChangeLog b/testing/perl/ChangeLog new file mode 100644 index 000000000..9add39e20 --- /dev/null +++ b/testing/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/testing/perl/PKGBUILD b/testing/perl/PKGBUILD new file mode 100644 index 000000000..496ca3fdd --- /dev/null +++ b/testing/perl/PKGBUILD @@ -0,0 +1,109 @@ +# $Id: PKGBUILD 143472 2011-11-24 17:03:10Z stephane $ +# 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/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch new file mode 100644 index 000000000..a2d176ec6 --- /dev/null +++ b/testing/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/testing/perl/perl.install b/testing/perl/perl.install new file mode 100644 index 000000000..a355c5bbe --- /dev/null +++ b/testing/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/testing/perl/perlbin.csh b/testing/perl/perlbin.csh new file mode 100644 index 000000000..535f0b18d --- /dev/null +++ b/testing/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/testing/perl/perlbin.sh b/testing/perl/perlbin.sh new file mode 100755 index 000000000..20f830436 --- /dev/null +++ b/testing/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/testing/perl/provides.pl b/testing/perl/provides.pl new file mode 100644 index 000000000..3bf369577 --- /dev/null +++ b/testing/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/php/PKGBUILD b/testing/php/PKGBUILD new file mode 100644 index 000000000..59bdfd2dd --- /dev/null +++ b/testing/php/PKGBUILD @@ -0,0 +1,365 @@ +# $Id: PKGBUILD 143474 2011-11-24 17:03:15Z stephane $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.8 +_suhosinver=5.3.7-0.9.10 +pkgrel=5 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm') +md5sums=('704cd414a0565d905e1074ffdc1fadfb' + '08582e502fed8221c6577042ca45ddb8' + '5bf4473f658404aa9a97bf026ecef8e9' + '65606c606df97a0760dfe5aaf9893afc' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '09005dabd90c48ddd392b3dbf05f8a82' + '07c4e412909ac65a44ec90e7a2c4bade') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/testing/php/apache.conf b/testing/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/testing/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + +<IfModule dir_module> + <IfModule php5_module> + DirectoryIndex index.php index.html + <FilesMatch "\.php$"> + SetHandler application/x-httpd-php + </FilesMatch> + <FilesMatch "\.phps$"> + SetHandler application/x-httpd-php-source + </FilesMatch> + </IfModule> +</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/testing/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b4dd32f96 --- /dev/null +++ b/testing/php/php-fpm.conf.in.patch @@ -0,0 +1,80 @@ +--- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ +@@ -102,7 +102,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -121,9 +122,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; Unix user/group of processes + ; Note: The user is mandatory. If the group is not set, the default user's group +@@ -163,23 +164,23 @@ + ; The number of child processes created on startup. + ; Note: Used only when pm is set to 'dynamic' + ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 +-;pm.start_servers = 20 ++pm.start_servers = 20 + + ; The desired minimum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.min_spare_servers = 5 ++pm.min_spare_servers = 5 + + ; The desired maximum number of idle server processes. + ; Note: Used only when pm is set to 'dynamic' + ; Note: Mandatory when pm is set to 'dynamic' +-;pm.max_spare_servers = 35 ++pm.max_spare_servers = 35 + + ; The number of requests each child process should execute before respawning. + ; This can be useful to work around memory leaks in 3rd party libraries. For + ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. + ; Default Value: 0 +-;pm.max_requests = 500 ++pm.max_requests = 500 + + ; The URI to view the FPM status page. If this value is not set, no URI will be + ; recognized as a status page. By default, the status page shows the following +@@ -333,7 +334,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch new file mode 100644 index 000000000..46c842921 --- /dev/null +++ b/testing/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-02-09 01:25:44.000000000 +0100 ++++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -781,7 +781,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -804,7 +804,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -938,53 +938,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/testing/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/testing/polkit-gnome/PKGBUILD b/testing/polkit-gnome/PKGBUILD deleted file mode 100644 index 00e0132e5..000000000 --- a/testing/polkit-gnome/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140661 2011-10-17 19:27:15Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=polkit-gnome -pkgver=0.104 -pkgrel=1 -pkgdesc="PolicyKit integration for the GNOME desktop" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" -license=('LGPL') -depends=('polkit' 'gtk3') -makedepends=('intltool' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz - polkit-gnome-authentication-agent-1.desktop) -sha256sums=('5a59d47cbc87e3e5ac24e5e28b4fa9fc07d6d0096e53fa53d8e6b3fd06854d94' - 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \ - "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop" -} diff --git a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop deleted file mode 100644 index fc2acc28d..000000000 --- a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop +++ /dev/null @@ -1,88 +0,0 @@ -[Desktop Entry] -Name=PolicyKit Authentication Agent -Name[ar]=مدير الاستيثاق PolicyKit -Name[be]=PolicyKit - аґент аўтэнтыфікацыі -Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট -Name[ca]=Agent d'autenticació del PolicyKit -Name[cs]=Ověřovací agent PolicyKit -Name[da]=Godkendelsesprogrammet PolicyKit -Name[de]=Legitimationsdienst von PolicyKit -Name[el]=Πράκτορας πιστοποίησης PolicyKit -Name[en_GB]=PolicyKit Authentication Agent -Name[es]=Agente de autenticación de PolicyKit -Name[eu]=PolicyKit autentifikatzeko agentea -Name[fi]=PolicytKit-tunnistautumisohjelma -Name[fr]=Agent d'authentification de PolicyKit -Name[gl]=Axente de autenticación PolicyKit -Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ -Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि -Name[hu]=PolicyKit hitelesítési ügynök -Name[it]=Agente di autenticazione per PolicyKit -Name[ja]=PolicyKit 認証エージェント -Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ -Name[lt]=PolicyKit tapatybės nustatymo agentas -Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് -Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट -Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ -Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ -Name[pl]=Agent uwierzytelniania PolicyKit -Name[pt]=Agente de Autenticação PolicyKit -Name[pt_BR]=Agente de autenticação PolicyKit -Name[ro]=Agent de autentificare PolicyKit -Name[sk]=Agent PolicyKit na overovanie totožnosti -Name[sl]=PolicyKit program overjanja -Name[sv]=Autentiseringsagent för PolicyKit -Name[ta]=PolicyKit அங்கீகார முகவர் -Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి -Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit -Name[uk]=Агент автентифікації PolicyKit -Name[zh_CN]=PolicyKit 认证代理 -Name[zh_HK]=PolicyKit 驗證代理程式 -Name[zh_TW]=PolicyKit 驗證代理程式 -Comment=PolicyKit Authentication Agent -Comment[ar]=مدير الاستيثاق PolicyKit -Comment[be]=PolicyKit - аґент аўтэнтыфікацыі -Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট -Comment[ca]=Agent d'autenticació del PolicyKit -Comment[cs]=Ověřovací agent PolicyKit -Comment[da]=Godkendelsesprogrammet PolicyKit -Comment[de]=Legitimationsdienst von PolicyKit -Comment[el]=Πράκτορας πιστοποίησης PolicyKit -Comment[en_GB]=PolicyKit Authentication Agent -Comment[es]=Agente de autenticación de PolicyKit -Comment[eu]=PolicyKit autentifikatzeko agentea -Comment[fi]=PolicytKit-tunnistautumisohjelma -Comment[fr]=Agent d'authentification de PolicyKit -Comment[gl]=Axente de autenticación PolicyKit -Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ -Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि -Comment[hu]=PolicyKit hitelesítési ügynök -Comment[it]=Agente di autenticazione per PolicyKit -Comment[ja]=PolicyKit 認証エージェント -Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ -Comment[lt]=PolicyKit tapatybės nustatymo agentas -Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന് ഏജന്റ് -Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट -Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ -Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ -Comment[pl]=Agent uwierzytelniania PolicyKit -Comment[pt]=Agente de Autenticação PolicyKit -Comment[pt_BR]=Agente de autenticação PolicyKit -Comment[ro]=Agent de autentificare PolicyKit -Comment[sk]=Agent PolicyKit na overovanie totožnosti -Comment[sl]=PolicyKit program overjanja -Comment[sv]=Autentiseringsagent för PolicyKit -Comment[ta]=PolicyKit அங்கீகார முகவர் -Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి -Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit -Comment[uk]=Агент автентифікації PolicyKit -Comment[zh_CN]=PolicyKit 认证代理 -Comment[zh_HK]=PolicyKit 驗證代理程式 -Comment[zh_TW]=PolicyKit 驗證代理程式 -Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -Terminal=false -Type=Application -Categories= -NoDisplay=true -NotShowIn=KDE; -AutostartCondition=GNOME3 unless-session gnome diff --git a/testing/python/PKGBUILD b/testing/python/PKGBUILD new file mode 100644 index 000000000..15e95141f --- /dev/null +++ b/testing/python/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 143476 2011-11-24 17:03:18Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=python +pkgver=3.2.2 +pkgrel=2 +_pybasever=3.2 +pkgdesc="Next generation of the python high-level scripting language" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.python.org/" +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib') +makedepends=('tk' 'sqlite3' 'valgrind') +optdepends=('tk: for tkinter' 'sqlite3') +provides=('python3') +replaces=('python3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz + gdbm-magic-values.patch) +sha1sums=('5e654dbd48476193ccdef4d604ed4f45b48c6769' + '43bfbe3e23360f412b95cb284ff29b2cbe338be9') + +build() { + cd "${srcdir}/Python-${pkgver}" + + # FS#23997 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py + + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + ./configure --prefix=/usr \ + --enable-shared \ + --with-threads \ + --with-computed-gotos \ + --enable-ipv6 \ + --with-valgrind \ + --with-wide-unicode \ + --with-system-expat \ + --with-dbmliborder=gdbm:ndbm \ + --with-system-ffi + + make +} + +check() { + cd "${srcdir}/Python-${pkgver}" + LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \ + "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site test_uuid +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" install maninstall + + # Why are these not done by default... + ln -sf python3 "${pkgdir}/usr/bin/python" + ln -sf python3-config "${pkgdir}/usr/bin/python-config" + ln -sf idle3 "${pkgdir}/usr/bin/idle" + ln -sf pydoc3 "${pkgdir}/usr/bin/pydoc" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1" + + # Fix FS#22552 + ln -sf ../../libpython${_pybasever}mu.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so" + + # Clean-up reference to build directory + sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile" + + # License + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/python/gdbm-magic-values.patch b/testing/python/gdbm-magic-values.patch new file mode 100644 index 000000000..e8ce828cf --- /dev/null +++ b/testing/python/gdbm-magic-values.patch @@ -0,0 +1,13 @@ +diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py +--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400 ++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400 +@@ -166,7 +166,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "dbm.gnu" + + # Later versions of Berkeley db hash file have a 12-byte pad in +diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS diff --git a/testing/qemu/65-kvm.rules b/testing/qemu/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/testing/qemu/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu/PKGBUILD b/testing/qemu/PKGBUILD deleted file mode 100644 index 478935151..000000000 --- a/testing/qemu/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 140817 2011-10-19 18:05:05Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=0.15.1 -pkgrel=1 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://wiki.qemu.org/Index.html" -makedepends=('texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux-ng' 'curl' 'libsasl' 'libgl') -backup=('etc/qemu/target-x86_64.conf') -install=qemu.install -source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd ${srcdir}/${pkgname}-${pkgver} - sed -i -e 's/lib64/lib/g' x86_64.ld - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=oss,alsa,sdl \ - --python=/usr/bin/python2 \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m644 ${srcdir}/65-kvm.rules \ - ${pkgdir}/lib/udev/rules.d/65-kvm.rules - # strip scripts directory - find ${pkgdir}/usr/src/linux-${_kernver}/scripts -type f -perm -u+w 2>/dev/null | while read binary ; do - case "$(file -bi "$binary")" in - *application/x-executable*) # Binaries - /usr/bin/strip $STRIP_BINARIES "$binary";; - esac - done - -} -md5sums=('34f17737baaf1b3495c89cd6d4a607ed' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install deleted file mode 100644 index e16ac027c..000000000 --- a/testing/qemu/qemu.install +++ /dev/null @@ -1,24 +0,0 @@ -# kvm: the new package version -post_install() { - # - groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Load the correct KVM module, you will need a KVM capable CPU!" - echo ">>> Add yourself to the group 'kvm'." - echo ">>> Use 'qemu -enable-kvm' to use KVM." - echo "" - if [ "$(vercmp $2 0.11)" -lt 0 ]; then - echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module" - echo "is no longer supported and will be removed from the repositories. You" - echo "can safely uninstall it from your system." - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # - groupdel kvm -} diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD new file mode 100644 index 000000000..b12032df5 --- /dev/null +++ b/testing/ruby/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 143480 2011-11-24 17:03:21Z stephane $ +# Maintainer: +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> +# Contributor: Jeramy Rutley <jrutley@gmail.com> + +pkgbase=ruby +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p0 +pkgrel=2 +pkgdesc="An object-oriented language for quick and easy programming" +arch=('i686' 'x86_64') +url="http://www.ruby-lang.org/en/" +license=('BSD' 'custom') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2) +sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \ + --enable-shared --enable-pthread --disable-rpath + make +} + +package_ruby() { + depends=('openssl' 'libffi' 'libyaml') + provides=('rubygems' 'rake') + conflicts=('rake') + optdepends=('tk: for Ruby/TK') + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-nodoc + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} + +package_ruby-docs() { + pkgdesc="Documentation files for ruby" + + cd "${srcdir}/${pkgbase}-${pkgver//_/-}" + make DESTDIR="${pkgdir}" install-doc install-capi + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL" +} diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD deleted file mode 100644 index e5105f8c3..000000000 --- a/testing/seahorse/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 140718 2011-10-18 14:25:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Michel Brabants <michel.linux@tiscali.be> - -pkgname=seahorse -pkgver=3.2.1 -pkgrel=1 -pkgdesc="GNOME application for managing PGP keys." -arch=(i686 x86_64) -license=('GPL') -url="http://projects.gnome.org/seahorse/" -depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') -optdepends=('openssh: SSH support') -provides=('x11-ssh-askpass') -options=('!libtool' '!emptydirs') -groups=('gnome-extra') -install=seahorse.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - seahorse-ssh-askpass.sh) -sha256sums=('84f1df80055ca66179a023130e179de44053e7df91c1f6c7fd536563fac832b2' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-ldap --enable-hkp \ - --disable-scrollkeeper \ - --disable-update-mime-database \ - --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ - "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" -} diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh deleted file mode 100644 index 44281ac2b..000000000 --- a/testing/seahorse/seahorse-ssh-askpass.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ -z "$SSH_ASKPASS" ]; then - export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass -fi diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install deleted file mode 100644 index 9a98d52e0..000000000 --- a/testing/seahorse/seahorse.install +++ /dev/null @@ -1,21 +0,0 @@ -pkgname=seahorse - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD new file mode 100644 index 000000000..ddc575e91 --- /dev/null +++ b/testing/subversion/PKGBUILD @@ -0,0 +1,100 @@ +# $Id: PKGBUILD 143482 2011-11-24 17:03:24Z stephane $ +# Maintainer: Paul Mattal <paul@archlinux.org> +# Contributor: Jason Chu <jason@archlinux.org> + +pkgname=subversion +pkgver=1.6.17 +pkgrel=7 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +license=('apache' 'bsd') +depends=('neon' 'apr-util' 'sqlite3') +optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion') +makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' 'java-environment' + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +url="http://subversion.apache.org/" +provides=('svn') +options=('!makeflags' '!libtool') +source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 + svnserve svn svnserve.conf svnmerge.py + subversion.rpath.fix.patch + subversion.suppress.deprecation.warnings.patch + subversion-perl-bindings.patch) +md5sums=('81e5dc5beee4b3fc025ac70c0b6caa14' + 'a2b029e8385007ffb99b437b30521c90' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'a6371baeda7e224504629ecdda2749b4' + '6b4340ba9d8845cd8497e013ae01be3f' + '1166f3b7413d7e7450299b3525680bbe' + '0591aa39837931161b4d61ff35c7b147') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + export PYTHON=/usr/bin/python2 + + # apply patches + patch -Np0 -i ../subversion.rpath.fix.patch + patch -Np1 -i ../subversion.suppress.deprecation.warnings.patch + patch -Np1 -i ../subversion-perl-bindings.patch + + # configure + autoreconf + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-neon=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \ + --enable-javahl --with-gnome-keyring --with-kwallet + + # build + (make external-all && make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all ) +} + +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py CLEANUP=yes +#} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install + export LD_LIBRARY_PATH=${pkgdir}/usr/lib:$LD_LIBRARY_PATH + make DESTDIR=${pkgdir} install + + make DESTDIR=${pkgdir} swig-py + make install-swig-py DESTDIR=${pkgdir} + + install -d ${pkgdir}/usr/lib/python2.7 + mv ${pkgdir}/usr/lib/svn-python/ ${pkgdir}/usr/lib/python2.7/site-packages + + install -d ${pkgdir}/usr/share/subversion + install -d -m 755 tools/hook-scripts ${pkgdir}/usr/share/subversion/ + rm -f ${pkgdir}/usr/share/subversion/hook-scripts/*.in + + make DESTDIR=${pkgdir} swig-pl + make install-swig-pl DESTDIR=${pkgdir} INSTALLDIRS=vendor + rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist + rm -rf ${pkgdir}/usr/lib/perl5/core_perl + + make DESTDIR=${pkgdir} swig-rb + make install-swig-rb DESTDIR=${pkgdir} + + make DESTDIR=${pkgdir} javahl + make DESTDIR=${pkgdir} install-javahl + + install -d ${pkgdir}/etc/{rc.d,xinetd.d,conf.d} + + install -m 755 ${srcdir}/svnserve ${pkgdir}/etc/rc.d + install -m 644 ${srcdir}/svn ${pkgdir}/etc/xinetd.d + install -m 644 ${srcdir}/svnserve.conf ${pkgdir}/etc/conf.d/svnserve + install -m 755 ${srcdir}/svnmerge.py ${pkgdir}/usr/bin/svnmerge + install -D -m 644 ${srcdir}/subversion-$pkgver/COPYING \ + ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + + # bash completion + install -Dm 644 ${srcdir}/${pkgname}-${pkgver}/tools/client-side/bash_completion \ + ${pkgdir}/etc/bash_completion.d/subversion +} diff --git a/testing/subversion/subversion-perl-bindings.patch b/testing/subversion/subversion-perl-bindings.patch new file mode 100644 index 000000000..3c34daa47 --- /dev/null +++ b/testing/subversion/subversion-perl-bindings.patch @@ -0,0 +1,12 @@ +diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in +--- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000 ++++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000 +@@ -43,7 +43,7 @@ + my %config = ( + ABSTRACT => 'Perl bindings for Subversion', + DEFINE => $cppflags, +- CCFLAGS => $cflags, ++ CCFLAGS => $Config{ccflags}, + INC => join(' ',$apr_cflags, $apu_cflags, + " -I$swig_srcdir/perl/libsvn_swig_perl", + " -I$svnlib_srcdir/include", diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch new file mode 100644 index 000000000..ba6ee9e4e --- /dev/null +++ b/testing/subversion/subversion.rpath.fix.patch @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200 ++++ Makefile.in 2009-06-04 00:56:29.000000000 -0300 +@@ -678,6 +678,7 @@ + + $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL + cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL ++ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}} + + swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \ + $(SWIG_PL_DIR)/native/Makefile diff --git a/testing/subversion/subversion.suppress.deprecation.warnings.patch b/testing/subversion/subversion.suppress.deprecation.warnings.patch new file mode 100644 index 000000000..94ce89b18 --- /dev/null +++ b/testing/subversion/subversion.suppress.deprecation.warnings.patch @@ -0,0 +1,22 @@ +diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py +--- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500 ++++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500 +@@ -19,6 +19,7 @@ + from libsvn.core import * + import libsvn.core as _libsvncore + import atexit as _atexit ++import warnings + + class SubversionException(Exception): + def __init__(self, message=None, apr_err=None, child=None, +@@ -44,7 +45,9 @@ + Exception.__init__(self, *args) + + self.apr_err = apr_err +- self.message = message ++ with warnings.catch_warnings(): ++ warnings.simplefilter("ignore", DeprecationWarning) ++ self.message = message + self.child = child + self.file = file + self.line = line diff --git a/testing/subversion/svn b/testing/subversion/svn new file mode 100644 index 000000000..8988aaf63 --- /dev/null +++ b/testing/subversion/svn @@ -0,0 +1,11 @@ +service svn +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/bin/svnserve + server_args = -i + log_on_failure += USERID + disable = yes +} diff --git a/testing/subversion/svnmerge.py b/testing/subversion/svnmerge.py new file mode 100644 index 000000000..d8931648f --- /dev/null +++ b/testing/subversion/svnmerge.py @@ -0,0 +1,2370 @@ +#!/usr/bin/env python2 +# -*- coding: utf-8 -*- +# Copyright (c) 2005, Giovanni Bajo +# Copyright (c) 2004-2005, Awarix, Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +# +# Author: Archie Cobbs <archie at awarix dot com> +# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com> +# +# Acknowledgments: +# John Belmonte <john at neggie dot net> - metadata and usability +# improvements +# Blair Zajac <blair at orcaware dot com> - random improvements +# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive +# merging support +# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple +# location identifier formats +# +# $HeadURL$ +# $LastChangedDate$ +# $LastChangedBy$ +# $LastChangedRevision$ +# +# Requisites: +# svnmerge.py has been tested with all SVN major versions since 1.1 (both +# client and server). It is unknown if it works with previous versions. +# +# Differences from svnmerge.sh: +# - More portable: tested as working in FreeBSD and OS/2. +# - Add double-verbose mode, which shows every svn command executed (-v -v). +# - "svnmerge avail" now only shows commits in source, not also commits in +# other parts of the repository. +# - Add "svnmerge block" to flag some revisions as blocked, so that +# they will not show up anymore in the available list. Added also +# the complementary "svnmerge unblock". +# - "svnmerge avail" has grown two new options: +# -B to display a list of the blocked revisions +# -A to display both the blocked and the available revisions. +# - Improved generated commit message to make it machine parsable even when +# merging commits which are themselves merges. +# - Add --force option to skip working copy check +# - Add --record-only option to "svnmerge merge" to avoid performing +# an actual merge, yet record that a merge happened. +# - Can use a variety of location-identifier formats +# +# TODO: +# - Add "svnmerge avail -R": show logs in reverse order +# +# Information for Hackers: +# +# Identifiers for branches: +# A branch is identified in three ways within this source: +# - as a working copy (variable name usually includes 'dir') +# - as a fully qualified URL +# - as a path identifier (an opaque string indicating a particular path +# in a particular repository; variable name includes 'pathid') +# A "target" is generally user-specified, and may be a working copy or +# a URL. + +import sys, os, getopt, re, types, tempfile, time, locale +from bisect import bisect +from xml.dom import pulldom + +NAME = "svnmerge" +if not hasattr(sys, "version_info") or sys.version_info < (2, 0): + error("requires Python 2.0 or newer") + +# Set up the separator used to separate individual log messages from +# each revision merged into the target location. Also, create a +# regular expression that will find this same separator in already +# committed log messages, so that the separator used for this run of +# svnmerge.py will have one more LOG_SEPARATOR appended to the longest +# separator found in all the commits. +LOG_SEPARATOR = 8 * '.' +LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR), + re.MULTILINE) + +# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX. +LOG_LINE_PREFIX = 2 * ' ' + +# Set python to the default locale as per environment settings, same as svn +# TODO we should really parse config and if log-encoding is specified, set +# the locale to match that encoding +locale.setlocale(locale.LC_ALL, '') + +# We want the svn output (such as svn info) to be non-localized +# Using LC_MESSAGES should not affect localized output of svn log, for example +if os.environ.has_key("LC_ALL"): + del os.environ["LC_ALL"] +os.environ["LC_MESSAGES"] = "C" + +############################################################################### +# Support for older Python versions +############################################################################### + +# True/False constants are Python 2.2+ +try: + True, False +except NameError: + True, False = 1, 0 + +def lstrip(s, ch): + """Replacement for str.lstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + i = 0 + try: + while s[i] == ch: + i = i+1 + return s[i:] + except IndexError: + return "" + +def rstrip(s, ch): + """Replacement for str.rstrip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + try: + if s[-1] != ch: + return s + i = -2 + while s[i] == ch: + i = i-1 + return s[:i+1] + except IndexError: + return "" + +def strip(s, ch): + """Replacement for str.strip (support for arbitrary chars to strip was + added in Python 2.2.2).""" + return lstrip(rstrip(s, ch), ch) + +def rsplit(s, sep, maxsplits=0): + """Like str.rsplit, which is Python 2.4+ only.""" + L = s.split(sep) + if not 0 < maxsplits <= len(L): + return L + return [sep.join(L[0:-maxsplits])] + L[-maxsplits:] + +############################################################################### + +def kwextract(s): + """Extract info from a svn keyword string.""" + try: + return strip(s, "$").strip().split(": ")[1] + except IndexError: + return "<unknown>" + +__revision__ = kwextract('$Rev$') +__date__ = kwextract('$Date$') + +# Additional options, not (yet?) mapped to command line flags +default_opts = { + "svn": "svn", + "prop": NAME + "-integrated", + "block-prop": NAME + "-blocked", + "commit-verbose": True, + "verbose": 0, +} +logs = {} + +def console_width(): + """Get the width of the console screen (if any).""" + try: + return int(os.environ["COLUMNS"]) + except (KeyError, ValueError): + pass + + try: + # Call the Windows API (requires ctypes library) + from ctypes import windll, create_string_buffer + h = windll.kernel32.GetStdHandle(-11) + csbi = create_string_buffer(22) + res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi) + if res: + import struct + (bufx, bufy, + curx, cury, wattr, + left, top, right, bottom, + maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw) + return right - left + 1 + except ImportError: + pass + + # Parse the output of stty -a + if os.isatty(1): + out = os.popen("stty -a").read() + m = re.search(r"columns (\d+);", out) + if m: + return int(m.group(1)) + + # sensible default + return 80 + +def error(s): + """Subroutine to output an error and bail.""" + print >> sys.stderr, "%s: %s" % (NAME, s) + sys.exit(1) + +def report(s): + """Subroutine to output progress message, unless in quiet mode.""" + if opts["verbose"]: + print "%s: %s" % (NAME, s) + +def prefix_lines(prefix, lines): + """Given a string representing one or more lines of text, insert the + specified prefix at the beginning of each line, and return the result. + The input must be terminated by a newline.""" + assert lines[-1] == "\n" + return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n" + +def recode_stdout_to_file(s): + if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \ + or sys.stdout.encoding is None: + return s + u = s.decode(sys.stdout.encoding) + return u.encode(locale.getdefaultlocale()[1]) + +class LaunchError(Exception): + """Signal a failure in execution of an external command. Parameters are the + exit code of the process, the original command line, and the output of the + command.""" + +try: + """Launch a sub-process. Return its output (both stdout and stderr), + optionally split by lines (if split_lines is True). Raise a LaunchError + exception if the exit code of the process is non-zero (failure). + + This function has two implementations, one based on subprocess (preferred), + and one based on popen (for compatibility). + """ + import subprocess + import shlex + + def launch(cmd, split_lines=True): + # Requiring python 2.4 or higher, on some platforms we get + # much faster performance from the subprocess module (where python + # doesn't try to close an exhorbitant number of file descriptors) + stdout = "" + stderr = "" + try: + if os.name == 'nt': + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + else: + # Use shlex to break up the parameters intelligently, + # respecting quotes. shlex can't handle unicode. + args = shlex.split(cmd.encode('ascii')) + p = subprocess.Popen(args, stdout=subprocess.PIPE, \ + close_fds=False, stderr=subprocess.PIPE) + stdoutAndErr = p.communicate() + stdout = stdoutAndErr[0] + stderr = stdoutAndErr[1] + except OSError, inst: + # Using 1 as failure code; should get actual number somehow? For + # examples see svnmerge_test.py's TestCase_launch.test_failure and + # TestCase_launch.test_failurecode. + raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst)) + + if p.returncode == 0: + if split_lines: + # Setting keepends=True for compatibility with previous logic + # (where file.readlines() preserves newlines) + return stdout.splitlines(True) + else: + return stdout + else: + raise LaunchError(p.returncode, cmd, stdout + stderr) +except ImportError: + # support versions of python before 2.4 (slower on some systems) + def launch(cmd, split_lines=True): + if os.name not in ['nt', 'os2']: + import popen2 + p = popen2.Popen4(cmd) + p.tochild.close() + if split_lines: + out = p.fromchild.readlines() + else: + out = p.fromchild.read() + ret = p.wait() + if ret == 0: + ret = None + else: + ret >>= 8 + else: + i,k = os.popen4(cmd) + i.close() + if split_lines: + out = k.readlines() + else: + out = k.read() + ret = k.close() + + if ret is None: + return out + raise LaunchError(ret, cmd, out) + +def launchsvn(s, show=False, pretend=False, **kwargs): + """Launch SVN and grab its output.""" + username = password = configdir = "" + if opts.get("username", None): + username = "--username=" + opts["username"] + if opts.get("password", None): + password = "--password=" + opts["password"] + if opts.get("config-dir", None): + configdir = "--config-dir=" + opts["config-dir"] + cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive", + username, password, configdir, s])) + if show or opts["verbose"] >= 2: + print cmd + if pretend: + return None + return launch(cmd, **kwargs) + +def svn_command(s): + """Do (or pretend to do) an SVN command.""" + out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"], + pretend=opts["dry-run"], + split_lines=False) + if not opts["dry-run"]: + print out + +def check_dir_clean(dir): + """Check the current status of dir for local mods.""" + if opts["force"]: + report('skipping status check because of --force') + return + report('checking status of "%s"' % dir) + + # Checking with -q does not show unversioned files or external + # directories. Though it displays a debug message for external + # directories, after a blank line. So, practically, the first line + # matters: if it's non-empty there is a modification. + out = launchsvn("status -q %s" % dir) + if out and out[0].strip(): + error('"%s" has local modifications; it must be clean' % dir) + +class PathIdentifier: + """Abstraction for a path identifier, so that we can start talking + about it before we know the form that it takes in the properties (its + external_form). Objects are referenced in the class variable 'locobjs', + keyed by all known forms.""" + + # a map of UUID (or None) to repository root URL. + repo_hints = {} + + # a map from any known string form to the corresponding PathIdentifier + locobjs = {} + + def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None): + self.repo_relative_path = repo_relative_path + self.uuid = uuid + self.url = url + self.external_form = external_form + + def __repr__(self): + return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>' + + def __str__(self): + """Return a printable string representation""" + if self.external_form: + return self.external_form + if self.url: + return self.format('url') + if self.uuid: + return self.format('uuid') + return self.format('path') + + def from_pathid(pathid_str): + """convert pathid_str to a PathIdentifier""" + if not PathIdentifier.locobjs.has_key(pathid_str): + if is_url(pathid_str): + # we can determine every form; PathIdentifier.hint knows how to do that + PathIdentifier.hint(pathid_str) + elif pathid_str[:7] == 'uuid://': + mo = re.match('uuid://([^/]*)(.*)', pathid_str) + if not mo: + error("Invalid path identifier '%s'" % pathid_str) + uuid, repo_relative_path = mo.groups() + pathid = PathIdentifier(repo_relative_path, uuid=uuid) + # we can cache this by uuid:// pathid and by repo-relative path + PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid + elif pathid_str and pathid_str[0] == '/': + # strip any trailing slashes + pathid_str = pathid_str.rstrip('/') + pathid = PathIdentifier(repo_relative_path=pathid_str) + # we can only cache this by repo-relative path + PathIdentifier.locobjs[pathid_str] = pathid + else: + error("Invalid path identifier '%s'" % pathid_str) + return PathIdentifier.locobjs[pathid_str] + from_pathid = staticmethod(from_pathid) + + def from_target(target): + """Convert a target (either a working copy path or an URL) into a + path identifier.""" + # prime the cache first if we don't know about this target yet + if not PathIdentifier.locobjs.has_key(target): + PathIdentifier.hint(target) + + try: + return PathIdentifier.locobjs[target] + except KeyError: + error("Could not recognize path identifier '%s'" % target) + from_target = staticmethod(from_target) + + def hint(target): + """Cache some information about target, as it may be referenced by + repo-relative path in subversion properties; the cache can help to + expand such a relative path to a full path identifier.""" + if PathIdentifier.locobjs.has_key(target): return + if not is_url(target) and not is_wc(target): return + + url = target_to_url(target) + + root = get_repo_root(url) + assert root[-1] != "/" + assert url[:len(root)] == root, "url=%r, root=%r" % (url, root) + repo_relative_path = url[len(root):] + + try: + uuid = get_svninfo(target)['Repository UUID'] + uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path) + except KeyError: + uuid = None + uuid_pathid = None + + locobj = PathIdentifier.locobjs.get(url) or \ + (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid)) + if not locobj: + locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url) + + PathIdentifier.repo_hints[uuid] = root # (uuid may be None) + + PathIdentifier.locobjs[target] = locobj + PathIdentifier.locobjs[url] = locobj + if uuid_pathid: + PathIdentifier.locobjs[uuid_pathid] = locobj + if not PathIdentifier.locobjs.has_key(repo_relative_path): + PathIdentifier.locobjs[repo_relative_path] = locobj + hint = staticmethod(hint) + + def format(self, fmt): + if fmt == 'path': + return self.repo_relative_path + elif fmt == 'uuid': + return "uuid://%s%s" % (self.uuid, self.repo_relative_path) + elif fmt == 'url': + return self.url + else: + error("Unkonwn path type '%s'" % fmt) + + def match_substring(self, str): + """Test whether str is a substring of any representation of this + PathIdentifier.""" + if self.repo_relative_path.find(str) >= 0: + return True + + if self.uuid: + if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0: + return True + + if self.url: + if (self.url + self.repo_relative_path).find(str) >= 0: + return True + + return False + + def get_url(self): + """Convert a pathid into a URL. If this is not possible, error out.""" + if self.url: + return self.url + # if we have a uuid and happen to know the URL for it, use that + elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid): + self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + return self.url + # if we've only seen one rep, use that (a guess, but an educated one) + elif not self.uuid and len(PathIdentifier.repo_hints) == 1: + uuid, root = PathIdentifier.repo_hints.items()[0] + if uuid: + self.uuid = uuid + PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self + self.url = root + self.repo_relative_path + PathIdentifier.locobjs[self.url] = self + report("Guessing that '%s' refers to '%s'" % (self, self.url)) + return self.url + else: + error("Cannot determine URL for '%s'; " % self + + "Explicit source argument (-S/--source) required.\n") + +class RevisionLog: + """ + A log of the revisions which affected a given URL between two + revisions. + """ + + def __init__(self, url, begin, end, find_propchanges=False): + """ + Create a new RevisionLog object, which stores, in self.revs, a list + of the revisions which affected the specified URL between begin and + end. If find_propchanges is True, self.propchange_revs will contain a + list of the revisions which changed properties directly on the + specified URL. URL must be the URL for a directory in the repository. + """ + self.url = url + + # Setup the log options (--quiet, so we don't show log messages) + log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url) + if find_propchanges: + # The --verbose flag lets us grab merge tracking information + # by looking at propchanges + log_opts = "--verbose " + log_opts + + # Read the log to look for revision numbers and merge-tracking info + self.revs = [] + self.propchange_revs = [] + repos_pathid = PathIdentifier.from_target(url) + for chg in SvnLogParser(launchsvn("log %s" % log_opts, + split_lines=False)): + self.revs.append(chg.revision()) + for p in chg.paths(): + if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path: + self.propchange_revs.append(chg.revision()) + + # Save the range of the log + self.begin = int(begin) + if end == "HEAD": + # If end is not provided, we do not know which is the latest + # revision in the repository. So we set 'end' to the latest + # known revision. + self.end = self.revs[-1] + else: + self.end = int(end) + + self._merges = None + self._blocks = None + + def merge_metadata(self): + """ + Return a VersionedProperty object, with a cached view of the merge + metadata in the range of this log. + """ + + # Load merge metadata if necessary + if not self._merges: + self._merges = VersionedProperty(self.url, opts["prop"]) + self._merges.load(self) + + return self._merges + + def block_metadata(self): + if not self._blocks: + self._blocks = VersionedProperty(self.url, opts["block-prop"]) + self._blocks.load(self) + + return self._blocks + + +class VersionedProperty: + """ + A read-only, cached view of a versioned property. + + self.revs contains a list of the revisions in which the property changes. + self.values stores the new values at each corresponding revision. If the + value of the property is unknown, it is set to None. + + Initially, we set self.revs to [0] and self.values to [None]. This + indicates that, as of revision zero, we know nothing about the value of + the property. + + Later, if you run self.load(log), we cache the value of this property over + the entire range of the log by noting each revision in which the property + was changed. At the end of the range of the log, we invalidate our cache + by adding the value "None" to our cache for any revisions which fall out + of the range of our log. + + Once self.revs and self.values are filled, we can find the value of the + property at any arbitrary revision using a binary search on self.revs. + Once we find the last revision during which the property was changed, + we can lookup the associated value in self.values. (If the associated + value is None, the associated value was not cached and we have to do + a full propget.) + + An example: We know that the 'svnmerge' property was added in r10, and + changed in r21. We gathered log info up until r40. + + revs = [0, 10, 21, 40] + values = [None, "val1", "val2", None] + + What these values say: + - From r0 to r9, we know nothing about the property. + - In r10, the property was set to "val1". This property stayed the same + until r21, when it was changed to "val2". + - We don't know what happened after r40. + """ + + def __init__(self, url, name): + """View the history of a versioned property at URL with name""" + self.url = url + self.name = name + + # We know nothing about the value of the property. Setup revs + # and values to indicate as such. + self.revs = [0] + self.values = [None] + + # We don't have any revisions cached + self._initial_value = None + self._changed_revs = [] + self._changed_values = [] + + def load(self, log): + """ + Load the history of property changes from the specified + RevisionLog object. + """ + + # Get the property value before the range of the log + if log.begin > 1: + self.revs.append(log.begin-1) + try: + self._initial_value = self.raw_get(log.begin-1) + except LaunchError: + # The specified URL might not exist before the + # range of the log. If so, we can safely assume + # that the property was empty at that time. + self._initial_value = { } + self.values.append(self._initial_value) + else: + self._initial_value = { } + self.values[0] = self._initial_value + + # Cache the property values in the log range + old_value = self._initial_value + for rev in log.propchange_revs: + new_value = self.raw_get(rev) + if new_value != old_value: + self._changed_revs.append(rev) + self._changed_values.append(new_value) + self.revs.append(rev) + self.values.append(new_value) + old_value = new_value + + # Indicate that we know nothing about the value of the property + # after the range of the log. + if log.revs: + self.revs.append(log.end+1) + self.values.append(None) + + def raw_get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + return get_revlist_prop(self.url, self.name, rev) + + def get(self, rev=None): + """ + Get the property at revision REV. If rev is not specified, get + the property at revision HEAD. + """ + + if rev is not None: + + # Find the index using a binary search + i = bisect(self.revs, rev) - 1 + + # Return the value of the property, if it was cached + if self.values[i] is not None: + return self.values[i] + + # Get the current value of the property + return self.raw_get(rev) + + def changed_revs(self, key=None): + """ + Get a list of the revisions in which the specified dictionary + key was changed in this property. If key is not specified, + return a list of revisions in which any key was changed. + """ + if key is None: + return self._changed_revs + else: + changed_revs = [] + old_val = self._initial_value + for rev, val in zip(self._changed_revs, self._changed_values): + if val.get(key) != old_val.get(key): + changed_revs.append(rev) + old_val = val + return changed_revs + + def initialized_revs(self): + """ + Get a list of the revisions in which keys were added or + removed in this property. + """ + initialized_revs = [] + old_len = len(self._initial_value) + for rev, val in zip(self._changed_revs, self._changed_values): + if len(val) != old_len: + initialized_revs.append(rev) + old_len = len(val) + return initialized_revs + +class RevisionSet: + """ + A set of revisions, held in dictionary form for easy manipulation. If we + were to rewrite this script for Python 2.3+, we would subclass this from + set (or UserSet). As this class does not include branch + information, it's assumed that one instance will be used per + branch. + """ + def __init__(self, parm): + """Constructs a RevisionSet from a string in property form, or from + a dictionary whose keys are the revisions. Raises ValueError if the + input string is invalid.""" + + self._revs = {} + + revision_range_split_re = re.compile('[-:]') + + if isinstance(parm, types.DictType): + self._revs = parm.copy() + elif isinstance(parm, types.ListType): + for R in parm: + self._revs[int(R)] = 1 + else: + parm = parm.strip() + if parm: + for R in parm.split(","): + rev_or_revs = re.split(revision_range_split_re, R) + if len(rev_or_revs) == 1: + self._revs[int(rev_or_revs[0])] = 1 + elif len(rev_or_revs) == 2: + for rev in range(int(rev_or_revs[0]), + int(rev_or_revs[1])+1): + self._revs[rev] = 1 + else: + raise ValueError, 'Ill formatted revision range: ' + R + + def sorted(self): + revnums = self._revs.keys() + revnums.sort() + return revnums + + def normalized(self): + """Returns a normalized version of the revision set, which is an + ordered list of couples (start,end), with the minimum number of + intervals.""" + revnums = self.sorted() + revnums.reverse() + ret = [] + while revnums: + s = e = revnums.pop() + while revnums and revnums[-1] in (e, e+1): + e = revnums.pop() + ret.append((s, e)) + return ret + + def __str__(self): + """Convert the revision set to a string, using its normalized form.""" + L = [] + for s,e in self.normalized(): + if s == e: + L.append(str(s)) + else: + L.append(str(s) + "-" + str(e)) + return ",".join(L) + + def __contains__(self, rev): + return self._revs.has_key(rev) + + def __sub__(self, rs): + """Compute subtraction as in sets.""" + revs = {} + for r in self._revs.keys(): + if r not in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __and__(self, rs): + """Compute intersections as in sets.""" + revs = {} + for r in self._revs.keys(): + if r in rs: + revs[r] = 1 + return RevisionSet(revs) + + def __nonzero__(self): + return len(self._revs) != 0 + + def __len__(self): + """Return the number of revisions in the set.""" + return len(self._revs) + + def __iter__(self): + return iter(self.sorted()) + + def __or__(self, rs): + """Compute set union.""" + revs = self._revs.copy() + revs.update(rs._revs) + return RevisionSet(revs) + +def merge_props_to_revision_set(merge_props, pathid): + """A converter which returns a RevisionSet instance containing the + revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a + dictionary of pathid -> revision set branch integration information + (as returned by get_merge_props()).""" + if not merge_props.has_key(pathid): + error('no integration info available for path "%s"' % pathid) + return RevisionSet(merge_props[pathid]) + +def dict_from_revlist_prop(propvalue): + """Given a property value as a string containing per-source revision + lists, return a dictionary whose key is a source path identifier + and whose value is the revisions for that source.""" + prop = {} + + # Multiple sources are separated by any whitespace. + for L in propvalue.split(): + # We use rsplit to play safe and allow colons in pathids. + pathid_str, revs = rsplit(L.strip(), ":", 1) + + pathid = PathIdentifier.from_pathid(pathid_str) + + # cache the "external" form we saw + pathid.external_form = pathid_str + + prop[pathid] = revs + return prop + +def get_revlist_prop(url_or_dir, propname, rev=None): + """Given a repository URL or working copy path and a property + name, extract the values of the property which store per-source + revision lists and return a dictionary whose key is a source path + identifier, and whose value is the revisions for that source.""" + + # Note that propget does not return an error if the property does + # not exist, it simply does not output anything. So we do not need + # to check for LaunchError here. + args = '--strict "%s" "%s"' % (propname, url_or_dir) + if rev: + args = '-r %s %s' % (rev, args) + out = launchsvn('propget %s' % args, split_lines=False) + + return dict_from_revlist_prop(out) + +def get_merge_props(dir): + """Extract the merged revisions.""" + return get_revlist_prop(dir, opts["prop"]) + +def get_block_props(dir): + """Extract the blocked revisions.""" + return get_revlist_prop(dir, opts["block-prop"]) + +def get_blocked_revs(dir, source_pathid): + p = get_block_props(dir) + if p.has_key(source_pathid): + return RevisionSet(p[source_pathid]) + return RevisionSet("") + +def format_merge_props(props, sep=" "): + """Formats the hash PROPS as a string suitable for use as a + Subversion property value.""" + assert sep in ["\t", "\n", " "] # must be a whitespace + props = props.items() + props.sort() + L = [] + for h, r in props: + L.append("%s:%s" % (h, r)) + return sep.join(L) + +def _run_propset(dir, prop, value): + """Set the property 'prop' of directory 'dir' to value 'value'. We go + through a temporary file to not run into command line length limits.""" + try: + fd, fname = tempfile.mkstemp() + f = os.fdopen(fd, "wb") + except AttributeError: + # Fallback for Python <= 2.3 which does not have mkstemp (mktemp + # suffers from race conditions. Not that we care...) + fname = tempfile.mktemp() + f = open(fname, "wb") + + try: + f.write(value) + f.close() + report("property data written to temp file: %s" % value) + svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir)) + finally: + os.remove(fname) + +def set_props(dir, name, props): + props = format_merge_props(props) + if props: + _run_propset(dir, name, props) + else: + # Check if NAME exists on DIR before trying to delete it. + # As of 1.6 propdel no longer supports deleting a + # non-existent property. + out = launchsvn('propget "%s" "%s"' % (name, dir)) + if out: + svn_command('propdel "%s" "%s"' % (name, dir)) + +def set_merge_props(dir, props): + set_props(dir, opts["prop"], props) + +def set_block_props(dir, props): + set_props(dir, opts["block-prop"], props) + +def set_blocked_revs(dir, source_pathid, revs): + props = get_block_props(dir) + if revs: + props[source_pathid] = str(revs) + elif props.has_key(source_pathid): + del props[source_pathid] + set_block_props(dir, props) + +def is_url(url): + """Check if url looks like a valid url.""" + return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid' + +def check_url(url): + """Similar to is_url, but actually invoke get_svninfo to find out""" + return get_svninfo(url) != {} + +def is_pathid(pathid): + return isinstance(pathid, PathIdentifier) + +def is_wc(dir): + """Check if a directory is a working copy.""" + return os.path.isdir(os.path.join(dir, ".svn")) or \ + os.path.isdir(os.path.join(dir, "_svn")) + +_cache_svninfo = {} +def get_svninfo(target): + """Extract the subversion information for a target (through 'svn info'). + This function uses an internal cache to let clients query information + many times.""" + if _cache_svninfo.has_key(target): + return _cache_svninfo[target] + info = {} + for L in launchsvn('info "%s"' % target): + L = L.strip() + if not L: + continue + key, value = L.split(": ", 1) + info[key] = value.strip() + _cache_svninfo[target] = info + return info + +def target_to_url(target): + """Convert working copy path or repos URL to a repos URL.""" + if is_wc(target): + info = get_svninfo(target) + return info["URL"] + return target + +_cache_reporoot = {} +def get_repo_root(target): + """Compute the root repos URL given a working-copy path, or a URL.""" + # Try using "svn info WCDIR". This works only on SVN clients >= 1.3 + if not is_url(target): + try: + info = get_svninfo(target) + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except KeyError: + pass + url = target_to_url(target) + assert url[-1] != '/' + else: + url = target + + # Go through the cache of the repository roots. This avoids extra + # server round-trips if we are asking the root of different URLs + # in the same repository (the cache in get_svninfo() cannot detect + # that of course and would issue a remote command). + assert is_url(url) + for r in _cache_reporoot: + if url.startswith(r): + return r + + # Try using "svn info URL". This works only on SVN clients >= 1.2 + try: + info = get_svninfo(url) + # info may be {}, in which case we'll see KeyError here + root = info["Repository Root"] + _cache_reporoot[root] = None + return root + except (KeyError, LaunchError): + pass + + # Constrained to older svn clients, we are stuck with this ugly + # trial-and-error implementation. It could be made faster with a + # binary search. + while url: + temp = os.path.dirname(url) + try: + launchsvn('proplist "%s"' % temp) + except LaunchError: + _cache_reporoot[url] = None + return rstrip(url, "/") + url = temp + + error("svn repos root of %s not found" % target) + +class SvnLogParser: + """ + Parse the "svn log", going through the XML output and using pulldom (which + would even allow streaming the command output). + """ + def __init__(self, xml): + self._events = pulldom.parseString(xml) + def __getitem__(self, idx): + for event, node in self._events: + if event == pulldom.START_ELEMENT and node.tagName == "logentry": + self._events.expandNode(node) + return self.SvnLogRevision(node) + raise IndexError, "Could not find 'logentry' tag in xml" + + class SvnLogRevision: + def __init__(self, xmlnode): + self.n = xmlnode + def revision(self): + return int(self.n.getAttribute("revision")) + def author(self): + return self.n.getElementsByTagName("author")[0].firstChild.data + def paths(self): + return [self.SvnLogPath(n) + for n in self.n.getElementsByTagName("path")] + + class SvnLogPath: + def __init__(self, xmlnode): + self.n = xmlnode + def action(self): + return self.n.getAttribute("action") + def pathid(self): + return self.n.firstChild.data + def copyfrom_rev(self): + try: return self.n.getAttribute("copyfrom-rev") + except KeyError: return None + def copyfrom_pathid(self): + try: return self.n.getAttribute("copyfrom-path") + except KeyError: return None + +def get_copyfrom(target): + """Get copyfrom info for a given target (it represents the + repository-relative path from where it was branched). NOTE: + repos root has no copyfrom info. In this case None is returned. + + Returns the: + - source file or directory from which the copy was made + - revision from which that source was copied + - revision in which the copy was committed + """ + repos_path = PathIdentifier.from_target(target).repo_relative_path + for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"' + % target, split_lines=False)): + for p in chg.paths(): + if p.action() == 'A' and p.pathid() == repos_path: + # These values will be None if the corresponding elements are + # not found in the log. + return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision() + return None,None,None + +def get_latest_rev(url): + """Get the latest revision of the repository of which URL is part.""" + try: + info = get_svninfo(url) + if not info.has_key("Revision"): + error("Not a valid URL: %s" % url) + return info["Revision"] + except LaunchError: + # Alternative method for latest revision checking (for svn < 1.2) + report('checking latest revision of "%s"' % url) + L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0] + rev = re.search("revision (\d+)", L).group(1) + report('latest revision of "%s" is %s' % (url, rev)) + return rev + +def get_created_rev(url): + """Lookup the revision at which the path identified by the + provided URL was first created.""" + oldest_rev = -1 + report('determining oldest revision for URL "%s"' % url) + ### TODO: Refactor this to use a modified RevisionLog class. + lines = None + cmd = "log -r1:HEAD --stop-on-copy -q " + url + try: + lines = launchsvn(cmd + " --limit=1") + except LaunchError: + # Assume that --limit isn't supported by the installed 'svn'. + lines = launchsvn(cmd) + if lines and len(lines) > 1: + i = lines[1].find(" ") + if i != -1: + oldest_rev = int(lines[1][1:i]) + if oldest_rev == -1: + error('unable to determine oldest revision for URL "%s"' % url) + return oldest_rev + +def get_commit_log(url, revnum): + """Return the log message for a specific integer revision + number.""" + out = launchsvn("log --incremental -r%d %s" % (revnum, url)) + return recode_stdout_to_file("".join(out[1:])) + +def construct_merged_log_message(url, revnums): + """Return a commit log message containing all the commit messages + in the specified revisions at the given URL. The separator used + in this log message is determined by searching for the longest + svnmerge separator existing in the commit log messages and + extending it by one more separator. This results in a new commit + log message that is clearer in describing merges that contain + other merges. Trailing newlines are removed from the embedded + log messages.""" + messages = [''] + longest_sep = '' + for r in revnums.sorted(): + message = get_commit_log(url, r) + if message: + message = re.sub(r'(\r\n|\r|\n)', "\n", message) + message = rstrip(message, "\n") + "\n" + messages.append(prefix_lines(LOG_LINE_PREFIX, message)) + for match in LOG_SEPARATOR_RE.findall(message): + sep = match[1] + if len(sep) > len(longest_sep): + longest_sep = sep + + longest_sep += LOG_SEPARATOR + "\n" + messages.append('') + return longest_sep.join(messages) + +def get_default_source(branch_target, branch_props): + """Return the default source for branch_target (given its branch_props). + Error out if there is ambiguity.""" + if not branch_props: + error("no integration info available") + + props = branch_props.copy() + pathid = PathIdentifier.from_target(branch_target) + + # To make bidirectional merges easier, find the target's + # repository local path so it can be removed from the list of + # possible integration sources. + if props.has_key(pathid): + del props[pathid] + + if len(props) > 1: + err_msg = "multiple sources found. " + err_msg += "Explicit source argument (-S/--source) required.\n" + err_msg += "The merge sources available are:" + for prop in props: + err_msg += "\n " + str(prop) + error(err_msg) + + return props.keys()[0] + +def should_find_reflected(branch_dir): + should_find_reflected = opts["bidirectional"] + + # If the source has integration info for the target, set find_reflected + # even if --bidirectional wasn't specified + if not should_find_reflected: + source_props = get_merge_props(opts["source-url"]) + should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir)) + + return should_find_reflected + +def analyze_revs(target_pathid, url, begin=1, end=None, + find_reflected=False): + """For the source of the merges in the source URL being merged into + target_pathid, analyze the revisions in the interval begin-end (which + defaults to 1-HEAD), to find out which revisions are changes in + the url, which are changes elsewhere (so-called 'phantom' + revisions), optionally which are reflected changes (to avoid + conflicts that can occur when doing bidirectional merging between + branches), and which revisions initialize merge tracking against other + branches. Return a tuple of four RevisionSet's: + (real_revs, phantom_revs, reflected_revs, initialized_revs). + + NOTE: To maximize speed, if "end" is not provided, the function is + not able to find phantom revisions following the last real + revision in the URL. + """ + + begin = str(begin) + if end is None: + end = "HEAD" + else: + end = str(end) + if long(begin) > long(end): + return RevisionSet(""), RevisionSet(""), \ + RevisionSet(""), RevisionSet("") + + logs[url] = RevisionLog(url, begin, end, find_reflected) + revs = RevisionSet(logs[url].revs) + + if end == "HEAD": + # If end is not provided, we do not know which is the latest revision + # in the repository. So return the phantom revision set only up to + # the latest known revision. + end = str(list(revs)[-1]) + + phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs + + if find_reflected: + reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid) + reflected_revs += logs[url].block_metadata().changed_revs(target_pathid) + else: + reflected_revs = [] + + initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs()) + reflected_revs = RevisionSet(reflected_revs) + + return revs, phantom_revs, reflected_revs, initialized_revs + +def analyze_source_revs(branch_target, source_url, **kwargs): + """For the given branch and source, extract the real and phantom + source revisions.""" + branch_url = target_to_url(branch_target) + branch_pathid = PathIdentifier.from_target(branch_target) + + # Extract the latest repository revision from the URL of the branch + # directory (which is already cached at this point). + end_rev = get_latest_rev(source_url) + + # Calculate the base of analysis. If there is a "1-XX" interval in the + # merged_revs, we do not need to check those. + base = 1 + r = opts["merged-revs"].normalized() + if r and r[0][0] == 1: + base = r[0][1] + 1 + + # See if the user filtered the revision set. If so, we are not + # interested in something outside that range. + if opts["revision"]: + revs = RevisionSet(opts["revision"]).sorted() + if base < revs[0]: + base = revs[0] + if end_rev > revs[-1]: + end_rev = revs[-1] + + return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs) + +def minimal_merge_intervals(revs, phantom_revs): + """Produce the smallest number of intervals suitable for merging. revs + is the RevisionSet which we want to merge, and phantom_revs are phantom + revisions which can be used to concatenate intervals, thus minimizing the + number of operations.""" + revnums = revs.normalized() + ret = [] + + cur = revnums.pop() + while revnums: + next = revnums.pop() + assert next[1] < cur[0] # otherwise it is not ordered + assert cur[0] - next[1] > 1 # otherwise it is not normalized + for i in range(next[1]+1, cur[0]): + if i not in phantom_revs: + ret.append(cur) + cur = next + break + else: + cur = (next[0], cur[1]) + + ret.append(cur) + ret.reverse() + return ret + +def display_revisions(revs, display_style, revisions_msg, source_url): + """Show REVS as dictated by DISPLAY_STYLE, either numerically, in + log format, or as diffs. When displaying revisions numerically, + prefix output with REVISIONS_MSG when in verbose mode. Otherwise, + request logs or diffs using SOURCE_URL.""" + if display_style == "revisions": + if revs: + report(revisions_msg) + print revs + elif display_style == "logs": + for start,end in revs.normalized(): + svn_command('log --incremental -v -r %d:%d %s' % \ + (start, end, source_url)) + elif display_style in ("diffs", "summarize"): + if display_style == 'summarize': + summarize = '--summarize ' + else: + summarize = '' + + for start, end in revs.normalized(): + print + if start == end: + print "%s: changes in revision %d follow" % (NAME, start) + else: + print "%s: changes in revisions %d-%d follow" % (NAME, + start, end) + print + + # Note: the starting revision number to 'svn diff' is + # NOT inclusive so we have to subtract one from ${START}. + svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize, + source_url)) + else: + assert False, "unhandled display style: %s" % display_style + +def action_init(target_dir, target_props): + """Initialize for merges.""" + # Check that directory is ready for being modified + check_dir_clean(target_dir) + + target_pathid = PathIdentifier.from_target(target_dir) + source_pathid = opts['source-pathid'] + if source_pathid == target_pathid: + error("cannot init integration source path '%s'\nIts path identifier does not " + "differ from the path identifier of the current directory, '%s'." + % (source_pathid, target_pathid)) + + source_url = opts['source-url'] + + # If the user hasn't specified the revisions to use, see if the + # "source" is a copy from the current tree and if so, we can use + # the version data obtained from it. + revision_range = opts["revision"] + if not revision_range: + # If source was originally copied from target, and we are merging + # changes from source to target (the copy target is the merge source, + # and the copy source is the merge target), then we want to mark as + # integrated up to the rev in which the copy was committed which + # created the merge source: + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(source_url) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + if target_pathid == cf_pathid: + report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' % + (source_url, target_dir, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + str(copy_committed_in_rev) + + if not revision_range: + # If the reverse is true: copy source is the merge source, and + # the copy target is the merge target, then we want to mark as + # integrated up to the specific rev of the merge target from + # which the merge source was copied. (Longer discussion at: + # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 ) + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir) + + cf_pathid = None + if cf_source: + cf_url = get_repo_root(target_dir) + cf_source + if is_url(cf_url) and check_url(cf_url): + cf_pathid = PathIdentifier.from_target(cf_url) + + source_pathid = PathIdentifier.from_target(source_url) + if source_pathid == cf_pathid: + report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' % + (target_dir, source_url, cf_rev, copy_committed_in_rev)) + revision_range = "1-" + cf_rev + + # When neither the merge source nor target is a copy of the other, and + # the user did not specify a revision range, then choose a default which is + # the current revision; saying, in effect, "everything has been merged, so + # mark as integrated up to the latest rev on source url). + if not revision_range: + revision_range = "1-" + get_latest_rev(source_url) + + revs = RevisionSet(revision_range) + + report('marking "%s" as already containing revisions "%s" of "%s"' % + (target_dir, revs, source_url)) + + revs = str(revs) + # If the local svnmerge-integrated property already has an entry + # for the source-pathid, simply error out. + if not opts["force"] and target_props.has_key(source_pathid): + error('Repository-relative path %s has already been initialized at %s\n' + 'Use --force to re-initialize' % (source_pathid, target_dir)) + # set the pathid's external_form based on the user's options + source_pathid.external_form = source_pathid.format(opts['location-type']) + + revs = str(revs) + target_props[source_pathid] = revs + + # Set property + set_merge_props(target_dir, target_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \ + % (NAME, revs) + print >>f, '%s' % source_url + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_avail(branch_dir, branch_props): + """Show commits available for merges.""" + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + report('skipping phantom revisions: %s' % phantom_revs) + if reflected_revs: + report('skipping reflected revisions: %s' % reflected_revs) + report('skipping initialized revisions: %s' % initialized_revs) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \ + reflected_revs - initialized_revs + + # Compose the set of revisions to show + revs = RevisionSet("") + report_msg = "revisions available to be merged are:" + if "avail" in opts["avail-showwhat"]: + revs |= avail_revs + if "blocked" in opts["avail-showwhat"]: + revs |= blocked_revs + report_msg = "revisions blocked are:" + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["avail-display"], + report_msg, + opts["source-url"]) + +def action_integrated(branch_dir, branch_props): + """Show change sets already merged. This set of revisions is + calculated from taking svnmerge-integrated property from the + branch, and subtracting any revision older than the branch + creation revision.""" + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + revs = merge_props_to_revision_set(branch_props, opts["source-pathid"]) + + # Lookup the oldest revision on the branch path. + oldest_src_rev = get_created_rev(opts["source-url"]) + + # Subtract any revisions which pre-date the branch. + report("subtracting revisions which pre-date the source URL (%d)" % + oldest_src_rev) + revs = revs - RevisionSet(range(1, oldest_src_rev)) + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs = revs & RevisionSet(opts["revision"]) + + display_revisions(revs, opts["integrated-display"], + "revisions already integrated are:", opts["source-url"]) + +def action_merge(branch_dir, branch_props): + """Record merge meta data, and do the actual merge (if not + requested otherwise via --record-only).""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"], + find_reflected= + should_find_reflected(branch_dir)) + + if opts["revision"]: + revs = RevisionSet(opts["revision"]) + else: + revs = source_revs + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + merged_revs = opts["merged-revs"] + + # Show what we're doing + if opts["verbose"]: # just to avoid useless calculations + if merged_revs & revs: + report('"%s" already contains revisions %s' % (branch_dir, + merged_revs & revs)) + if phantom_revs: + report('memorizing phantom revision(s): %s' % phantom_revs) + if reflected_revs: + report('memorizing reflected revision(s): %s' % reflected_revs) + if blocked_revs & revs: + report('skipping blocked revisions(s): %s' % (blocked_revs & revs)) + if initialized_revs: + report('skipping initialized revision(s): %s' % initialized_revs) + + # Compute final merge set. + revs = revs - merged_revs - blocked_revs - reflected_revs - \ + phantom_revs - initialized_revs + if not revs: + report('no revisions to merge, exiting') + return + + # When manually marking revisions as merged, we only update the + # integration meta data, and don't perform an actual merge. + record_only = opts["record-only"] + + if record_only: + report('recording merge of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('merging in revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the merge(s). Note: the starting revision number to 'svn merge' + # is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + old_block_props = get_block_props(branch_dir) + merge_metadata = logs[opts["source-url"]].merge_metadata() + block_metadata = logs[opts["source-url"]].block_metadata() + for start,end in minimal_merge_intervals(revs, phantom_revs): + if not record_only: + # Preset merge/blocked properties to the source value at + # the start rev to avoid spurious property conflicts + set_merge_props(branch_dir, merge_metadata.get(start - 1)) + set_block_props(branch_dir, block_metadata.get(start - 1)) + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (start - 1, end, opts["source-url"], branch_dir)) + # TODO: to support graph merging, add logic to merge the property + # meta-data manually + + # Update the set of merged revisions. + merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + # Reset the blocked revs + set_block_props(branch_dir, old_block_props) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded merge of revisions %s via %s from ' % \ + (revs, NAME) + else: + print >>f, 'Merged revisions %s via %s from ' % \ + (revs, NAME) + print >>f, '%s' % opts["source-url"] + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], revs), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_block(branch_dir, branch_props): + """Block revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + source_revs, phantom_revs, reflected_revs, initialized_revs = \ + analyze_source_revs(branch_dir, opts["source-url"]) + revs_to_block = source_revs - opts["merged-revs"] + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_block = RevisionSet(opts["revision"]) & revs_to_block + + if not revs_to_block: + error('no available revisions to block') + + # Change blocked information + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + blocked_revs = blocked_revs | revs_to_block + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_block), + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_unblock(branch_dir, branch_props): + """Unblock revisions.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"]) + revs_to_unblock = blocked_revs + + # Limit to revisions specified by -r (if any) + if opts["revision"]: + revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"]) + + if not revs_to_unblock: + error('no available revisions to unblock') + + # Change blocked information + blocked_revs = blocked_revs - revs_to_unblock + set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME) + if opts["commit-verbose"]: + print >>f + print >>f, construct_merged_log_message(opts["source-url"], + revs_to_unblock), + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +def action_rollback(branch_dir, branch_props): + """Rollback previously integrated revisions.""" + + # Make sure the revision arguments are present + if not opts["revision"]: + error("The '-r' option is mandatory for rollback") + + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + # Get the list of all revisions already merged into this source-pathid. + merged_revs = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # At which revision was the src created? + oldest_src_rev = get_created_rev(opts["source-url"]) + src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev) + + # Limit to revisions specified by -r (if any) + revs = merged_revs & RevisionSet(opts["revision"]) + + # make sure there's some revision to rollback + if not revs: + report("Nothing to rollback in revision range r%s" % opts["revision"]) + return + + # If even one specified revision lies outside the lifetime of the + # merge source, error out. + if revs & src_pre_exist_range: + err_str = "Specified revision range falls out of the rollback range.\n" + err_str += "%s was created at r%d" % (opts["source-pathid"], + oldest_src_rev) + error(err_str) + + record_only = opts["record-only"] + + if record_only: + report('recording rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + else: + report('rollback of revision(s) %s from "%s"' % + (revs, opts["source-url"])) + + # Do the reverse merge(s). Note: the starting revision number + # to 'svn merge' is NOT inclusive so we have to subtract one from start. + # We try to keep the number of merge operations as low as possible, + # because it is faster and reduces the number of conflicts. + rollback_intervals = minimal_merge_intervals(revs, []) + # rollback in the reverse order of merge + rollback_intervals.reverse() + for start, end in rollback_intervals: + if not record_only: + # Do the merge + svn_command("merge --force -r %d:%d %s %s" % \ + (end, start - 1, opts["source-url"], branch_dir)) + + # Write out commit message if desired + # calculate the phantom revs first + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + if record_only: + print >>f, 'Recorded rollback of revisions %s via %s from ' % \ + (revs , NAME) + else: + print >>f, 'Rolled back revisions %s via %s from ' % \ + (revs , NAME) + print >>f, '%s' % opts["source-url"] + + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + + # Update the set of merged revisions. + merged_revs = merged_revs - revs + branch_props[opts["source-pathid"]] = str(merged_revs) + set_merge_props(branch_dir, branch_props) + +def action_uninit(branch_dir, branch_props): + """Uninit SOURCE URL.""" + # Check branch directory is ready for being modified + check_dir_clean(branch_dir) + + # If the source-pathid does not have an entry in the svnmerge-integrated + # property, simply error out. + if not branch_props.has_key(opts["source-pathid"]): + error('Repository-relative path "%s" does not contain merge ' + 'tracking information for "%s"' \ + % (opts["source-pathid"], branch_dir)) + + del branch_props[opts["source-pathid"]] + + # Set merge property with the selected source deleted + set_merge_props(branch_dir, branch_props) + + # Set blocked revisions for the selected source to None + set_blocked_revs(branch_dir, opts["source-pathid"], None) + + # Write out commit message if desired + if opts["commit-file"]: + f = open(opts["commit-file"], "w") + print >>f, 'Removed merge tracking for "%s" for ' % NAME + print >>f, '%s' % opts["source-url"] + f.close() + report('wrote commit message to "%s"' % opts["commit-file"]) + +############################################################################### +# Command line parsing -- options and commands management +############################################################################### + +class OptBase: + def __init__(self, *args, **kwargs): + self.help = kwargs["help"] + del kwargs["help"] + self.lflags = [] + self.sflags = [] + for a in args: + if a.startswith("--"): self.lflags.append(a) + elif a.startswith("-"): self.sflags.append(a) + else: + raise TypeError, "invalid flag name: %s" % a + if kwargs.has_key("dest"): + self.dest = kwargs["dest"] + del kwargs["dest"] + else: + if not self.lflags: + raise TypeError, "cannot deduce dest name without long options" + self.dest = self.lflags[0][2:] + if kwargs: + raise TypeError, "invalid keyword arguments: %r" % kwargs.keys() + def repr_flags(self): + f = self.sflags + self.lflags + r = f[0] + for fl in f[1:]: + r += " [%s]" % fl + return r + +class Option(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs.setdefault("default", 0) + del kwargs["default"] + self.value = kwargs.setdefault("value", None) + del kwargs["value"] + OptBase.__init__(self, *args, **kwargs) + def apply(self, state, value): + assert value == "" + if self.value is not None: + state[self.dest] = self.value + else: + state[self.dest] += 1 + +class OptionArg(OptBase): + def __init__(self, *args, **kwargs): + self.default = kwargs["default"] + del kwargs["default"] + self.metavar = kwargs.setdefault("metavar", None) + del kwargs["metavar"] + OptBase.__init__(self, *args, **kwargs) + + if self.metavar is None: + if self.dest is not None: + self.metavar = self.dest.upper() + else: + self.metavar = "arg" + if self.default: + self.help += " (default: %s)" % self.default + def apply(self, state, value): + assert value is not None + state[self.dest] = value + def repr_flags(self): + r = OptBase.repr_flags(self) + return r + " " + self.metavar + +class CommandOpts: + class Cmd: + def __init__(self, *args): + self.name, self.func, self.usage, self.help, self.opts = args + def short_help(self): + return self.help.split(".")[0] + def __str__(self): + return self.name + def __call__(self, *args, **kwargs): + return self.func(*args, **kwargs) + + def __init__(self, global_opts, common_opts, command_table, version=None): + self.progname = NAME + self.version = version.replace("%prog", self.progname) + self.cwidth = console_width() - 2 + self.ctable = command_table.copy() + self.gopts = global_opts[:] + self.copts = common_opts[:] + self._add_builtins() + for k in self.ctable.keys(): + cmd = self.Cmd(k, *self.ctable[k]) + opts = [] + for o in cmd.opts: + if isinstance(o, types.StringType) or \ + isinstance(o, types.UnicodeType): + o = self._find_common(o) + opts.append(o) + cmd.opts = opts + self.ctable[k] = cmd + + def _add_builtins(self): + self.gopts.append( + Option("-h", "--help", help="show help for this command and exit")) + if self.version is not None: + self.gopts.append( + Option("-V", "--version", help="show version info and exit")) + self.ctable["help"] = (self._cmd_help, + "help [COMMAND]", + "Display help for a specific command. If COMMAND is omitted, " + "display brief command description.", + []) + + def _cmd_help(self, cmd=None, *args): + if args: + self.error("wrong number of arguments", "help") + if cmd is not None: + cmd = self._command(cmd) + self.print_command_help(cmd) + else: + self.print_command_list() + + def _paragraph(self, text, width=78): + chunks = re.split("\s+", text.strip()) + chunks.reverse() + lines = [] + while chunks: + L = chunks.pop() + while chunks and len(L) + len(chunks[-1]) + 1 <= width: + L += " " + chunks.pop() + lines.append(L) + return lines + + def _paragraphs(self, text, *args, **kwargs): + pars = text.split("\n\n") + lines = self._paragraph(pars[0], *args, **kwargs) + for p in pars[1:]: + lines.append("") + lines.extend(self._paragraph(p, *args, **kwargs)) + return lines + + def _print_wrapped(self, text, indent=0): + text = self._paragraphs(text, self.cwidth - indent) + print text.pop(0) + for t in text: + print " " * indent + t + + def _find_common(self, fl): + for o in self.copts: + if fl in o.lflags+o.sflags: + return o + assert False, fl + + def _compute_flags(self, opts, check_conflicts=True): + back = {} + sfl = "" + lfl = [] + for o in opts: + sapp = lapp = "" + if isinstance(o, OptionArg): + sapp, lapp = ":", "=" + for s in o.sflags: + if check_conflicts and back.has_key(s): + raise RuntimeError, "option conflict: %s" % s + back[s] = o + sfl += s[1:] + sapp + for l in o.lflags: + if check_conflicts and back.has_key(l): + raise RuntimeError, "option conflict: %s" % l + back[l] = o + lfl.append(l[2:] + lapp) + return sfl, lfl, back + + def _extract_command(self, args): + """ + Try to extract the command name from the argument list. This is + non-trivial because we want to allow command-specific options even + before the command itself. + """ + opts = self.gopts[:] + for cmd in self.ctable.values(): + opts.extend(cmd.opts) + sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False) + + lopts,largs = getopt.getopt(args, sfl, lfl) + if not largs: + return None + return self._command(largs[0]) + + def _fancy_getopt(self, args, opts, state=None): + if state is None: + state= {} + for o in opts: + if not state.has_key(o.dest): + state[o.dest] = o.default + + sfl, lfl, back = self._compute_flags(opts) + try: + lopts,args = getopt.gnu_getopt(args, sfl, lfl) + except AttributeError: + # Before Python 2.3, there was no gnu_getopt support. + # So we can't parse intermixed positional arguments + # and options. + lopts,args = getopt.getopt(args, sfl, lfl) + + for o,v in lopts: + back[o].apply(state, v) + return state, args + + def _command(self, cmd): + if not self.ctable.has_key(cmd): + self.error("unknown command: '%s'" % cmd) + return self.ctable[cmd] + + def parse(self, args): + if not args: + self.print_small_help() + sys.exit(0) + + cmd = None + try: + cmd = self._extract_command(args) + opts = self.gopts[:] + if cmd: + opts.extend(cmd.opts) + args.remove(cmd.name) + state, args = self._fancy_getopt(args, opts) + except getopt.GetoptError, e: + self.error(e, cmd) + + # Handle builtins + if self.version is not None and state["version"]: + self.print_version() + sys.exit(0) + if state["help"]: # special case for --help + if cmd: + self.print_command_help(cmd) + sys.exit(0) + cmd = self.ctable["help"] + else: + if cmd is None: + self.error("command argument required") + if str(cmd) == "help": + cmd(*args) + sys.exit(0) + return cmd, args, state + + def error(self, s, cmd=None): + print >>sys.stderr, "%s: %s" % (self.progname, s) + if cmd is not None: + self.print_command_help(cmd) + else: + self.print_small_help() + sys.exit(1) + def print_small_help(self): + print "Type '%s help' for usage" % self.progname + def print_usage_line(self): + print "usage: %s <subcommand> [options...] [args...]\n" % self.progname + def print_command_list(self): + print "Available commands (use '%s help COMMAND' for more details):\n" \ + % self.progname + cmds = self.ctable.keys() + cmds.sort() + indent = max(map(len, cmds)) + for c in cmds: + h = self.ctable[c].short_help() + print " %-*s " % (indent, c), + self._print_wrapped(h, indent+6) + def print_command_help(self, cmd): + cmd = self.ctable[str(cmd)] + print 'usage: %s %s\n' % (self.progname, cmd.usage) + self._print_wrapped(cmd.help) + def print_opts(opts, self=self): + if not opts: return + flags = [o.repr_flags() for o in opts] + indent = max(map(len, flags)) + for f,o in zip(flags, opts): + print " %-*s :" % (indent, f), + self._print_wrapped(o.help, indent+5) + print '\nCommand options:' + print_opts(cmd.opts) + print '\nGlobal options:' + print_opts(self.gopts) + + def print_version(self): + print self.version + +############################################################################### +# Options and Commands description +############################################################################### + +global_opts = [ + Option("-F", "--force", + help="force operation even if the working copy is not clean, or " + "there are pending updates"), + Option("-n", "--dry-run", + help="don't actually change anything, just pretend; " + "implies --show-changes"), + Option("-s", "--show-changes", + help="show subversion commands that make changes"), + Option("-v", "--verbose", + help="verbose mode: output more information about progress"), + OptionArg("-u", "--username", + default=None, + help="invoke subversion commands with the supplied username"), + OptionArg("-p", "--password", + default=None, + help="invoke subversion commands with the supplied password"), + OptionArg("-c", "--config-dir", metavar="DIR", + default=None, + help="cause subversion commands to consult runtime config directory DIR"), +] + +common_opts = [ + Option("-b", "--bidirectional", + value=True, + default=False, + help="remove reflected and initialized revisions from merge candidates. " + "Not required but may be specified to speed things up slightly"), + OptionArg("-f", "--commit-file", metavar="FILE", + default="svnmerge-commit-message.txt", + help="set the name of the file where the suggested log message " + "is written to"), + Option("-M", "--record-only", + value=True, + default=False, + help="do not perform an actual merge of the changes, yet record " + "that a merge happened"), + OptionArg("-r", "--revision", + metavar="REVLIST", + default="", + help="specify a revision list, consisting of revision numbers " + 'and ranges separated by commas, e.g., "534,537-539,540"'), + OptionArg("-S", "--source", "--head", + default=None, + help="specify a merge source for this branch. It can be either " + "a working directory path, a full URL, or an unambiguous " + "substring of one of the locations for which merge tracking was " + "already initialized. Needed only to disambiguate in case of " + "multiple merge sources"), +] + +command_table = { + "init": (action_init, + "init [OPTION...] [SOURCE]", + """Initialize merge tracking from SOURCE on the current working + directory. + + If SOURCE is specified, all the revisions in SOURCE are marked as already + merged; if this is not correct, you can use --revision to specify the + exact list of already-merged revisions. + + If SOURCE is omitted, then it is computed from the "svn cp" history of the + current working directory (searching back for the branch point); in this + case, %s assumes that no revision has been integrated yet since + the branch point (unless you teach it with --revision).""" % NAME, + [ + "-f", "-r", # import common opts + OptionArg("-L", "--location-type", + dest="location-type", + default="path", + help="Use this type of location identifier in the new " + + "Subversion properties; 'uuid', 'url', or 'path' " + + "(default)"), + ]), + + "avail": (action_avail, + "avail [OPTION...] [PATH]", + """Show unmerged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to those + also specified in the option. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions.""", + [ + Option("-A", "--all", + dest="avail-showwhat", + value=["blocked", "avail"], + default=["avail"], + help="show both available and blocked revisions (aka ignore " + "blocked revisions)"), + "-b", + Option("-B", "--blocked", + dest="avail-showwhat", + value=["blocked"], + help="show the blocked revision list (see '%s block')" % NAME), + Option("-d", "--diff", + dest="avail-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("--summarize", + dest="avail-display", + value="summarize", + help="show summarized diff instead of revision list"), + Option("-l", "--log", + dest="avail-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "integrated": (action_integrated, + "integrated [OPTION...] [PATH]", + """Show merged revisions available for PATH as a revision list. + If --revision is given, the revisions shown will be limited to + those also specified in the option.""", + [ + Option("-d", "--diff", + dest="integrated-display", + value="diffs", + default="revisions", + help="show corresponding diff instead of revision list"), + Option("-l", "--log", + dest="integrated-display", + value="logs", + help="show corresponding log history instead of revision list"), + "-r", + "-S", + ]), + + "rollback": (action_rollback, + "rollback [OPTION...] [PATH]", + """Rollback previously merged in revisions from PATH. The + --revision option is mandatory, and specifies which revisions + will be rolled back. Only the previously integrated merges + will be rolled back. + + When manually rolling back changes, --record-only can be used to + instruct %s that a manual rollback of a certain revision + already happened, so that it can record it and offer that + revision for merge henceforth.""" % (NAME), + [ + "-f", "-r", "-S", "-M", # import common opts + ]), + + "merge": (action_merge, + "merge [OPTION...] [PATH]", + """Merge in revisions into PATH from its source. If --revision is omitted, + all the available revisions will be merged. In any case, already merged-in + revisions will NOT be merged again. + + When svnmerge is used to bidirectionally merge changes between a + branch and its source, it is necessary to not merge the same changes + forth and back: e.g., if you committed a merge of a certain + revision of the branch into the source, you do not want that commit + to appear as available to merged into the branch (as the code + originated in the branch itself!). svnmerge will automatically + exclude these so-called "reflected" revisions. + + When manually merging changes across branches, --record-only can + be used to instruct %s that a manual merge of a certain revision + already happened, so that it can record it and not offer that + revision for merge anymore. Conversely, when there are revisions + which should not be merged, use '%s block'.""" % (NAME, NAME), + [ + "-b", "-f", "-r", "-S", "-M", # import common opts + ]), + + "block": (action_block, + "block [OPTION...] [PATH]", + """Block revisions within PATH so that they disappear from the available + list. This is useful to hide revisions which will not be integrated. + If --revision is omitted, it defaults to all the available revisions. + + Do not use this option to hide revisions that were manually merged + into the branch. Instead, use '%s merge --record-only', which + records that a merge happened (as opposed to a merge which should + not happen).""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "unblock": (action_unblock, + "unblock [OPTION...] [PATH]", + """Revert the effect of '%s block'. If --revision is omitted, all the + blocked revisions are unblocked""" % NAME, + [ + "-f", "-r", "-S", # import common opts + ]), + + "uninit": (action_uninit, + "uninit [OPTION...] [PATH]", + """Remove merge tracking information from PATH. It cleans any kind of merge + tracking information (including the list of blocked revisions). If there + are multiple sources, use --source to indicate which source you want to + forget about.""", + [ + "-f", "-S", # import common opts + ]), +} + + +def main(args): + global opts + + # Initialize default options + opts = default_opts.copy() + logs.clear() + + optsparser = CommandOpts(global_opts, common_opts, command_table, + version="%%prog r%s\n modified: %s\n\n" + "Copyright (C) 2004,2005 Awarix Inc.\n" + "Copyright (C) 2005, Giovanni Bajo" + % (__revision__, __date__)) + + cmd, args, state = optsparser.parse(args) + opts.update(state) + + source = opts.get("source", None) + branch_dir = "." + + if str(cmd) == "init": + if len(args) == 1: + source = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + elif str(cmd) in command_table.keys(): + if len(args) == 1: + branch_dir = args[0] + elif len(args) > 1: + optsparser.error("wrong number of parameters", cmd) + else: + assert False, "command not handled: %s" % cmd + + # Validate branch_dir + if not is_wc(branch_dir): + if str(cmd) == "avail": + info = None + # it should be noted here that svn info does not error exit + # if an invalid target is specified to it (as is + # intuitive). so the try, except code is not absolutely + # necessary. but, I retain it to indicate the intuitive + # handling. + try: + info = get_svninfo(branch_dir) + except LaunchError: + pass + # test that we definitely targeted a subversion directory, + # mirroring the purpose of the earlier is_wc() call + if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory": + error('"%s" is neither a valid URL, nor a working directory' % branch_dir) + else: + error('"%s" is not a subversion working directory' % branch_dir) + + # give out some hints as to potential pathids + PathIdentifier.hint(branch_dir) + if source: PathIdentifier.hint(source) + + # Extract the integration info for the branch_dir + branch_props = get_merge_props(branch_dir) + + # Calculate source_url and source_path + report("calculate source path for the branch") + if not source: + if str(cmd) == "init": + cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir) + if not cf_source: + error('no copyfrom info available. ' + 'Explicit source argument (-S/--source) required.') + opts["source-url"] = get_repo_root(branch_dir) + cf_source + opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"]) + + if not opts["revision"]: + opts["revision"] = "1-" + cf_rev + else: + opts["source-pathid"] = get_default_source(branch_dir, branch_props) + opts["source-url"] = opts["source-pathid"].get_url() + + assert is_pathid(opts["source-pathid"]) + assert is_url(opts["source-url"]) + else: + # The source was given as a command line argument and is stored in + # SOURCE. Ensure that the specified source does not end in a /, + # otherwise it's easy to have the same source path listed more + # than once in the integrated version properties, with and without + # trailing /'s. + source = rstrip(source, "/") + if not is_wc(source) and not is_url(source): + # Check if it is a substring of a pathid recorded + # within the branch properties. + found = [] + for pathid in branch_props.keys(): + if pathid.match_substring(source): + found.append(pathid) + if len(found) == 1: + # (assumes pathid is a repository-relative-path) + source_pathid = found[0] + source = source_pathid.get_url() + else: + error('"%s" is neither a valid URL, nor an unambiguous ' + 'substring of a repository path, nor a working directory' + % source) + else: + source_pathid = PathIdentifier.from_target(source) + + source_pathid = PathIdentifier.from_target(source) + if str(cmd) == "init" and \ + source_pathid == PathIdentifier.from_target("."): + error("cannot init integration source path '%s'\n" + "Its repository-relative path must differ from the " + "repository-relative path of the current directory." + % source_pathid) + opts["source-pathid"] = source_pathid + opts["source-url"] = target_to_url(source) + + # Sanity check source_url + assert is_url(opts["source-url"]) + # SVN does not support non-normalized URL (and we should not + # have created them) + assert opts["source-url"].find("/..") < 0 + + report('source is "%s"' % opts["source-url"]) + + # Get previously merged revisions (except when command is init) + if str(cmd) != "init": + opts["merged-revs"] = merge_props_to_revision_set(branch_props, + opts["source-pathid"]) + + # Perform the action + cmd(branch_dir, branch_props) + + +if __name__ == "__main__": + try: + main(sys.argv[1:]) + except LaunchError, (ret, cmd, out): + err_msg = "command execution failed (exit code: %d)\n" % ret + err_msg += cmd + "\n" + err_msg += "".join(out) + error(err_msg) + except KeyboardInterrupt: + # Avoid traceback on CTRL+C + print "aborted by user" + sys.exit(1) diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve new file mode 100755 index 000000000..670fee742 --- /dev/null +++ b/testing/subversion/svnserve @@ -0,0 +1,42 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/svnserve + +PID=`pidof -o %PPID /usr/bin/svnserve` +case "$1" in + start) + stat_busy "Starting svnserve" + if [ -z "$PID" ]; then + if [ -n "$SVNSERVE_USER" ]; then + su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" & + else + /usr/bin/svnserve -d $SVNSERVE_ARGS & + fi + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon svnserve + stat_done + fi + ;; + stop) + stat_busy "Stopping svnserve" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon svnserve + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf new file mode 100644 index 000000000..37fb7ea10 --- /dev/null +++ b/testing/subversion/svnserve.conf @@ -0,0 +1,7 @@ +# +# Parameters to be passed to svnserve +# +#SVNSERVE_ARGS="-r /path/to/some/repos" +SVNSERVE_ARGS="" + +#SVNSERVE_USER="svn" diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD deleted file mode 100644 index e33cf34e2..000000000 --- a/testing/sushi/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140633 2011-10-17 15:35:16Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=sushi -pkgver=0.2.1 -pkgrel=1 -pkgdesc="A quick previewer for Nautilus" -arch=(i686 x86_64) -url="http://www.gnome.org" -license=('GPL2') -groups=(gnome-extra) -depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince') -makedepends=('intltool' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib/sushi - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD new file mode 100644 index 000000000..595c4585b --- /dev/null +++ b/testing/syslog-ng/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 143455 2011-11-24 16:44:04Z dreisner $ +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Aaron Griffin <aaron@archlinux.org> + +pkgname=syslog-ng +pkgver=3.3.3 +pkgrel=1 +pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" +arch=('i686' 'x86_64') +license=('GPL2') +groups=('base') +url="http://www.balabit.com/network-security/syslog-ng/" +depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk') +makedepends=('flex' 'pkg-config') +optdepends=('logrotate: for rotating log files') +provides=('logger') +options=('!libtool') +backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \ + 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng') +source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz" + syslog-ng.conf + syslog-ng.logrotate + syslog-ng.rc) +sha1sums=('e2ec8ba4bde24809630a7675bf5d97f00be467f8' + '98074e0facfc6ef036202662cc86d04b38a2c142' + '949128fe3d7f77a7aab99048061f885bc758000c' + 'a6ad26912b5bcbe1b47b003309945d733613b98f') + +build() { + cd "$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/syslog-ng \ + --libexecdir=/usr/lib \ + --localstatedir=/var/lib/syslog-ng \ + --with-pidfile-dir=/run \ + --disable-spoof-source \ + --enable-systemd \ + --with-systemdsystemunitdir=/lib/systemd/system + + make +} + +package() { + make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install + + install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d" + install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf" + install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng" + install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng" +} diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf new file mode 100644 index 000000000..8f86eac2f --- /dev/null +++ b/testing/syslog-ng/syslog-ng.conf @@ -0,0 +1,92 @@ +@version: 3.3 +# +# /etc/syslog-ng/syslog-ng.conf +# + +options { + stats_freq (0); + flush_lines (0); + time_reopen (10); + log_fifo_size (10000); + chain_hostnames (off); + use_dns (no); + use_fqdn (no); + create_dirs (no); + keep_hostname (yes); + perm(0640); + group("log"); +}; + +source src { + unix-dgram("/dev/log"); + internal(); + file("/proc/kmsg"); +}; + +destination d_authlog { file("/var/log/auth.log"); }; +destination d_syslog { file("/var/log/syslog.log"); }; +destination d_cron { file("/var/log/crond.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kernel { file("/var/log/kernel.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_news { file("/var/log/news.log"); }; +destination d_ppp { file("/var/log/ppp.log"); }; +destination d_debug { file("/var/log/debug.log"); }; +destination d_messages { file("/var/log/messages.log"); }; +destination d_errors { file("/var/log/errors.log"); }; +destination d_everything { file("/var/log/everything.log"); }; +destination d_iptables { file("/var/log/iptables.log"); }; +destination d_acpid { file("/var/log/acpid.log"); }; +destination d_console { usertty("root"); }; + +# Log everything to tty12 +destination console_all { file("/dev/tty12"); }; + +filter f_auth { facility(auth); }; +filter f_authpriv { facility(auth, authpriv); }; +filter f_syslog { program(syslog-ng); }; +filter f_cron { facility(cron); }; +filter f_daemon { facility(daemon); }; +filter f_kernel { facility(kern) and not filter(f_iptables); }; +filter f_lpr { facility(lpr); }; +filter f_mail { facility(mail); }; +filter f_news { facility(news); }; +filter f_user { facility(user); }; +filter f_uucp { facility(uucp); }; +filter f_ppp { facility(local2); }; +filter f_debug { not facility(auth, authpriv, news, mail); }; +filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); }; +filter f_everything { level(debug..emerg) and not facility(auth, authpriv); }; +filter f_emergency { level(emerg); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_crit { level(crit); }; +filter f_err { level(err); }; +filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); }; +filter f_acpid { program("acpid"); }; + +log { source(src); filter(f_acpid); destination(d_acpid); }; +log { source(src); filter(f_authpriv); destination(d_authlog); }; +log { source(src); filter(f_syslog); destination(d_syslog); }; +log { source(src); filter(f_cron); destination(d_cron); }; +log { source(src); filter(f_daemon); destination(d_daemon); }; +log { source(src); filter(f_kernel); destination(d_kernel); }; +log { source(src); filter(f_lpr); destination(d_lpr); }; +log { source(src); filter(f_mail); destination(d_mail); }; +log { source(src); filter(f_news); destination(d_news); }; +log { source(src); filter(f_ppp); destination(d_ppp); }; +log { source(src); filter(f_user); destination(d_user); }; +log { source(src); filter(f_uucp); destination(d_uucp); }; +#log { source(src); filter(f_debug); destination(d_debug); }; +log { source(src); filter(f_messages); destination(d_messages); }; +log { source(src); filter(f_err); destination(d_errors); }; +log { source(src); filter(f_emergency); destination(d_console); }; +log { source(src); filter(f_everything); destination(d_everything); }; +log { source(src); filter(f_iptables); destination(d_iptables); }; + +# Log everything to tty12 +#log { source(src); destination(console_all); }; diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate new file mode 100644 index 000000000..3509f2970 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.logrotate @@ -0,0 +1,7 @@ +/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log { + missingok + sharedscripts + postrotate + /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true + endscript +} diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc new file mode 100755 index 000000000..516b03da3 --- /dev/null +++ b/testing/syslog-ng/syslog-ng.rc @@ -0,0 +1,66 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +checkconfig() { + if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then + stat_fail + exit 1 + fi +} + +pidfile=/run/syslog-ng.pid +if [[ -r $pidfile ]]; then + read -r PID < "$pidfile" + if [[ $PID && ! -d /proc/$PID ]]; then + # stale pidfile + unset PID + rm -f "$pidfile" + fi +fi + +case $1 in + start) + stat_busy "Starting Syslog-NG" + checkconfig + if [[ -z $PID ]] && /usr/sbin/syslog-ng; then + add_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + stop) + stat_busy "Stopping Syslog-NG" + if [[ $PID ]] && kill $PID &>/dev/null; then + rm_daemon syslog-ng + stat_done + else + stat_fail + exit 1 + fi + ;; + reload) + stat_busy "Reloading Syslog-NG configuration and re-opening log files" + if [[ -z $PID ]]; then + stat_fail + else + checkconfig + if kill -HUP $PID &>/dev/null; then + stat_done + else + stat_fail + exit 1 + fi + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart|reload}" +esac diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD deleted file mode 100644 index efeeb6fa0..000000000 --- a/testing/totem/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 140611 2011-10-17 13:04:37Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=totem -pkgname=('totem' 'totem-plugin') -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A GNOME3 integrated movie player based on Gstreamer." -url="http://www.gnome.org" -arch=('i686' 'x86_64') -license=('GPL2' 'custom') -depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' - 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' - 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst' - 'clutter-gtk' 'mx') -makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils' - 'libepc' 'bluez' 'vala' 'grilo') -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('e3af3281bde6666af4c7f9594b090087657b06c98e96212b11531269e2ee40a4') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/totem \ - --localstatedir=/var \ - --disable-static \ - --enable-python \ - --enable-nautilus - make -} - -package_totem() { - groups=('gnome-extra') - install=totem.install - optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'lirc-utils: Infrared Remote Control plugin' - 'libepc: Publish Playlist plugin' - 'libgdata: YouTube Browser plugin' - 'bluez: Bemused plugin' - 'grilo-plugins: Browse sidebar (remote media)' - 'pyxdg: opensubtitles plugin') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -r "${pkgdir}/usr/lib/mozilla" - rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer" - - sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ - $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py} - - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING" -} - -package_totem-plugin() { - pkgdesc="Totem plugin for web browsers" - depends=("totem=${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - make -C browser-plugin \ - plugindir=/usr/lib/mozilla/plugins \ - xptdir=/usr/lib/mozilla/plugins \ - DESTDIR="${pkgdir}" install - - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING" -} diff --git a/testing/totem/totem.install b/testing/totem/totem.install deleted file mode 100644 index 07cb42dcb..000000000 --- a/testing/totem/totem.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91) < 0 )); then - usr/sbin/gconfpkg --uninstall totem - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules deleted file mode 100644 index 6bdf4e249..000000000 --- a/testing/udev/81-arch.rules +++ /dev/null @@ -1,9 +0,0 @@ -# do not edit this file, it will be overwritten on update -# this file is going away in the near future - -# this might belong in <http://aur.archlinux.org/packages.php?ID=22698> -# see also /usr/src/*/Documentation/laptops/sonypi.txt -KERNEL=="sonypi", MODE="0666" - -# this might belong in <https://aur.archlinux.org/packages.php?ID=18393> -KERNEL=="legousbtower*", MODE="0666" diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index 00ee77d90..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,101 +0,0 @@ -# $Id: PKGBUILD 140824 2011-10-19 21:51:21Z tomegun $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Tom Gundersen <teg@jklm.no> - -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=174 -pkgrel=1 -arch=(i686 x86_64) -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -groups=('base') -options=(!makeflags !libtool) -makedepends=('gobject-introspection' 'gperf') -#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 -source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2 - 81-arch.rules) - -build() { - cd $srcdir/$pkgbase-$pkgver - - ./configure --sysconfdir=/etc\ - --with-rootlibdir=/lib\ - --libexecdir=/lib/udev\ - --sbindir=/sbin\ - --with-systemdsystemunitdir=/lib/systemd/system\ - --disable-rule-generator\ - --enable-udev_acl - - make -} - -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf) - conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') - replaces=('devfsd') - - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=${pkgdir} install - # Install our rule for permissions and symlinks - install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules - - # create framebuffer blacklist - mkdir -p $pkgdir/lib/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - - # /dev/loop0 is created for convenience, to autoload the module if necessary - # may be obsoleted by https://lkml.org/lkml/2011/7/30/111 - mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - - # udevd moved, symlink to make life easy for restarting udevd manually - ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - cd $srcdir/$pkgbase-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules - # create static devices in /lib/udev/devices/ - mkdir -p ${pkgdir}/lib/udev/devices/{pts,shm} - - mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 - mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 - mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 - mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 - - ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd - ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin - ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout - ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr - ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core - - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/net/tun - mkdir ${pkgdir}/lib/udev/devices/net - mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 - # /dev/fuse - mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 - # /dev/ppp - mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 -} -md5sums=('3b84706046a33d7a7e00491a1136804d' - '3da2bb9891592f9438a07bd641465531') diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index 2cc8caaa0..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,62 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" - if [ "$(vercmp $2 168)" -lt 0 ]; then - echo "Kernel 2.6.32 or newer is now required." - echo " --" - echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo " --" - echo "Arch specific cd symlinks are now no longer created." - echo " --" - echo "cd and net persistent rules will no longer be autogenerated," - echo "see <https://wiki.archlinux.org/index.php/Udev> for details." - echo " --" - echo "Errors are now logged (possibly to the console) by default." - echo " --" - fi - if [ "$(vercmp $2 171)" -lt 0 ]; then - echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" - echo "blacklisting in MODULES no longer works." - echo "See 'man modprobe.conf' for a replacement to blacklisting." - echo "To disable a module mod1 on the kernel command line, use" - echo "mod1.disable=1" - echo "or" - echo "modprobe.blacklist=mod1" - echo " --" - echo "The following modules are no longer unconditionally loaded:" - echo " pcspkr irtty-sir analog lp ppdev ide-generic" - echo "Add them to MODULES in rc.conf if you need them." - echo " --" - fi - if [ "$(vercmp $2 172)" -lt 0 ]; then - echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat." - echo " --" - echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" - echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" - echo "takes precedence." - echo " --" - echo "kbd and rtc devices are no longer world readable." - echo " --" - echo "rtc is no longer in the audio group and fb devices are no longer in" - echo "the video group, as permissions and ownership of fb devices are controlled" - echo "by X." - echo " --" - fi - echo "We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo "'scanner' and 'video' groups. Beware of any changes." - echo " --" - echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - echo " --" - echo "For security reasons, we no longer add devices to the 'storage' group. Use" - echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo "this functionality back." - echo " --" - echo "We no longer create the static nodes on install needed for an initrd-less and" - echo "devtmpfs-less boot, this only affects fresh installs." - echo "---------------" - fi -} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD deleted file mode 100644 index 189f5a3c2..000000000 --- a/testing/vinagre/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 140698 2011-10-18 08:19:26Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: lp76 <l.peduto@gmail.com> - -pkgname=vinagre -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A VNC Client for the GNOME Desktop" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnome.org/projects/vinagre/" -install=vinagre.install -depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') -optdepends=('openssh: SSH plugin' - 'rdesktop: RDP plugin') -makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') -groups=('gnome-extra') -options=('!emptydirs' '!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('077dc011d048e9ed7a683ed74dc027c5c7e47d0b95b99acb493bf99fff22369c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - #building with as-needed breaks rdp - #https://bugzilla.gnome.org/show_bug.cgi?id=653558 - export LDFLAGS="$LDFLAGS,--no-as-needed" - ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ - --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install deleted file mode 100644 index 68158ac80..000000000 --- a/testing/vinagre/vinagre.install +++ /dev/null @@ -1,20 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91-2) < 0 )); then - usr/sbin/gconfpkg --uninstall vinagre - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD deleted file mode 100644 index 29211ebf2..000000000 --- a/testing/vino/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 140702 2011-10-18 13:14:38Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=vino -pkgver=3.2.1 -pkgrel=1 -pkgdesc="a VNC server for the GNOME desktop" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') -makedepends=('intltool' 'networkmanager') -groups=('gnome-extra') -url="http://www.gnome.org" -options=(!emptydirs) -install=vino.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('b8c5a59914886b8676fb512da380114adb896264c46a36d3f123cf459ba799df') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vino \ - --localstatedir=/var \ - --enable-gnome-keyring \ - --enable-avahi \ - --disable-http-server - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/vino/vino.install b/testing/vino/vino.install deleted file mode 100644 index 469266843..000000000 --- a/testing/vino/vino.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall vino - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD deleted file mode 100644 index 01dbce661..000000000 --- a/testing/vte3/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 140602 2011-10-17 12:30:38Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgbase=vte3 -pkgname=(vte3 vte-common) -pkgver=0.30.1 -pkgrel=1 -pkgdesc="Virtual Terminal Emulator widget for use with GTK3" -arch=('i686' 'x86_64') -license=('LGPL') -options=('!libtool' '!emptydirs') -makedepends=('intltool' 'gobject-introspection' 'gtk3') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz) -sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64') - -build() { - cd "${srcdir}/vte-${pkgver}" - #warning: type-punning to incomplete type might break strict-aliasing rules - export CFLAGS="$CFLAGS -fno-strict-aliasing" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/vte \ - --localstatedir=/var --disable-static \ - --enable-introspection - make -} - -package_vte3(){ - depends=('gtk3' 'vte-common') - cd "${srcdir}/vte-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper -} - -package_vte-common() { - pkgdesc="Common files used by vte and vte3" - cd "${srcdir}/vte-${pkgver}" - - make -C gnome-pty-helper DESTDIR="${pkgdir}" install -} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD new file mode 100644 index 000000000..ecbe65fb5 --- /dev/null +++ b/testing/xf86-video-intel/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 142914 2011-11-18 08:37:24Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-intel +pkgver=2.17.0 +pkgrel=1 +pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/" +license=('custom') +depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') +conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') +options=('!libtool') +groups=('xorg-drivers' 'xorg') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('04ad9fa1f4c4e0a90f48752a709bf14700c864af') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr --enable-dri + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD deleted file mode 100644 index e916282d7..000000000 --- a/testing/yelp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 140645 2011-10-17 18:01:35Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=yelp -pkgver=3.2.1 -pkgrel=1 -pkgdesc="A help browser for GNOME" -arch=('i686' 'x86_64') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'gtk-doc') -groups=('gnome') -license=('GPL') -options=('!emptydirs' '!libtool') -url="http://www.gnome.org" -install=yelp.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install deleted file mode 100644 index f3bf19a93..000000000 --- a/testing/yelp/yelp.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall yelp - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD new file mode 100644 index 000000000..25b52721f --- /dev/null +++ b/testing/ypserv/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 143484 2011-11-24 17:03:26Z stephane $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=ypserv +pkgver=2.26 +pkgrel=2 +pkgdesc='Linux NIS Server' +arch=('i686' 'x86_64') +url='http://www.linux-nis.org/nis/ypserv/' +license=('GPL2') +depends=('gdbm' 'openslp') +backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets') +source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz" \ + 'yppasswd' + 'ypserv') +sha1sums=('0d7ab3f04ff7fa5f611e71ea0f3c188659602743' + '96192b628afe36709496e4801d016c4bff343f0e' + 'b625381bfa6cf62345377a7df30b8f45935206c5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup + install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf + install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets + install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv + install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd +} diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd new file mode 100755 index 000000000..c2b00b2ca --- /dev/null +++ b/testing/ypserv/yppasswd @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting NIS Password Daemon" + /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon yppasswd + stat_done + fi + ;; + stop) + stat_busy "Stopping NIS Password Daemon" + killall -q /usr/sbin/rpc.yppasswdd + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon yppasswd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/testing/ntp/ntpdate b/testing/ypserv/ypserv index 4f7c8375b..c36e6901b 100755 --- a/testing/ntp/ntpdate +++ b/testing/ypserv/ypserv @@ -2,30 +2,33 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/ntpd.conf case "$1" in start) - stat_busy "Starting NTP Client" - /usr/bin/ntpd -q $NTP_CLIENT_OPTION &> /dev/null + stat_busy "Starting NIS Server" + /usr/sbin/ypserv if [ $? -gt 0 ]; then stat_fail - exit 1 else - add_daemon ntpdate + add_daemon ypserv stat_done fi ;; stop) - stat_busy "Stopping NTP Client" - rm_daemon ntpdate - stat_done + stat_busy "Stopping NIS Server" + killall -q /usr/sbin/ypserv + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ypserv + stat_done + fi ;; restart) $0 stop + sleep 1 $0 start ;; *) echo "usage: $0 {start|stop|restart}" esac - diff --git a/testing/zsh/PKGBUILD b/testing/zsh/PKGBUILD new file mode 100644 index 000000000..35561cb90 --- /dev/null +++ b/testing/zsh/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 143486 2011-11-24 17:03:28Z stephane $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=zsh +pkgver=4.3.12 +pkgrel=3 +pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +depends=('pcre' 'libcap' 'gdbm') +install=zsh.install +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" 'modules.patch') +md5sums=('7a82c0bf0635e046ca4e9ec1bdef3811' + 'b367c1398b60242f7044a93a837227f9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # upstream patch to fix handling of compressed kernel modules + patch -p1 -i ${srcdir}/modules.patch + # FS#16360 + sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ + Doc/zsh.texi \ + Completion/Unix/Type/_services \ + Completion/Unix/Command/_init_d + ./configure --prefix=/usr \ + --bindir=/bin \ + --enable-etcdir=/etc/zsh \ + --enable-zshenv=/etc/zsh/zshenv \ + --enable-zlogin=/etc/zsh/zlogin \ + --enable-zlogout=/etc/zsh/zlogout \ + --enable-zprofile=/etc/profile \ + --enable-zshrc=/etc/zsh/zshrc \ + --enable-maildir-support \ + --with-term-lib='ncursesw' \ + --enable-multibyte \ + --enable-function-subdirs \ + --enable-fndir=/usr/share/zsh/functions \ + --enable-scriptdir=/usr/share/zsh/scripts \ + --with-tcsetpgrp \ + --enable-pcre \ + --enable-cap \ + --enable-zsh-secure-free + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + # This test wont work with the noatime mount option + rm Test/C02cond.ztst + HOME="${srcdir}" make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/zsh/modules.patch b/testing/zsh/modules.patch new file mode 100644 index 000000000..315d40b98 --- /dev/null +++ b/testing/zsh/modules.patch @@ -0,0 +1,11 @@ +--- a/Completion/Linux/Command/_modutils ++++ b/Completion/Linux/Command/_modutils +@@ -107,7 +107,7 @@ case "$state" in + ! _retrieve_cache modules-$kver; + then + # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough? +- modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) ) ++ modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) ) + _store_cache modules-$kver modules + fi + diff --git a/testing/zsh/zsh.install b/testing/zsh/zsh.install new file mode 100644 index 000000000..e2a53bea8 --- /dev/null +++ b/testing/zsh/zsh.install @@ -0,0 +1,11 @@ +post_install() { + grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i '/^\/bin\/zsh/d' etc/shells +} diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD new file mode 100644 index 000000000..c6297290a --- /dev/null +++ b/~brendan/guile/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Brendan Tildesley <brendan.tildesley@gmail.com> +pkgname=guile +pkgver=2.0.3 +pkgrel=1 +pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - portable Scheme implementation written in C." +url="http://www.gnu.org/software/guile/" +license=('GPL3' 'LGPL3') +arch=(i686 x86_64 mips64el) +depends=('gmp>=4.1' 'libtool' 'gettext' 'libunistring' 'gc' 'libffi') +builddepends=('pkgconfig') +install=guile.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('4fde55bbd612adda267420d86d8b395d49031809') +# I think .xz is only provided for latest release, so change to .gz if it vanishes + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --disable-static \ + --disable-error-on-warning + make LDFLAGS+="-lpthread" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +}
\ No newline at end of file diff --git a/multilib-testing/libtool-multilib/libtool.install b/~brendan/guile/guile.install index 424c8cb88..ed113ab8f 100644 --- a/multilib-testing/libtool-multilib/libtool.install +++ b/~brendan/guile/guile.install @@ -1,10 +1,11 @@ -infodir=/usr/share/info -filelist=(libtool.info libtool.info-1 libtool.info-2) +infodir=usr/share/info +filelist=(guile.info + r5rs.info) post_install() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + install-info $infodir/$file $infodir/dir 2> /dev/null done } @@ -15,7 +16,7 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + install-info --delete $infodir/$file $infodir/dir 2> /dev/null done } diff --git a/~brendan/libunistring/PKGBUILD b/~brendan/libunistring/PKGBUILD new file mode 100644 index 000000000..634195741 --- /dev/null +++ b/~brendan/libunistring/PKGBUILD @@ -0,0 +1,27 @@ +# Former Arch maintainer: Emmanuel 'guinness' Boudreault +# Current Arch maintainer: Patrick McCarty <pnorcks at gmail dot com> +# Parabola maintainer: Brendan Tildesley <brendan.tildesley@gmail.com> + +pkgname=libunistring +pkgver=0.9.3 +pkgrel=1 +pkgdesc="GNU library for manipulating Unicode strings and C strings." +url="http://www.gnu.org/software/libunistring/" +arch=('i686' 'x86_64') +license=('GPL3' 'LGPL3') +depends=('glibc') +install=${pkgname}.install +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('db8eca3b64163abadf8c40e5cecc261f') +sha256sums=('610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr || return 1 + make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install || return 1 +}
\ No newline at end of file diff --git a/core/ed/ed.install b/~brendan/libunistring/libunistring.install index 637807f96..58dd2ef8e 100644 --- a/core/ed/ed.install +++ b/~brendan/libunistring/libunistring.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(ed.info red.info) +infodir=usr/share/info +filelist=(libunistring.info) post_install() { [ -x usr/bin/install-info ] || return 0 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') diff --git a/~mtjm/h-client/PKGBUILD b/~mtjm/h-client/PKGBUILD index 81b0c0a92..a92c2eb6d 100644 --- a/~mtjm/h-client/PKGBUILD +++ b/~mtjm/h-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=h-client -_pkgver=0.0a0.dev-r26 +_pkgver=0.0a0.dev-r50 pkgver=${_pkgver/-/.} pkgrel=1 pkgdesc="A client for an h-source server (such as http://www.h-node.com)" @@ -12,10 +12,18 @@ depends=('python2' 'python2-distribute' 'python-pycurl' 'pygtk') options=(!emptydirs) # Official source is in SVN, this is made by "python2 setup.py sdist". source=("http://mtjm.eu/releases/hclient-${_pkgver}.tar.gz") -md5sums=('1dee91bbd4f5985b986e21953a05c477') +sha512sums=('fa9c494d32d900bf34d9af1a68e79abbffb29380fbc1812290130e4183b496c1c29f09da216ada7898d69c8ecda58621862507672193cc4fd14ce942dfb7c986') + +check() { + cd "$srcdir/hclient-${_pkgver}" + python2 setup.py test +} package() { cd "$srcdir/hclient-${_pkgver}" + # Remove tests, they aren't useful after installation. + rm -rf {,build/lib/}tests_hclient + rm -rf {,build/lib/}hclient.egg-info python2 setup.py install --root="$pkgdir/" --optimize=1 } diff --git a/~mtjm/thinkfan/PKGBUILD b/~mtjm/thinkfan/PKGBUILD new file mode 100644 index 000000000..9bb9a4793 --- /dev/null +++ b/~mtjm/thinkfan/PKGBUILD @@ -0,0 +1,36 @@ +# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu> +# From https://aur.archlinux.org/packages.php?ID=24359 +# Maintainer: nblock <nblock [/at\] archlinux DOT us> +# Contributor: Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> + +pkgname=thinkfan +pkgver=0.7.3 +pkgrel=1 +pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3') +source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz "thinkfan") +url="http://thinkfan.sourceforge.net/" +#backup=('etc/thinkfan.conf') +md5sums=('d1b0d7a05b37cce412ee227cf759a9f6' + '16fc3a83a1468e3ccaeba67e14ab2177') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + make + install -D -m755 ${pkgname} ${pkgdir}/usr/sbin/${pkgname} + install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname} + + # A better way would be to check it at install time. +# if ! [[ -f /proc/acpi/ibm/fan ]]; then +# echo "thinkpad_acpi procfs entries don't seem to exist." \ +# "You'll need to use the generic sysfs hwmon interface. Will use sysfs conf." + install -D -m644 thinkfan.conf.sysfs ${pkgdir}/etc/thinkfan.conf.sysfs +# else +# echo "This seems to be a Thinkpad. You should use the IBM" \ +# "interface. Will use thinkfan conf." + [ "${CARCH}" = "mips64el" ] || install -D -m644 thinkfan.conf.thinkpad ${pkgdir}/etc/thinkfan.conf.thinkpad +# fi +} + +# vim:set ts=2 sw=2 noet: diff --git a/~mtjm/thinkfan/thinkfan b/~mtjm/thinkfan/thinkfan new file mode 100644 index 000000000..d37c81424 --- /dev/null +++ b/~mtjm/thinkfan/thinkfan @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +test -f /usr/sbin/thinkfan || exit 0 + +case "$1" in + start) + stat_busy "Starting thinkfan" + /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon thinkfan + stat_done + fi + ;; + stop) + stat_busy "Stopping thinkfan" + PID=$(</var/run/thinkfan.pid) + kill $PID + rm -f /var/run/thinkfan.pid + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon thinkfan + stat_done + fi + ;; + restart) + stat_busy "Restarting thinkfan" + + PID=$(</var/run/thinkfan.pid) + kill $PID + rm -f /var/run/thinkfan.pid + if [ $? -gt 0 ]; then + stat_fail + rm_daemon thinkfan + else + /usr/sbin/thinkfan -- -q -s5 >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + rm_daemon thinkfan + else + stat_done + fi + fi + ;; + *) + echo "Usage: $0 {stop|start|restart}" + ;; +esac +exit 0 |
