diff options
698 files changed, 0 insertions, 49264 deletions
diff --git a/community-staging/cmus/PKGBUILD b/community-staging/cmus/PKGBUILD deleted file mode 100644 index 5e9ff3b19..000000000 --- a/community-staging/cmus/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 71033 2012-05-22 06:10:17Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=cmus -pkgver=2.4.3 -pkgrel=2 -pkgdesc="A very feature-rich ncurses-based music player" -arch=('i686' 'x86_64') -url="http://cmus.sourceforge.net/" -license=('GPL') -depends=('ncurses') -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' - 'libpulse: for PulseAudio output plugin support' - 'ffmpeg: for ffmpeg input plugin support' - 'libmodplug: for modplug input plugin support' - 'faad2: for input AAC plugin support' - 'libmad: for mp3 input plugin support' - 'libmpcdec: for musepack input plugin support' - 'wavpack: for wavpack input plugin support' - 'libvorbis: for vorbis input plugin support' - 'flac: for flac input plugin support' - 'libmp4v2: for mp4 input plugin support') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -sha1sums=('ba63a417b0df42fa9a4850dd8b922a95a426f7f5') - -build() { - cd "$srcdir/$pkgname-v$pkgver" - ./configure prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-v$pkgver" - make DESTDIR="$pkgdir" install - install -D -m 644 contrib/_cmus "$pkgdir/usr/share/zsh/site-functions/_cmus" -} diff --git a/community-staging/collectd/PKGBUILD b/community-staging/collectd/PKGBUILD deleted file mode 100644 index 38536f927..000000000 --- a/community-staging/collectd/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 71113 2012-05-24 13:38:17Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Gerhard Brauer <gerhard.brauer@web.de> - -pkgname=collectd -pkgver=5.1.0 -pkgrel=2 -pkgdesc='Daemon which collects system performance statistics periodically' -arch=('i686' 'x86_64') -url='http://collectd.org/' -license=('GPL') - -optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins' - 'libdbi: dbi plugin' - 'libesmtp: notify_email plugin' - 'libgcrypt: encryption and authentication for network plugin' - 'iptables: iptables plugin' - 'libmemcached: memcachec plugin' - 'libmysqlclient: mysql plugin' - 'iproute2: netlink plugin' - 'net-snmp: snmp plugin' - 'libnotify: notify_desktop plugin' - 'liboping: ping plugin' - 'libpcap: dns plugin' - 'perl: perl plugin' - 'postgresql-libs: postgresql plugin' - 'python2: python plugin' - 'rrdtool: rrdtool and rrdcached plugins' - 'lm_sensors: lm_sensors and sensors plugins' - 'libvirt: libvirt plugin' - 'libxml2: ascent and libvirt plugins' - 'xmms: xmms plugin' - 'yajl: curl_json plugin') - -makedepends=('curl' 'libdbi' 'libesmtp' 'libgcrypt' 'iptables' 'libmemcached' - 'libmysqlclient' 'iproute2' 'net-snmp' 'libnotify' 'liboping' - 'libpcap' 'postgresql-libs' 'python2' 'rrdtool' 'lm_sensors' - 'libvirt' 'libxml2' 'xmms' 'yajl') - -depends=('libltdl') - -source=("${url}files/${pkgname}-${pkgver}.tar.gz" - 'rtnl_dump_filter.patch' - 'libperl.patch' - 'rc.d') -sha1sums=('55f17b17a10710641a9bf4e8c5332cef661cafcd' - 'c92b8dacff0a71f2cc8645c2e350ff9bdc1cbd5f' - '245c098d121a4a05594553583310953b3a2f6461' - '0f441718d5519cb043b1130e5a1d0379078adbcc') - -backup=('etc/collectd.conf') -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i ../rtnl_dump_filter.patch - patch -p1 -i ../libperl.patch - autoconf - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --with-python=/usr/bin/python2 - - make all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl -} diff --git a/community-staging/collectd/install b/community-staging/collectd/install deleted file mode 100644 index 54cc0e1b3..000000000 --- a/community-staging/collectd/install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - cat <<EOF -==> Customize your /etc/collectd.conf (you really want to). -==> Then start and stop the daemon using: /etc/rc.d/collectd -==> To see some result of collected data, use the Perl script: -==> /usr/share/collectd/collectd2html.pl -EOF -} diff --git a/community-staging/collectd/libperl.patch b/community-staging/collectd/libperl.patch deleted file mode 100644 index baa9c5397..000000000 --- a/community-staging/collectd/libperl.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -aur old/configure.in new/configure.in ---- old/configure.in 2011-09-29 20:38:56.725672831 +1000 -+++ new/configure.in 2011-09-29 20:39:07.975658829 +1000 -@@ -2810,11 +2810,13 @@ - then - SAVE_CFLAGS="$CFLAGS" - SAVE_LDFLAGS="$LDFLAGS" -+ SAVE_LIBS="$LIBS" - dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string) - PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts` - PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts` - CFLAGS="$CFLAGS $PERL_CFLAGS" - LDFLAGS="$LDFLAGS $PERL_LDFLAGS" -+ LIBS="$LIBS -L/usr/lib/perl5/core_perl/CORE -lperl $PERL_LDFLAGS" - - AC_CACHE_CHECK([for libperl], - [c_cv_have_libperl], -@@ -2833,7 +2835,10 @@ - Nullsv); - ]]), - [c_cv_have_libperl="yes"], -- [c_cv_have_libperl="no"] -+ [ -+ c_cv_have_libperl="no" -+ LIBS="$SAVE_LIBS" -+ ] - ) - ) - diff --git a/community-staging/collectd/rc.d b/community-staging/collectd/rc.d deleted file mode 100644 index 442f2324a..000000000 --- a/community-staging/collectd/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -name=collectd -prog="/usr/sbin/collectdmon" - -PID=$(pidof -o %PPID $prog) - -case "$1" in -start) - stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && $prog \ - && { add_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -stop) - stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon $name; stat_done; } \ - || { stat_fail; exit 1; } - ;; -restart) - $0 stop - sleep 2 - $0 start - ;; -reload) - stat_busy "Sending SIGHUP to $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ - && { stat_done; } \ - || { stat_fail; exit 1; } - ;; -*) - echo "usage: $0 {start|stop|restart|reload}" - exit 1 - ;; -esac diff --git a/community-staging/collectd/rtnl_dump_filter.patch b/community-staging/collectd/rtnl_dump_filter.patch deleted file mode 100644 index d5929a621..000000000 --- a/community-staging/collectd/rtnl_dump_filter.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/src/netlink.c new/src/netlink.c ---- old/src/netlink.c 2012-01-22 22:10:04.000000000 +1100 -+++ new/src/netlink.c 2012-02-01 17:22:54.362752065 +1100 -@@ -570,8 +570,7 @@ - return (-1); - } - -- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - return (-1); -@@ -608,8 +607,7 @@ - continue; - } - -- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - continue; diff --git a/community-staging/courier-mta/PKGBUILD b/community-staging/courier-mta/PKGBUILD deleted file mode 100644 index 792b3de7a..000000000 --- a/community-staging/courier-mta/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 71214 2012-05-25 05:02:06Z svenstaro $ -# 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.68.0 -pkgrel=2 -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' 'pam' '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=('5bd56150ed7c75cc8378c443742c632e' - '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 - - LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth" - echo $LDFLAGS - # 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 deleted file mode 100644 index 5856a5cda..000000000 --- a/community-staging/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# 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 deleted file mode 100644 index b0d827e43..000000000 --- a/community-staging/courier-mta/courier-mta.install +++ /dev/null @@ -1,61 +0,0 @@ -# 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, imapd-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 deleted file mode 100644 index 416946a5a..000000000 --- a/community-staging/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/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 deleted file mode 100644 index 6c541321e..000000000 --- a/community-staging/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/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 deleted file mode 100644 index 7c581a24a..000000000 --- a/community-staging/courier-mta/courier.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 31458aca8..000000000 --- a/community-staging/courier-mta/esmtpd-msa.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 2a13be03f..000000000 --- a/community-staging/courier-mta/esmtpd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index dbaa9d680..000000000 --- a/community-staging/courier-mta/esmtpd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 3dc74cfdf..000000000 --- a/community-staging/courier-mta/imapd-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 8bce59f6c..000000000 --- a/community-staging/courier-mta/imapd.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 6e7ae4e12..000000000 --- a/community-staging/courier-mta/pop3d-ssl.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 25f8379ba..000000000 --- a/community-staging/courier-mta/pop3d.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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 deleted file mode 100644 index 835cc2bf0..000000000 --- a/community-staging/courier-mta/webmaild.rc.d +++ /dev/null @@ -1,45 +0,0 @@ -#!/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/ekg2/PKGBUILD b/community-staging/ekg2/PKGBUILD deleted file mode 100644 index a73592ddc..000000000 --- a/community-staging/ekg2/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 71286 2012-05-26 08:42:25Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Mateusz Herych <heniekk@gmail.com> - -pkgname=ekg2 -pkgver=0.3.1 -pkgrel=4 -pkgdesc="ncurses based Jabber, Gadu-Gadu, Tlen and IRC client" -arch=('i686' 'x86_64') -url="http://ekg2.org/" -license=('GPL') -depends=('aspell' 'libjpeg' 'python2' 'libgadu' 'gnutls' 'gpm' 'libidn' 'giflib') -optdepends=('xosd: xosd support' - 'sqlite: sqlite support' - 'gtk2: gtk support') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('68fc05b432c34622df6561eaabef5a40') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's|ncursesw/ncurses.h|ncurses.h|g' configure plugins/ncurses/ecurses.h - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-libgadu \ - --with-xosd \ - --enable-unicode \ - --enable-shared \ - --without-gpg - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/perl5/core_perl/perllocal.pod - mv "$pkgdir"/usr/libexec/ioctld "$pkgdir"/usr/lib/ekg2/ioctld - rm -rf "$pkgdir"/usr/libexec - chmod -R 755 "$pkgdir"/usr/lib/perl5 -} diff --git a/community-staging/flightgear/PKGBUILD b/community-staging/flightgear/PKGBUILD deleted file mode 100644 index 04e3247af..000000000 --- a/community-staging/flightgear/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 71245 2012-05-26 03:39:52Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: William Rea <sillywilly@gmail.com> -# Contributor: Hans Janssen <hans@janserv.xs4all.nl> - -pkgname=flightgear -pkgver=2.6.0 -pkgrel=5 -pkgdesc="An open-source, multi-platform flight simulator" -arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') -makedepends=('boost' 'cmake') -license=("GPL") -url="http://www.flightgear.org" -options=('!makeflags') -#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") -#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") -source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('943f784f55c7e11ddce6082d2d1dbba4') - -build() { - cd $srcdir/flightgear-$pkgver - sed -i '1,1i#include <unistd.h>' utils/TerraSync/terrasync.cxx - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . - make - sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop -} - -package() { - depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data') - cd $srcdir/flightgear-$pkgver - make DESTDIR=$pkgdir install - install -Dm0644 package/flightgear.desktop $pkgdir//usr/share/applications/flightgear.desktop - install -Dm0644 package/RedHat/flightgear.48.png $pkgdir/usr/share/icons/flightgear.png - ln -sf flightgear $pkgdir/usr/share/FlightGear -} diff --git a/community-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD deleted file mode 100644 index 3ee72720d..000000000 --- a/community-staging/freeradius/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 71182 2012-05-24 15:20:26Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jason R Begley (jayray@digitalgoat.com> - -pkgname=freeradius -pkgver=2.1.12 -pkgrel=6 -pkgdesc="The premier open source RADIUS server" -arch=('i686' 'x86_64') -url="http://www.freeradius.org/" -license=('GPL') -depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmysqlclient') -makedepends=('libpcap' 'unixodbc' 'python2') -optdepends=('libpcap' 'unixodbc' 'python2') -options=('!libtool' '!makeflags') -install=$pkgname.install -source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig} - radiusd - krb5-build-fix.patch) -md5sums=('862d3a2c11011e61890ba84fa636ed8c' - '8759569d36b9f353c281e24875b556be' - '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 deleted file mode 100644 index c3b9f9415..000000000 --- a/community-staging/freeradius/freeradius.install +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 11dae7090..000000000 --- a/community-staging/freeradius/krb5-build-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index bf872b6f2..000000000 --- a/community-staging/freeradius/radiusd +++ /dev/null @@ -1,43 +0,0 @@ -#!/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/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD deleted file mode 100644 index 5e5575015..000000000 --- a/community-staging/gambas2/PKGBUILD +++ /dev/null @@ -1,954 +0,0 @@ -# $Id: PKGBUILD 70704 2012-05-15 09:13:45Z lcarlier $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Biru Ionut <ionut@archlinux.ro> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Toni Foerster <stonerl@skeps.de> - -pkgbase="gambas2" -pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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.24.0 -pkgrel=1 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' - 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') -license=('GPL2') -options=('!emptydirs' '!makeflags') -groups=('gambas2') -replaces=('gambas2') -conflicts=('gambas2') -source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' - 'gambas2-script.install' 'gambas2-runtime.install' - 'poppler-0.20.patch') -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') -_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" - -_buildgbcomp() { - cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install $1.gambas ${pkgdir}/usr/lib/gambas2/ - install .component ${pkgdir}/usr/lib/gambas2/$1.component - chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component - install .info ${pkgdir}/usr/share/gambas2/info/$1.info - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info - install .list ${pkgdir}/usr/share/gambas2/info/$1.list - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list - if test -d control; then - install -d ${pkgdir}/usr/share/gambas2/control/$1 - install control/*.png ${pkgdir}/usr/share/gambas2/control/$1 - chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png - fi -} - -build() { - cd "${srcdir}/$pkgbase-$pkgver" - - msg "Applying patches ..." - # workaround to allow package splitting - patch -Np1 -i ../fix-gbi-gba-path.patch - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np0 -i ../../poppler-0.20.patch - cd .. - - ./reconf-all - ## - - . /etc/profile.d/kde3.sh - . /etc/profile.d/qt3.sh - - ./configure -C --disable-qte --prefix=/usr - make bindir=${pkgdir}/usr/bin -} - -package_gambas2-meta() { - depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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') - pkgdesc="Gambas2 meta package" -} - -package_gambas2-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas2 runtime environment" - install=gambas2-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \ - ${pkgdir}/usr/lib/gambas2 - ln -s gbx2 ${pkgdir}/usr/bin/gbr2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ - ${pkgdir}/usr/share/gambas2/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas2/icons - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png -} - -package_gambas2-devel() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-ide() { - depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings' - 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel') - pkgdesc="Gambas2 Integrated Development Environment" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - _buildgbcomp gb.form.mdi - _buildgbcomp gb.settings - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/ - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin - install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin - ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ - ${pkgdir}/usr/share/applications/gambas2.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ - ${pkgdir}/usr/share/pixmaps/gambas2.png -} - -package_gambas2-examples() { - depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') - pkgdesc="Gambas2 examples" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas2/{help,info} -} - -package_gambas2-help() { - depends=() - pkgdesc="Gambas2 help files" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver}/help - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - #fix help - chown root:root -R ${pkgdir}/usr/share/gambas2/help/help -} - -package_gambas2-script() { - depends=('gambas2-devel') - pkgdesc="Gambas2 scripter and server programs support" - install=gambas2-script.install -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install -m755 gbs2.gambas ${pkgdir}/usr/bin - - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2 - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2 - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/ - ## -} - -package_gambas2-gb-chart() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 chart component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.chart - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-compress() { - depends=('gambas2-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas2 compression support component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-corba() { - depends=('gambas2-runtime' 'omniorb') - pkgdesc="Gambas2 corba component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-crypt() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 MD5/DES crypting component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-firebird() { - depends=('gambas2-gb-db' 'libfbclient') - pkgdesc="Gambas2 Firebird database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-form() { - depends=('gambas2-gb-db' 'gambas2-gb-form') - pkgdesc="Gambas2 database form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.db.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-db-mysql() { - depends=('gambas2-gb-db' 'libmysqlclient') - pkgdesc="Gambas2 MySQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-odbc() { - depends=('gambas2-gb-db' 'unixodbc') - pkgdesc="Gambas2 ODBC database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-postgresql() { - depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1') - pkgdesc="Gambas2 PostgreSQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') - pkgdesc="Gambas2 Sqlite2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite') - pkgdesc="Gambas2 Sqlite3 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-desktop() { - depends=('gambas2-runtime' 'libsm' 'libxtst') - pkgdesc="Gambas2 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form() { - depends=('gambas2-gb-gui') - pkgdesc="Gambas2 form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-dialog() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form dialog component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-mdi() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form MDI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.mdi - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk() { - depends=('gambas2-runtime' 'gtk2') - pkgdesc="Gambas2 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-ext() { - depends=('gambas2-gb-gtk') - pkgdesc="Gambas2 graphical GTK+ toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-svg() { - depends=('gambas2-gb-gtk' 'librsvg') - pkgdesc="Gambas2 graphical GTK+ toolkit svg component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-image() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 image processing component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-info() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 info component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.info - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-net() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-curl() { - depends=('gambas2-runtime' 'curl') - pkgdesc="Gambas2 advanced networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-smtp() { - depends=('gambas2-runtime' 'glib2') - pkgdesc="Gambas2 SMTP component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') - pkgdesc="Gambas2 OpenGL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-option() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 command-line options component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pcre() { - depends=('gambas2-runtime' 'pcre') - pkgdesc="Gambas2 PCRE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pdf() { - depends=('gambas2-runtime' 'poppler-glib') - pkgdesc="Gambas2 PDF component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-qt() { - depends=('gambas2-runtime' 'qt3') - pkgdesc="Gambas2 graphical QT toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-ext() { - depends=('gambas2-gb-qt') - pkgdesc="Gambas2 graphical QT toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-opengl() { - depends=('gambas2-gb-qt' 'libgl') - pkgdesc="Gambas2 graphical QT toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-kde() { - depends=('gambas2-gb-qt' 'kdelibs3') - pkgdesc="Gambas2 KDE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html* - rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html* -} - -package_gambas2-gb-qt-kde-html() { - depends=('gambas2-gb-qt-kde') - pkgdesc="Gambas2 KHTML component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-report() { - depends=('gambas2-runtime' 'gambas2-gb-form') - pkgdesc="Gambas2 report component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.report - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') - pkgdesc="Gambas2 SDL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-sdl-sound() { - depends=('gambas2-runtime' 'sdl_mixer') - pkgdesc="Gambas2 SDL sound component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-settings() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 settings management component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.settings - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-v4l() { - depends=('gambas2-runtime' 'libjpeg' 'libpng') - pkgdesc="Gambas2 V4L component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-vb() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 VB transitional component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-web() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 CGI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.web - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml() { - depends=('gambas2-runtime' 'libxml2') - pkgdesc="Gambas2 xml component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*} - rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-rpc() { - depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl') - pkgdesc="Gambas2 xml-rpc component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*} - rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-xslt() { - depends=('gambas2-gb-xml' 'libxslt') - pkgdesc="Gambas2 xml-xslt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community-staging/gambas2/fix-gbi-gba-path.patch b/community-staging/gambas2/fix-gbi-gba-path.patch deleted file mode 100644 index 9be8e921e..000000000 --- a/community-staging/gambas2/fix-gbi-gba-path.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- component.am 2010-03-15 20:54:43.000000000 +0100 -+++ ../component.am 2010-04-30 15:00:47.218700833 +0200 -@@ -6,17 +6,17 @@ - @if test -d $(COMPONENT); then \ - echo "Compiling the $(COMPONENT) project..."; \ - ( \ -- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ -+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ - cd $(COMPONENT); \ -- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ -+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -+ $(GBFILES)/gba$(GAMBAS_VERSION); \ - rm -rf .gambas; \ - $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ - ) \ - fi - @echo - @echo "Creating the information files for $(COMPONENT) component..." -- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) -+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) - @echo - - uninstall-hook: diff --git a/community-staging/gambas2/gambas2-runtime.install b/community-staging/gambas2/gambas2-runtime.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-staging/gambas2/gambas2-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas2/gambas2-script.install b/community-staging/gambas2/gambas2-script.install deleted file mode 100644 index 86558e434..000000000 --- a/community-staging/gambas2/gambas2-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} diff --git a/community-staging/gambas2/gambas2.install b/community-staging/gambas2/gambas2.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-staging/gambas2/gambas2.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/gambas2/poppler-0.20.patch b/community-staging/gambas2/poppler-0.20.patch deleted file mode 100644 index a73d42a7f..000000000 --- a/community-staging/gambas2/poppler-0.20.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: src/CPdfDocument.cpp -=================================================================== ---- src/CPdfDocument.cpp (révision 4732) -+++ src/CPdfDocument.cpp (copie de travail) -@@ -407,7 +407,11 @@ - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else - THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif - - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); -@@ -833,13 +837,22 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, - gTrue, - x,y,w,h, -+ gFalse); -+ #else -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, - gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse, - THIS->doc->getCatalog ()); -+ #endif - - map=THIS->dev->getBitmap(); - -@@ -929,9 +942,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \ - gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -+ #endif - - THIS->page->display(gfx); - dev->endPage(); -@@ -960,7 +978,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1200,12 +1220,21 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) { - GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1); -Index: configure.ac -=================================================================== ---- configure.ac (révision 4732) -+++ configure.ac (copie de travail) -@@ -25,6 +25,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD deleted file mode 100644 index 67429bb67..000000000 --- a/community-staging/gambas3/PKGBUILD +++ /dev/null @@ -1,1130 +0,0 @@ -# $Id: PKGBUILD 70702 2012-05-15 08:45:28Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> - -pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' - 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' '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') -pkgver=3.1.1 -pkgrel=3 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl') -options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install' - 'poppler-0-20.patch') -md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' - 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29' - '39d2ae1e2096a29df7857fce083eafaf') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np1 -i ../../poppler-0-20.patch - cd .. - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Runtime environment" - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install - - cd ../gbx - make DESTDIR="${pkgdir}" install - cd ../lib/debug - make DESTDIR="${pkgdir}" install - cd ../eval - make DESTDIR="${pkgdir}" install - cd ../draw - make DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas3.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - cd gbc - make DESTDIR="${pkgdir}" uninstall -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install -} - -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="Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - -#!! with the ide !! - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ - ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' - '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="Applications examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* - ## -} - -package_gambas3-gb-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite') - pkgdesc="Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/control - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-gb-gui') - pkgdesc="Form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') - pkgdesc="Image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4' 'qtwebkit') - pkgdesc="Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="Signal component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="VB transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install deleted file mode 100644 index 6c8201a6a..000000000 --- a/community-staging/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 - xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml -} diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-staging/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-staging/gambas3/poppler-0-20.patch b/community-staging/gambas3/poppler-0-20.patch deleted file mode 100644 index 3b0e4612a..000000000 --- a/community-staging/gambas3/poppler-0-20.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac ---- gb.pdf/configure.ac 2012-05-14 08:55:02.448921378 +0200 -+++ gb.pdf.fixed/configure.ac 2012-05-14 08:52:19.098596499 +0200 -@@ -24,6 +24,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ -diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp ---- gb.pdf/src/CPdfDocument.cpp 2012-05-14 08:55:02.388922483 +0200 -+++ gb.pdf.fixed/src/CPdfDocument.cpp 2012-05-15 09:25:45.168457227 +0200 -@@ -449,9 +449,13 @@ - - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); -- -- THIS->dev->startDoc(THIS->doc->getXRef ()); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else -+ THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif -+ - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); - -@@ -875,6 +879,14 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, -+ gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse); -+ #else - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, -@@ -882,7 +894,8 @@ - x,y,w,h, - gFalse, - THIS->doc->getCatalog ()); -- -+ #endif -+ - map=THIS->dev->getBitmap(); - - data=(uint32_t*)map->getDataPtr(); -@@ -940,9 +953,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -- -+ #endif -+ - THIS->page->display(gfx); - dev->endPage(); - -@@ -970,7 +988,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1152,13 +1172,22 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - - count = 0; -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) - GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff --git a/community-staging/inn/PKGBUILD b/community-staging/inn/PKGBUILD deleted file mode 100644 index 913f0ebac..000000000 --- a/community-staging/inn/PKGBUILD +++ /dev/null @@ -1,132 +0,0 @@ -# $Id: PKGBUILD 71184 2012-05-24 15:22:05Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Edward Tjörnhammar <xhemi@cube2.se> -# Contributor: Edward Tjörnhammar <xhemi@cube2.se> - -pkgname=inn -pkgver=2.5.2 -pkgrel=10 -pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers." -url="http://www.isc.org/software/inn/" -arch=('i686' 'x86_64') -license=("custom:INN") -depends=('openssl' 'dovecot') -makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl') -optdepends=('perl' 'python2' 'libsasl') -options=(emptydirs docs zipman) -install=inn.install -backup=(etc/inn/newsfeeds - etc/inn/incoming.conf - etc/inn/nnrpd.track - etc/inn/passwd.nntp - etc/inn/inn.conf - etc/inn/moderators - etc/inn/control.ctl - etc/inn/expire.ctl - etc/inn/nntpsend.ctl - etc/inn/innreport.conf - etc/inn/innwatch.ctl - etc/inn/distrib.pats - etc/inn/actsync.cfg - etc/inn/actsync.ign - etc/inn/motd.news - etc/inn/storage.conf - etc/inn/cycbuff.conf - etc/inn/buffindexed.conf - etc/inn/innfeed.conf - etc/inn/news2mail.cf - etc/inn/readers.conf - etc/inn/radius.conf - etc/inn/ovdb.conf - etc/inn/subscriptions - var/db/inn/active - var/db/inn/active.times - var/db/inn/history - var/db/inn/history.dir - var/db/inn/history.hash - var/db/inn/history.index - var/db/inn/newsgroups) -source=(http://ftp.isc.org/isc/inn/inn-$pkgver.tar.gz - innd.rc - nnrpd.rc - innd.conf - nnrpd.conf - site.make.patch) -md5sums=('a6e577dceb90d07501b96149508b974b' - 'a243d9498568f1beee20da5684b5fbfc' - 'a0b1ff8501ac8a31ce81a2f9c9b4bac9' - 'fbf1d2c5b3c5a08ae3e515c71c2e2e4a' - 'bb4bbe86ae52fbbf08b0f6f370dea052' - '960c800026ed6e03901cf0bafdfd53d8') - -build() { - cd $srcdir/inn-$pkgver - - [ $NOEXTRACT -eq 1 ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --includedir=/usr/include/inn \ - --sbindir=/usr/sbin \ - --with-libtool \ - --with-gnu-id \ - --with-db-dir=/var/db/inn \ - --sysconfdir=/etc/inn \ - --with-spool-dir=/var/spool/news \ - --with-log-dir=/var/log/inn \ - --with-run-dir=/var/run/inn \ - --with-tmp-dir=/var/spool/inn/tmp \ - --enable-largefiles \ - --with-openssl=/usr \ - --with-perl \ - --with-python \ - --with-sendmail=/usr/bin/msmtp \ - --with-sasl=/usr \ - --with-news-user=9 \ - --with-news-group=13 - # See https://wiki.archlinux.org/index.php/DeveloperWiki:UID_/_GID_Database - - test -f include/config.h - cat >>include/config.h <<EOF -#undef RUNASUSER -#define RUNASUSER "news" -#undef RUNASGROUP -#define RUNASGROUP "news" -EOF - sed -i 's|-export-dynamic gnu|-export-dynamic|' Makefile.global - [ $NOEXTRACT -eq 1 ] || patch -p3 < $srcdir/site.make.patch - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH - - make -} - -package() { - cd $srcdir/inn-$pkgver - export LD_LIBRARY_PATH=.:$pkgdir/usr/lib:$LD_LIBRARY_PATH - - make DESTDIR=$pkgdir install - - mkdir -p $pkgdir/etc/{conf,rc}.d - install -m0755 $srcdir/innd.rc $pkgdir/etc/rc.d/innd - install -m0644 $srcdir/innd.conf $pkgdir/etc/conf.d/innd - - install -m0755 $srcdir/nnrpd.rc $pkgdir/etc/rc.d/nnrpd - install -m0644 $srcdir/nnrpd.conf $pkgdir/etc/conf.d/nnrpd - - cd $pkgdir/usr/lib - for i in lib*.a; do - gcc -shared -o ${i%%.a}.so.2.0.0 $i - for j in 2.0 2; do - ln -s ${i%%a}so.2.0.0 ${i%%a}so.$j - done - done - - touch $pkgdir/var/db/inn/history{.dir,.hash,.index,} - - mkdir -p $pkgdir/usr/share/doc/inn $pkgdir/usr/share/inn/ - mv $pkgdir/usr/share/man/man3/list.3 $pkgdir/usr/share/man/man3/list-inn.3 - mv $pkgdir/usr/doc/* $pkgdir/usr/share/doc/inn/ - mv $pkgdir/usr/http/* $pkgdir/usr/share/inn/ - mv $pkgdir/usr/bin/archive $pkgdir/usr/bin/archive.inn - rm -rf $pkgdir/usr/doc $pkgdir/usr/http $pkgdir/var/run - install -D -m0644 $srcdir/inn-$pkgver/LICENSE $pkgdir/usr/share/licenses/inn/LICENSE - chown root:root $pkgdir/usr/bin/innbind - chmod 05555 $pkgdir/usr/bin/innbind -} diff --git a/community-staging/inn/inn.install b/community-staging/inn/inn.install deleted file mode 100644 index e4070870f..000000000 --- a/community-staging/inn/inn.install +++ /dev/null @@ -1,22 +0,0 @@ -post_install() { - 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>&- >&- - - /usr/bin/makedbz -i -o 2>&- >&- - mkdir /var/log/news 2>&- >&- - - chown news:news -R var/spool/news 2>&- >&- - chown news:news var/log/news 2>&- >&- - chown news:news -R var/db/inn 2>&- >&- - - echo "" - echo "->" - echo "-> If this is a first-time installation, a minimal active file and" - echo "-> history database have been installed. Do not forget to update" - echo "-> your cron entries and configure INN. See INSTALL for more" - echo "-> information." - echo "->" - echo "-> The default user:group for inn is news:news" - echo "->" - echo "" -} diff --git a/community-staging/inn/innd.conf b/community-staging/inn/innd.conf deleted file mode 100644 index 48f96ba5e..000000000 --- a/community-staging/inn/innd.conf +++ /dev/null @@ -1,2 +0,0 @@ -NEWS_USER=news -NEWS_GROUP=news diff --git a/community-staging/inn/innd.rc b/community-staging/inn/innd.rc deleted file mode 100644 index 5e36aec0d..000000000 --- a/community-staging/inn/innd.rc +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/innd ] && . /etc/conf.d/innd -[ -z "$NEWS_USER" ] && print "Please set news username" && exit 1; -[ -z "$NEWS_GROUP" ] && print "Please set news groupname" && exit 1; - -case "$1" in - start) - stat_busy "Starting InterNetNews" - [ -d /var/run/inn ] || { - mkdir -p /var/run/inn - chown -R $NEWS_USER:$NEWS_GROUP /var/run/inn - } - su $NEWS_USER -c /usr/bin/rc.news 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - echo $! > /var/run/innd.pid - add_daemon innd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews" - ctlinnd throttle "shutting down" 2>&- >&- - su $NEWS_USER -c /usr/bin/rc.news stop 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - kill `ps faxu| grep ^$NEWS_USER | awk -- '{print $2}'` 2>&- >&- - rm /var/run/innd.pid - rm_daemon innd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/inn/nnrpd.conf b/community-staging/inn/nnrpd.conf deleted file mode 100644 index 689a289ce..000000000 --- a/community-staging/inn/nnrpd.conf +++ /dev/null @@ -1,3 +0,0 @@ -USE_SSL=1 -LISTEN_PORT=563 -NNRPD_OPTS="-D -S -p $LISTEN_PORT -c /etc/inn/readers.conf" diff --git a/community-staging/inn/nnrpd.rc b/community-staging/inn/nnrpd.rc deleted file mode 100644 index d7c902832..000000000 --- a/community-staging/inn/nnrpd.rc +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/nnrpd ] && . /etc/conf.d/nnrpd -[ -z "$NNRPD_OPTS" ] && print "FATAL: No arguments where passed" && exit 1; - -PID=`pidof -o %PPID nnrpd` -case "$1" in - start) - stat_busy "Starting InterNetNews Readers Daemon" - if [ ! -f /var/run/nnrpd.pid ]; then - stat_append ":: InterNetNews (innd) is not running" - stat_fail - exit 1 - fi - - [ -d /var/run/inn ] || mkdir -p /var/run/inn - [ -z "$PID" ] && nnrpd $NNRPD_OPTS 2>&- >&- - if [ $? -gt 0 ]; then - stat_fail - else - PID=`pidof -o %PPID nnrpd` - echo $PID > /var/run/nnrpd.pid - add_daemon nnrpd - stat_done - fi - - ;; - stop) - stat_busy "Stopping InterNetNews Readers Daemon" - [ ! -z "$PID" ] && kill $PID >&- - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/nnrpd.pid - rm_daemon nnrpd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-staging/inn/site.make.patch b/community-staging/inn/site.make.patch deleted file mode 100644 index 5af6e1162..000000000 --- a/community-staging/inn/site.make.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- old/src/inn-2.4.5/site/Makefile 2008-06-29 19:56:57.000000000 +0200 -+++ new/src/inn-2.4.5/site/Makefile 2008-10-09 19:27:59.613208825 +0200 -@@ -52,7 +52,6 @@ - - PATH_ACTIVE = ${PATHDB}/active - PATH_ACTIVE_TIMES = ${PATHDB}/active.times --PATH_HISTORY = ${PATHDB}/history - PATH_NEWSGROUPS = ${PATHDB}/newsgroups - - ## Scripts from above, plus site-specific config files. -@@ -98,7 +97,7 @@ - ALL_INSTALLED = $(MOST_INSTALLED) $(REST_INSTALLED) - - SPECIAL = $D$(PATH_ACTIVE) $D$(PATH_ACTIVE_TIMES) \ -- $D$(PATH_NEWSGROUPS) $D$(PATH_HISTORY) -+ $D$(PATH_NEWSGROUPS) - - ## Get new versions of everything from samples directory. - all: $(ALL) config -@@ -143,12 +142,6 @@ - chown $(RUNASUSER) $@ - chgrp $(RUNASGROUP) $@ - chmod $(FILEMODE) $@ --$D$(PATH_HISTORY): -- touch $@ -- chown $(RUNASUSER) $@ -- chgrp $(RUNASGROUP) $@ -- chmod $(FILEMODE) $@ -- test -z "$D" && $(PATHBIN)/makedbz -i -o - - bootstrap: - diff --git a/community-staging/ktikz/PKGBUILD b/community-staging/ktikz/PKGBUILD deleted file mode 100644 index d20dfbdcb..000000000 --- a/community-staging/ktikz/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> -# Contributor: linuxSEAT <--put_my_name_here--@gmail.com> -# Contributor: Le_J <clej37 at gmail dot com> - -pkgname=ktikz -pkgver=0.10 -pkgrel=4 -pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)" -arch=('i686' 'x86_64') -url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/" -license=("GPL") -depends=('poppler-qt' 'kdelibs') -makedepends=('automoc4' 'cmake' 'docbook-xml') -source=("http://www.hackenberger.at/ktikz/"$pkgname"_"$pkgver".tar.gz") -md5sums=('e8f0826cba2447250bcdcd389a71a2ac') - -build() { - cd "$srcdir"/"$pkgname" - - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` - make -} - -package() { - cd "$srcdir"/"$pkgname" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/ktikz/ktikz.install b/community-staging/ktikz/ktikz.install deleted file mode 100644 index 210d1ac2b..000000000 --- a/community-staging/ktikz/ktikz.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor > /dev/null - update-mime-database /usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/community-staging/libcec/PKGBUILD b/community-staging/libcec/PKGBUILD deleted file mode 100644 index 4c501c681..000000000 --- a/community-staging/libcec/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71308 2012-05-26 14:17:38Z idevolder $ -# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> -# Contributor: Philippe Cherel <philippe.cherel@mayenne.org> - -pkgname=libcec -pkgver=1.6.3 -pkgrel=1 -pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" -arch=('i686' 'x86_64') -url="https://github.com/Pulse-Eight/libcec" -license=('GPL') -depends=('udev' 'lockdev') -source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-ab37938 -sha256sums=('964fb7ad2281b44dacddd57e5cfc16750271492cbbf48291ee487644d69bcb61') -options=(!libtool) - -build() { - mv "$_srcfolder" "$pkgname-$pkgver" - - cd "$pkgname-$pkgver" - autoreconf -vif - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD deleted file mode 100644 index 2db22ffbf..000000000 --- a/community-staging/libextractor/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 70661 2012-05-14 09:30:25Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s@gmail.com> -# Contributor: damir <damir@archlinux.org> - -pkgname=libextractor -pkgver=0.6.3 -pkgrel=2 -pkgdesc="A library used to extract meta-data from files of arbitrary type" -arch=("i686" "x86_64") -license=('GPL') -url="http://gnunet.org/libextractor/" -depends=('libvorbis' 'libltdl' 'gtk2' 'libgsf' 'libmpeg2') -makedepends=('flac' 'poppler' 'exiv2' 'qt') -optdepends=('flac' - 'poppler' - 'exiv2' - 'qt') -options=('!libtool' '!makeflags') -install=libextractor.install -source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('7004ff6be06e400050f0ad7016140981' - '81f95c31831dde62428a98ae32464c51') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir -} diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install deleted file mode 100644 index 1cf51e095..000000000 --- a/community-staging/libextractor/libextractor.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(extractor.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - 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 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community-staging/libvirt/PKGBUILD b/community-staging/libvirt/PKGBUILD deleted file mode 100644 index 881952915..000000000 --- a/community-staging/libvirt/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# $Id: PKGBUILD 71247 2012-05-26 03:42:33Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jonathan Wiersma <archaur at jonw dot org> - -pkgname=libvirt -pkgver=0.9.12 -pkgrel=4 -pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" -arch=('i686' 'x86_64') -url="http://libvirt.org/" -license=('LGPL') -depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' - 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' - 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'netcf' 'libnl') -makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') -optdepends=('bridge-utils: for briged networking (default)' - 'dnsmasq: for NAT/DHCP for guests' - 'kvm' - 'openbsd-netcat: for remote management over ssh' - 'qemu' - 'radvd' - 'dmidecode') -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" -source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" - libvirtd.rc.d - libvirtd.conf.d - libvirtd-guests.rc.d - libvirtd-guests.conf.d - openbsd-netcat-default.patch - libvirt-libnl3.patch) -md5sums=('5e842bc55733ceba60c64767580ff3e4' - 'c43244c40a0437038c82089618e7beaa' - '3ed0e24f5b5e25bf553f5427d64915e6' - '8297b1be794a24cc77f66af9380ace59' - 'bc2971dacdbac967fc3474e50affc345' - 'b0be50eb9dfe4d133decf23b60880f7d' - 'ba27fbcd989de8d84cfff98326f10c54') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - export PYTHON=`which python2` - 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 - - [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch - - patch -Np1 -i ${srcdir}/libvirt-libnl3.patch - aclocal - automake --add-missing || true - autoreconf - - export LDFLAGS=-lX11 - export RADVD=/usr/sbin/radvd - [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ - --with-storage-lvm --without-xen --with-udev --without-hal --disable-static - find -name Makefile -exec sed -i 's#-L /usr#-L/usr#' {} \; - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -D -m755 "$srcdir"/libvirtd.rc.d "$pkgdir"/etc/rc.d/libvirtd - install -D -m644 "$srcdir"/libvirtd.conf.d "$pkgdir"/etc/conf.d/libvirtd - - install -D -m755 "$srcdir"/libvirtd-guests.rc.d "$pkgdir"/etc/rc.d/libvirtd-guests - install -D -m644 "$srcdir"/libvirtd-guests.conf.d "$pkgdir"/etc/conf.d/libvirtd-guests - - rm -rf $pkgdir/var/run -} diff --git a/community-staging/libvirt/libvirt-libnl3.patch b/community-staging/libvirt/libvirt-libnl3.patch deleted file mode 100644 index 1e5f141b9..000000000 --- a/community-staging/libvirt/libvirt-libnl3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac ---- libvirt-0.9.12/configure.ac 2012-05-14 06:15:40.000000000 +0400 -+++ libvirt-0.9.12.my/configure.ac 2012-05-17 13:18:22.000000000 +0400 -@@ -71,7 +71,7 @@ - LIBCURL_REQUIRED="7.18.0" - OPENWSMAN_REQUIRED="2.2.3" - LIBPCAP_REQUIRED="1.0.0" --LIBNL_REQUIRED="1.1" -+LIBNL_REQUIRED="3.2" - LIBSSH2_REQUIRED="1.0" - LIBBLKID_REQUIRED="2.17" - DBUS_REQUIRED="1.0.0" -@@ -2652,21 +2652,9 @@ - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - have_libnl=yes - AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) -- AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) - PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) - LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" - LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" -- ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ -- have_libnl=yes -- AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], -- [whether the netlink library is available]) -- AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], -- [whether the netlink v1 library is available]) -- ], [ -- if test "$with_macvtap" = "yes"; then -- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) -- fi -- ]) - ]) - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) -diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am ---- libvirt-0.9.12/daemon/Makefile.am 2012-04-20 08:25:25.000000000 +0400 -+++ libvirt-0.9.12.my/daemon/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -96,6 +96,7 @@ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ - $(WARN_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ - -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" -diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am ---- libvirt-0.9.12/src/Makefile.am 2012-05-05 16:53:48.000000000 +0400 -+++ libvirt-0.9.12.my/src/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -16,6 +16,7 @@ - - AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ - $(LIBXML_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ - $(WIN32_EXTRA_CFLAGS) \ -diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c ---- libvirt-0.9.12/src/util/virnetdevmacvlan.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c 2012-05-17 13:25:21.000000000 +0400 -@@ -27,6 +27,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevmacvlan.h" - #include "virmacaddr.h" - #include "util.h" -diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c ---- libvirt-0.9.12/src/util/virnetdevvportprofile.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c 2012-05-17 13:27:54.000000000 +0400 -@@ -22,6 +22,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevvportprofile.h" - #include "virterror_internal.h" - -diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c ---- libvirt-0.9.12/src/util/virnetlink.c 2012-05-09 16:41:41.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.c 2012-05-17 13:38:08.000000000 +0400 -@@ -49,7 +49,7 @@ - - #define NETLINK_ACK_TIMEOUT_S 2 - --#if defined(__linux__) && defined(HAVE_LIBNL) -+#if defined(__linux__) && defined(HAVE_LIBNL3) - /* State for a single netlink event handle */ - struct virNetlinkEventHandle { - int watch; -diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h ---- libvirt-0.9.12/src/util/virnetlink.h 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.h 2012-05-17 13:27:37.000000000 +0400 -@@ -23,9 +23,10 @@ - # include "config.h" - # include "internal.h" - --# if defined(__linux__) && defined(HAVE_LIBNL) -+# if defined(__linux__) && defined(HAVE_LIBNL3) - - # include <netlink/msg.h> -+# include <stdint.h> - - # else - diff --git a/community-staging/libvirt/libvirt.install b/community-staging/libvirt/libvirt.install deleted file mode 100644 index 3881386d2..000000000 --- a/community-staging/libvirt/libvirt.install +++ /dev/null @@ -1,38 +0,0 @@ -_libvirt_setup() { - rm -f /usr/lib/python?.?/site-packages/libvirt.pyc - echo ">>> To use libvirt as a non-root user:" - echo ">>> Use polkit to grant access." - echo ">>> ...or change the access model in /etc/libvirt/libvirtd.conf." - echo ">>> (see unixperms.patch in PKGBUILD for help)" - echo "" -} - -post_install() { - _libvirt_setup || return 1 - echo ">>> Be sure to see optdepends as you may find some of them helpfull." - echo ">>> Especially: bridge-utils, dnsmasq, and hal." - echo "" - echo ">>> To start libvirtd run: '/etc/rc.d/libvirtd start' as root." - echo ">>> Add 'libvirtd' to daemons in /etc/rc.conf if you want it to load upon" - echo ">>> booting." - echo "" - /bin/true -} - -post_upgrade() { - _libvirt_setup || return 1 - echo ">>> To finish the upgrade, restart libvirtd by running the command:" - echo ">>> '/etc/rc.d/libvirtd restart' as root or rebooting." - echo ">>> You may also need to run 'rm -rf ~/.libvirt'" - echo "" - /bin/true -} - -post_remove() { - rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc - echo ">>> You may wish to delete the group 'libvirt' if it still exists." - echo ">>> It can be removed by running 'groupdel libvirt' as root." - echo "" - depmod -a - /bin/true -} diff --git a/community-staging/libvirt/libvirtd-guests.conf.d b/community-staging/libvirt/libvirtd-guests.conf.d deleted file mode 100644 index 02a933715..000000000 --- a/community-staging/libvirt/libvirtd-guests.conf.d +++ /dev/null @@ -1,11 +0,0 @@ -LIBVIRTD_STOP_ACTION=suspend - -#LIBVIRTD_URI="-c qemu+ssh://user@host/system" -LIBVIRTD_URI="" - -#LIBVIRTD_BYPASS_CACHE="--bypass-cache" -LIBVIRTD_BYPASS_CACHE="" - -LIBVIRTD_START_DELAY=0 - -LIBVIRTD_SHUTDOWN_TIMEOUT=3 diff --git a/community-staging/libvirt/libvirtd-guests.rc.d b/community-staging/libvirt/libvirtd-guests.rc.d deleted file mode 100644 index 670b5431a..000000000 --- a/community-staging/libvirt/libvirtd-guests.rc.d +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash - -. /etc/conf.d/libvirtd-guests -. /etc/rc.conf -. /etc/rc.d/functions - -LIBVIRTD_LISTFILE="/var/state/libvirtd/vm-list" - -# get guest state by name -libvirt_get_guest_state() -{ - virsh $LIBVIRTD_URI dominfo "$1" | grep -E '^State:' | awk '{print $2}' -} - -# list IDs of running guests -libvirt_list() -{ - - list=$(virsh $LIBVIRTD_URI list) - - if [ $? -ne 0 ]; then - RETVAL=1 - return 1 - fi - - uuids= - for id in $(echo "$list" | awk 'NR > 2 {print $1}'); do - uuid=$(virsh $LIBVIRTD_UTI dominfo $id | awk '/^UUID:/{print $2}') - if [ -z "$uuid" ]; then - RETVAL=1 - return 1 - fi - uuids="$uuids $uuid" - done - - echo $uuids - -} - -libvirt_domname() -{ - uuid=$1 - name=$(virsh $LIBVIRTD_URI dominfo $uuid | awk 'NR == 2 {$1=""; print}') - - echo $name -} - -# suspend guest by name -libvirt_suspend() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE managedsave "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# shutdown guest by name -libvirt_shutdown() -{ - virsh $LIBVIRTD_URI shutdown "$1" >/dev/null - timeout=$LIBVIRTD_SHUTDOWN_TIMEOUT - while [ "$timeout" -gt 0 ]; do - sleep 1 - timeout=$((timeout - 1)) - state=`libvirt_get_guest_state "$1"` - [ "x$state" == "xshut" ] && return 0 - done - return 1 -} - -# start guest by name -libvirt_start() -{ - virsh $LIBVIRTD_URI $LIBVIRTD_BYPASS_CACHE start "$1" >/dev/null -} - -# stop all guests -libvirt_stop_all() -{ - mkdir -p `dirname $LIBVIRTD_LISTFILE` - echo -n >$LIBVIRTD_LISTFILE - - for i in `libvirt_list`; do - name=`libvirt_domname $i` - if [ "x$LIBVIRTD_STOP_ACTION" == "xsuspend" ]; then - stat_busy "Suspending libvirtd/$name guest" - libvirt_suspend "$i" - else - stat_busy "Shutting libvirtd/$i guest down" - libvirt_shutdown "$i" - fi - [ $? -eq 0 ] && stat_done || stat_fail - echo $i >>$LIBVIRTD_LISTFILE - done -} - -# start all guests -libvirt_start_all() -{ - if [ -f $LIBVIRTD_LISTFILE ]; then - for i in `cat $LIBVIRTD_LISTFILE`; do - name='libvirt_domname $i' - stat_busy "Starting/resuming libvirtd/$name guest" - libvirt_start "$i" - [ $? -eq 0 ] && { sleep $LIBVIRTD_START_DELAY; stat_done; } || stat_fail - done - fi - rm -f $LIBVIRTD_LISTFILE -} - -# main -LC_ALL=C -LANG=C -case "$1" in - start) - libvirt_start_all - add_daemon libvirtd-guests - ;; - stop) - libvirt_stop_all - rm_daemon libvirtd-guests - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/community-staging/libvirt/libvirtd.conf.d b/community-staging/libvirt/libvirtd.conf.d deleted file mode 100644 index d4d25b47a..000000000 --- a/community-staging/libvirt/libvirtd.conf.d +++ /dev/null @@ -1,3 +0,0 @@ -LIBVIRTD_CONFIG="/etc/libvirt/libvirtd.conf" -LIBVIRTD_ARGS="-p /var/run/libvirtd.pid" -KRB5_KTNAME="/etc/libvirt/krb5.tab" diff --git a/community-staging/libvirt/libvirtd.rc.d b/community-staging/libvirt/libvirtd.rc.d deleted file mode 100644 index 193bffa9c..000000000 --- a/community-staging/libvirt/libvirtd.rc.d +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/libvirtd -. /etc/rc.d/functions - -LIBVIRTD_CONFIG_ARGS= -if [ -n "$LIBVIRTD_CONFIG" ] -then - LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" -fi - -PID=`pidof -o %PPID /usr/sbin/libvirtd` -case "$1" in - start) - stat_busy "Starting libvirtd" - export RADVD=/usr/sbin/radvd - for i in /var/run/libvirt/qemu /var/run/libvirt/lxc /var/run/libvirt/uml /var/run/libvirt/network; do - [ -d $i ] || mkdir -p $i - done - [ -z "$PID" ] && ( - mkdir -p /var/{cache,run}/libvirt - rm -rf /var/cache/libvirt/* - KRB5_KTNAME=$KRB5_KTNAME \ - /usr/sbin/libvirtd --daemon $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS - ) - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon libvirtd - stat_done - fi - ;; - stop) - stat_busy "Stopping libvirtd" - [ ! -z "$PID" ] && ( - kill $PID &> /dev/null - rm -rf /var/cache/libvirt/* - rm -f /var/run/libvirtd.pid - ) - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon libvirtd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading libvirtd configuration" - [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo $"Usage: $0 {start|stop|restart|reload}" - ;; -esac -exit 0 diff --git a/community-staging/libvirt/openbsd-netcat-default.patch b/community-staging/libvirt/openbsd-netcat-default.patch deleted file mode 100644 index a01b4f14e..000000000 --- a/community-staging/libvirt/openbsd-netcat-default.patch +++ /dev/null @@ -1,36 +0,0 @@ -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[] = { -- "nc", "-U", spec->dest.unix_socket.file, NULL -+ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL - }; - ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); - } -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, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - keyfile, - sockname))) - goto failed; -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); - - if (!netcat) -- netcat = "nc"; -+ netcat = "nc.openbsd"; - - virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); - diff --git a/community-staging/linux-tools/PKGBUILD b/community-staging/linux-tools/PKGBUILD deleted file mode 100644 index 6458a1d7f..000000000 --- a/community-staging/linux-tools/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 71200 2012-05-24 20:12:17Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=linux-tools -pkgname=('perf' 'cpupower') -pkgver=3.4 -pkgrel=2 -license=('GPL2') -arch=('i686' 'x86_64') -url='http://www.kernel.org' -options=('!strip') -makedepends=('asciidoc' 'xmlto') -# split packages need all package dependencies set manually in makedepends -makedepends+=('python2' 'libnewt' 'elfutils' 'pciutils') -source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" -# "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.4.xz" - 'cpupower.rc' - 'cpupower.conf' - 'cpupower.service') -md5sums=('967f72983655e2479f951195953e8480' - '73dbc931e86b3b73d6e2338dcbee81a4' - '857ccdd0598511e3bf4b63522754dc48' - '20870541e88109d2f153be3c58a277f1') - -build() { - # apply stable patching set - if [[ -e "$srcdir"/patch-* ]]; then - msg2 'Applying stable patch set' - patch -N -p1 -i "$srcdir"/patch-* - fi - - msg2 'Build perf' - pushd linux-$pkgver/tools/perf - make \ - DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ - PYTHON=python2 \ - NO_GTK2=1 \ - PERF_VERSION=$pkgver-$pkgrel \ - all man - popd - - msg2 'Build cpupower' - cd linux-$pkgver/tools/power/cpupower - # we cannot use --as-needed - LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"} - make VERSION=$pkgver-$pkgrel -} - -package_perf() { - pkgdesc='Linux kernel performance auditing tool' - depends=('python2' 'libnewt' 'elfutils') - - cd linux-$pkgver/tools/perf - make \ - DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ - PYTHON=python2 \ - NO_GTK2=1 \ - PERF_VERSION=$pkgver-$pkgrel \ - install install-man -} - -package_cpupower() { - pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor' - backup=('etc/conf.d/cpupower') - depends=('pciutils') - conflicts=('cpufrequtils') - - pushd linux-$pkgver/tools/power/cpupower - make \ - DESTDIR="$pkgdir" \ - mandir='/usr/share/man' \ - docdir='/usr/share/doc/cpupower' \ - install install-man - popd - # install rc.d script - install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower" - install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower" - install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/linux-tools/cpupower.conf b/community-staging/linux-tools/cpupower.conf deleted file mode 100644 index ee8602953..000000000 --- a/community-staging/linux-tools/cpupower.conf +++ /dev/null @@ -1,28 +0,0 @@ -# Define CPUs governor -# valid governors: ondemand, performance, powersave, conservative, userspace. -#governor='ondemand' - -# Limit frequency range -# Valid suffixes: Hz, kHz (default), MHz, GHz, THz -#min_freq="2.25GHz" -#max_freq="3GHz" - -# Specific frequency to be set. -# Requires userspace governor to be available and loaded. -#freq= - -# Utilizes cores in one processor package/socket first before processes are -# scheduled to other processor packages/sockets. -# See man (1) CPUPOWER-SET for additional details. -#mc_scheduler= - -# Utilizes thread siblings of one processor core first before processes are -# scheduled to other cores. See man (1) CPUPOWER-SET for additional details. -#smp_scheduler= - -# Sets a register on supported Intel processore which allows software to convey -# its policy for the relative importance of performance versus energy savings to -# the processor. See man (1) CPUPOWER-SET for additional details. -#perf_bias= - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/linux-tools/cpupower.rc b/community-staging/linux-tools/cpupower.rc deleted file mode 100644 index 27a491e95..000000000 --- a/community-staging/linux-tools/cpupower.rc +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower - -case "$1" in - start|restart) - stat_busy "Setting cpupower rules" - declare -i fail=0 - - # frequency-set options - declare -a params=() - params+=(${governor:+-g $governor}) - params+=(${min_freq:+-d $min_freq}) - params+=(${max_freq:+-u $max_freq}) - params+=(${freq:+-f $freq}) - if ((${#params[@]} > 0)); then - cpupower frequency-set "${params[@]}" >/dev/null || fail=1 - fi - - # set options - declare -a params=() - params+=(${mc_scheduler:+-m $mc_scheduler}) - params+=(${smp_scheduler:+-s $smp_scheduler}) - params+=(${perf_bias:+-b $perf_bias}) - if ((${#params[@]} > 0)); then - cpupower set "${params[@]}" >/dev/null || fail=1 - fi - - # print failure if any - (($fail > 0)) && stat_fail && exit 1 || stat_done - ;; - *) - echo "usage: ${0##*/} {start|restart}" -esac - -true - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/linux-tools/cpupower.service b/community-staging/linux-tools/cpupower.service deleted file mode 100644 index f77cfdc97..000000000 --- a/community-staging/linux-tools/cpupower.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Apply cpupower configuration - -[Service] -Type=oneshot -ExecStart=/etc/rc.d/cpupower start -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/community-staging/pcsc-perl/PKGBUILD b/community-staging/pcsc-perl/PKGBUILD deleted file mode 100644 index 7131cdf61..000000000 --- a/community-staging/pcsc-perl/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71294 2012-05-26 12:15:03Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> -# Contributor: marc0s <marc0s@fsfe.org> - -pkgname=pcsc-perl -pkgver=1.4.12 -pkgrel=3 -pkgdesc="A Perl Module for PC/SC SmartCard access" -arch=('i686' 'x86_64') -url="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/" -license=('GPL' 'PerlArtistic') -depends=('pcsclite' 'perl') -makedepends=('pkgconfig') -options=('!emptydirs') -source=("http://ludovic.rousseau.free.fr/softwares/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f34c5ab748815bf0b2e571362b4f8121') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-staging/pcsclite/PKGBUILD b/community-staging/pcsclite/PKGBUILD deleted file mode 100644 index e32997c8c..000000000 --- a/community-staging/pcsclite/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 71253 2012-05-26 06:27:20Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> - -pkgname=pcsclite -pkgver=1.8.3 -pkgrel=3 -pkgdesc="PC/SC Architecture smartcard middleware library" -arch=('i686' 'x86_64') -url="https://alioth.debian.org/projects/pcsclite/" -license=('BSD') -depends=('python') -makedepends=('pkg-config') -options=('!libtool' '!docs') -source=("https://alioth.debian.org/frs/download.php/3706/pcsc-lite-${pkgver}.tar.bz2" - 'pcscd') -md5sums=('7ad8c97c89f77aab7a00317eb7e811e9' - 'c97b6bce695222efb0f003d8e8369010') - -build() { - cd "${srcdir}/pcsc-lite-${pkgver}" - - ./configure --prefix=/usr \ - --enable-libudev \ - --sysconfdir=/etc \ - --enable-ipcdir=/run/pcscd \ - --enable-usbdropdir=/usr/lib/pcsc/drivers \ - --with-systemdsystemunitdir=/usr/lib/systemd/system - - make -} - -package() { - cd "${srcdir}/pcsc-lite-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 ${srcdir}/pcsc-lite-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -D -m755 ${srcdir}/pcscd ${pkgdir}/etc/rc.d/pcscd - install -d ${pkgdir}/usr/lib/pcsc/drivers -} diff --git a/community-staging/pcsclite/pcscd b/community-staging/pcsclite/pcscd deleted file mode 100644 index 1dc5e0166..000000000 --- a/community-staging/pcsclite/pcscd +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/sbin/pcscd -NAME=pcscd -DESC="PC/SC smart card daemon" -PID_FILE=/run/pcscd/pcscd.pid -PCSCD_OPTIONS= - -case "$1" in - start) - stat_busy "Starting $DESC" - $DAEMON $PCSCD_OPTIONS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $NAME - stat_done - fi - ;; - - stop) - stat_busy "Stopping $DESC" - [ -f $PID_FILE ] && kill `cat $PID_FILE` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $NAME status"; - ck_status $NAME - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" - ;; - -esac - -exit 0 - diff --git a/community-staging/pdf2djvu/PKGBUILD b/community-staging/pdf2djvu/PKGBUILD deleted file mode 100644 index b648f931e..000000000 --- a/community-staging/pdf2djvu/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 70840 2012-05-17 17:02:35Z spupykin $ -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> - -pkgname=pdf2djvu -pkgver=0.7.12 -pkgrel=1 -pkgdesc="Creates DjVu files from PDF files" -arch=('i686' 'x86_64') -url="http://pdf2djvu.googlecode.com" -license=('GPL') -depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') -makedepends=('pstreams') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz" - "poppler-0.20.patch") -md5sums=('4fd56c0763b56b4081fc9c85be16d9d7' - '60ceee2409012a5f2b89b96e4a038793') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 <$srcdir/poppler-0.20.patch - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 -} diff --git a/community-staging/pdf2djvu/poppler-0.20.patch b/community-staging/pdf2djvu/poppler-0.20.patch deleted file mode 100644 index 36d23f73a..000000000 --- a/community-staging/pdf2djvu/poppler-0.20.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure ---- pdf2djvu-0.7.12/configure 2012-01-22 03:17:01.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure 2012-05-17 20:44:06.000000000 +0400 -@@ -6653,7 +6653,7 @@ - - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac ---- pdf2djvu-0.7.12/configure.ac 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure.ac 2012-05-17 20:43:37.000000000 +0400 -@@ -225,7 +225,7 @@ - AX_CXXFLAGS_WARN_ALL(CXXFLAGS) - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc ---- pdf2djvu-0.7.12/pdf-backend.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf-backend.cc 2012-05-17 20:47:24.000000000 +0400 -@@ -32,10 +32,10 @@ - * ====================== - */ - --static void poppler_error_handler(int pos, char *message, va_list args) -+static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message) - { - std::string format; -- std::string expanded_message = string_vprintf(message, args); -+ std::string expanded_message = message; - const char *c_message = expanded_message.c_str(); - if (pos >= 0) - { -@@ -61,7 +61,7 @@ - Cwd cwd(argv0_dir_name); - #endif - globalParams = new GlobalParams(); -- setErrorFunction(poppler_error_handler); -+ setErrorCallback(poppler_error_handler, 0); - } - - void pdf::Environment::set_antialias(bool value) -diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc ---- pdf2djvu-0.7.12/pdf2djvu.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf2djvu.cc 2012-05-17 20:55:07.000000000 +0400 -@@ -1387,13 +1387,13 @@ - debug(0)++; - } - out1.reset(new pdf::Renderer(paper_color, config.monochrome)); -- out1->startDoc(doc->getXRef()); -+ out1->startDoc((PDFDoc*)doc->getXRef()); - outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outm->startDoc(doc->getXRef()); -+ outm->startDoc((PDFDoc*)doc->getXRef()); - if (!config.monochrome) - { - outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outs->startDoc(doc->getXRef()); -+ outs->startDoc((PDFDoc*)doc->getXRef()); - } - } - assert(doc.get() != NULL); diff --git a/community-staging/perl-berkeleydb/PKGBUILD b/community-staging/perl-berkeleydb/PKGBUILD deleted file mode 100644 index 463fd7389..000000000 --- a/community-staging/perl-berkeleydb/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71186 2012-05-24 15:24:25Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-berkeleydb -pkgver=0.50 -pkgrel=3 -pkgdesc="Interface to Berkeley DB version 2, 3 or 4" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/BerkeleyDB/" -license=('GPL' 'PerlArtistic') -depends=('perl' 'db') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz) -md5sums=('6afc8f49133c262c606d1b96e1412863') - -build() { - cd $srcdir/BerkeleyDB-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - _dbver=`pacman -Q db | cut -d\ -f2 | cut -d- -f1` - depends=('perl' "db=$_dbver") - - cd $srcdir/BerkeleyDB-$pkgver - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-class-methodmaker/PKGBUILD b/community-staging/perl-class-methodmaker/PKGBUILD deleted file mode 100644 index 22ff76b28..000000000 --- a/community-staging/perl-class-methodmaker/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 71126 2012-05-24 15:00:48Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-class-methodmaker -pkgver=2.18 -pkgrel=6 -pkgdesc="Create generic class methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Class-MethodMaker" -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCHWIGON/Class-MethodMaker-${pkgver}.tar.gz") -md5sums=('99435d78e0a1754b102fe39597c6c3df') - -build() { - cd $srcdir/Class-MethodMaker-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-clone/PKGBUILD b/community-staging/perl-clone/PKGBUILD deleted file mode 100644 index 21a131b25..000000000 --- a/community-staging/perl-clone/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: François Charette <firmicus ατ gmx δοτ net> -# Contributor: Alex Dioso <adioso->gmail*com> - -pkgname=perl-clone -pkgver=0.31 -pkgrel=5 -pkgdesc='Recursive copy of nested objects.' -arch=('i686' 'x86_64') -url='http://search.cpan.org/~RDF/Clone' -license=('GPL' 'PerlArtistic') -depends=('perl>=5.10.0') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz") -md5sums=('65f34e7280d7b7dfb72ab6224e5767f5') - -build() { - cd Clone-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Clone-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-crypt-blowfish/PKGBUILD b/community-staging/perl-crypt-blowfish/PKGBUILD deleted file mode 100644 index 148b97008..000000000 --- a/community-staging/perl-crypt-blowfish/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 71130 2012-05-24 15:02:06Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-crypt-blowfish -pkgver=2.12 -pkgrel=5 -pkgdesc="Perl/CPAN Module Crypt::Blowfish : XSbased implementation of Blowfish" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Crypt-Blowfish" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/D/DP/DPARIS/Crypt-Blowfish-$pkgver.tar.gz") -md5sums=('a0eca17addc8bdaf38c044c365a8800c') - -build() { - cd $srcdir/Crypt-Blowfish-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-crypt-des/PKGBUILD b/community-staging/perl-crypt-des/PKGBUILD deleted file mode 100644 index 480bd2f63..000000000 --- a/community-staging/perl-crypt-des/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 71132 2012-05-24 15:02:49Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -#Contributor: Pete Morris <pete dot morris at gmail dot com> -pkgname=perl-crypt-des -pkgver=2.05 -pkgrel=5 -pkgdesc="Perl DES encryption module" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dparis/Crypt-DES" -license=("GPL" "PerlArtistic") -depends=('glibc') -source=("http://www.cpan.org/authors/id/D/DP/DPARIS/Crypt-DES-$pkgver.tar.gz") -md5sums=('a8a0bea7064e11d2af434f3e468c17bb') -build() { - cd Crypt-DES-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=${pkgdir} - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-curses/PKGBUILD b/community-staging/perl-curses/PKGBUILD deleted file mode 100644 index 9bdbda592..000000000 --- a/community-staging/perl-curses/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 71134 2012-05-24 15:03:24Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-curses -pkgver=1.28 -pkgrel=5 -pkgdesc="Character screen handling and windowing" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Curses" -license=('GPL' 'PerlArtistic') -depends=('perl' 'ncurses') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-$pkgver.tgz) -md5sums=('ed9f7ddf2d90f4266da91c3dc9fad9c9') - -build() { - cd $srcdir/Curses-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make pure_install doc_install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-data-structure-util/PKGBUILD b/community-staging/perl-data-structure-util/PKGBUILD deleted file mode 100644 index ef4a46da2..000000000 --- a/community-staging/perl-data-structure-util/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 71136 2012-05-24 15:04:04Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-data-structure-util -pkgver=0.15 -pkgrel=6 -pkgdesc="Perl/CPAN Module Data::Structure::Util" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Data-Structure-Util" -license=("GPL" "PerlArtistic") -source=("http://search.cpan.org/CPAN/authors/id/A/AN/ANDYA/Data-Structure-Util-$pkgver.tar.gz") -md5sums=('e12ba777c0abfbd79a131de28d542359') - -build() { - cd $srcdir/Data-Structure-Util-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-datetime/PKGBUILD b/community-staging/perl-datetime/PKGBUILD deleted file mode 100644 index 821abdb4e..000000000 --- a/community-staging/perl-datetime/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 71138 2012-05-24 15:04:45Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-datetime -pkgver=0.72 -pkgrel=2 -pkgdesc="A complete, easy to use date and time object" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DateTime" -license=('GPL' 'PerlArtistic') -depends=('perl-datetime-timezone>=0.59' 'perl-datetime-locale>=0.41' - 'perl-params-validate>=0.76' 'perl-math-round') -LC_NUMERIC=C -provides=("perl-datetime=`printf %.4f $pkgver`") -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz) -md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3') - -build() { - cd $srcdir/DateTime-$pkgver - perl Build.PL installdirs=vendor destdir="$pkgdir/" - ./Build -} - -check() { - cd $srcdir/DateTime-$pkgver -# ./Build test - true -} - -package() { - cd $srcdir/DateTime-$pkgver - ./Build install - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD deleted file mode 100644 index 49cc66ac4..000000000 --- a/community-staging/perl-dbd-odbc/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71222 2012-05-25 09:48:35Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-dbd-odbc -pkgver=1.37 -pkgrel=2 -pkgdesc="ODBC Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-ODBC/" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi' 'perl' 'unixodbc') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz") -md5sums=('0c294f8e3365c841dcee8a0ba4671c99') - -build() { - cd DBD-ODBC-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd DBD-ODBC-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-dbd-pg/PKGBUILD b/community-staging/perl-dbd-pg/PKGBUILD deleted file mode 100644 index 561621a19..000000000 --- a/community-staging/perl-dbd-pg/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71224 2012-05-25 09:49:12Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-dbd-pg -pkgver=2.19.2 -pkgrel=2 -pkgdesc="Postgres Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-Pg" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.52' 'postgresql-libs') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-${pkgver}.tar.gz") -md5sums=('67c859593e40959b42b3ef23ce6b581e') - -build() { - cd DBD-Pg-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd DBD-Pg-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-dbd-sqlite2/PKGBUILD b/community-staging/perl-dbd-sqlite2/PKGBUILD deleted file mode 100644 index 4a081e33b..000000000 --- a/community-staging/perl-dbd-sqlite2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71226 2012-05-25 09:49:51Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-dbd-sqlite2 -pkgver=0.33 -pkgrel=9 -pkgdesc="Perl/CPAN Module DBD::SQLite2" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/DBD-SQLite2" -license=("GPL" "PerlArtistic") -depends=("perl-dbi") -source=("http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite2-${pkgver}.tar.gz") -md5sums=('babd83fd5eb9ba7560ad4bab4c76c0eb') - -build() { - cd DBD-SQLite2-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd DBD-SQLite2-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-dbd-sybase/PKGBUILD b/community-staging/perl-dbd-sybase/PKGBUILD deleted file mode 100644 index 60d018ef8..000000000 --- a/community-staging/perl-dbd-sybase/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71228 2012-05-25 09:50:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-dbd-sybase -pkgver=1.14 -pkgrel=2 -pkgdesc="Sybase Driver for DBI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/DBD-Sybase/" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.52' 'perl>=5.10.0' 'freetds') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/M/ME/MEWP/DBD-Sybase-${pkgver}.tar.gz") -md5sums=('db6662d710b3adffe37bd8aec8060eda') - -build() { - cd $srcdir/DBD-Sybase-${pkgver} - export SYBASE=/usr - echo -e "\n\n\n\n\n\n" | PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/DBD-Sybase-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-device-serialport/PKGBUILD b/community-staging/perl-device-serialport/PKGBUILD deleted file mode 100644 index d831bf993..000000000 --- a/community-staging/perl-device-serialport/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 71140 2012-05-24 15:05:25Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ross melin <rdmelin@gmail.com> - -pkgname=perl-device-serialport -pkgver=1.04 -pkgrel=4 -pkgdesc="POSIX clone of Win32::SerialPort" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Device-SerialPort" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/C/CO/COOK/Device-SerialPort-$pkgver.tar.gz) -md5sums=('82c698151f934eb28c65d1838cee7d9e') - -build() { - cd $srcdir/Device-SerialPort-$pkgver - eval `perl -V:archname` - PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor - make - make DESTDIR=$pkgdir install - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-file-rsyncp/PKGBUILD b/community-staging/perl-file-rsyncp/PKGBUILD deleted file mode 100644 index 9cc61aad8..000000000 --- a/community-staging/perl-file-rsyncp/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71205 2012-05-24 22:17:08Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=perl-file-rsyncp -pkgver=0.70 -pkgrel=2 -pkgdesc='Perl interface to rsync file list encoding and decoding' -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -options=('!emptydirs' '!makeflags') -url='http://search.cpan.org/dist/File-RsyncP' -source=("http://search.cpan.org/CPAN/authors/id/C/CB/CBARRATT/File-RsyncP-$pkgver.tar.gz") -md5sums=('f244372d15a2991b8700f62e73ac51e4') - -build() { - cd File-RsyncP-$pkgver - USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd File-RsyncP-$pkgver - make test -} - -package() { - cd File-RsyncP-$pkgver - make install DESTDIR="$pkgdir/" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/perl-fuse/PKGBUILD b/community-staging/perl-fuse/PKGBUILD deleted file mode 100644 index e124ecb69..000000000 --- a/community-staging/perl-fuse/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71142 2012-05-24 15:06:05Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-fuse -pkgver=0.14 -pkgrel=2 -pkgdesc="write filesystems in Perl using FUSE" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Fuse" -depends=('perl' 'fuse') -license=('GPL') -source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz) -md5sums=('df72f17bf03e1a31c1a834816a3a59f1') - -build() { - cd $srcdir/Fuse-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd $srcdir/Fuse-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-gd/PKGBUILD b/community-staging/perl-gd/PKGBUILD deleted file mode 100644 index b7acb99cd..000000000 --- a/community-staging/perl-gd/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71144 2012-05-24 15:06:46Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com> - -pkgname=perl-gd -pkgver=2.46 -pkgrel=3 -pkgdesc="Interface to Gd Graphics Library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GD" -license=('GPL' 'PerlArtistic') -depends=('gd') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz) -md5sums=('ea86a94eb45330eae27ecbfd5c2f43bb') - -build() { - cd $srcdir/GD-$pkgver - unset CFLAGS - unset LDFLAGS - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make CCFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -} -package() { - cd $srcdir/GD-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-gssapi/PKGBUILD b/community-staging/perl-gssapi/PKGBUILD deleted file mode 100644 index 0c1272153..000000000 --- a/community-staging/perl-gssapi/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71146 2012-05-24 15:07:37Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-gssapi -pkgver=0.28 -pkgrel=6 -pkgdesc="Perl/CPAN Module GSSAPI" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/GSSAPI" -license=("GPL" "PerlArtistic") -depends=('krb5') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-${pkgver}.tar.gz") -md5sums=('65f00a0749212af064289c8a05e59b3f') - -build() { - cd GSSAPI-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GSSAPI-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-gstreamer-interfaces/PKGBUILD b/community-staging/perl-gstreamer-interfaces/PKGBUILD deleted file mode 100644 index 2c47cff0a..000000000 --- a/community-staging/perl-gstreamer-interfaces/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71298 2012-05-26 12:32:26Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer-interfaces -pkgver=0.06 -pkgrel=5 -pkgdesc="GStreamer::Interfaces" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer-Interfaces" -license=('GPL' 'PerlArtistic') -depends=('glib-perl' 'gstreamer0.10-base' 'perl-extutils-pkgconfig' 'perl-gstreamer' 'perl-extutils-depends') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/T/TS/TSCH/GStreamer-Interfaces-${pkgver}.tar.gz") -md5sums=('aa9583a484fa6829935b360887ecda45') - -build() { - cd GStreamer-Interfaces-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd GStreamer-Interfaces-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-gstreamer/PKGBUILD b/community-staging/perl-gstreamer/PKGBUILD deleted file mode 100644 index 8b325a974..000000000 --- a/community-staging/perl-gstreamer/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71306 2012-05-26 14:01:59Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> - -pkgname=perl-gstreamer -pkgver=0.17 -pkgrel=1 -pkgdesc="Interface to the GStreamer library" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/GStreamer" -license=('GPL' 'PerlArtistic') -depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz) -md5sums=('8fe097daf0e2534452a3f69af05ec9fd') - -build() { - cd GStreamer-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd GStreamer-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-html-strip/PKGBUILD b/community-staging/perl-html-strip/PKGBUILD deleted file mode 100644 index aa62f2d85..000000000 --- a/community-staging/perl-html-strip/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71148 2012-05-24 15:08:17Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-html-strip -pkgver=1.06 -pkgrel=8 -pkgdesc="Perl/CPAN Module HTML::Strip" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~kilinrax/HTML-Strip/" -license=("GPL" "PerlArtistic") -depends=('perl') -source=("http://www.cpan.org/authors/id/K/KI/KILINRAX/HTML-Strip-$pkgver.tar.gz") -md5sums=('ceeacef0c7c31983e3a991e77bb58b45') -options=('!emptydirs') - -build() { - cd $srcdir/HTML-Strip-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/HTML-Strip-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-inline-java/PKGBUILD b/community-staging/perl-inline-java/PKGBUILD deleted file mode 100644 index 6fee5a322..000000000 --- a/community-staging/perl-inline-java/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71150 2012-05-24 15:08:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> - -pkgname=perl-inline-java -pkgver=0.53 -pkgrel=4 -pkgdesc="The Inline::Java module allows you to put Java source code directly inline in a Perl script or module." -arch=('i686' 'x86_64') -depends=('perl' 'perl-inline' 'java-runtime') -makedepends=('java-environment') -license=("GPL" "PerlArtistic") -url="http://search.cpan.org/dist/Inline-Java" -source=(http://search.cpan.org/CPAN/authors/id/P/PA/PATL/Inline-Java-$pkgver.tar.gz) -md5sums=('23f96c2ac4915302c3647c0abc92916f') -options=('!emptydirs') - -build() { - cd $srcdir/Inline-Java-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor J2SDK=$J2SDKDIR - make java - make -} -package() { - cd $srcdir/Inline-Java-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-io-dirent/PKGBUILD b/community-staging/perl-io-dirent/PKGBUILD deleted file mode 100644 index edb76b026..000000000 --- a/community-staging/perl-io-dirent/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71203 2012-05-24 22:13:58Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=perl-io-dirent -pkgver=0.05 -pkgrel=2 -pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir' -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url='http://search.cpan.org/~scottw/IO-Dirent/' -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SC/SCOTTW/IO-Dirent-$pkgver.tar.gz") -md5sums=('248ab22c31a310c3482fd99592ae550c') - -build() { - cd IO-Dirent-$pkgver - USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd IO-Dirent-$pkgver - make test -} - -package() { - cd IO-Dirent-$pkgver - make install DESTDIR="$pkgdir/" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/perl-io-tty/PKGBUILD b/community-staging/perl-io-tty/PKGBUILD deleted file mode 100644 index d1b37d6bb..000000000 --- a/community-staging/perl-io-tty/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71152 2012-05-24 15:09:36Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-io-tty -pkgver=1.10 -pkgrel=2 -pkgdesc="Provide an interface to TTYs and PTYs" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/IO-Tty/" -license=("GPL" "PerlArtistic") -depends=('glibc') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/IO-Tty-$pkgver.tar.gz") -md5sums=('46baec86a145e57f0ec661fa412b097c') - -build() { - cd $srcdir/IO-Tty-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} -package(){ - cd $srcdir/IO-Tty-$pkgver - make install DESTDIR=$pkgdir - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-json-xs/PKGBUILD b/community-staging/perl-json-xs/PKGBUILD deleted file mode 100644 index 6a7e22210..000000000 --- a/community-staging/perl-json-xs/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 71154 2012-05-24 15:10:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tor Krill <tor@krill.nu> - -pkgname=perl-json-xs -pkgver=2.32 -pkgrel=2 -pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast" -url="http://search.cpan.org/dist/JSON-XS/" -license=("GPL") -arch=('i686' 'x86_64') -depends=('perl' 'perl-common-sense') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz) -md5sums=('87f71c78010083ad4d158b5765c4a609') - -build() { - cd $srcdir/JSON-XS-$pkgver -# eval `perl -V:archname` - perl Makefile.PL INSTALLDIRS=vendor - make -} -package() { - cd $srcdir/JSON-XS-$pkgver - make DESTDIR=$pkgdir install - - find $pkgdir -name '.packlist' -delete && \ - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-libapreq2/PKGBUILD b/community-staging/perl-libapreq2/PKGBUILD deleted file mode 100644 index 6bbc2f1ec..000000000 --- a/community-staging/perl-libapreq2/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71156 2012-05-24 15:10:57Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Tom K <tomk@runbox.com> - -pkgname=perl-libapreq2 -pkgver=2.13 -pkgrel=3 -pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data." -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/libapreq2" -depends=('mod_perl' 'apr-util') -makedepends=('perl-extutils-xsbuilder') -license=("GPL") -options=('!libtool' '!makeflags') -source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz) -md5sums=('c11fb0861aa84dcc6cd0f0798b045eee') - -build() { - cd $srcdir/libapreq2-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL --with-apache2-apxs=/usr/sbin/apxs - find . -type f -name Makefile -exec sed -i 's#-ldb-5.1#-ldb-5.2#' {} \; - sed -i 's#-ldb-5.1#-ldb-5.2#' apreq2-config - make -} -package(){ - cd $srcdir/libapreq2-$pkgver - make install DESTDIR=$pkgdir - sed -i "s#$srcdir#/usr/src#" $pkgdir/usr/bin/apreq2-config - find $pkgdir -name '.packlist' -delete - find $pkgdir -name '*.pod' -delete -} diff --git a/community-staging/perl-linux-pid/PKGBUILD b/community-staging/perl-linux-pid/PKGBUILD deleted file mode 100644 index 001b23842..000000000 --- a/community-staging/perl-linux-pid/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 71300 2012-05-26 12:33:28Z bluewind $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Generator : CPANPLUS::Dist::Arch 1.12 - -pkgname='perl-linux-pid' -pkgver='0.04' -pkgrel='2' -pkgdesc="Interface to Linux getpp?id functions" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -depends=('perl') -url='http://search.cpan.org/dist/Linux-Pid' -source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz') -md5sums=('130c4d299f827abf1f2285fddf03fccb') -_distdir="${srcdir}/Linux-Pid-0.04" - -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() { - cd "$_distdir" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - make test - ) -} - -package() { - cd "$_distdir" - make install - find "$pkgdir" -name .packlist -o -name perllocal.pod -delete -} - diff --git a/community-staging/perl-mail-box-parser-c/PKGBUILD b/community-staging/perl-mail-box-parser-c/PKGBUILD deleted file mode 100644 index d76f93665..000000000 --- a/community-staging/perl-mail-box-parser-c/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71158 2012-05-24 15:11:40Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-box-parser-c -pkgver=3.006 -pkgrel=8 -pkgdesc="Perl/CPAN Module Mail::Box::Parser::C : extends MailBox with the speed of C" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Box-Parser-C" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/M/MA/MARKOV/Mail-Box-Parser-C-${pkgver}.tar.gz") -md5sums=('3dfb3e2729597ae33114250cbce1b884') - -build() { - cd Mail-Box-Parser-C-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Box-Parser-C-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-mail-transport-dbx/PKGBUILD b/community-staging/perl-mail-transport-dbx/PKGBUILD deleted file mode 100644 index db0fb88fd..000000000 --- a/community-staging/perl-mail-transport-dbx/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71160 2012-05-24 15:12:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-mail-transport-dbx -pkgver=0.07 -pkgrel=8 -pkgdesc="Perl/CPAN Module Mail::Transport::Dbx : Parse Outlook Express mailboxes" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Mail-Transport-Dbx" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/V/VP/VPARSEVAL/Mail-Transport-Dbx-${pkgver}.tar.gz") -md5sums=('4dcf5346a67c0a7f861cb2bb51a7d14e') - -build() { - cd Mail-Transport-Dbx-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Mail-Transport-Dbx-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-net-dbus/PKGBUILD b/community-staging/perl-net-dbus/PKGBUILD deleted file mode 100644 index 01eaa3257..000000000 --- a/community-staging/perl-net-dbus/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 71162 2012-05-24 15:13:00Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-net-dbus -pkgver=1.0.0 -pkgrel=2 -pkgdesc="Binding for DBus messaging protocol" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Net-DBus" -license=('GPL' 'PerlArtistic') -depends=('dbus' 'perl-xml-twig') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANBERR/Net-DBus-${pkgver}.tar.gz") -md5sums=('b17e32976d1a3b56feb908ebd7fed7f1') - -build() { - cd Net-DBus-${pkgver} - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd Net-DBus-${pkgver} - make install DESTDIR=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-net-libidn/PKGBUILD b/community-staging/perl-net-libidn/PKGBUILD deleted file mode 100644 index 25b52b1fa..000000000 --- a/community-staging/perl-net-libidn/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71164 2012-05-24 15:13:39Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-net-libidn -pkgver=0.12 -pkgrel=6 -pkgdesc="Perl/CPAN Module Net::LibIDN" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Net-LibIDN/" -license=("GPL" "PerlArtistic") -depends=(perl libidn) -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TH/THOR/Net-LibIDN-${pkgver}.tar.gz") -md5sums=('c3e4de2065009d67bcb1df0afb473e12') - -build() { - cd Net-LibIDN-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Net-LibIDN-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-package-stash-xs/PKGBUILD b/community-staging/perl-package-stash-xs/PKGBUILD deleted file mode 100644 index 24f48ca2c..000000000 --- a/community-staging/perl-package-stash-xs/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 71302 2012-05-26 12:34:18Z bluewind $ - -pkgname=perl-package-stash-xs -pkgver=0.25 -pkgrel=2 -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-staging/perl-params-classify/PKGBUILD b/community-staging/perl-params-classify/PKGBUILD deleted file mode 100644 index 2f32dce7f..000000000 --- a/community-staging/perl-params-classify/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 71166 2012-05-24 15:14:16Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-params-classify -pkgver=0.013 -pkgrel=2 -pkgdesc="argument type classification" -arch=(i686 x86_64) -license=('PerlArtistic') -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=('63d24fbec775472ada49d16bce4a9b1f') - -build() { - cd $srcdir/Params-Classify-$pkgver - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make install DESTDIR=${pkgdir} - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete -} diff --git a/community-staging/perl-params-util/PKGBUILD b/community-staging/perl-params-util/PKGBUILD deleted file mode 100644 index d1cd22773..000000000 --- a/community-staging/perl-params-util/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 71304 2012-05-26 12:34:54Z bluewind $ - -pkgname=perl-params-util -pkgver=1.04 -pkgrel=2 -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-staging/perl-params-validate/PKGBUILD b/community-staging/perl-params-validate/PKGBUILD deleted file mode 100644 index 4336830ae..000000000 --- a/community-staging/perl-params-validate/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71168 2012-05-24 15:14:58Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-params-validate -pkgver=1.06 -pkgrel=3 -pkgdesc="Validate sub params against a spec" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Params-Validate" -license=('GPL' 'PerlArtistic') -depends=('perl' 'perl-module-implementation') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DR/DROLSKY/Params-Validate-${pkgver}.tar.gz") -md5sums=('4f7a281269cd30d7c3994ba5acb50857') - -build() { - cd Params-Validate-${pkgver} - perl ./Build.PL --installdirs=vendor - ./Build -} -package(){ - cd Params-Validate-${pkgver} - ./Build install --destdir=${pkgdir} - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-string-crc32/PKGBUILD b/community-staging/perl-string-crc32/PKGBUILD deleted file mode 100644 index 2fc051dfd..000000000 --- a/community-staging/perl-string-crc32/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71170 2012-05-24 15:15:35Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-string-crc32 -pkgver=1.4 -pkgrel=8 -pkgdesc="Perl/CPAN Module String::CRC32 : ZMODEMlike CRC32 generation" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/String-CRC32" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/S/SO/SOENKE/String-CRC32-${pkgver}.tar.gz") -md5sums=('9b241bc4a482a3aa59fbb1429bc30546') - -build() { - cd String-CRC32-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd String-CRC32-${pkgver} - - make pure_install doc_install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-text-charwidth/PKGBUILD b/community-staging/perl-text-charwidth/PKGBUILD deleted file mode 100644 index 6e33f7668..000000000 --- a/community-staging/perl-text-charwidth/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71172 2012-05-24 15:16:12Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-text-charwidth -pkgver=0.04 -pkgrel=8 -pkgdesc="Perl/CPAN Module Text::CharWidth" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Text-CharWidth" -license=("GPL" "PerlArtistic") -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/K/KU/KUBOTA/Text-CharWidth-${pkgver}.tar.gz") -md5sums=('37a723df0580c0758c0ee67b37336c15') - -build() { - cd Text-CharWidth-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-CharWidth-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-text-kakasi/ChangeLog b/community-staging/perl-text-kakasi/ChangeLog deleted file mode 100644 index 0a469fdff..000000000 --- a/community-staging/perl-text-kakasi/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2008-10-27 Allan McRae <allan@archlinux.org> - * perl-text-kakasi 2.04-4 - * fixed typo in depends diff --git a/community-staging/perl-text-kakasi/PKGBUILD b/community-staging/perl-text-kakasi/PKGBUILD deleted file mode 100644 index 7b95d1bb1..000000000 --- a/community-staging/perl-text-kakasi/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 71174 2012-05-24 15:16:46Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-text-kakasi -pkgver=2.04 -pkgrel=9 -pkgdesc="Perl frontend to kakasi" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Text-Kakasi" -license=('GPL' 'PerlArtistic') -depends=('perl' 'kakasi') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/D/DA/DANKOGAI/Text-Kakasi-${pkgver}.tar.gz") -md5sums=('5a9e381cb93edfd707124a63c60f96b1') - -build() { - cd Text-Kakasi-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Text-Kakasi-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-tie-hash-indexed/PKGBUILD b/community-staging/perl-tie-hash-indexed/PKGBUILD deleted file mode 100644 index 6b907f694..000000000 --- a/community-staging/perl-tie-hash-indexed/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71176 2012-05-24 15:17:24Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-tie-hash-indexed -pkgver=0.05 -pkgrel=8 -pkgdesc="Ordered hashes for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Tie-Hash-Indexed" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MH/MHX/Tie-Hash-Indexed-${pkgver}.tar.gz) -md5sums=('41e2d013df8cfafdd239bc65bbada014') - -build() { - cd Tie-Hash-Indexed-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tie-Hash-Indexed-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-tk-tablematrix/PKGBUILD b/community-staging/perl-tk-tablematrix/PKGBUILD deleted file mode 100644 index a1c277836..000000000 --- a/community-staging/perl-tk-tablematrix/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 71262 2012-05-26 07:28:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-tk-tablematrix -pkgver=1.23 -pkgrel=9 -pkgdesc="Display data in TableSpreadsheet format" -arch=("i686" "x86_64") -url="http://search.cpan.org/dist/Tk-TableMatrix" -license=("GPL" "PerlArtistic") -depends=('perl-tk') -options=('!emptydirs') -source=("http://www.cpan.org/authors/id/C/CE/CERNEY/Tk-TableMatrix-${pkgver}.tar.gz") -md5sums=('6b7653d129bf1a8327054a88b58d6364') - -build() { - cd Tk-TableMatrix-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Tk-TableMatrix-${pkgver} - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete - - rm -f ${pkgdir}/usr/lib/perl5/vendor_perl/auto/Tk/pTk/extralibs.ld -} diff --git a/community-staging/perl-www-curl/PKGBUILD b/community-staging/perl-www-curl/PKGBUILD deleted file mode 100644 index eccec2850..000000000 --- a/community-staging/perl-www-curl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 71178 2012-05-24 15:18:00Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Charles Mauch <cmauch@gmail.com> - -pkgname=perl-www-curl -pkgver=4.15 -pkgrel=3 -pkgdesc="Perl/CPAN Module WWW::Curl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/WWW-Curl/" -license=("GPL" "PerlArtistic") -depends=("curl") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/S/SZ/SZBALINT/WWW-Curl-${pkgver}.tar.gz") -md5sums=('31c0b8c7e5e2d26bcc8213d702186d5f') - -build() { - cd WWW-Curl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd WWW-Curl-${pkgver} - - make install DESTDIR=${pkgdir} - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/perl-xmms/PKGBUILD b/community-staging/perl-xmms/PKGBUILD deleted file mode 100644 index 8af5be8b3..000000000 --- a/community-staging/perl-xmms/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 71180 2012-05-24 15:18:43Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Georg Grabler <ggrabler@gmail.com> - -pkgname=perl-xmms -pkgver=0.12 -pkgrel=8 -pkgdesc="Bundle::Xmms - Bundle for xmms remote control shell" -arch=('i686' 'x86_64') -url="http://search.cpan.org/~dougm/Xmms-Perl/" -depends=('perl' 'xmms' 'libxxf86dga') -license=('GPL' 'PerlArtistic') -source=("http://search.cpan.org/CPAN/authors/id/D/DO/DOUGM/Xmms-Perl-${pkgver}.tar.gz") -md5sums=('d1fbf6d09330f7855dd80f3ceee8e6f7') - -build() { - cd Xmms-Perl-${pkgver} - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -package() { - cd Xmms-Perl-${pkgver} - - make DESTDIR=${pkgdir} install - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/community-staging/pork/PKGBUILD b/community-staging/pork/PKGBUILD deleted file mode 100644 index ba6016644..000000000 --- a/community-staging/pork/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 71198 2012-05-24 19:24:21Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=pork -pkgver=0.99.8.1 -pkgrel=6 -pkgdesc="Console-based AOL Instant Messenger & IRC client" -arch=('i686' 'x86_64') -url="http://dev.ojnk.net/" -license=('GPL') -depends=('ncurses' 'perl') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz) -sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed') - -build() { - cd $pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd $pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community-staging/rxvt-unicode/PKGBUILD b/community-staging/rxvt-unicode/PKGBUILD deleted file mode 100644 index 905b823ef..000000000 --- a/community-staging/rxvt-unicode/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 71207 2012-05-24 22:39:26Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org - -pkgname=rxvt-unicode -pkgver=9.15 -pkgrel=3 -pkgdesc='An unicode enabled rxvt-clone terminal emulator (urxvt)' -arch=('i686' 'x86_64') -url='http://software.schmorp.de/pkg/rxvt-unicode.html' -license=('GPL') -depends=('libxft' 'gdk-pixbuf2' 'perl' 'startup-notification') -optdepends=('gtk2-perl: to use the urxvt-tabbed') -source=( - "http://dist.schmorp.de/rxvt-unicode/$pkgname-$pkgver.tar.bz2" - 'urxvt.desktop' - 'urxvtc.desktop' - 'urxvt-tabbed.desktop' -) -md5sums=('15595aa326167ac5eb68c28d95432faf' - '88d8786d74b819450adf722180db09fd' - 'bebf5b6b399b74b557fcedbdb47cc387' - '2604896bb107fbb5511bfd6f46d65894') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --with-terminfo=/usr/share/terminfo \ - --enable-256-color \ - --enable-combining \ - --enable-fading \ - --enable-font-styles \ - --enable-iso14755 \ - --enable-keepscrolling \ - --enable-lastlog \ - --enable-mousewheel \ - --enable-next-scroll \ - --enable-perl \ - --enable-pixbuf \ - --enable-pointer-blank \ - --enable-rxvt-scroll \ - --enable-selectionscrolling \ - --enable-slipwheeling \ - --enable-smart-resize \ - --enable-startup-notification \ - --enable-transparency \ - --enable-unicode3 \ - --enable-utmp \ - --enable-wtmp \ - --enable-xft \ - --enable-xim \ - --enable-xterm-scroll \ - --disable-frills - make -} - -package() { - pushd $pkgname-$pkgver - # workaround terminfo installation - export TERMINFO="$pkgdir/usr/share/terminfo" - install -d "$TERMINFO" - make DESTDIR="$pkgdir" install - # install the tabbing wrapper ( requires gtk2-perl! ) - sed -i 's/\"rxvt\"/"urxvt"/' doc/rxvt-tabbed - install -Dm 755 doc/rxvt-tabbed "$pkgdir/usr/bin/urxvt-tabbed" - popd - # install freedesktop menu - for _f in urxvt urxvtc urxvt-tabbed; do - install -Dm644 $_f.desktop "$pkgdir/usr/share/applications/$_f.desktop" - done -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-staging/rxvt-unicode/urxvt-tabbed.desktop b/community-staging/rxvt-unicode/urxvt-tabbed.desktop deleted file mode 100644 index f3efdc9b9..000000000 --- a/community-staging/rxvt-unicode/urxvt-tabbed.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt (tabbed) -Comment=An unicode capable and tabbed rxvt clone -Exec=urxvt-tabbed -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-staging/rxvt-unicode/urxvt.desktop b/community-staging/rxvt-unicode/urxvt.desktop deleted file mode 100644 index 0a9baf7df..000000000 --- a/community-staging/rxvt-unicode/urxvt.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt -Comment=An unicode capable rxvt clone -Exec=urxvt -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-staging/rxvt-unicode/urxvtc.desktop b/community-staging/rxvt-unicode/urxvtc.desktop deleted file mode 100644 index e39a418f6..000000000 --- a/community-staging/rxvt-unicode/urxvtc.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=urxvt (client) -Comment=An unicode capable rxvt clone client for urxvtd -Exec=urxvtc -Icon=terminal -Terminal=false -Type=Application -Categories=Application;System;TerminalEmulator; diff --git a/community-staging/spacefm/PKGBUILD b/community-staging/spacefm/PKGBUILD deleted file mode 100644 index 818712771..000000000 --- a/community-staging/spacefm/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 71258 2012-05-26 07:14:26Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ -# Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com> - -pkgname=spacefm -pkgver=0.7.6 -pkgrel=3 -pkgdesc="A multi-panel tabbed file manager" -arch=('i686' 'x86_64') -url="http://ignorantguru.github.com/spacefm/" -license=('GPL2') -install=$pkgname.install -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'udev') -makedepends=('intltool' 'gettext') -optdepends=('lsof: device processes' - 'eject: eject media' - 'wget: plugin download' - 'gksu: perform as root functionality' - 'pmount: mount as non-root user' - 'udisks: mount as non-root user' - 'udisks2: mount as non-root user') -source=(https://raw.github.com/IgnorantGuru/spacefm/master/packages/${pkgver}/spacefm-${pkgver}.tar.xz) -md5sums=('572b256ab46073d8bb065999bd531423') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # NOTE: To enable hal support add --enable-hal to - # configure line below. See README for details. - # NOTE: To disable inotify and use fam or gamin instead, add: - # --disable-inotify to configure line below. - # NOTE: To add a custom su program (mysu in this example), add: - # --with-preferable-sudo="mysu" to configure line below. - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install -} - diff --git a/community-staging/spacefm/spacefm.install b/community-staging/spacefm/spacefm.install deleted file mode 100644 index 1182e768f..000000000 --- a/community-staging/spacefm/spacefm.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-staging/tellico/PKGBUILD b/community-staging/tellico/PKGBUILD deleted file mode 100644 index 3f232cf5d..000000000 --- a/community-staging/tellico/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 70653 2012-05-13 20:54:07Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=tellico -pkgver=2.3.5 -pkgrel=2 -pkgdesc="A collection manager for KDE" -arch=('i686' 'x86_64') -url="http://tellico-project.org/" -license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') - -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 - -# fix python 2.7 path - find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/community-staging/tellico/tellico.install b/community-staging/tellico/tellico.install deleted file mode 100644 index 3b3aff7d9..000000000 --- a/community-staging/tellico/tellico.install +++ /dev/null @@ -1,13 +0,0 @@ -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/community-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD deleted file mode 100644 index 44061879e..000000000 --- a/community-staging/znc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 71210 2012-05-24 23:36:36Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: mickael9 <mickael9 at gmail dot com> - -pkgname=znc -pkgver=0.206 -pkgrel=2 -pkgdesc='An IRC bouncer with modules & scripts support' -url='http://en.znc.in/wiki/index.php/ZNC' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('c-ares' 'libsasl') -#makedepends=('swig' 'tcl' 'python' 'perl') -makedepends=('tcl' 'python' 'perl') -optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" - "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" - "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") -md5sums=('b7d3f21da81abaeb553066b0e10beb53' - 'a9c72d556d9a4ef100520433f17d71ae' - '19bf033c5cb9243171c215043c594f07') - -build() { - # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 - # use an alternate ways of building znc explain here: - # - http://wiki.znc.in/Modperl - # - http://wiki.znc.in/Modpython - mv -v modperl/* $pkgname-$pkgver/modules/modperl - mv -v modpython/* $pkgname-$pkgver/modules/modpython - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-sasl \ - --enable-python \ - --enable-perl \ - --enable-tcl \ - --disable-swig \ - --enable-extra - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/awesome/01-fix_glib2_build.patch b/community-testing/awesome/01-fix_glib2_build.patch deleted file mode 100644 index aeab63fbb..000000000 --- a/community-testing/awesome/01-fix_glib2_build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny <thomas.moschny@gmx.de> -Date: Wed, 14 Dec 2011 20:00:53 +0100 -Subject: [PATCH] Fix build with glib2 2.31.0 - -Starting with glib2 2.31.0, It is no longer possible to -include individual headers (like "ghash.h") -- you must -#include <glib.h>. - -Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- - spawn.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/spawn.c b/spawn.c -index 3c8cf07..a6d6c5e 100644 ---- a/spawn.c -+++ b/spawn.c -@@ -24,7 +24,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include <glib/gspawn.h> -+#include <glib.h> - - #include "spawn.h" - #include "screen.h" --- -1.7.2.5 - diff --git a/community-testing/awesome/PKGBUILD b/community-testing/awesome/PKGBUILD deleted file mode 100644 index 83c1f336c..000000000 --- a/community-testing/awesome/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 69984 2012-04-27 22:04:24Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: xduugu -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: Vesa Kaihlavirta - -pkgname=awesome -pkgver=3.4.11 -pkgrel=4 -pkgdesc='Highly configurable framework window manager' -arch=('i686' 'x86_64') -url='http://awesome.naquadah.org/' -license=('GPL2') -depends=( - 'cairo' - 'dbus' - 'imlib2' - 'libev' - 'libxdg-basedir' - 'lua' - 'pango' - 'startup-notification' - 'xcb-util-image' - 'xcb-util-keysyms' - 'xcb-util-wm' - 'xorg-xmessage' -) -makedepends=( - 'asciidoc' - 'cmake' - 'docbook-xsl' - 'doxygen' - 'gperf' - 'imagemagick' - 'luadoc' - 'xmlto' -) -optdepends=( - 'rlwrap: readline support for awesome-client' - 'feh: image background setter for awsetbg' -) -provides=('notification-daemon') -source=("$url/download/$pkgname-$pkgver.tar.xz" - "$pkgname.desktop" - '01-fix_glib2_build.patch') -md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2' - '0fdbeec43d211c6750041d7e37611a6a' - 'baa179074c36e26ef156ebb2060bfd5c') - -build() { - cd $pkgname-$pkgver - # to remove in 3.4.12 - patch -N -p1 -i ../01-fix_glib2_build.patch - make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE' -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # install desktop file so you can start awesome from your login manager - install -Dm644 ../awesome.desktop "$pkgdir/usr/share/xsessions/awesome.desktop" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/awesome/awesome.desktop b/community-testing/awesome/awesome.desktop deleted file mode 100644 index 453399c6e..000000000 --- a/community-testing/awesome/awesome.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Awesome -Comment=Highly configurable framework window manager -Type=XSession -Exec=awesome -TryExec=awesome diff --git a/community-testing/ecryptfs-utils/PKGBUILD b/community-testing/ecryptfs-utils/PKGBUILD deleted file mode 100644 index e88479bef..000000000 --- a/community-testing/ecryptfs-utils/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 70054 2012-04-28 21:41:48Z dreisner $ -# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> -# Contributor: Richard Murri <admin@richardmurri.com> -# Contributor: Michal Krenek <mikos@sg1.cz> - -pkgname=ecryptfs-utils -pkgver=96 -pkgrel=2 -arch=('i686' 'x86_64') -pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux" -url="https://launchpad.net/ecryptfs" -license=('GPL') -makedepends=('swig' 'intltool' 'gettext') -depends=('keyutils' 'nss' 'python2') -source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz") -options=(!libtool) -md5sums=('4f92c9f6e8f62ac00ca7e2c4e480f1d7') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-pamdir=/usr/lib/security PYTHON=python2 - make -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir/" install - chmod +s "$pkgdir"/sbin/mount.ecryptfs_private -} diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD deleted file mode 100644 index f17e4461a..000000000 --- a/community-testing/gambas2/PKGBUILD +++ /dev/null @@ -1,954 +0,0 @@ -# $Id: PKGBUILD 70991 2012-05-21 16:29:25Z foutrelis $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Biru Ionut <ionut@archlinux.ro> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Toni Foerster <stonerl@skeps.de> - -pkgbase="gambas2" -pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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.24.0 -pkgrel=1 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' - 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') -license=('GPL2') -options=('!emptydirs' '!makeflags') -groups=('gambas2') -replaces=('gambas2') -conflicts=('gambas2') -source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' - 'gambas2-script.install' 'gambas2-runtime.install' - 'poppler-0.20.patch') -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b') -_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" - -_buildgbcomp() { - cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install $1.gambas ${pkgdir}/usr/lib/gambas2/ - install .component ${pkgdir}/usr/lib/gambas2/$1.component - chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component - install .info ${pkgdir}/usr/share/gambas2/info/$1.info - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info - install .list ${pkgdir}/usr/share/gambas2/info/$1.list - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list - if test -d control; then - install -d ${pkgdir}/usr/share/gambas2/control/$1 - install control/*.png ${pkgdir}/usr/share/gambas2/control/$1 - chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png - fi -} - -build() { - cd "${srcdir}/$pkgbase-$pkgver" - - msg "Applying patches ..." - # workaround to allow package splitting - patch -Np1 -i ../fix-gbi-gba-path.patch - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np0 -i ../../poppler-0.20.patch - cd .. - - ./reconf-all - ## - - . /etc/profile.d/kde3.sh - . /etc/profile.d/qt3.sh - - ./configure -C --disable-qte --prefix=/usr - make bindir=${pkgdir}/usr/bin -} - -package_gambas2-meta() { - depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - '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') - pkgdesc="Gambas2 meta package" -} - -package_gambas2-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas2 runtime environment" - install=gambas2-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \ - ${pkgdir}/usr/lib/gambas2 - ln -s gbx2 ${pkgdir}/usr/bin/gbr2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ - ${pkgdir}/usr/share/gambas2/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas2/icons - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png -} - -package_gambas2-devel() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-ide() { - depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings' - 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel') - pkgdesc="Gambas2 Integrated Development Environment" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - _buildgbcomp gb.form.mdi - _buildgbcomp gb.settings - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/ - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin - install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin - ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ - ${pkgdir}/usr/share/applications/gambas2.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ - ${pkgdir}/usr/share/pixmaps/gambas2.png -} - -package_gambas2-examples() { - depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') - pkgdesc="Gambas2 examples" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas2/{help,info} -} - -package_gambas2-help() { - depends=() - pkgdesc="Gambas2 help files" -# arch=('any') - - cd ${srcdir}/${pkgbase}-${pkgver}/help - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - #fix help - chown root:root -R ${pkgdir}/usr/share/gambas2/help/help -} - -package_gambas2-script() { - depends=('gambas2-devel') - pkgdesc="Gambas2 scripter and server programs support" - install=gambas2-script.install -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install -m755 gbs2.gambas ${pkgdir}/usr/bin - - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2 - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2 - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/ - ## -} - -package_gambas2-gb-chart() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 chart component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.chart - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-compress() { - depends=('gambas2-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas2 compression support component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-corba() { - depends=('gambas2-runtime' 'omniorb') - pkgdesc="Gambas2 corba component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-crypt() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 MD5/DES crypting component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-firebird() { - depends=('gambas2-gb-db' 'libfbclient') - pkgdesc="Gambas2 Firebird database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-form() { - depends=('gambas2-gb-db' 'gambas2-gb-form') - pkgdesc="Gambas2 database form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.db.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-db-mysql() { - depends=('gambas2-gb-db' 'libmysqlclient') - pkgdesc="Gambas2 MySQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-odbc() { - depends=('gambas2-gb-db' 'unixodbc') - pkgdesc="Gambas2 ODBC database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-postgresql() { - depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1') - pkgdesc="Gambas2 PostgreSQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2') - pkgdesc="Gambas2 Sqlite2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite') - pkgdesc="Gambas2 Sqlite3 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-desktop() { - depends=('gambas2-runtime' 'libsm' 'libxtst') - pkgdesc="Gambas2 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form() { - depends=('gambas2-gb-gui') - pkgdesc="Gambas2 form component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-dialog() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form dialog component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-mdi() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form MDI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.mdi - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk() { - depends=('gambas2-runtime' 'gtk2') - pkgdesc="Gambas2 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-ext() { - depends=('gambas2-gb-gtk') - pkgdesc="Gambas2 graphical GTK+ toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-svg() { - depends=('gambas2-gb-gtk' 'librsvg') - pkgdesc="Gambas2 graphical GTK+ toolkit svg component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gui() { - depends=('gambas2-gb-qt' 'gambas2-gb-gtk') - pkgdesc="Gambas2 automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-image() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 image processing component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-info() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 info component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.info - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-net() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-curl() { - depends=('gambas2-runtime' 'curl') - pkgdesc="Gambas2 advanced networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-smtp() { - depends=('gambas2-runtime' 'glib2') - pkgdesc="Gambas2 SMTP component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'libgl' 'mesa') - pkgdesc="Gambas2 OpenGL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-option() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 command-line options component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pcre() { - depends=('gambas2-runtime' 'pcre') - pkgdesc="Gambas2 PCRE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pdf() { - depends=('gambas2-runtime' 'poppler-glib') - pkgdesc="Gambas2 PDF component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-qt() { - depends=('gambas2-runtime' 'qt3') - pkgdesc="Gambas2 graphical QT toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-ext() { - depends=('gambas2-gb-qt') - pkgdesc="Gambas2 graphical QT toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-opengl() { - depends=('gambas2-gb-qt' 'libgl') - pkgdesc="Gambas2 graphical QT toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-kde() { - depends=('gambas2-gb-qt' 'kdelibs3') - pkgdesc="Gambas2 KDE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html* - rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html* -} - -package_gambas2-gb-qt-kde-html() { - depends=('gambas2-gb-qt-kde') - pkgdesc="Gambas2 KHTML component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-report() { - depends=('gambas2-runtime' 'gambas2-gb-form') - pkgdesc="Gambas2 report component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.report - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl') - pkgdesc="Gambas2 SDL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-sdl-sound() { - depends=('gambas2-runtime' 'sdl_mixer') - pkgdesc="Gambas2 SDL sound component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-settings() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 settings management component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.settings - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-v4l() { - depends=('gambas2-runtime' 'libjpeg' 'libpng') - pkgdesc="Gambas2 V4L component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-vb() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 VB transitional component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-web() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 CGI component" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.web - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml() { - depends=('gambas2-runtime' 'libxml2') - pkgdesc="Gambas2 xml component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*} - rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-rpc() { - depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl') - pkgdesc="Gambas2 xml-rpc component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*} - rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-xslt() { - depends=('gambas2-gb-xml' 'libxslt') - pkgdesc="Gambas2 xml-xslt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch deleted file mode 100644 index 9be8e921e..000000000 --- a/community-testing/gambas2/fix-gbi-gba-path.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- component.am 2010-03-15 20:54:43.000000000 +0100 -+++ ../component.am 2010-04-30 15:00:47.218700833 +0200 -@@ -6,17 +6,17 @@ - @if test -d $(COMPONENT); then \ - echo "Compiling the $(COMPONENT) project..."; \ - ( \ -- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ -+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ - cd $(COMPONENT); \ -- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ -+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -+ $(GBFILES)/gba$(GAMBAS_VERSION); \ - rm -rf .gambas; \ - $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ - ) \ - fi - @echo - @echo "Creating the information files for $(COMPONENT) component..." -- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) -+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) - @echo - - uninstall-hook: diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install deleted file mode 100644 index 86558e434..000000000 --- a/community-testing/gambas2/gambas2-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/poppler-0.20.patch b/community-testing/gambas2/poppler-0.20.patch deleted file mode 100644 index a73d42a7f..000000000 --- a/community-testing/gambas2/poppler-0.20.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: src/CPdfDocument.cpp -=================================================================== ---- src/CPdfDocument.cpp (révision 4732) -+++ src/CPdfDocument.cpp (copie de travail) -@@ -407,7 +407,11 @@ - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else - THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif - - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); -@@ -833,13 +837,22 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, - gTrue, - x,y,w,h, -+ gFalse); -+ #else -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, - gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse, - THIS->doc->getCatalog ()); -+ #endif - - map=THIS->dev->getBitmap(); - -@@ -929,9 +942,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \ - gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -+ #endif - - THIS->page->display(gfx); - dev->endPage(); -@@ -960,7 +978,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1200,12 +1220,21 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) { - GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1); -Index: configure.ac -=================================================================== ---- configure.ac (révision 4732) -+++ configure.ac (copie de travail) -@@ -25,6 +25,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD deleted file mode 100644 index 86205d2b3..000000000 --- a/community-testing/gambas3/PKGBUILD +++ /dev/null @@ -1,1130 +0,0 @@ -# $Id: PKGBUILD 70993 2012-05-21 16:29:35Z foutrelis $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> - -pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' - 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' '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') -pkgver=3.1.1 -pkgrel=3 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl') -options=('!emptydirs' '!makeflags') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install' - 'poppler-0-20.patch') -md5sums=('bdf387f435d7aeedb7efa488ea1a5d62' - 'b284be39d147ec799f1116a6abc068b4' - 'b5cc403990f31b8ea1c5cf37366d3d29' - '39d2ae1e2096a29df7857fce083eafaf') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np1 -i ../../poppler-0-20.patch - cd .. - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Runtime environment" - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install - - cd ../gbx - make DESTDIR="${pkgdir}" install - cd ../lib/debug - make DESTDIR="${pkgdir}" install - cd ../eval - make DESTDIR="${pkgdir}" install - cd ../draw - make DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas3.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - cd gbc - make DESTDIR="${pkgdir}" uninstall -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" install -} - -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="Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - -#!! with the ide !! - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ - ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' - 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' - '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="Applications examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* - ## -} - -package_gambas3-gb-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]* - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2') - pkgdesc="Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite') - pkgdesc="Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring') - pkgdesc="Desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/control - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-gb-gui') - pkgdesc="Form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image') - pkgdesc="Image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'libgl' 'glew') - pkgdesc="OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'libgl') - pkgdesc="Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4' 'qtwebkit') - pkgdesc="Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl') - pkgdesc="SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="Signal component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="VB transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl') - pkgdesc="XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*} - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install deleted file mode 100644 index 6c8201a6a..000000000 --- a/community-testing/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3 - xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml -} diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-testing/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gambas3/poppler-0-20.patch b/community-testing/gambas3/poppler-0-20.patch deleted file mode 100644 index 3b0e4612a..000000000 --- a/community-testing/gambas3/poppler-0-20.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac ---- gb.pdf/configure.ac 2012-05-14 08:55:02.448921378 +0200 -+++ gb.pdf.fixed/configure.ac 2012-05-14 08:52:19.098596499 +0200 -@@ -24,6 +24,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ -diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp ---- gb.pdf/src/CPdfDocument.cpp 2012-05-14 08:55:02.388922483 +0200 -+++ gb.pdf.fixed/src/CPdfDocument.cpp 2012-05-15 09:25:45.168457227 +0200 -@@ -449,9 +449,13 @@ - - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); -- -- THIS->dev->startDoc(THIS->doc->getXRef ()); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else -+ THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif -+ - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); - -@@ -875,6 +879,14 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, -+ gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse); -+ #else - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, -@@ -882,7 +894,8 @@ - x,y,w,h, - gFalse, - THIS->doc->getCatalog ()); -- -+ #endif -+ - map=THIS->dev->getBitmap(); - - data=(uint32_t*)map->getDataPtr(); -@@ -940,9 +953,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -- -+ #endif -+ - THIS->page->display(gfx); - dev->endPage(); - -@@ -970,7 +988,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1152,13 +1172,22 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - - count = 0; -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) - GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff --git a/community-testing/i3lock/PKGBUILD b/community-testing/i3lock/PKGBUILD deleted file mode 100644 index 8a422ad18..000000000 --- a/community-testing/i3lock/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 70151 2012-04-30 19:56:29Z ttopper $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=i3lock -pkgver=2.4 -pkgrel=2 -pkgdesc="An improved screenlocker based upon XCB and PAM" -arch=('i686' 'x86_64') -url="http://i3wm.org/i3lock/" -license=('MIT') -groups=("i3") -depends=('xcb-util-image' 'xcb-util-keysyms' 'pam' 'libev' 'libx11' 'cairo') -options=('docs') -source=("http://i3wm.org/i3lock/$pkgname-$pkgver.tar.bz2") -md5sums=('728e2654d886ef97449708f0135e9fa5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make - gzip i3lock.1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 i3lock.1.gz ${pkgdir}/usr/share/man/man1/i3lock.1.gz - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - make clean -} - -# vim:set ts=2 sw=2 et: - diff --git a/community-testing/ktikz/PKGBUILD b/community-testing/ktikz/PKGBUILD deleted file mode 100644 index d20dfbdcb..000000000 --- a/community-testing/ktikz/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> -# Contributor: linuxSEAT <--put_my_name_here--@gmail.com> -# Contributor: Le_J <clej37 at gmail dot com> - -pkgname=ktikz -pkgver=0.10 -pkgrel=4 -pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)" -arch=('i686' 'x86_64') -url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/" -license=("GPL") -depends=('poppler-qt' 'kdelibs') -makedepends=('automoc4' 'cmake' 'docbook-xml') -source=("http://www.hackenberger.at/ktikz/"$pkgname"_"$pkgver".tar.gz") -md5sums=('e8f0826cba2447250bcdcd389a71a2ac') - -build() { - cd "$srcdir"/"$pkgname" - - cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix` - make -} - -package() { - cd "$srcdir"/"$pkgname" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/ktikz/ktikz.install b/community-testing/ktikz/ktikz.install deleted file mode 100644 index 210d1ac2b..000000000 --- a/community-testing/ktikz/ktikz.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor > /dev/null - update-mime-database /usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/libextractor/PKGBUILD b/community-testing/libextractor/PKGBUILD deleted file mode 100644 index 93dac3214..000000000 --- a/community-testing/libextractor/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 71003 2012-05-21 17:28:00Z foutrelis $ -# Maintainer: Sergej Pupykin <pupykin.s@gmail.com> -# Contributor: damir <damir@archlinux.org> - -pkgname=libextractor -pkgver=0.6.3 -pkgrel=4 -pkgdesc="A library used to extract meta-data from files of arbitrary type" -arch=("i686" "x86_64") -license=('GPL') -url="http://gnunet.org/libextractor/" -depends=('libltdl') -makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2') -optdepends=('flac: flac support' - 'poppler: pdf support' - 'exiv2: metadata support' - 'qt: the Qt GUI interface/thumbnails' - 'gtk2: gtk2 GUI interface/thumbnails' - 'libgsf: (optional) for ODF support' - 'libmpeg2: mpeg support' - 'libvorbis: ogg/vorbis support') -options=('!libtool' '!makeflags') -install=libextractor.install -source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('7004ff6be06e400050f0ad7016140981' - '81f95c31831dde62428a98ae32464c51') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir -} diff --git a/community-testing/libextractor/libextractor.install b/community-testing/libextractor/libextractor.install deleted file mode 100644 index 1cf51e095..000000000 --- a/community-testing/libextractor/libextractor.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(extractor.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - 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 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/mariadb/PKGBUILD b/community-testing/mariadb/PKGBUILD deleted file mode 100644 index aa5ea5ab0..000000000 --- a/community-testing/mariadb/PKGBUILD +++ /dev/null @@ -1,133 +0,0 @@ -# $Id: PKGBUILD 69922 2012-04-26 15:44:57Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> - -pkgbase=mariadb -pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.23 -pkgrel=3 -arch=('i686' 'x86_64') -license=('GPL') -url="http://mariadb.org/" -makedepends=('cmake' 'openssl' 'zlib') -options=('!libtool') -source=("http://mirror.de.gsnw.de:56431/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz" - 'mysqld') -md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f' - '3bb5a9a96340feb0184bc057ee6e330b') - -build() { - cd "${srcdir}" - mkdir build - cd build - - # CFLAGS/CXXFLAGS as suggested upstream - CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ - CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \ - - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ - -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ - -DENABLED_LOCAL_INFILE=ON \ - -DINSTALL_INFODIR=share/mysql/docs \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_INCLUDEDIR=include/mysql \ - -DINSTALL_DOCREADMEDIR=share/mysql \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_DOCDIR=share/mysql/docs \ - -DINSTALL_SHAREDIR=share/mysql \ - -DWITH_READLINE=ON \ - -DWITH_ZLIB=system \ - -DWITH_SSL=system \ - -DWITH_LIBWRAP=OFF \ - -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \ - -DWITH_EXTRA_CHARSETS=complex \ - -DWITH_EMBEDDED_SERVER=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=1 \ - -DWITH_PARTITION_STORAGE_ENGINE=1 \ - -DWITH_PBXT_STORAGE_ENGINE=1 \ - -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ - -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ - -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 - - make -} - -package_libmariadbclient(){ - pkgdesc="MariaDB client libraries" - depends=('openssl') - conflicts=('libmysqlclient') - provides=("libmysqlclient=${pkgver}") - - cd "${srcdir}"/build - for dir in include libmysql libmysqld libservices; do - make -C ${dir} DESTDIR="${pkgdir}" install - done - - install -d "${pkgdir}"/usr/bin - install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done -} - -package_mariadb-clients() { - pkgdesc="MariaDB client tools" - depends=('libmariadbclient') - conflicts=('mysql-clients') - provides=("mysql-clients=${pkgver}") - - cd "${srcdir}"/build - make -C client DESTDIR="${pkgdir}" install - - # install man pages - install -d "${pkgdir}"/usr/share/man/man1 - for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 - done - - # provided by mariadb - rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest} -} - -package_mariadb() { - pkgdesc="A fast SQL database server, drop-in replacement for MySQL" - backup=('etc/mysql/my.cnf') - install=mariadb.install - depends=('mariadb-clients') - conflicts=('mysql') - provides=("mysql=${pkgver}") - optdepends=('perl-dbi' 'perl-dbd-mysql') - options=('emptydirs') - - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install - - install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf - install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld - - # provided by libmariadbclient - rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded} - rm "${pkgdir}"/usr/lib/libmysql* - rm -r "${pkgdir}"/usr/include/ - rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1 - - # provided by mariadb-clients - rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap} - rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1 - - # not needed - rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench} - rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 - - install -dm700 "${pkgdir}"/var/lib/mysql -} diff --git a/community-testing/mariadb/mariadb.install b/community-testing/mariadb/mariadb.install deleted file mode 100644 index 9a4479215..000000000 --- a/community-testing/mariadb/mariadb.install +++ /dev/null @@ -1,26 +0,0 @@ -post_install(){ - groupadd -g 89 mysql &>/dev/null - useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - usr/bin/mysql_install_db --user=mysql --basedir=/usr - chown -R mysql:mysql var/lib/mysql &>/dev/null -} - -post_upgrade(){ - getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null - getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d /var/lib/mysql -s /bin/false mysql &>/dev/null - - if [ "$(vercmp $2 5.5)" -lt 0 ]; then - echo " >> " - echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it." - echo " >> " - fi -} - -post_remove(){ - if getent passwd mysql >/dev/null 2>&1; then - userdel mysql - fi - if getent group mysql >/dev/null 2>&1; then - groupdel mysql - fi -} diff --git a/community-testing/mariadb/mysqld b/community-testing/mariadb/mysqld deleted file mode 100755 index e9fe8f5a8..000000000 --- a/community-testing/mariadb/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD deleted file mode 100644 index 3aec1baa0..000000000 --- a/community-testing/open-vm-tools/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# $Id: PKGBUILD 70159 2012-04-30 23:16:41Z ebelanger $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Krzysztof Raczkowski <raczkow@gmail.com> - -pkgname=open-vm-tools -pkgver=2012.03.13 -_pkgsubver=651368 -pkgrel=4 -pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools" -arch=('i686' 'x86_64') -url="http://open-vm-tools.sourceforge.net/" -license=('LGPL') -depends=('open-vm-tools-modules' 'libdnet' 'icu' 'procps-ng' 'uriparser' 'libsigc++' 'libxss') -makedepends=('chrpath' 'doxygen' 'gtkmm' 'fuse' 'libxtst') -optdepends=('gtkmm' 'libnotify' 'libxtst' 'fuse' 'libsm') -options=('docs' '!libtool') -install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}.tar.gz - scripts-network.patch - scripts-network-FS19541.patch - open-vm-tools-X11Bool.patch - open-vm-tools.conf.d - open-vm-tools.rc.d - tools.conf - vmware-guestd - xautostart.conf) -md5sums=('a664206443d5de53f5f8ee8d5fe6c2d7' - 'b8f68fef3d388489e40dba581b6da18a' - '199508b0d3fe6fa9b726d09170bf51f1' - '8c333a979578bdc0c3134c1dd6bb7353' - '79b0a14d86191fee70a4639da8bd7785' - '67cb83a9e5a4dd016c1a1da2863ca36d' - 'b55d15e2c4be396aad709aeca91033d3' - '1b9ae908fce4c623269f100ee9bdfdef' - '75a25d83417e683957321f97a00f8465') - -build() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - [ -f Makefile ] || CUSTOM_PROCPS_NAME="procps" ./configure --prefix=/usr --without-kernel-modules - make -} - -package() { - cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - - make install DESTDIR="$pkgdir" - install -D -m 755 scripts/common/vmware-xdg-detect-de "$pkgdir"/usr/bin/vmware-xdg-detect-de - chmod 07755 "$pkgdir"/usr/bin/vmware-user-suid-wrapper - - cd "$pkgdir" - 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 - install -D -m 644 "$srcdir"/tools.conf "$pkgdir"/etc/vmware-tools/tools.conf - install -D -m 644 "$srcdir"/xautostart.conf "$pkgdir"/etc/vmware-tools/xautostart.conf - install -D -m 644 "$srcdir"/vmware-guestd "$pkgdir"/etc/pam.d/vmware-guestd - rm -rf "$pkgdir"/usr/etc - - ln -fs /usr/sbin/mount.vmhgfs "$pkgdir"/sbin/mount.vmhgfs - - cd "$pkgdir" && find -type f -exec sh -c "file {} | grep ELF >/dev/null && echo {} && chrpath -d {}" \; -} diff --git a/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch b/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch deleted file mode 100644 index f12581807..000000000 --- a/community-testing/open-vm-tools/open-vm-tools-X11Bool.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -wbBur open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h ---- open-vm-tools-2010.08.24-292196.org/lib/include/vm_basic_types.h 2010-08-24 19:59:22.000000000 +0000 -+++ open-vm-tools-2010.08.24-292196/lib/include/vm_basic_types.h 2010-08-30 09:38:48.000000000 +0000 -@@ -83,8 +83,11 @@ - - /* STRICT ANSI means the Xserver build and X defines Bool differently. */ - #if !defined(__STRICT_ANSI__) || defined(__FreeBSD__) || defined(__MINGW32__) -+# ifndef _XTYPEDEF_BOOL -+# define _XTYPEDEF_BOOL - typedef char Bool; - #endif -+#endif - - #ifndef FALSE - #define FALSE 0 diff --git a/community-testing/open-vm-tools/open-vm-tools.conf.d b/community-testing/open-vm-tools/open-vm-tools.conf.d deleted file mode 100644 index 83f7864e8..000000000 --- a/community-testing/open-vm-tools/open-vm-tools.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# Enable support for Drag'n'Drop -VM_DRAG_AND_DROP="yes" - -# vmware-guestd settings -GUESTD_BIN="/usr/sbin/vmware-guestd" -PIDFILE="/var/run/vmware-guestd.pid" diff --git a/community-testing/open-vm-tools/open-vm-tools.install b/community-testing/open-vm-tools/open-vm-tools.install deleted file mode 100644 index 88d9b88e6..000000000 --- a/community-testing/open-vm-tools/open-vm-tools.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - [ ! -d "/mnt/hgfs" ] && mkdir /mnt/hgfs - echo ">>>" - echo ">>> You can mount VMware Shared Folders via:" - echo ">>> mount -t vmhgfs .host:/ /mnt/hgfs" - echo ">>>" - echo ">>> or by adding this line to /etc/fstab:" - echo ">>> .host:/ /mnt/hgfs vmhgfs defaults 0 0" - echo ">>>" -} diff --git a/community-testing/open-vm-tools/open-vm-tools.rc.d b/community-testing/open-vm-tools/open-vm-tools.rc.d deleted file mode 100644 index 0c9221489..000000000 --- a/community-testing/open-vm-tools/open-vm-tools.rc.d +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/open-vm-tools ] && . /etc/conf.d/open-vm-tools - -PID=`pidof -o %PPID /usr/bin/vmtoolsd` -case "$1" in - start) - stat_busy "Starting Open Virtual Machine Tools" - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - VMBLOCK=`grep -w vmblock /proc/modules` - [ -z "$VMBLOCK" ] && modprobe vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - if [ ! -d "$DND_TMPDIR" ]; then - mkdir $DND_TMPDIR - chmod 1777 $DND_TMPDIR - fi - - mount -t vmblock none /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - fi - - - for m in vmhgfs vmsync; do - VMMOD=`grep -w $m /proc/modules` - [ -z "$VMMOD" ] && \ - { modprobe $m - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi; } - done - - - [ -z "$PID" ] && /usr/bin/vmtoolsd --background $PIDFILE - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon open-vm-tools - stat_done - fi - ;; - stop) - stat_busy "Stopping Open Virtual Machine Tools" - [ ! -z "$PID" ] && kill $PID &>/dev/null -# if [ $? -gt 0 ]; then -# stat_fail -# exit 1 -# fi - - for m in vmhgfs vmsync vmci; do - VMMOD=`grep -w $m /proc/modules` - [ ! -z "$VMMOD" ] && rmmod $m - if [ $? -gt 0 ]; then - stat_fail - exit 4 - fi - done - - if [ "$VM_DRAG_AND_DROP" == "yes" ]; then - MOUNTPOINT=`grep -w "none /proc/fs/vmblock/mountPoint vmblock" /proc/modules` - [ -z "$MOUNTPOINT" ] && umount /proc/fs/vmblock/mountPoint - if [ $? -gt 0 ]; then - stat_fail - exit 5 - fi - - DND_TMPDIR="/tmp/VMwareDnD" - rm -r $DND_TMPDIR - - VMBLOCK=`grep -w vmblock /proc/modules` - [ ! -z "$VMBLOCK" ] && rmmod vmblock - if [ $? -gt 0 ]; then - stat_fail - exit 6 - fi - fi - - rm_daemon open-vm-tools - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/open-vm-tools/scripts-network-FS19541.patch b/community-testing/open-vm-tools/scripts-network-FS19541.patch deleted file mode 100644 index 5fcb33ba8..000000000 --- a/community-testing/open-vm-tools/scripts-network-FS19541.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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 ..." - -- ifup $nic -+ ifconfig $nic up - exitCode=`expr $exitCode \| $?` - fi - done < $activeList -@@ -105,7 +105,7 @@ - # `which' may be a bit noisy, so we'll shush it. - dbusSend=`which dbus-send 2>/dev/null` - 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` - 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 ifup >/dev/null 2>&1 || Panic "ifup not in search path." - which ifconfig >/dev/null 2>&1 || Panic "ifconfig not in search path." - - case "$1" in diff --git a/community-testing/open-vm-tools/scripts-network.patch b/community-testing/open-vm-tools/scripts-network.patch deleted file mode 100644 index 44c7e6dcb..000000000 --- a/community-testing/open-vm-tools/scripts-network.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- network.org 2012-03-17 22:20:11.000000000 +0400 -+++ network 2012-03-17 22:18:47.000000000 +0400 -@@ -34,51 +34,6 @@ - - - # --# find_networking_script -- --# --# Searches common Linux distro init/rc paths to find a singular network --# services script. --# --# Result: --# Returns a valid networking script path on success or "error" on failure. --# --# Side effects: --# None. --# -- --find_networking_script() { -- local script="error" -- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do -- if [ -d "$dir/rc0.d" ] && -- [ -d "$dir/rc1.d" ] && -- [ -d "$dir/rc2.d" ] && -- [ -d "$dir/rc3.d" ] && -- [ -d "$dir/rc4.d" ] && -- [ -d "$dir/rc5.d" ] && -- [ -d "$dir/rc6.d" ]; then -- -- # Now find the appropriate networking script. -- if [ -d "$dir/init.d" ]; then -- if [ -x "$dir/init.d/network" ]; then -- script="$dir/init.d/network" -- elif [ -x "$dir/init.d/networking" ]; then -- script="$dir/init.d/networking" -- fi -- else -- if [ -x "$dir/network" ]; then -- script="$dir/network" -- elif [ -x "$dir/networking" ]; then -- script="$dir/networking" -- fi -- fi -- fi -- done -- -- echo "$script" --} -- -- --# - # run_network_script -- - # - # Finds out how to run the system's script used to control networking, and -@@ -87,17 +42,7 @@ - # - run_network_script() - { -- script=`find_networking_script` -- [ "$script" != "error" ] || Panic "Cannot find system networking script." -- -- # Using SysV "service" if it exists, otherwise fall back to run the script directly -- service=`which service 2>/dev/null` -- if [ $? = 0 -a -n "$service" ]; then -- serviceName=`basename "$script"` -- "$service" "$serviceName" "$1" -- else -- "$script" "$1" -- fi -+ /etc/rc.d/network "$1" - } - - diff --git a/community-testing/open-vm-tools/tools.conf b/community-testing/open-vm-tools/tools.conf deleted file mode 100644 index 0bb2681b1..000000000 --- a/community-testing/open-vm-tools/tools.conf +++ /dev/null @@ -1 +0,0 @@ -bindir = "/usr/bin" diff --git a/community-testing/open-vm-tools/vmware-guestd b/community-testing/open-vm-tools/vmware-guestd deleted file mode 100644 index f8ea34fc0..000000000 --- a/community-testing/open-vm-tools/vmware-guestd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_unix2.so shadow nullok -auth required pam_unix_auth.so shadow nullok -account sufficient pam_unix2.so -account required pam_unix_acct.so diff --git a/community-testing/open-vm-tools/xautostart.conf b/community-testing/open-vm-tools/xautostart.conf deleted file mode 100644 index 829f379ce..000000000 --- a/community-testing/open-vm-tools/xautostart.conf +++ /dev/null @@ -1,6 +0,0 @@ -gnome-panel -ksmserver -startkde -kwrapper -panel -xfce4-panel diff --git a/community-testing/pam-krb5/PKGBUILD b/community-testing/pam-krb5/PKGBUILD deleted file mode 100644 index 7b0f55e2b..000000000 --- a/community-testing/pam-krb5/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 70056 2012-04-28 21:41:50Z dreisner $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Ryan Corder <ryanc@greengrey.org> - -pkgname=pam-krb5 -pkgver=4.5 -pkgrel=2 -pkgdesc='A PAM module providing Kerberos v5 support.' -arch=('i686' 'x86_64') -url='http://www.eyrie.org/~eagle/software/pam-krb5/' -license=('custom') -options=('!libtool') -depends=('krb5' 'pam') -source=("http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz") -md5sums=('5736795225cf7f84718af42a15570fe0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-reduced-depends \ - --libdir=/usr/lib - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/pam_mysql/PKGBUILD b/community-testing/pam_mysql/PKGBUILD deleted file mode 100644 index 25d792b0b..000000000 --- a/community-testing/pam_mysql/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 70058 2012-04-28 21:41:51Z dreisner $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arjan Timmerman<arjan@archlinux.org> -# Contributor: Manolis Tzanidakis -pkgname=pam_mysql -pkgver=0.7RC1 -pkgrel=6 -pkgdesc="A PAM module to authenticate users against mysql." -arch=(i686 x86_64) -license=('GPL') -url="http://pam-mysql.sourceforge.net" -depends=('pam' 'mysql' 'openssl') -source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6177183d7e98dc12f2e444c9fbd4f13c') -options=(!libtool) - -build() { - cd $srcdir/$pkgname-$pkgver - - sed -i 's/pam_mysql_la_LIBADD = /pam_mysql_la_LIBADD = -lpam/g' Makefile.in - ./configure --prefix=/usr --with-pam-mods-dir=/usr/lib/security - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install -} diff --git a/community-testing/pam_pwcheck/PKGBUILD b/community-testing/pam_pwcheck/PKGBUILD deleted file mode 100644 index 5457ef37a..000000000 --- a/community-testing/pam_pwcheck/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 70060 2012-04-28 21:41:52Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=pam_pwcheck -pkgver=3.9 -pkgrel=4 -pkgdesc="A password strength checking module for PAM-aware password changing programs" -arch=(i686 x86_64) -url="http://www.thkukuk.de/pam/pam_pwcheck/" -depends=('pam') -license=('GPL') -source=(ftp://ftp.suse.com/pub/people/kukuk/pam/pam_pwcheck/pam_pwcheck-$pkgver.tar.bz2) -md5sums=('27be63338af88d14610d182b6a161cd1') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --mandir=/usr/share/man --libdir=/usr/lib - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD deleted file mode 100644 index ecd4c9d65..000000000 --- a/community-testing/pdf2djvu/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 71059 2012-05-22 21:46:21Z ebelanger $ -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> - -pkgname=pdf2djvu -pkgver=0.7.12 -pkgrel=1 -pkgdesc="Creates DjVu files from PDF files" -arch=('i686' 'x86_64') -url="http://pdf2djvu.googlecode.com" -license=('GPL') -depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') -makedepends=('pstreams') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz" - "poppler-0.20.patch") -md5sums=('4fd56c0763b56b4081fc9c85be16d9d7' - '9f9c5b098a3a13256beac04553ee67c3') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 <$srcdir/poppler-0.20.patch - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 -} diff --git a/community-testing/pdf2djvu/poppler-0.20.patch b/community-testing/pdf2djvu/poppler-0.20.patch deleted file mode 100644 index 36d23f73a..000000000 --- a/community-testing/pdf2djvu/poppler-0.20.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure ---- pdf2djvu-0.7.12/configure 2012-01-22 03:17:01.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure 2012-05-17 20:44:06.000000000 +0400 -@@ -6653,7 +6653,7 @@ - - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac ---- pdf2djvu-0.7.12/configure.ac 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure.ac 2012-05-17 20:43:37.000000000 +0400 -@@ -225,7 +225,7 @@ - AX_CXXFLAGS_WARN_ALL(CXXFLAGS) - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc ---- pdf2djvu-0.7.12/pdf-backend.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf-backend.cc 2012-05-17 20:47:24.000000000 +0400 -@@ -32,10 +32,10 @@ - * ====================== - */ - --static void poppler_error_handler(int pos, char *message, va_list args) -+static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message) - { - std::string format; -- std::string expanded_message = string_vprintf(message, args); -+ std::string expanded_message = message; - const char *c_message = expanded_message.c_str(); - if (pos >= 0) - { -@@ -61,7 +61,7 @@ - Cwd cwd(argv0_dir_name); - #endif - globalParams = new GlobalParams(); -- setErrorFunction(poppler_error_handler); -+ setErrorCallback(poppler_error_handler, 0); - } - - void pdf::Environment::set_antialias(bool value) -diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc ---- pdf2djvu-0.7.12/pdf2djvu.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf2djvu.cc 2012-05-17 20:55:07.000000000 +0400 -@@ -1387,13 +1387,13 @@ - debug(0)++; - } - out1.reset(new pdf::Renderer(paper_color, config.monochrome)); -- out1->startDoc(doc->getXRef()); -+ out1->startDoc((PDFDoc*)doc->getXRef()); - outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outm->startDoc(doc->getXRef()); -+ outm->startDoc((PDFDoc*)doc->getXRef()); - if (!config.monochrome) - { - outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outs->startDoc(doc->getXRef()); -+ outs->startDoc((PDFDoc*)doc->getXRef()); - } - } - assert(doc.get() != NULL); diff --git a/community-testing/php-geoip/PKGBUILD b/community-testing/php-geoip/PKGBUILD deleted file mode 100644 index d12726a44..000000000 --- a/community-testing/php-geoip/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 70079 2012-04-29 06:43:36Z pschmitz $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> - -pkgname=php-geoip -pkgver=1.0.8 -pkgrel=2 -pkgdesc="GeoIP module for PHP" -arch=('i686' 'x86_64') -url="http://pecl.php.net/package/geoip" -license=('PHP') -depends=('php' 'geoip') -backup=('etc/php/conf.d/geoip.ini') -source=(http://pecl.php.net/get/geoip-$pkgver.tgz) -sha256sums=('08beeb2cbe9ab729d06b026795f5b9084aead6a1762493b0be53c4393d68d08a') - -build() { - cd "$srcdir/geoip-$pkgver" - - phpize - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/geoip-$pkgver" - - make INSTALL_ROOT="$pkgdir" install - echo ';extension=geoip.so' >geoip.ini - install -Dm644 geoip.ini "$pkgdir/etc/php/conf.d/geoip.ini" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcache/PKGBUILD b/community-testing/php-memcache/PKGBUILD deleted file mode 100644 index 5e49b5e67..000000000 --- a/community-testing/php-memcache/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 70081 2012-04-29 06:43:37Z pschmitz $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> - -pkgname=php-memcache -pkgver=3.0.6 -pkgrel=3 -pkgdesc="Memcache module for PHP" -arch=('i686' 'x86_64') -url="http://pecl.php.net/package/memcache" -license=('PHP') -depends=('php') -backup=('etc/php/conf.d/memcache.ini') -install=php-memcache.install -source=(http://pecl.php.net/get/memcache-$pkgver.tgz) -sha256sums=('cf6871f0944ee38022c5f84910f306d83b0f51564bbc08624a215e06d8486618') - -build() { - cd "$srcdir/memcache-$pkgver" - - phpize - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/memcache-$pkgver" - - make INSTALL_ROOT="$pkgdir" install - echo ';extension=memcache.so' >memcache.ini - install -Dm644 memcache.ini "$pkgdir/etc/php/conf.d/memcache.ini" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcache/php-memcache.install b/community-testing/php-memcache/php-memcache.install deleted file mode 100644 index fa56baf81..000000000 --- a/community-testing/php-memcache/php-memcache.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - echo ' - ==> PHP extension - - A config file was stored under /etc/php/conf.d/. In order to use this - extension make sure to uncomment it from its config file. - ' -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/php-memcached/PKGBUILD b/community-testing/php-memcached/PKGBUILD deleted file mode 100644 index 7e36997b5..000000000 --- a/community-testing/php-memcached/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 70083 2012-04-29 06:43:38Z pschmitz $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> - -pkgname=php-memcached -pkgver=2.0.1 -pkgrel=4 -pkgdesc="PHP extension for interfacing with memcached via libmemcached library" -arch=('i686' 'x86_64') -url="http://pecl.php.net/package/memcached" -license=('PHP') -depends=('php' 'libmemcached') -backup=('etc/php/conf.d/memcached.ini') -source=(http://pecl.php.net/get/memcached-$pkgver.tgz) -sha256sums=('250779594e846b7b31390c384697eb24a5096123b0d3e2f4a1a0b79d14fb1bff') - -build() { - cd "$srcdir/memcached-$pkgver" - - phpize - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/memcached-$pkgver" - - make INSTALL_ROOT="$pkgdir" install - echo ';extension=memcached.so' >memcached.ini - install -Dm644 memcached.ini "$pkgdir/etc/php/conf.d/memcached.ini" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD deleted file mode 100644 index eede5ca9d..000000000 --- a/community-testing/qingy/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 70157 2012-04-30 23:01:40Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=qingy -pkgver=1.0.0 -pkgrel=4 -pkgdesc="A DirectFB getty replacement" -arch=('i686' 'x86_64') -url="http://qingy.sourceforge.net/" -license=('GPL') -depends=('directfb' 'openssl' 'libxss') -makedepends=('emacs') -backup=('etc/qingy/settings' 'etc/qingy/welcomes') -options=('!libtool') -install=qingy.install -source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ - qingy.logrotate) -md5sums=('1e0912655e240adfd0ce5ced30bbc685' - 'a9bdfd0ac9f29380eafa97a4a056789d') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/lib/security/||' media/pam/default/qingy - XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ - ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ - --disable-optimizations --enable-pam \ - --disable-static-build --enable-gpm-lock --enable-emacs - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" -} diff --git a/community-testing/qingy/qingy.install b/community-testing/qingy/qingy.install deleted file mode 100644 index 5cf234b72..000000000 --- a/community-testing/qingy/qingy.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=usr/share/info -filelist=(qingy.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/qingy/qingy.logrotate b/community-testing/qingy/qingy.logrotate deleted file mode 100644 index e16fb8d2a..000000000 --- a/community-testing/qingy/qingy.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/qingy.log { - compress - rotate 1 - size=+1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/community-testing/tellico/PKGBUILD b/community-testing/tellico/PKGBUILD deleted file mode 100644 index 8810eaea1..000000000 --- a/community-testing/tellico/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 71001 2012-05-21 16:29:59Z foutrelis $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=tellico -pkgver=2.3.5 -pkgrel=2 -pkgdesc="A collection manager for KDE" -arch=('i686' 'x86_64') -url="http://tellico-project.org/" -license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c') - -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 - -# fix python 2.7 path - find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/community-testing/tellico/tellico.install b/community-testing/tellico/tellico.install deleted file mode 100644 index 3b3aff7d9..000000000 --- a/community-testing/tellico/tellico.install +++ /dev/null @@ -1,13 +0,0 @@ -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/community-testing/xdebug/PKGBUILD b/community-testing/xdebug/PKGBUILD deleted file mode 100644 index 3c21729e1..000000000 --- a/community-testing/xdebug/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 70085 2012-04-29 06:43:40Z pschmitz $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jonathan Wiersma <arch aur at jonw dot org> -# Contributor: Jonathan Wiersma <arch aur at jonw dot org> -# Contributor: sracker <smb.sac@gmail.com> - -pkgname=xdebug -pkgver=2.2.0RC2 -pkgrel=1 -pkgdesc="PHP debugging extension" -arch=('i686' 'x86_64') -url="http://www.xdebug.org" -license=('GPL') -depends=('php') -install="${pkgname}.install" -backup=('etc/php/conf.d/xdebug.ini') -source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz - xdebug-5.2.ini - xdebug.ini) -md5sums=('2227de3691ca569d17a342ae30b2e57c' - '6b7fdbbe0bf381bda40e77e29981f439' - '68de800943369d4c76bdf7eb35c8463b') - -build() { - local PHPVER=`php -r 'echo phpversion();'` - - cd $srcdir/$pkgname-$pkgver - phpize - ./configure --prefix=/usr --enable-xdebug - make - - cd debugclient - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - - cd $srcdir/$pkgname-$pkgver - if [ "$PHPVER" \< "5.3.0" ] ; then - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so - install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini - else - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so - install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini - fi -} diff --git a/community-testing/xdebug/xdebug-5.2.ini b/community-testing/xdebug/xdebug-5.2.ini deleted file mode 100644 index 9beb7fc30..000000000 --- a/community-testing/xdebug/xdebug-5.2.ini +++ /dev/null @@ -1,5 +0,0 @@ -zend_extension=/usr/lib/php/xdebug.so -;xdebug.remote_enable=on -;xdebug.remote_host=127.0.0.1 -;xdebug.remote_port=9000 -;xdebug.remote_handler=dbgp diff --git a/community-testing/xdebug/xdebug.ini b/community-testing/xdebug/xdebug.ini deleted file mode 100644 index c6c9222ea..000000000 --- a/community-testing/xdebug/xdebug.ini +++ /dev/null @@ -1,5 +0,0 @@ -zend_extension=/usr/lib/php/modules/xdebug.so -;xdebug.remote_enable=on -;xdebug.remote_host=127.0.0.1 -;xdebug.remote_port=9000 -;xdebug.remote_handler=dbgp diff --git a/community-testing/xdebug/xdebug.install b/community-testing/xdebug/xdebug.install deleted file mode 100644 index a7ec0b9cc..000000000 --- a/community-testing/xdebug/xdebug.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - local _configfile=/etc/php/conf.d/xdebug.ini - echo " ==> You may wish to uncomment/change the settings found in " - echo " $_configfile" - echo "" -} - -post_upgrade() { - local _configfile=/etc/php/conf.d/xdebug.ini - local PHPVER=$(php -r 'echo phpversion();') - post_install $1 - - if [ "$PHPVER" \< "5.3" ] ; then - echo " ==> You are currenty running a version of php < 5.3." - echo " When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname." - echo "" - fi -} diff --git a/community/acpid/acpid b/community/acpid/acpid deleted file mode 100644 index 288ac078d..000000000 --- a/community/acpid/acpid +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid - -PID=`pidof -o %PPID /usr/sbin/acpid` -case "$1" in - start) - stat_busy "Starting acpid" - [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon acpid - stat_done - fi - ;; - stop) - stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon acpid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/acpid/acpid.conf.d b/community/acpid/acpid.conf.d deleted file mode 100644 index b60103a2d..000000000 --- a/community/acpid/acpid.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Arguments to be passed to the acpid daemon -# - -ACPID_ARGS="" diff --git a/community/bibletime/PKGBUILD b/community/bibletime/PKGBUILD deleted file mode 100644 index 057c61125..000000000 --- a/community/bibletime/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 61169 2011-12-23 14:46:29Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de> -pkgname=bibletime -pkgver=2.9.1 -pkgrel=1 -pkgdesc="Bible study tool for KDE4" -arch=('x86_64' 'i686') -url="http://www.bibletime.info/" -license=('GPL2') -depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit') -makedepends=('cmake' 'boost-libs') -install=$pkgname.install -source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -sha256sums=('308a86d4a1f63203e01438e75be8306377927498b5d0ae8769a4df3c828013b5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/bibletime/bibletime.install b/community/bibletime/bibletime.install deleted file mode 100644 index ad97d7bab..000000000 --- a/community/bibletime/bibletime.install +++ /dev/null @@ -1,13 +0,0 @@ -post_upgrade() { - update-desktop-database -q -} - -post_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD deleted file mode 100644 index c8c641216..000000000 --- a/community/blackbox/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $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=10 -pkgdesc="A window manager for X11" -url="http://blackboxwm.sourceforge.net/" -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') -license=('MIT') -options=('!libtool') -source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz - gcc4.3.patch - bbdock.patch - bsetbg-feh.patch - textpropertytostring-unconditional.patch) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i ../gcc4.3.patch - patch -Np0 -i ../bbdock.patch - patch -Np0 -i ../bsetbg-feh.patch - patch -Np1 -i ../textpropertytostring-unconditional.patch - - ./configure --prefix=/usr --mandir=/usr/share/man - make - make DESTDIR=$pkgdir install - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/blackbox/bbdock.patch b/community/blackbox/bbdock.patch deleted file mode 100644 index 709b6cfe1..000000000 --- a/community/blackbox/bbdock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 -+++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 -@@ -248,6 +248,13 @@ - bt::PixmapCache::find(screen->screenNumber(), texture, - frame.rect.width(), frame.rect.height(), - frame.pixmap); -+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ -+ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) -+ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); -+ else if ((texture.texture() & bt::Texture::Solid)) -+ XSetWindowBackground(display, frame.window, -+ texture.color1().pixel(screen->screenNumber())); -+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ - XClearArea(display, frame.window, 0, 0, - frame.rect.width(), frame.rect.height(), True); - diff --git a/community/blackbox/bsetbg-feh.patch b/community/blackbox/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/community/blackbox/bsetbg-feh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 -+++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 -@@ -22,7 +22,7 @@ - - PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin - --img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" -+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" - - display_full_cmd="display -geometry 800x600 -window root" - display_tile_cmd="display -window root" -@@ -59,6 +59,11 @@ - xsetbg_center_cmd="xsetbg -center" - xsetbg_default_cmd="$xsetbg_center_cmd" - -+feh_full_cmd="feh --bg-scale" -+feh_tile_cmd="feh --bg-tile" -+feh_center_cmd="feh --bg-center" -+feh_default_cmd="$feh_center_cmd" -+ - ################################## - - me=`basename $0` diff --git a/community/blackbox/gcc4.3.patch b/community/blackbox/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/community/blackbox/gcc4.3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc ---- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -45,6 +45,8 @@ - #include <stdio.h> - #include <stdlib.h> - -+#include <cstring> -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - -diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc ---- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -30,6 +30,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - bt::Resource::Resource(void) - : db(NULL) -diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc ---- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 -+++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "XDG.hh" - - #include <stdlib.h> -- -+#include <algorithm> - - // make sure directory names end with a slash - static std::string terminateDir(const std::string &string) -diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc ---- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 -+++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - #include <X11/Xutil.h> - #include <X11/cursorfont.h> - -+#include <cstring> -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc ---- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 -+++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -48,6 +48,8 @@ - #include <ctype.h> - #include <dirent.h> - -+#include <cstring> -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { -diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc ---- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 -+++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - - #include <assert.h> - -+#include <cstring> -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc ---- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 -+++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -36,6 +36,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! -diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg ---- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # -diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc ---- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -27,11 +27,14 @@ - #include <Pen.hh> - #include <Texture.hh> - -+#include <cstdlib> - #include <cctype> - - #include <X11/Xatom.h> - #include <stdio.h> - -+#include <cstring> -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/community/blackbox/textpropertytostring-unconditional.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk <jwilk@debian.org> -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include <X11/Xutil.h> -+ - #include <limits.h> - #include <string> - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff --git a/community/ccrtp/PKGBUILD b/community/ccrtp/PKGBUILD deleted file mode 100644 index 061bb0488..000000000 --- a/community/ccrtp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 70714 2012-05-15 11:37:10Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -pkgname=ccrtp -pkgver=2.0.3 -pkgrel=1 -pkgdesc="GNU ccRTP" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/ccrtp/" -license=('GPL' 'custom') -depends=('zlib' 'libxml2' 'libgcrypt' 'ucommon') -options=('!libtool') -install=$pkgname.install -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('365feddd276c78104600204ae6db4e76c66036df1e5b905e855239daac6a2473') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 COPYING.addendum "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/ccrtp/ccrtp.install b/community/ccrtp/ccrtp.install deleted file mode 100644 index 51b971c5c..000000000 --- a/community/ccrtp/ccrtp.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(ccrtp.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 - done -} - -post_upgrade() { - post_install "$1" -} - -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 - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/ccrtp/gcc46.patch b/community/ccrtp/gcc46.patch deleted file mode 100644 index a4b25b369..000000000 --- a/community/ccrtp/gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -aur ccrtp-1.8.0.old//src/ccrtp/sources.h ccrtp-1.8.0.new//src/ccrtp/sources.h ---- ccrtp-1.8.0.old//src/ccrtp/sources.h 2011-05-14 03:15:35.993564505 -0700 -+++ ccrtp-1.8.0.new//src/ccrtp/sources.h 2011-05-14 03:19:02.033569568 -0700 -@@ -46,6 +46,7 @@ - - #include <string> - #include <ccrtp/rtcppkt.h> -+#include <stddef.h> - - #ifdef CCXX_NAMESPACES - namespace ost { diff --git a/community/cuda-sdk/PKGBUILD b/community/cuda-sdk/PKGBUILD deleted file mode 100644 index 152b3add9..000000000 --- a/community/cuda-sdk/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Thomas Jost <schnouki@schnouki.net> -# Contributor: Carson Reynolds <carson@k2.t.u-tokyo.ac.jp> - -pkgname=cuda-sdk -pkgver=4.2.9 -pkgrel=1 -pkgdesc="NVIDIA's GPU programming sdk" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/object/cuda_home.html" -license=('custom') -depends=('cuda-toolkit' 'nvidia' 'opencl-nvidia' 'freeglut' 'libxmu') -makedepends=('perl') -source=(http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_${pkgver}_linux.run) -md5sums=('693d969aca8bb06a5a1d51ef5c3ca04b') - -build() { - cd "$srcdir" - - sh gpucomputingsdk_${pkgver}_linux.run --noexec --keep --nox11 --nochown --target sdk >/dev/null - cd sdk - - find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_ATOMIC_BUILTINS" - find . -name *.cu | xargs sed -i "1 i #undef _GLIBCXX_USE_INT128" - - #find . -name 'Makefile*' -exec sed -i 's/^\tmake /\t$(MAKE) /g; s/^\t@make /\t@$(MAKE) /g' "{}" + - - # Sadly we need to install this first and compile afterwards, this is why we only have build() - install -dm755 "$pkgdir/opt/cuda-sdk" - ./install-sdk-linux.pl --prefix="$pkgdir/opt/cuda-sdk" --cudaprefix="/opt/cuda-toolkit" >/dev/null - - cd "$pkgdir/opt/cuda-sdk" - make CUDA_INSTALL_PATH=/opt/cuda-toolkit NO_MPI=1 - # simpleMPI sometimes causes segfaults when building... - - install -Dm755 "$pkgdir/opt/cuda-sdk/License.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community/gambas2/db.firebird.gcc-4.6.0-fix.patch deleted file mode 100644 index 0b6e68df3..000000000 --- a/community/gambas2/db.firebird.gcc-4.6.0-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864 -+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865 -@@ -1216,7 +1216,8 @@ - GB.StoreVariant(&fantom, &buffer[i]); - } - else{ -- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]); -+ GB_VARIANT val = res->GetData(pos,i); -+ GB.StoreVariant(&val , &buffer[i]); - } - } - } -@@ -1874,6 +1875,8 @@ - static char query[SQLMAXLEN]; - int type; - std::string str1,str2; -+ GB_VARIANT varval; -+ char* charval; - snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field); - if (do_query(db, query, &res, "Unable to get the field from the table")){ - delete res; -@@ -1900,9 +1903,11 @@ - str1=res->GetData(0,3).value.value._string; - if(str1!="") - str2=str1.assign(str1,8,str1.length()-8); -- GB.FreeString(&res->GetData(0,3).value.value._string); -+ charval = res->GetData(0,3).value.value._string; -+ GB.FreeString(&charval); - res->SetData(0,3,str2); -- GB.StoreVariant(&res->GetData(0,3), &info->def); -+ varval = res->GetData(0,3); -+ GB.StoreVariant(&varval, &info->def); - } - delete res; - return FALSE; diff --git a/community/gambas2/poppler-0.18.patch b/community/gambas2/poppler-0.18.patch deleted file mode 100644 index fbcc430bf..000000000 --- a/community/gambas2/poppler-0.18.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038 -+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997 -@@ -22,6 +22,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8) - pkg-config --atleast-version=0.11.3 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) -+ pkg-config --atleast-version=0.17.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) - fi - - AC_OUTPUT( \ - ---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870 -+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997 -@@ -44,6 +44,7 @@ - #include <Outline.h> - #include <Link.h> - #include <Gfx.h> -+#include <glib/poppler-features.h> - - /***************************************************************************** - -@@ -956,12 +957,17 @@ - Bookmarks of a PDF page - - ******************************************************************************/ -+ - void aux_fill_links(void *_object) - { -+ #if POPPLER_VERSION_0_17 -+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); -+ #else - Object obj; - - THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ()); - obj.free(); -+ #endif - } - - BEGIN_PROPERTY (PDFPAGELINKS_count) diff --git a/community/go/go b/community/go/go deleted file mode 100644 index 2f68ce8ff..000000000 --- a/community/go/go +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if [[ -z $GOROOT ]]; then - export GOROOT=/usr/lib/go -fi -if [[ -z $GOROOT_FINAL ]]; then - export GOROOT_FINAL=$GOROOT -fi -/usr/bin/go.elf "$@" diff --git a/community/go/go.run b/community/go/go.run deleted file mode 100644 index 2f68ce8ff..000000000 --- a/community/go/go.run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -if [[ -z $GOROOT ]]; then - export GOROOT=/usr/lib/go -fi -if [[ -z $GOROOT_FINAL ]]; then - export GOROOT_FINAL=$GOROOT -fi -/usr/bin/go.elf "$@" diff --git a/community/ipvsadm/ipvsadm.rules b/community/ipvsadm/ipvsadm.rules deleted file mode 100644 index 6740463a1..000000000 --- a/community/ipvsadm/ipvsadm.rules +++ /dev/null @@ -1 +0,0 @@ -# emtpy rules file for ipvsadm diff --git a/community/libunistring/PKGBUILD b/community/libunistring/PKGBUILD deleted file mode 100644 index c08199c03..000000000 --- a/community/libunistring/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 67762 2012-03-14 10:42:36Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Former Maintainer: Emmanuel 'guinness' Boudreault -# Current Maintainer: Patrick McCarty <pnorcks at gmail dot com> - -pkgname=libunistring -pkgver=0.9.3 -pkgrel=4 -pkgdesc="Library for manipulating Unicode strings and C strings." -url="http://www.gnu.org/software/libunistring/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('glibc') -install=${pkgname}.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db8eca3b64163abadf8c40e5cecc261f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/libunistring/libunistring.install b/community/libunistring/libunistring.install deleted file mode 100644 index 58dd2ef8e..000000000 --- a/community/libunistring/libunistring.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=usr/share/info -filelist=(libunistring.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/libvirt/unixperms.patch b/community/libvirt/unixperms.patch deleted file mode 100644 index b3fb86cf5..000000000 --- a/community/libvirt/unixperms.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -ur libvirt-0.7.4-orig/daemon/libvirtd.conf libvirt-0.7.4-patched/daemon/libvirtd.conf ---- libvirt-0.7.4-orig/daemon/libvirtd.conf 2009-11-23 03:10:33.398655655 -0800 -+++ libvirt-0.7.4-patched/daemon/libvirtd.conf 2009-11-23 03:09:37.831189671 -0800 -@@ -78,14 +78,14 @@ - # without becoming root. - # - # This is restricted to 'root' by default. --#unix_sock_group = "libvirt" -+unix_sock_group = "libvirt" - - # Set the UNIX socket permissions for the R/O socket. This is used - # for monitoring VM status only - # - # Default allows any user. If setting group ownership may want to - # restrict this to: --#unix_sock_ro_perms = "0777" -+unix_sock_ro_perms = "0770" - - # Set the UNIX socket permissions for the R/W socket. This is used - # for full management of VMs -@@ -95,7 +95,7 @@ - # - # If not using PolicyKit and setting group ownership for access - # control then you may want to relax this to: --#unix_sock_rw_perms = "0770" -+unix_sock_rw_perms = "0770" - - # Set the name of the directory in which sockets will be found/created. - #unix_sock_dir = "/var/run/libvirt" -@@ -126,7 +126,7 @@ - # - # To restrict monitoring of domains you may wish to enable - # an authentication mechanism here --#auth_unix_ro = "none" -+auth_unix_ro = "none" - - # Set an authentication scheme for UNIX read-write sockets - # By default socket permissions only allow root. If PolicyKit -@@ -135,7 +135,7 @@ - # - # If the unix_sock_rw_perms are changed you may wish to enable - # an authentication mechanism here --#auth_unix_rw = "none" -+auth_unix_rw = "none" - - # Change the authentication scheme for TCP sockets. - # diff --git a/community/libvirt/yajl-2.x.patch b/community/libvirt/yajl-2.x.patch deleted file mode 100644 index 80d3edce0..000000000 --- a/community/libvirt/yajl-2.x.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 -+++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 -@@ -709,7 +709,7 @@ - - static int virJSONParserHandleNumber(void * ctx, - const char * s, -- unsigned int l) -+ size_t l) - { - virJSONParserPtr parser = ctx; - char *str = strndup(s, l); -@@ -735,7 +735,7 @@ - - static int virJSONParserHandleString(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, -@@ -756,7 +756,7 @@ - - static int virJSONParserHandleMapKey(void * ctx, - const unsigned char * stringVal, -- unsigned int stringLen) -+ size_t stringLen) - { - virJSONParserPtr parser = ctx; - virJSONParserStatePtr state; -@@ -894,14 +894,14 @@ - /* XXX add an incremental streaming parser - yajl trivially supports it */ - virJSONValuePtr virJSONValueFromString(const char *jsonstring) - { -- yajl_parser_config cfg = { 1, 1 }; - yajl_handle hand; - virJSONParser parser = { NULL, NULL, 0 }; - virJSONValuePtr ret = NULL; - - VIR_DEBUG("string=%s", jsonstring); - -- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); -+ hand = yajl_alloc(&parserCallbacks, NULL, &parser); -+ yajl_config(hand, yajl_allow_comments, 1); - - if (yajl_parse(hand, - (const unsigned char *)jsonstring, -@@ -1002,15 +1002,16 @@ - - char *virJSONValueToString(virJSONValuePtr object) - { -- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ - yajl_gen g; - const unsigned char *str; - char *ret = NULL; -- unsigned int len; -+ size_t len; - - VIR_DEBUG("object=%p", object); - -- g = yajl_gen_alloc(&conf, NULL); -+ g = yajl_gen_alloc(NULL); -+ yajl_gen_config(g, yajl_gen_beautify, 0); -+ yajl_gen_config(g, yajl_gen_indent_string, " "); - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD deleted file mode 100644 index 934c4a450..000000000 --- a/community/libzrtpcpp/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 70716 2012-05-15 11:42:17Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Michel Brabants <michel.brabants@euphonynet.be> - -pkgname=libzrtpcpp -pkgver=2.0.0 -pkgrel=1 -pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" -arch=('i686' 'x86_64') -url="http://zfoneproject.com" -license=('GPL') -depends=('ccrtp' 'ucommon') -makedepends=('pkgconfig' 'cmake') -options=('!libtool') -source=(ftp://ftp.gnu.org/gnu/ccrtp/$pkgname-$pkgver.tar.gz) -md5sums=('dc1501e7e8a46a1608fc3820c7476727') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's|lib64|lib|g' CMakeLists.txt - cmake -DCMAKE_INSTALL_PREFIX=/usr . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/myodbc/myconf.h.in b/community/myodbc/myconf.h.in deleted file mode 100644 index 2a04eebba..000000000 --- a/community/myodbc/myconf.h.in +++ /dev/null @@ -1,165 +0,0 @@ -/* driver/myconf.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the <iodbcinst.h> header file. */ -#undef HAVE_IODBCINST_H - -/* Define to 1 if you have the <isqlext.h> header file. */ -#undef HAVE_ISQLEXT_H - -/* Define to 1 if you have the <isqltypes.h> header file. */ -#undef HAVE_ISQLTYPES_H - -/* Define to 1 if you have the <isql.h> header file. */ -#undef HAVE_ISQL_H - -/* Define to 1 if you have the `z' library (-lz). */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <odbcinst.h> header file. */ -#undef HAVE_ODBCINST_H - -/* Define to 1 if you have the <sqlext.h> header file. */ -#undef HAVE_SQLEXT_H - -/* Define if SQLGetPrivateProfileString is defined */ -#undef HAVE_SQLGETPRIVATEPROFILESTRING - -/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */ -#undef HAVE_SQLGETPRIVATEPROFILESTRINGW - -/* Define to 1 if you have the <sqltypes.h> header file. */ -#undef HAVE_SQLTYPES_H - -/* Define to 1 if you have the <sql.h> header file. */ -#undef HAVE_SQL_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strndup' function. */ -#undef HAVE_STRNDUP - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define if SQLCHAR is undefined */ -#undef SQLCHAR - -/* Define if SQLHDBC is undefined */ -#undef SQLHDBC - -/* Define if SQLHENV is undefined */ -#undef SQLHENV - -/* Define if SQLHSTMT is undefined */ -#undef SQLHSTMT - -/* Define if SQLHWND is undefined */ -#undef SQLHWND - -/* Define if SQLINTEGER is undefined */ -#undef SQLINTEGER - -/* Define if SQLPOINTER is undefined */ -#undef SQLPOINTER - -/* Define if SQLRETURN is undefined */ -#undef SQLRETURN - -/* Define if SQLSMALLINT is undefined */ -#undef SQLSMALLINT - -/* Define if SQLUINTEGER is undefined */ -#undef SQLUINTEGER - -/* Define if SQLUSMALLINT is undefined */ -#undef SQLUSMALLINT - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define path to system ODBC.INI file */ -#undef SYSTEM_ODBC_INI - -/* Define if compiler defines C99 __func__ macro */ -#undef USE_C99_FUNC_MACRO - -/* Define if compiler defines __FUNCTION__ */ -#undef USE_GNU_FUNC_MACRO - -/* use iODBC */ -#undef USE_IODBC - -/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */ -#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR - -/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */ -#undef USE_SQLCOLATTRIBUTE_SQLPOINTER - -/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER - */ -#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR - -/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */ -#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR - -/* use unixODBC */ -#undef USE_UNIXODBC - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* Define if we are using unix build environment */ -#undef _UNIX_ diff --git a/community/myodbc/myodbc-64bit.patch b/community/myodbc/myodbc-64bit.patch deleted file mode 100644 index ac62d816a..000000000 --- a/community/myodbc/myodbc-64bit.patch +++ /dev/null @@ -1,85 +0,0 @@ -Fix some 64-bitness issues arising from unixODBC 2.2.14 changes. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c ---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500 -@@ -1205,7 +1205,7 @@ - { - /* See comment for fill_transfer_oct_len_buff()*/ - SQLLEN size= get_display_size(stmt, field); -- sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size); -+ sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size); - - return size; - } -@@ -1228,7 +1228,7 @@ - */ - SQLLEN len= get_transfer_octet_length(stmt, field); - -- sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len ); -+ sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len ); - - return len; - } -@@ -1245,8 +1245,7 @@ - SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field) - { - SQLULEN size= get_column_size(stmt, field); -- sprintf(buff, (size== SQL_NO_TOTAL ? "%d" : -- (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size); -+ sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size); - return size; - } - -diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c ---- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500 -@@ -599,7 +599,7 @@ - fprintf(stdout, "# Column Name : %s\n", szColName); - fprintf(stdout, "# NameLengh : %d\n", pcbColName); - fprintf(stdout, "# DataType : %d\n", pfSqlType); -- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef); -+ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef); - fprintf(stdout, "# DecimalDigits : %d\n", pibScale); - fprintf(stdout, "# Nullable : %d\n", pfNullable); - -@@ -632,7 +632,7 @@ - - rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len); - mycon(hdbc,rc); -- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); -+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); - is_num(len, 4); - is_str(db, "test", 5); - -@@ -653,7 +653,7 @@ - - rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len); - mycon(hdbc,rc); -- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len); -+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len); - is_num(len, 17); - is_str(db, cur_db, 18); - -diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c ---- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500 -@@ -711,7 +711,7 @@ - - rc = SQLRowCount(hstmt1,&row_count); - mystmt(hstmt1,rc); -- fprintf(stdout, "rows affected: %d\n", row_count); -+ fprintf(stdout, "rows affected: %ld\n", row_count); - myassert(row_count == 1); - - rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus); -@@ -732,7 +732,7 @@ - - rc = SQLRowCount(hstmt1,&row_count); - mystmt(hstmt1,rc); -- fprintf(stdout, "rows affected: %d\n", row_count); -+ fprintf(stdout, "rows affected: %ld\n", row_count); - myassert(row_count == 1); - - SQLFreeStmt(hstmt,SQL_UNBIND); diff --git a/community/myodbc/myodbc-add-mysys.patch b/community/myodbc/myodbc-add-mysys.patch deleted file mode 100644 index a30466114..000000000 --- a/community/myodbc/myodbc-add-mysys.patch +++ /dev/null @@ -1,29 +0,0 @@ -Add files extracted from mysql into the driver build script. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am ---- mysql-connector-odbc-5.1.8.orig/util/Makefile.am 2010-10-28 14:33:17.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/util/Makefile.am 2010-12-23 18:09:00.359695597 -0500 -@@ -10,6 +10,22 @@ - installer.c \ - odbcinstw.c \ - unicode_transcode.c \ -+ array.c \ -+ list.c \ -+ my_alloc.c \ -+ my_malloc.c \ -+ string.c \ -+ int2str.c \ -+ is_prefix.c \ -+ longlong2str.c \ -+ strcend.c \ -+ strend.c \ -+ strfill.c \ -+ strmake.c \ -+ strmov.c \ -+ strxmov.c \ -+ mysys_err.h \ -+ mysys_priv.h \ - MYODBCUtil.h \ - MYODBCUtilAllocDataSource.c \ - MYODBCUtilAllocDriver.c \ diff --git a/community/myodbc/myodbc-my-free.patch b/community/myodbc/myodbc-my-free.patch deleted file mode 100644 index cf7730a59..000000000 --- a/community/myodbc/myodbc-my-free.patch +++ /dev/null @@ -1,253 +0,0 @@ -Once again, mysql can't manage to ship a mysql-connector-odbc release -on time ... mysql 5.5 changed the my_free() function and the released -connector version is not up to speed. Can't use NEAR anymore, either. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c ---- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500 -@@ -94,11 +94,11 @@ - { - if (stmt->result) - { -- my_free((char *)stmt->result, MYF(0)); -+ my_free((char *)stmt->result); - } - if (stmt->result_array) - { -- my_free((char *)stmt->result_array, MYF(0)); -+ my_free((char *)stmt->result_array); - } - set_mem_error(&stmt->dbc->mysql); - return handle_connection_error(stmt); -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c ---- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500 -@@ -269,13 +269,13 @@ - pthread_mutex_lock(&dbc->lock); - if (mysql_query(mysql, select)) - { -- my_free(select, MYF(0)); -+ my_free(select); - pthread_mutex_unlock(&dbc->lock); - return NULL; - } - result= mysql_store_result(&dbc->mysql); - pthread_mutex_unlock(&dbc->lock); -- my_free(select, MYF(0)); -+ my_free(select); - - return result; - } -@@ -1094,7 +1094,7 @@ - SQLFORE_KEYS_FIELDS * - row_count, - MYF(0)); -- my_free((char *)tempdata, MYF(0)); -+ my_free((char *)tempdata); - - if (!stmt->result_array) - { -@@ -1323,12 +1323,12 @@ - && (j != mypcREMARKS) - && (j != mypcCOLUMN_DEF) - && (j != mypcIS_NULLABLE)) -- my_free(((char**)cur_params->data)[j], MYF(0)); -+ my_free(((char**)cur_params->data)[j]); - } - /* cleanup the list */ - params= list_delete_forward(params); -- my_free(cur_params->data, MYF(0)); -- my_free(cur_params, MYF(0)); -+ my_free(cur_params->data); -+ my_free(cur_params); - } - } - } -@@ -1675,7 +1675,7 @@ - } - - dynstr_free(&dynQuery); -- my_free(params_r, MYF(0)); -+ my_free(params_r); - - return nReturn; - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c ---- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500 -@@ -65,7 +65,7 @@ - */ - if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0)) - { -- my_free((char *)desc, MYF(0)); -+ my_free((char *)desc); - return NULL; - } - desc->desc_type= desc_type; -@@ -111,7 +111,7 @@ - if (aprec->par.alloced) - { - aprec->par.alloced= FALSE; -- my_free(aprec->par.value, MYF(0)); -+ my_free(aprec->par.value); - } - } - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h ---- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500 -@@ -113,7 +113,7 @@ - /* Max Primary keys in a cursor * WHERE clause */ - #define MY_MAX_PK_PARTS 32 - --#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } -+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } - - - /* We don't make any assumption about what the default may be. */ -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c ---- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500 -@@ -96,7 +96,7 @@ - exit: - pthread_mutex_unlock(&stmt->dbc->lock); - if ( query != stmt->query ) -- my_free(query,MYF(0)); -+ my_free(query); - - /* - If the original query was modified, we reset stmt->query so that the -@@ -104,7 +104,7 @@ - */ - if (stmt->orig_query) - { -- my_free(stmt->query,MYF(0)); -+ my_free(stmt->query); - stmt->query= stmt->orig_query; - stmt->query_end= stmt->orig_query_end; - stmt->orig_query= NULL; -@@ -625,7 +625,7 @@ - - out: - if (free_data) -- my_free(data, MYF(0)); -+ my_free(data); - - *toptr= to; - return SQL_SUCCESS; -@@ -1060,7 +1060,7 @@ - if ( cbValue == SQL_NULL_DATA ) - { - if ( aprec->par.alloced ) -- my_free(aprec->par.value,MYF(0)); -+ my_free(aprec->par.value); - aprec->par.alloced= FALSE; - aprec->par.value= NULL; - return SQL_SUCCESS; -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c ---- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500 -@@ -112,7 +112,7 @@ - GlobalUnlock(GlobalHandle((HGLOBAL) henv)); - GlobalFree(GlobalHandle((HGLOBAL) henv)); - #else -- if (henv) my_free((char*) henv,MYF(0)); -+ if (henv) my_free((char*) henv); - myodbc_end(); - #endif /* _UNIX_ */ - return(SQL_SUCCESS); -@@ -251,7 +251,8 @@ - LIST *next; - - dbc->env->connections= list_delete(dbc->env->connections,&dbc->list); -- my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR)); -+ if (dbc->database) -+ my_free(dbc->database); - if (dbc->ds) - ds_delete(dbc->ds); - pthread_mutex_destroy(&dbc->lock); -@@ -268,7 +269,7 @@ - GlobalUnlock(GlobalHandle((HGLOBAL) hdbc)); - GlobalFree(GlobalHandle((HGLOBAL) hdbc)); - #else -- my_free((char*) hdbc,MYF(0)); -+ my_free((char*) hdbc); - #endif - return SQL_SUCCESS; - } -@@ -513,7 +514,7 @@ - GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt)); - GlobalFree(GlobalHandle((HGLOBAL) hstmt)); - #else -- my_free((char*) hstmt,MYF(0)); -+ my_free((char*) hstmt); - #endif /* _UNIX_*/ - return SQL_SUCCESS; - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c ---- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500 -@@ -301,7 +301,7 @@ - return SQL_ERROR; - } - } -- my_free(dbc->database,MYF(0)); -+ my_free(dbc->database); - dbc->database= my_strdup(db,MYF(MY_WME)); - pthread_mutex_unlock(&dbc->lock); - } -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c ---- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500 -@@ -93,7 +93,7 @@ - CLEAR_STMT_ERROR(stmt); - - if (stmt->query) -- my_free(stmt->query, MYF(0)); -+ my_free(stmt->query); - - if (dupe && szSqlStr) - stmt->query= (char *)szSqlStr; -@@ -223,7 +223,7 @@ - { - aprec->par.alloced= FALSE; - assert(aprec->par.value); -- my_free(aprec->par.value,MYF(0)); -+ my_free(aprec->par.value); - aprec->par.value = NULL; - } - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c ---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500 -@@ -930,7 +930,7 @@ - ulong max_length= stmt->stmt_options.max_length; - ulong *offset= &stmt->getdata.src_offset; - #if MYSQL_VERSION_ID >= 40100 -- char NEAR _dig_vec[] = -+ char _dig_vec[] = - "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - #endif - -@@ -2154,7 +2154,7 @@ - - my_bool reget_current_catalog(DBC FAR *dbc) - { -- my_free(dbc->database,MYF(0)); -+ my_free(dbc->database); - dbc->database= NULL; - - if ( odbc_stmt(dbc, "select database()") ) -diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h ---- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500 -@@ -41,7 +41,7 @@ - #include <sqlext.h> - - #ifndef x_free --#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); } -+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); } - #endif - - #define myodbc_min(a, b) ((a) < (b) ? (a) : (b)) diff --git a/community/myodbc/myodbc-shutdown.patch b/community/myodbc/myodbc-shutdown.patch deleted file mode 100644 index ec0cf3d36..000000000 --- a/community/myodbc/myodbc-shutdown.patch +++ /dev/null @@ -1,27 +0,0 @@ -myodbc_end is really only usable during Windows DLL unload, since it's not -connection-specific and not thread-safe either. This bit of brain fade -accounts for our bug #185343 and several bugs filed at mysql.com. - -Furthermore, my_end() isn't exported from libmysqlclient anymore. -Hence, best fix is to turn the function into a no-op. - - -diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c ---- mysql-connector-odbc-5.1.8.orig/driver/dll.c 2010-10-28 14:33:18.000000000 -0400 -+++ mysql-connector-odbc-5.1.8/driver/dll.c 2010-12-23 15:05:49.394608226 -0500 -@@ -94,6 +94,7 @@ - */ - void myodbc_end() - { -+#if 0 - if (!--myodbc_inited) - { - my_free(decimal_point,MYF(0)); -@@ -121,6 +122,7 @@ - my_end(0); - #endif - } -+#endif - } - - diff --git a/community/netcf/netcf-0.1.7.patch b/community/netcf/netcf-0.1.7.patch deleted file mode 100644 index d4a4d31b7..000000000 --- a/community/netcf/netcf-0.1.7.patch +++ /dev/null @@ -1,426 +0,0 @@ -diff -ur netcf-0.1.7.ori//data/xml/initscripts-get.xsl netcf-0.1.7/data/xml/initscripts-get.xsl ---- netcf-0.1.7.ori//data/xml/initscripts-get.xsl 2009-10-04 08:18:41.000000000 +0200 -+++ netcf-0.1.7/data/xml/initscripts-get.xsl 2010-12-08 14:54:28.891813397 +0100 -@@ -47,9 +47,12 @@ - <xsl:template name="vlan-interface-common"> - <xsl:variable name="iface" select="concat(vlan/interface/@name, '.', vlan/@tag)"/> - -- <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute> -- <node label="DEVICE" value="{$iface}"/> -- <node label="VLAN" value="yes"/> -+ <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="$iface"/></xsl:attribute> -+ <node label="INTERFACE" value="{$iface}"/> -+ <node label="PHYS_INTERFACE" value="{vlan/interface/@name}"/> -+ <node label="VLAN" value="{vlan/@tag}"/> -+ <node label="CONNECTION" value="ethernet-iproute-vlan"/> -+ <node label="FLAG" value="false"/> - </xsl:template> - - <xsl:template name='bare-vlan-interface'> -@@ -68,6 +71,7 @@ - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> - <node label="TYPE" value="Bridge"/> -+ <node label="CONNECTION" value="bridge"/> - <xsl:call-template name="interface-addressing"/> - <xsl:if test="bridge/@stp"> - <node label="STP" value="{bridge/@stp}"/> -@@ -75,7 +79,11 @@ - <xsl:if test="bridge/@delay"> - <node label="DELAY" value="{bridge/@delay}"/> - </xsl:if> -+ <node label="DHCP_TIMEOUT" value="0"/> -+ <!-- -+ We don't have to define interfaces separately - </tree> -+ - <xsl:for-each select='bridge/interface'> - <tree> - <xsl:if test="@type = 'ethernet'"> -@@ -87,12 +95,29 @@ - <xsl:if test="@type = 'bond'"> - <xsl:call-template name="bare-bond-interface"/> - </xsl:if> -+ -+ BRIDGE_INTERFACES= is defined with all interfaces - <node label="BRIDGE" value="{../../@name}"/> -+ -+ <xsl:variable name="bridgeifaces" select="concat($bridgeifaces, '.', @name)"/> - </tree> - <xsl:if test="@type = 'bond'"> - <xsl:call-template name="bond-slaves"/> - </xsl:if> - </xsl:for-each> -+ --> -+ <!-- <xsl:if test="count(ip) > 1"> --> -+ <node label="BRIDGE_INTERFACES"> -+ <xsl:attribute name="value"> -+ <xsl:text></xsl:text> -+ <xsl:for-each select="bridge/interface"> -+ <xsl:value-of select="@name"/><xsl:value-of select="string(' ')"/> -+ </xsl:for-each> -+ <xsl:text></xsl:text> -+ </xsl:attribute> -+ </node> -+ <!-- </xsl:if> --> -+ </tree> - </xsl:template> - - <!-- -@@ -138,8 +163,8 @@ - Named templates, following the Relax NG syntax - --> - <xsl:template name="name-attr"> -- <xsl:attribute name="path">/files/etc/sysconfig/network-scripts/ifcfg-<xsl:value-of select="@name"/></xsl:attribute> -- <node label="DEVICE" value="{@name}"/> -+ <xsl:attribute name="path">/files/etc/network.d/ifcfg-<xsl:value-of select="@name"/></xsl:attribute> -+ <node label="INTERFACE" value="{@name}"/> - </xsl:template> - - <xsl:template name="mtu"> -@@ -153,6 +178,7 @@ - <xsl:if test="mac"> - <node label="HWADDR" value="{mac/@address}"/> - </xsl:if> -+ <node label="CONNECTION" value="{@type}"/> - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> - </xsl:template> -@@ -184,14 +210,14 @@ - <xsl:template name="protocol-ipv4"> - <xsl:choose> - <xsl:when test="dhcp"> -- <node label="BOOTPROTO" value="dhcp"/> -+ <node label="IP" value="dhcp"/> - <xsl:if test="dhcp/@peerdns"> - <node label="PEERDNS" value="{dhcp/@peerdns}"/> - </xsl:if> - </xsl:when> - <xsl:when test="ip"> -- <node label="BOOTPROTO" value="none"/> -- <node label="IPADDR" value="{ip/@address}"/> -+ <node label="IP" value="static"/> -+ <node label="ADDR" value="{ip/@address}"/> - <xsl:if test="ip/@prefix"> - <node label="NETMASK" value="{ipcalc:netmask(ip/@prefix)}"/> - </xsl:if> -diff -ur netcf-0.1.7.ori//data/xml/initscripts-put.xsl netcf-0.1.7/data/xml/initscripts-put.xsl ---- netcf-0.1.7.ori//data/xml/initscripts-put.xsl 2009-10-04 08:18:41.000000000 +0200 -+++ netcf-0.1.7/data/xml/initscripts-put.xsl 2010-11-26 10:44:46.133757628 +0100 -@@ -47,7 +47,7 @@ - </xsl:template> - - <xsl:template name="bare-vlan-interface"> -- <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/> -+ <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/> - <interface type="vlan"> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="vlan-device"/> -@@ -55,7 +55,7 @@ - </xsl:template> - - <xsl:template name="vlan-device"> -- <xsl:variable name="name" select="node[@label = 'DEVICE']/@value"/> -+ <xsl:variable name="name" select="node[@label = 'INTERFACE']/@value"/> - <xsl:variable name="device" select="substring-before($name, '.')"/> - <xsl:variable name="tag" select="substring-after($name, '.')"/> - <vlan tag="{$tag}"> -@@ -70,7 +70,7 @@ - match="tree[node[@label = 'TYPE' and @value = 'Bridge']]"> - <interface type="bridge"> - <!-- the bridge node itself --> -- <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/> -+ <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="startmode"/> - <xsl:call-template name="mtu"/> -@@ -101,17 +101,17 @@ - Bond - --> - <xsl:template name="bond-element"> -- <xsl:variable name="iface" select="node[@label= 'DEVICE']/@value"/> -+ <xsl:variable name="iface" select="node[@label= 'INTERFACE']/@value"/> - <bond> - <xsl:variable name="opts" select="node[@label = 'BONDING_OPTS']/@value"/> - <xsl:call-template name="bonding-opts"> - <xsl:with-param name="opts" select="$opts"/> - </xsl:call-template> - <xsl:variable name="primary" select="bond:option($opts, 'primary')"/> -- <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value = $primary]]"> -+ <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value = $primary]]"> - <xsl:call-template name='bare-ethernet-interface'/> - </xsl:for-each> -- <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'DEVICE' and @value != $primary]]"> -+ <xsl:for-each select="/descendant-or-self::*[node[@label = 'MASTER' and @value = $iface]][node[@label = 'INTERFACE' and @value != $primary]]"> - <xsl:call-template name='bare-ethernet-interface'/> - </xsl:for-each> - </bond> -@@ -125,7 +125,7 @@ - </xsl:template> - - <xsl:template name="bond-interface" -- match="tree[node[@label = 'DEVICE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]"> -+ match="tree[node[@label = 'INTERFACE'][@value = //tree/node[@label = 'MASTER']/@value]][count(node[@label = 'BRIDGE']) = 0]"> - <interface type="bond"> - <xsl:call-template name="name-attr"/> - <xsl:call-template name="startmode"/> -@@ -154,7 +154,7 @@ - - <xsl:template name="name-attr"> - <xsl:attribute name="name"> -- <xsl:value-of select="node[@label= 'DEVICE']/@value"/> -+ <xsl:value-of select="node[@label= 'INTERFACE']/@value"/> - </xsl:attribute> - </xsl:template> - -@@ -173,7 +173,7 @@ - <xsl:variable name="uses_dhcp" - select="node[@label = 'BOOTPROTO']/@value = 'dhcp'"/> - <xsl:variable name="uses_static" -- select="count(node[@label = 'IPADDR']) > 0"/> -+ select="count(node[@label = 'ADDR']) > 0"/> - <xsl:variable name="uses_ipv4" select="$uses_dhcp or $uses_static"/> - <xsl:if test="$uses_ipv4"> - <protocol family="ipv4"> -@@ -186,7 +186,7 @@ - </dhcp> - </xsl:when> - <xsl:when test="$uses_static"> -- <ip address="{node[@label = 'IPADDR']/@value}"> -+ <ip address="{node[@label = 'ADDR']/@value}"> - <xsl:choose> - <xsl:when test="node[@label = 'PREFIX']"> - <xsl:attribute name="prefix"><xsl:value-of select="node[@label = 'PREFIX']/@value"/></xsl:attribute> -diff -ur netcf-0.1.7.ori//src/drv_initscripts.c netcf-0.1.7/src/drv_initscripts.c ---- netcf-0.1.7.ori//src/drv_initscripts.c 2010-09-23 14:13:13.000000000 +0200 -+++ netcf-0.1.7/src/drv_initscripts.c 2010-12-08 13:57:02.027361706 +0100 -@@ -49,17 +49,20 @@ - #include <libexslt/exslt.h> - - static const char *const network_scripts_path = -- "/files/etc/sysconfig/network-scripts"; -+ //"/files/etc/sysconfig/network-scripts"; -+ "/files/etc/network.d/*"; - - static const char *const ifcfg_path = -- "/files/etc/sysconfig/network-scripts/*"; -+ //"/files/etc/sysconfig/network-scripts/*"; -+ "/files/etc/network.d/*"; - - /* Augeas should only load the files we are interested in */ - static const struct augeas_pv augeas_xfm_common_pv[] = { - /* Ifcfg files */ - { "/augeas/load/Ifcfg/lens", "Sysconfig.lns" }, - { "/augeas/load/Ifcfg/incl", -- "/etc/sysconfig/network-scripts/ifcfg-*" }, -+ "/etc/network.d/ifcfg-*" }, -+ //"/etc/sysconfig/network-scripts/ifcfg-*" }, - { "/augeas/load/Ifcfg/excl[1]", "*~" }, - { "/augeas/load/Ifcfg/excl[2]", "*.bak" }, - { "/augeas/load/Ifcfg/excl[3]", "*.orig" }, -@@ -107,10 +110,10 @@ - int nmatches; - - nmatches = aug_fmt_match(ncf, NULL, -- "%s[ DEVICE = '%s'" -+ "%s[ INTERFACE = '%s'" - " or BRIDGE = '%s'" - " or MASTER = '%s'" -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", - ifcfg_path, name, name, name, name); - return nmatches > 0; - } -@@ -173,7 +176,7 @@ - aug = get_augeas(ncf); - ERR_BAIL(ncf); - -- ndevs = aug_fmt_match(ncf, &devs, "%s[DEVICE = '%s']", -+ ndevs = aug_fmt_match(ncf, &devs, "%s[INTERFACE = '%s']", - ifcfg_path, name); - ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); - -@@ -296,7 +299,8 @@ - int result = 0, ndevs; - char **devs = NULL; - -- ndevs = aug_fmt_match(ncf, &devs, "%s/DEVICE", ifcfg_path); -+ ndevs = aug_fmt_match(ncf, &devs, "%s/INTERFACE", ifcfg_path); -+ printf("%i\n", ndevs); - ERR_COND_BAIL(ndevs < 0, ncf, EOTHER); - - result = uniq_ifcfg_paths(ncf, ndevs, devs, intf); -@@ -453,11 +457,11 @@ - - int drv_list_interfaces(struct netcf *ncf, int maxnames, char **names, - unsigned int flags) { -- return list_interface_ids(ncf, maxnames, names, flags, "DEVICE"); -+ return list_interface_ids(ncf, maxnames, names, flags, "INTERFACE"); - } - - int drv_num_of_interfaces(struct netcf *ncf, unsigned int flags) { -- return list_interface_ids(ncf, 0, NULL, flags, "DEVICE"); -+ return list_interface_ids(ncf, 0, NULL, flags, "INTERFACE"); - } - - struct netcf_if *drv_lookup_by_name(struct netcf *ncf, const char *name) { -@@ -599,8 +603,8 @@ - - ncf = nif->ncf; - ndevs = aug_fmt_match(ncf, &devs, -- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s'" -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]/DEVICE", -+ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s'" -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]/INTERFACE", - ifcfg_path, nif->name, nif->name, nif->name, nif->name); - ERR_BAIL(ncf); - -@@ -745,7 +749,7 @@ - int nmatches = 0; - - nmatches = aug_fmt_match(ncf, NULL, -- "%s[ DEVICE = '%s' and TYPE = 'Bridge']", -+ "%s[ INTERFACE = '%s' and TYPE = 'Bridge']", - ifcfg_path, name); - return nmatches > 0; - } -@@ -758,7 +762,7 @@ - ERR_BAIL(ncf); - - nslaves = aug_fmt_match(ncf, slaves, -- "%s[ BRIDGE = '%s' ]/DEVICE", ifcfg_path, name); -+ "%s[ BRIDGE = '%s' ]/INTERFACE", ifcfg_path, name); - ERR_BAIL(ncf); - for (int i=0; i < nslaves; i++) { - char *p = (*slaves)[i]; -@@ -790,8 +794,8 @@ - /* The last or clause catches slaves of a bond that are enslaved to - * a bridge NAME */ - r = xasprintf(&path, -- "%s[ DEVICE = '%s' or BRIDGE = '%s' or MASTER = '%s' " -- " or MASTER = ../*[BRIDGE = '%s']/DEVICE ]", -+ "%s[ INTERFACE = '%s' or BRIDGE = '%s' or MASTER = '%s' " -+ " or MASTER = ../*[BRIDGE = '%s']/INTERFACE ]", - ifcfg_path, name, name, name, name); - ERR_NOMEM(r < 0, ncf); - -@@ -967,7 +971,7 @@ - for (int i = 0; i < nmatches; i++) { - if (!has_ifcfg_file(ncf, matches[i])) - continue; -- r = xasprintf(&ifcfg, "%s[DEVICE = '%s']", ifcfg_path, matches[i]); -+ r = xasprintf(&ifcfg, "%s[INTERFACE = '%s']", ifcfg_path, matches[i]); - ERR_NOMEM(r < 0, ncf); - - if (! is_slave(ncf, ifcfg)) -@@ -1023,7 +1027,10 @@ - */ - - int drv_if_up(struct netcf_if *nif) { -- static const char *const ifup = "ifup"; -+ //static const char *const ifup = "ifup"; -+ static const char *const ifup = "netcfg"; -+ static const char *const ifprefix = "ifcfg-"; -+ char ifname[strlen(nif->name) + sizeof(ifprefix)]; - struct netcf *ncf = nif->ncf; - char **slaves = NULL; - int nslaves = 0; -@@ -1035,11 +1042,24 @@ - ERR_BAIL(ncf); - - for (int i=0; i < nslaves; i++) { -- run1(ncf, ifup, slaves[i]); -+ //run1(ncf, ifup, slaves[i]); -+ const char *const argv[] = { -+ ifup, "-u", slaves[i], NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - } - } -- run1(ncf, ifup, nif->name); -+ //run1(ncf, ifup, nif->name); -+ /* Interfaces name have to be equal to script under /etc/network.d */ -+ strcpy(ifname, ifprefix); -+ strcat(ifname, nif->name); -+ const char *const argv[] = { -+ ifup, "-u", ifname, NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - result = 0; - error: -@@ -1048,13 +1068,23 @@ - } - - int drv_if_down(struct netcf_if *nif) { -- static const char *const ifdown = "ifdown"; -+ //static const char *const ifdown = "ifdown"; -+ static const char *const ifdown = "netcfg"; -+ static const char *const ifprefix = "ifcfg-"; -+ char ifname[strlen(nif->name) + sizeof(ifprefix)]; - struct netcf *ncf = nif->ncf; - char **slaves = NULL; - int nslaves = 0; - int result = -1; - -- run1(ncf, ifdown, nif->name); -+ //run1(ncf, ifdown, nif->name); -+ strcpy(ifname, ifprefix); -+ strcat(ifname, nif->name); -+ const char *const argv[] = { -+ ifdown, "-d", ifname, NULL -+ }; -+ -+ run_program(ncf, argv); - ERR_BAIL(ncf); - if (is_bridge(ncf, nif->name)) { - /* Bring up bridge slaves after the bridge */ -@@ -1062,7 +1092,12 @@ - ERR_BAIL(ncf); - - for (int i=0; i < nslaves; i++) { -- run1(ncf, ifdown, slaves[i]); -+ //run1(ncf, ifdown, slaves[i]); -+ const char *const argvs[] = { -+ ifdown, "-d", slaves[i], NULL -+ }; -+ -+ run_program(ncf, argvs); - ERR_BAIL(ncf); - } - } -diff -ur netcf-0.1.7.ori//tests/interface/bridge.xml~ netcf-0.1.7/tests/interface/bridge.xml~ ---- netcf-0.1.7.ori//tests/interface/bridge.xml~ 2009-10-13 19:14:53.000000000 +0200 -+++ netcf-0.1.7/tests/interface/bridge.xml~ 2009-10-14 05:09:05.000000000 +0200 -@@ -2,10 +2,12 @@ - <start mode="onboot"/> - <mtu size="1500"/> - <protocol family="ipv4"> -- <ip address="192.168.80.5" prefix="24"/> -+ <dhcp/> - </protocol> - <bridge stp="off" delay="0.01"> - <interface type="ethernet" name="eth0"> -+ <mac address="ab:bb:cc:dd:ee:ff"/> - </interface> -+ <interface type="ethernet" name="eth1"/> - </bridge> - </interface> -diff -ur netcf-0.1.7.ori//tests/interface/vlan.xml~ netcf-0.1.7/tests/interface/vlan.xml~ ---- netcf-0.1.7.ori//tests/interface/vlan.xml~ 2010-07-30 06:02:39.000000000 +0200 -+++ netcf-0.1.7/tests/interface/vlan.xml~ 2010-09-07 18:26:22.000000000 +0200 -@@ -1,9 +1,9 @@ --<interface type="vlan" name="eth1.42"> -+<interface type="vlan" name="eth0.42"> - <start mode="onboot"/> - <protocol family="ipv4"> - <dhcp peerdns="no"/> - </protocol> - <vlan tag="42"> -- <interface name="eth1"/> -+ <interface name="eth0"/> - </vlan> - </interface> diff --git a/community/netsurf/netsurf.desktop b/community/netsurf/netsurf.desktop deleted file mode 100644 index aca4deefc..000000000 --- a/community/netsurf/netsurf.desktop +++ /dev/null @@ -1,127 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Netsurf -Name[ar]=صافي تصفح -Name[ast]=Netsurf -Name[ca]=Netsurf -Name[cs]=Netsurf -Name[da]=Netsurf -Name[de]=Netsurf -Name[el]=καθαρού σερφ -Name[en_GB]=Netsurf -Name[es]=Netsurf -Name[et]=Netsurf -Name[fi]=Netsurf -Name[fr]=Netsurf -Name[gl]=Netsurf -Name[he]=Netsurf -Name[hr]=Netsurf -Name[hu]=Netsurf -Name[id]=Netsurf -Name[it]=Netsurf -Name[ja]=Netsurf -Name[ko]=인터넷 서핑 -Name[lt]=Netsurf -Name[nl]=Netsurf -Name[no]=Netsurf -Name[pl]=Netsurf -Name[pt]=Netsurf -Name[pt_BR]=Netsurf -Name[ro]=Netsurf -Name[ru]=Netsurf -Name[sk]=Netsurf -Name[sr]=нетсурф -Name[sr@latin]=Netsurf -Name[sv]=Netsurf -Name[tr]=Netsurf -Name[ug]=Netsurf -Name[uk]=Інтернет серфінгу -Name[zh_CN]=Netsurf 网冲浪 -Name[zh_TW]=Netsurf 網衝浪 -GenericName=Web Browser -GenericName[ar]=متصفح الوب -GenericName[ast]=Restolador -GenericName[ca]=Navegador web -GenericName[cs]=Internetový prohlížeč -GenericName[da]=Webbrowser -GenericName[de]=Internetbetrachter -GenericName[el]=Περιηγητής Ιστού -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebibrauser -GenericName[fi]=Verkkoselain -GenericName[fr]=Navigateur Internet -GenericName[gl]=Navegador web -GenericName[he]=דפדפן -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Peramban Web -GenericName[it]=Browser web -GenericName[ja]=ウェブブラウザ -GenericName[ko]=웹 브라우저 -GenericName[lt]=Interneto naršyklė -GenericName[nl]=Webbrowser -GenericName[no]=Nettleser -GenericName[pa]=ਵੈੱਬ ਬਰਾਊਜ਼ਰ -GenericName[pl]=Przeglądarka internetowa -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador web -GenericName[ro]=Navigator web -GenericName[ru]=Интернет-обозреватель -GenericName[sk]=Internetový prehliadač -GenericName[sr]=Интернет прегледник -GenericName[sr@latin]=Internet preglednik -GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı -GenericName[ug]=توركۆرگۈ -GenericName[uk]=Переглядач Веб -GenericName[zh_CN]=网页浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Lightweight web browser -Comment[ar]=منصفح الوب الخفيف -Comment[ast]=Restolador llixeru -Comment[ca]=Navegador web lleuger -Comment[cs]=Odlehčený prohlížeč -Comment[da]=Letvægtig webbrowser -Comment[de]=Schlanker Internetbetrachter -Comment[el]=Ελαφρύς περιηγητής ιστού -Comment[en_GB]=Lightweight web browser -Comment[es]=Navegador web ligero -Comment[et]=Kergekaaluline veebibrauser -Comment[fi]=Kevyt verkkoselain -Comment[fr]=Navigateur Internet léger -Comment[gl]=Navegador web lixeiro -Comment[he]=דפדפן קל משקל -Comment[hr]=Lagani web preglednik -Comment[hu]=Könnyűsúlyú webböngésző -Comment[id]=Peramban web ringan -Comment[it]=Browser web leggero -Comment[ja]=軽量級ウェブブラウザ -Comment[ko]=가벼운 웹 브라우저 -Comment[lt]=Paprasta interneto naršyklė -Comment[nl]=Lichtgewicht webbrowser -Comment[no]=Lettvektig nettleser -Comment[pa]=ਲਾਈਟਵੇਟ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Comment[pl]=Umożliwia przeglądanie zawartości sieci internetowej -Comment[pt]=Navegador Web rápido -Comment[pt_BR]=Navegador web leve -Comment[ro]=Mic navigator web -Comment[ru]=Легковесный Интернет-обозреватель -Comment[sk]=Ľahký internetový prehliadač -Comment[sr]=Једноставан Интернет прегледник -Comment[sr@latin]=Jednostavan Internet preglednik -Comment[sv]=Resurssnål webbläsare -Comment[tr]=Hafif web tarayıcı -Comment[ug]=يېنىك توركۆرگۈ -Comment[uk]=Легкий переглядач Веб -Comment[zh_CN]=轻量级网页浏览器 -Comment[zh_TW]=輕量級網頁瀏覽器 -Categories=GTK;Network;WebBrowser; -MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo; -Exec=netsurf %U -Icon=netsurf -Terminal=false -StartupNotify=true -X-Osso-Type=application/x-executable -X-Osso-Service=netsurf diff --git a/community/onboard/fix_encoding_mismatch.patch b/community/onboard/fix_encoding_mismatch.patch deleted file mode 100644 index 01750598c..000000000 --- a/community/onboard/fix_encoding_mismatch.patch +++ /dev/null @@ -1,187 +0,0 @@ -Subject: Fix string encodings so as to not have a mismatch without mousetweaks -Author: marmuta -Origin: upstream, http://bazaar.launchpad.net/~onboard/onboard/0.91/revision/764 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/958385 - ---- - Onboard/Config.py | 9 +++++---- - Onboard/ConfigUtils.py | 9 ++++++--- - Onboard/Exceptions.py | 5 +++-- - Onboard/OnboardGtk.py | 5 +++-- - Onboard/settings.py | 7 ++++--- - Onboard/utils.py | 16 ++++++++++++++++ - 6 files changed, 37 insertions(+), 14 deletions(-) - -Index: onboard-0.97.0/Onboard/Config.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/Config.py -+++ onboard-0.97.0/Onboard/Config.py -@@ -12,7 +12,7 @@ - - from gi.repository import GLib, Gtk - --from Onboard.utils import show_confirmation_dialog, Version -+from Onboard.utils import show_confirmation_dialog, Version, unicode_str - from Onboard.WindowUtils import Handle - from Onboard.ConfigUtils import ConfigObject - from Onboard.MouseControl import Mousetweaks, ClickMapper -@@ -209,7 +209,7 @@ - try: - ConfigObject.__init__(self) - except SchemaError as e: -- _logger.error(str(e)) -+ _logger.error(unicode_str(e)) - sys.exit() - - # init paths -@@ -225,7 +225,8 @@ - try: - copytree(old_user_dir, user_dir) - except OSError as ex: # python >2.5 -- _logger.error(_("Failed to migrate user directory. ") + str(ex)) -+ _logger.error(_("Failed to migrate user directory. ") + \ -+ unicode_str(ex)) - - # Load system defaults (if there are any, not required). - # Used for distribution specific settings, aka branding. -@@ -347,7 +348,7 @@ - self.mousetweaks = Mousetweaks() - self.children.append(self.mousetweaks) - except (SchemaError, ImportError) as e: -- _logger.warning(str(e)) -+ _logger.warning(unicode_str(e)) - self.mousetweaks = None - - self.clickmapper = ClickMapper() -Index: onboard-0.97.0/Onboard/ConfigUtils.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/ConfigUtils.py -+++ onboard-0.97.0/Onboard/ConfigUtils.py -@@ -22,7 +22,8 @@ - from gi.repository import Gio - - from Onboard.Exceptions import SchemaError --from Onboard.utils import pack_name_value_list, unpack_name_value_list -+from Onboard.utils import pack_name_value_list, unpack_name_value_list, \ -+ unicode_str - - _CAN_SET_HOOK = "_can_set_" # return true if value is valid - _GSETTINGS_GET_HOOK = "_gsettings_get_" # retrieve from gsettings -@@ -388,7 +389,8 @@ - try: - filename = parser.read(paths) - except configparser.ParsingError as ex: -- _logger.error(_("Failed to read system defaults. " + str(ex))) -+ _logger.error(_("Failed to read system defaults. " + \ -+ unicode_str(ex))) - - if not filename: - _logger.info(_("No system defaults found.")) -@@ -501,7 +503,8 @@ - value = self.settings[self.key] - - except KeyError as ex: -- _logger.error(_("Failed to get gsettings value. ") + str(ex)) -+ _logger.error(_("Failed to get gsettings value. ") + \ -+ unicode_str(ex)) - - return value - -Index: onboard-0.97.0/Onboard/Exceptions.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/Exceptions.py -+++ onboard-0.97.0/Onboard/Exceptions.py -@@ -4,6 +4,7 @@ - - from traceback import format_tb - import sys -+from Onboard.utils import unicode_str - - class ChainableError(Exception): - """ -@@ -40,10 +41,10 @@ - traceback = property(_get_traceback) - - def __str__(self): -- message = self._message + "\n" -+ message = unicode_str(self._message) + "\n" - if self.chained_exception: - message += "%s: %s" % (type(self.chained_exception).__name__, -- str(self.chained_exception)) -+ unicode_str(self.chained_exception)) - return message - - class SVGSyntaxError(ChainableError): -Index: onboard-0.97.0/Onboard/OnboardGtk.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/OnboardGtk.py -+++ onboard-0.97.0/Onboard/OnboardGtk.py -@@ -26,7 +26,8 @@ - from Onboard.KeyGtk import * - from Onboard.KbdWindow import KbdWindow, KbdPlugWindow - from Onboard.KeyboardSVG import KeyboardSVG --from Onboard.utils import show_confirmation_dialog, CallOnce, timeit -+from Onboard.utils import show_confirmation_dialog, CallOnce, timeit, \ -+ unicode_str - from Onboard.Appearance import Theme - - ### Config Singleton ### -@@ -485,7 +486,7 @@ - except virtkey.error as e: - t = time.time() - if t > self._vk_error_time + .2: # rate limit to once per 200ms -- _logger.warning("vk: "+str(e)) -+ _logger.warning("vk: " + unicode_str(e)) - self._vk_error_time = t - - return self._vk -Index: onboard-0.97.0/Onboard/settings.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/settings.py -+++ onboard-0.97.0/Onboard/settings.py -@@ -24,7 +24,8 @@ - from Onboard.Appearance import Theme, ColorScheme - from Onboard.Scanner import ScanMode, ScanDevice - from Onboard.utils import show_ask_string_dialog, \ -- show_confirmation_dialog -+ show_confirmation_dialog, \ -+ unicode_str - - from virtkey import virtkey - from osk import Devices -@@ -400,8 +401,8 @@ - try: - Popen([filename, "universal-access"]) - except OSError as e: -- _logger.warning(_("System settings not found" -- " ({}): {}").format(filename, str(e))) -+ _logger.warning(_("System settings not found ({}): {}") \ -+ .format(filename, unicode_str(e))) - - def update_num_resize_handles_combobox(self): - self.num_resize_handles_list = Gtk.ListStore(str, int) -Index: onboard-0.97.0/Onboard/utils.py -=================================================================== ---- onboard-0.97.0.orig/Onboard/utils.py -+++ onboard-0.97.0/Onboard/utils.py -@@ -961,4 +961,20 @@ - return 1 - return 0 - -+def unicode_str(obj, encoding = "utf-8"): -+ """ -+ Safe str() function that always returns an unicode string. -+ Do nothing if the string was already unicode. -+ """ -+ if sys.version_info.major >= 3: # python 3? -+ return str(obj) -+ -+ if type(obj) == unicode: # unicode string? -+ return obj -+ -+ if hasattr(obj, "__unicode__"): # Exception object? -+ return unicode(obj) -+ -+ return str(obj).decode("utf-8") # strings, numbers, ... -+ - diff --git a/community/onboard/fix_unicode_translations.patch b/community/onboard/fix_unicode_translations.patch deleted file mode 100644 index 1eaf663cc..000000000 --- a/community/onboard/fix_unicode_translations.patch +++ /dev/null @@ -1,247 +0,0 @@ -=== modified file 'Onboard/Appearance.py' ---- Onboard/Appearance.py 2012-02-14 08:16:34 +0000 -+++ Onboard/Appearance.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - _logger = logging.getLogger("Appearance") - ############### - --from gettext import gettext as _ - from xml.dom import minidom - import os - import re - -=== modified file 'Onboard/Config.py' ---- Onboard/Config.py 2012-02-15 10:58:02 +0000 -+++ Onboard/Config.py 2012-02-15 23:27:20 +0000 -@@ -9,7 +9,6 @@ - import sys - from shutil import copytree - from optparse import OptionParser --from gettext import gettext as _ - - from gi.repository import GLib, Gtk - - -=== modified file 'Onboard/ConfigUtils.py' ---- Onboard/ConfigUtils.py 2012-02-08 14:56:38 +0000 -+++ Onboard/ConfigUtils.py 2012-02-15 23:27:20 +0000 -@@ -13,7 +13,6 @@ - import os - import sys - from ast import literal_eval --from gettext import gettext as _ - try: - import configparser - except ImportError: -@@ -418,8 +417,8 @@ - # convert ini file strings to property values - sysdef_gskeys = dict((k.sysdef, k) for k in list(self.gskeys.values())) - for sysdef, value in items: -- _logger.info(_("Found system default '{}={}'") \ -- .format(sysdef, value)) -+ _logger.info(_("Found system default '[{}] {}={}'") \ -+ .format(self.sysdef_section, sysdef, value)) - - gskey = sysdef_gskeys.get(sysdef, None) - value = self._convert_sysdef_key(gskey, sysdef, value) - -=== modified file 'Onboard/IconPalette.py' ---- Onboard/IconPalette.py 2012-02-15 01:34:13 +0000 -+++ Onboard/IconPalette.py 2012-02-15 23:27:20 +0000 -@@ -43,7 +43,6 @@ - config = Config() - ######################## - --from gettext import gettext as _ - - class IconPalette(Gtk.Window, WindowRectTracker, WindowManipulator): - """ - -=== modified file 'Onboard/Indicator.py' ---- Onboard/Indicator.py 2012-02-11 14:07:56 +0000 -+++ Onboard/Indicator.py 2012-02-15 23:27:20 +0000 -@@ -18,7 +18,6 @@ - config = Config() - ######################## - --from gettext import gettext as _ - - class Indicator(GObject.GObject): - - -=== modified file 'Onboard/KbdWindow.py' ---- Onboard/KbdWindow.py 2012-02-15 10:18:48 +0000 -+++ Onboard/KbdWindow.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - from Onboard.WindowUtils import Orientation, WindowRectTracker - from Onboard.IconPalette import IconPalette - --from gettext import gettext as _ - - ### Logging ### - import logging - -=== modified file 'Onboard/Keyboard.py' ---- Onboard/Keyboard.py 2012-02-14 20:21:02 +0000 -+++ Onboard/Keyboard.py 2012-02-15 23:27:20 +0000 -@@ -3,7 +3,6 @@ - from __future__ import division, print_function, unicode_literals - - import sys --from gettext import gettext as _ - - from gi.repository import GObject, Gtk, Gdk - - -=== modified file 'Onboard/KeyboardGTK.py' ---- Onboard/KeyboardGTK.py 2012-02-15 01:33:34 +0000 -+++ Onboard/KeyboardGTK.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - import os - import time --from gettext import gettext as _ - - import cairo - from gi.repository import GObject, Gdk, Gtk - -=== modified file 'Onboard/KeyboardSVG.py' ---- Onboard/KeyboardSVG.py 2012-02-09 19:18:36 +0000 -+++ Onboard/KeyboardSVG.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - import re - import sys - import shutil --from gettext import gettext as _ - from xml.dom import minidom - - from Onboard import Exceptions - -=== modified file 'Onboard/MouseControl.py' ---- Onboard/MouseControl.py 2012-01-19 08:50:34 +0000 -+++ Onboard/MouseControl.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - from __future__ import division, print_function, unicode_literals - --from gettext import gettext as _ - try: - import dbus - from dbus.mainloop.glib import DBusGMainLoop - -=== modified file 'Onboard/OnboardGtk.py' ---- Onboard/OnboardGtk.py 2012-02-15 10:58:02 +0000 -+++ Onboard/OnboardGtk.py 2012-02-15 23:27:20 +0000 -@@ -13,14 +13,14 @@ - import signal - import gettext - import os.path --from gettext import gettext as _ - import virtkey -- - from gi.repository import GObject, Gio, Gdk, Gtk - -+# setup gettext, install _() function for all modules -+app = "onboard" -+gettext.install(app, unicode=True) - - from Onboard.Indicator import Indicator -- - from Onboard.Keyboard import Keyboard - from Onboard.Scanner import Scanner - from Onboard.KeyGtk import * -@@ -37,11 +37,6 @@ - import Onboard.KeyCommon - import Onboard.utils as utils - --#setup gettext --app="onboard" --gettext.textdomain(app) --gettext.bindtextdomain(app) -- - DEFAULT_FONTSIZE = 10 - - class OnboardGtk(Gtk.Application): - -=== modified file 'Onboard/SnippetView.py' ---- Onboard/SnippetView.py 2012-01-09 22:25:10 +0000 -+++ Onboard/SnippetView.py 2012-02-15 23:27:20 +0000 -@@ -4,7 +4,6 @@ - - from gi.repository import GObject, Gtk - --from gettext import gettext as _ - - from Onboard.utils import show_error_dialog - - -=== modified file 'Onboard/TouchHandles.py' ---- Onboard/TouchHandles.py 2012-02-14 08:32:08 +0000 -+++ Onboard/TouchHandles.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - from math import pi, sqrt, sin, log - import cairo --from gettext import gettext as _ - - from Onboard.utils import Rect - from Onboard.WindowUtils import Handle - -=== modified file 'Onboard/WindowUtils.py' ---- Onboard/WindowUtils.py 2012-02-15 10:23:36 +0000 -+++ Onboard/WindowUtils.py 2012-02-15 23:27:20 +0000 -@@ -5,7 +5,6 @@ - - import time - from math import sqrt --from gettext import gettext as _ - - from gi.repository import GObject, Gtk, Gdk - - -=== modified file 'Onboard/settings.py' ---- Onboard/settings.py 2012-02-15 10:58:02 +0000 -+++ Onboard/settings.py 2012-02-15 23:27:20 +0000 -@@ -11,9 +11,14 @@ - from subprocess import Popen - from xml.parsers.expat import ExpatError - from xml.dom import minidom -+import gettext - - from gi.repository import GObject, Pango, Gdk, Gtk - -+# setup gettext, install _() function for all modules -+app = "onboard" -+gettext.install(app, unicode=True) -+ - from Onboard.KeyboardSVG import KeyboardSVG - from Onboard.SnippetView import SnippetView - from Onboard.Appearance import Theme, ColorScheme -@@ -36,14 +41,6 @@ - config = Config() - ######################## - --#setup gettext --import gettext --from gettext import gettext as _ --app = "onboard" --gettext.textdomain(app) --gettext.bindtextdomain(app) -- -- - - def LoadUI(filebase): - builder = Gtk.Builder() - -=== modified file 'Onboard/utils.py' ---- Onboard/utils.py 2012-02-15 01:33:34 +0000 -+++ Onboard/utils.py 2012-02-15 23:27:20 +0000 -@@ -11,7 +11,6 @@ - from subprocess import Popen - from math import pi, sqrt, sin - from contextlib import contextmanager --from gettext import gettext as _ - - from gi.repository import GObject, Gtk - - diff --git a/community/powertop/powertop-1.13-with-3.0.6.patch b/community/powertop/powertop-1.13-with-3.0.6.patch deleted file mode 100644 index fc61913a8..000000000 --- a/community/powertop/powertop-1.13-with-3.0.6.patch +++ /dev/null @@ -1,142 +0,0 @@ -Common subdirectories: powertop-1.13/kernel-patches and powertop-patched/kernel-patches -Common subdirectories: powertop-1.13/po and powertop-patched/po -diff -u powertop-1.13/powertop.c powertop-patched/powertop.c ---- powertop-1.13/powertop.c 2010-07-20 01:08:21.000000000 +0200 -+++ powertop-patched/powertop.c 2011-10-20 14:34:41.163951192 +0200 -@@ -547,95 +547,6 @@ - qsort (lines, linehead, sizeof (struct line), line_compare); - } - -- -- --int print_battery_proc_acpi(void) --{ -- DIR *dir; -- struct dirent *dirent; -- FILE *file; -- double rate = 0; -- double cap = 0; -- -- char filename[256]; -- -- dir = opendir("/proc/acpi/battery"); -- if (!dir) -- return 0; -- -- while ((dirent = readdir(dir))) { -- int dontcount = 0; -- double voltage = 0.0; -- double amperes_drawn = 0.0; -- double watts_drawn = 0.0; -- double amperes_left = 0.0; -- double watts_left = 0.0; -- char line[1024]; -- -- if (strlen(dirent->d_name) < 3) -- continue; -- -- sprintf(filename, "/proc/acpi/battery/%s/state", dirent->d_name); -- file = fopen(filename, "r"); -- if (!file) -- continue; -- memset(line, 0, 1024); -- while (fgets(line, 1024, file) != NULL) { -- char *c; -- if (strstr(line, "present:") && strstr(line, "no")) -- break; -- -- if (strstr(line, "charging state:") -- && !strstr(line, "discharging")) -- dontcount = 1; -- c = strchr(line, ':'); -- if (!c) -- continue; -- c++; -- -- if (strstr(line, "present voltage")) -- voltage = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "remaining capacity") && strstr(c, "mW")) -- watts_left = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "remaining capacity") && strstr(c, "mAh")) -- amperes_left = strtoull(c, NULL, 10) / 1000.0; -- -- if (strstr(line, "present rate") && strstr(c, "mW")) -- watts_drawn = strtoull(c, NULL, 10) / 1000.0 ; -- -- if (strstr(line, "present rate") && strstr(c, "mA")) -- amperes_drawn = strtoull(c, NULL, 10) / 1000.0; -- -- } -- fclose(file); -- -- if (!dontcount) { -- rate += watts_drawn + voltage * amperes_drawn; -- } -- cap += watts_left + voltage * amperes_left; -- -- -- } -- closedir(dir); -- if (prev_bat_cap - cap < 0.001 && rate < 0.001) -- last_bat_time = 0; -- if (!last_bat_time) { -- last_bat_time = prev_bat_time = time(NULL); -- last_bat_cap = prev_bat_cap = cap; -- } -- if (time(NULL) - last_bat_time >= 400) { -- prev_bat_cap = last_bat_cap; -- prev_bat_time = last_bat_time; -- last_bat_time = time(NULL); -- last_bat_cap = cap; -- } -- -- show_acpi_power_line(rate, cap, prev_bat_cap - cap, time(NULL) - prev_bat_time); -- return 1; --} -- - int print_battery_proc_pmu(void) - { - char line[80]; -@@ -719,9 +630,6 @@ - - char filename[256]; - -- if (print_battery_proc_acpi()) -- return; -- - if (print_battery_proc_pmu()) - return; - -@@ -733,7 +641,6 @@ - while ((dirent = readdir(dir))) { - int dontcount = 0; - double voltage = 0.0; -- double amperes_drawn = 0.0; - double watts_drawn = 0.0; - double watts_left = 0.0; - char line[1024]; -@@ -790,8 +697,12 @@ - watts_left *= strtoull(line, NULL, 10) / 1000000.0; - fclose(file); - -- sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); -+ sprintf(filename, "/sys/class/power_supply/%s/power_now", dirent->d_name); - file = fopen(filename, "r"); -+ if (!file) { -+ sprintf(filename, "/sys/class/power_supply/%s/current_now", dirent->d_name); -+ file = fopen(filename, "r"); -+ } - if (!file) - continue; - memset(line, 0, 1024); -@@ -801,7 +712,7 @@ - fclose(file); - - if (!dontcount) { -- rate += watts_drawn + voltage * amperes_drawn; -+ rate += watts_drawn; - } - cap += watts_left; - diff --git a/community/python2-ldap/setup.cfg.patch b/community/python2-ldap/setup.cfg.patch deleted file mode 100644 index 77444c04a..000000000 --- a/community/python2-ldap/setup.cfg.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- setup.cfg 2006-11-15 20:26:26.000000000 +0300 -+++ setup.cfg.my 2007-06-25 16:19:24.000000000 +0400 -@@ -7,14 +7,14 @@ - # for wrapping OpenLDAP 2 libs - [_ldap] - --library_dirs = /usr/local/openldap-2.3/lib --include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl -+library_dirs = /usr/lib -+include_dirs = /usr/include /usr/include/sasl - - extra_compile_args = - extra_objects = - - # Example for sparse build: basic functionality --#libs = ldap lber -+libs = ldap lber - - # Some Linux systems might need explicitly linking with -lresolv - #libs = ldap lber resolv -@@ -31,10 +31,10 @@ - optimize = 1 - - # Linux distributors/packagers should adjust these settings --[bdist_rpm] --provides = python-ldap --requires = python libldap.so.2 -+#[bdist_rpm] -+#provides = python-ldap -+#requires = python libldap.so.2 - # distribution_name = --release = 0 --packager = Michael Stroeder <michael@stroeder.com> --doc_files = CHANGES README INSTALL TODO Demo/ -+#release = 0 -+#packager = Michael Stroeder <michael@stroeder.com> -+#doc_files = CHANGES README INSTALL TODO Demo/ diff --git a/community/sakura/linker.patch b/community/sakura/linker.patch deleted file mode 100644 index 9277461d9..000000000 --- a/community/sakura/linker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sakura-3.0.0/CMakeLists.txt.bak 2012-02-29 22:50:16.786701967 +0100 -+++ sakura-3.0.0/CMakeLists.txt 2012-02-29 22:50:26.323368673 +0100 -@@ -43,7 +43,7 @@ - - INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS}) - LINK_DIRECTORIES (${GTK_LIBRARY_DIRS} ${VTE_LIBRARY_DIRS}) --LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES}) -+LINK_LIBRARIES (${GTK_LIBRARIES} ${VTE_LIBRARIES} -lm) - ADD_EXECUTABLE (sakura src/sakura.c) - ADD_DEPENDENCIES (sakura src/sakura.c src/sakura.h) - diff --git a/community/sslh/sslh.service b/community/sslh/sslh.service deleted file mode 100644 index 7ccad70e9..000000000 --- a/community/sslh/sslh.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SSL/SSH multiplexer - -[Service] -EnvironmentFile=/etc/conf.d/sslh -ExecStart=/usr/bin/sslh --foreground $DAEMON_OPTS - -[Install] -WantedBy=multi-user.target diff --git a/community/sword/PKGBUILD b/community/sword/PKGBUILD deleted file mode 100644 index 34be9efb8..000000000 --- a/community/sword/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 69772 2012-04-23 09:16:25Z ibiru $ -# Maintainer: Alexander Rødseth -# Contributor: Andrea Scarpino -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: TripleE <eric1548@yahoo.com> - -pkgname=sword -pkgver=1.6.2 -pkgrel=7 -pkgdesc="Library for Bible study programs" -arch=('x86_64' 'i686') -url="http://www.crosswire.org/sword/" -license=('GPL') -depends=('curl' 'clucene' 'swig') -makedepends=('cmake') -backup=('etc/sword.conf') -source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" - "curl.patch") -sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9' - '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i ../curl.patch - - mkdir ../build - cd ../build - - CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir/build" - - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/usr/lib/sword" - mv "$pkgdir"/usr/lib/${pkgver}_icu_* \ - "$pkgdir/usr/lib/sword/" - - cd "$srcdir/$pkgname-$pkgver/locales.d/" - for file in *.conf; do - install -Dm644 "$file" \ - "$pkgdir/usr/share/sword/locales.d/$file" - done - - cd ../include - install -d "$pkgdir/usr/include/sword" - install -Dm644 canon_{catholic{,2},synodalp}.h \ - "$pkgdir/usr/include/sword" - - cd ../samples - install -Dm644 mods.d/globals.conf \ - "$pkgdir/usr/share/sword/mods.d/globals.conf" - install -Dm644 recommended/sword.conf \ - "$pkgdir/etc/sword.conf" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/sword/curl.patch b/community/sword/curl.patch deleted file mode 100644 index 63fd4433c..000000000 --- a/community/sword/curl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp ---- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 -+++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 -@@ -26,7 +26,6 @@ - #include <fcntl.h> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> -diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp ---- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 -+++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 -@@ -25,7 +25,6 @@ - #include <cctype> - - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - - #include <swlog.h> diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD deleted file mode 100644 index 95160b25e..000000000 --- a/community/twinkle/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 67220 2012-03-05 09:00:06Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -pkgname=twinkle -pkgver=1.4.2 -pkgrel=15 -pkgdesc="Softphone for voice over IP and IM communication using SIP" -arch=('x86_64' 'i686') -url="http://www.twinklephone.com/" -license=('GPL') -depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp') -makedepends=('pkg-config' 'boost') -source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz" - "twinkle.desktop") -sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5' - '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862') -sha256sums=('807686c7ac1b54bb0ea27ff4be362db6926d1d3d6f1802f6d359a353157e89a5' - '88578b314f434d88ef387ee8bf541dcdd4dfeffba161c1c66e43ac54103b3862') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - . /etc/profile.d/qt3.sh - ./configure --prefix=/usr \ - --without-kde \ - --with-speex \ - --without-ilbc \ - --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \ - "$pkgdir/usr/share/pixmaps/twinkle.png" - install -Dm644 twinkle.desktop \ - "$pkgdir/usr/share/applications/twinkle.desktop" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/twinkle/twinkle.desktop b/community/twinkle/twinkle.desktop deleted file mode 100644 index 60688b5fe..000000000 --- a/community/twinkle/twinkle.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Twinkle -Comment=SIP softphone for Qt -Icon=twinkle.png -Exec=twinkle -Terminal=false -Type=Application -Categories=Network; -StartupNotify=false diff --git a/community/ucommon/PKGBUILD b/community/ucommon/PKGBUILD deleted file mode 100644 index bb002c30a..000000000 --- a/community/ucommon/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 70712 2012-05-15 11:28:13Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Dan Serban -# Contributors: David Zaragoza, Andrea Scarpino - -pkgname=ucommon -pkgver=5.2.2 -pkgrel=1 -pkgdesc="A light-weight C++ library to facilitate using C++ design patterns" -arch=(i686 x86_64) -url=http://ftp.gnu.org/gnu/commoncpp/ -license=(GPL) -depends=(openssl) -makedepends=(lynx) -options=('!libtool') -source=("http://ftp.gnu.org/pub/gnu/commoncpp/ucommon-$pkgver.tar.gz") -md5sums=('4739fcd9db006432f1b8e2ea226e414a') - -build() { - cd $(ls -1d ucommon-*/ | tail -1) - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install -} diff --git a/community/wings3d/wings3d b/community/wings3d/wings3d deleted file mode 100644 index c0fd3b2fb..000000000 --- a/community/wings3d/wings3d +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xiphos/PKGBUILD b/community/xiphos/PKGBUILD deleted file mode 100755 index f40d6ab39..000000000 --- a/community/xiphos/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 66596 2012-02-26 13:44:26Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Andrea Scarpino -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: TripleE <eric1548@yahoo.com> - -pkgname=xiphos -pkgver=3.1.5 -pkgrel=2 -pkgdesc="Bible study tool for GTK+" -arch=('x86_64' 'i686') -url="http://xiphos.org/" -license=('GPL') -depends=('libgsf' 'libglade' 'gtkhtml' 'sword') -makedepends=('gnome-doc-utils' 'intltool' 'python2') -conflicts=('gnomesword') -provides=('gnomesword') -replaces=('gnomesword') -install=xiphos.install -source=("http://downloads.sourceforge.net/gnomesword/$pkgname-$pkgver.tar.gz") -sha256sums=('2887426908e269f25d2d191be445112027b2b7e80356823d4942b1803a359d8c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i '0,/on/s//on2/' waf - CXXFLAGS+=" -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1" ./waf configure --prefix=/usr --enable-gtkhtml - ./waf build --prefix=/usr -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./waf install --destdir="$pkgdir" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/xiphos/xiphos.install b/community/xiphos/xiphos.install deleted file mode 100644 index 048e77780..000000000 --- a/community/xiphos/xiphos.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/core/coreutils/coreutils-uname.patch b/core/coreutils/coreutils-uname.patch deleted file mode 100644 index b458abeba..000000000 --- a/core/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch/<ARCH>/ source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/core/ldns/Makefile.patch b/core/ldns/Makefile.patch deleted file mode 100644 index d98291ac9..000000000 --- a/core/ldns/Makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 -+++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 -@@ -130,7 +130,7 @@ - exit -1 ; \ - fi - drill/drill: $(DRILL_LOBJS) $(LIB) -- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill -+ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill - - install-drill: drill/drill - $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) -@@ -157,7 +157,7 @@ - exit -1 ; \ - fi - $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) -- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ -+ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ - - $(TESTNS): $(TESTNS_LOBJS) $(LIB) - $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/core/mdadm/mdadm.install b/core/mdadm/mdadm.install deleted file mode 100644 index e8404c260..000000000 --- a/core/mdadm/mdadm.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then - echo "Attention mdadm update:" - echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." - echo "Please update your /etc/mkinitcpio.conf accordingly." - fi -} diff --git a/core/mpfr/mpfr-3.1.0.p7.patch b/core/mpfr/mpfr-3.1.0.p7.patch deleted file mode 100644 index f3de639bc..000000000 --- a/core/mpfr/mpfr-3.1.0.p7.patch +++ /dev/null @@ -1,1236 +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 -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 -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 -@@ -0,0 +1 @@ -+gmp41compat -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p3 -+3.1.0-p4 -diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info ---- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 -@@ -2994,11 +2994,12 @@ - - * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their - behavior no longer depends on the platform (assuming this is also -- true for GMP's random generator). As a consequence, the returned -- values can be different between MPFR 3.1 and previous MPFR -- versions. Note: as the reproducibility of these functions was not -- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded -- as backward incompatible with previous versions. -+ true for GMP's random generator, which is not the case between GMP -+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, -+ the returned values can be different between MPFR 3.1 and previous -+ MPFR versions. Note: as the reproducibility of these functions -+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ -+ regarded as backward incompatible with previous versions. - - - -@@ -4239,13 +4240,13 @@ - Node: Type and Macro Changes129308 - Node: Added Functions132029 - Node: Changed Functions134972 --Node: Removed Functions139167 --Node: Other Changes139579 --Node: Contributors141108 --Node: References143574 --Node: GNU Free Documentation License145315 --Node: Concept Index167758 --Node: Function and Type Index173677 -+Node: Removed Functions139253 -+Node: Other Changes139665 -+Node: Contributors141194 -+Node: References143660 -+Node: GNU Free Documentation License145401 -+Node: Concept Index167844 -+Node: Function and Type Index173763 - - End Tag Table - -diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi ---- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 -@@ -3466,8 +3466,9 @@ - a lack of specification. - - @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. --Their behavior no longer depends on the platform (assuming this is also --true for GMP's random generator). As a consequence, the returned values -+Their behavior no longer depends on the platform (assuming this is also true -+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if -+@code{gmp_randinit_default} is used). As a consequence, the returned values - can be different between MPFR 3.1 and previous MPFR versions. - Note: as the reproducibility of these functions was not specified - before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as -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-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.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-p3" -+#define MPFR_VERSION_STRING "3.1.0-p4" - - /* 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-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p3"; -+ return "3.1.0-p4"; - } -diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c ---- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -114,21 +114,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.895943" -+# define C2 "0.848824" -+#else -+# define C1 "0.479652" -+# define C2 "0.648529" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.895943") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.895943, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.848824") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.848824, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c ---- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -160,23 +160,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.8488312" -+# define C2 "0.8156509" -+#else -+# define C1 "0.6485367" -+# define C2 "0.9362717" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandom (x, s, MPFR_RNDN); -- /* the following values are obtained on a 32-bit computer, we should get -- the same values on a 64-bit computer */ -- if (mpfr_cmp_str1 (x, "0.8488312") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.8488312, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandom (x, s, MPFR_RNDN); -- if (mpfr_cmp_str1 (x, "0.8156509") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.8156509, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 -@@ -0,0 +1 @@ -+logging-freeze -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p4 -+3.1.0-p5 -diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c ---- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c ---- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 -@@ -29,7 +29,7 @@ - MPFR_LOG_FUNC - (("x[%Pu]=%.*Rg u=%d rnd=%d", - mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), -- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); -+ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); - - if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ - { -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-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.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-p4" -+#define MPFR_VERSION_STRING "3.1.0-p5" - - /* 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/mul_d.c mpfr-3.1.0-b/src/mul_d.c ---- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -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-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p4"; -+ return "3.1.0-p5"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 -@@ -0,0 +1 @@ -+logging-varfmt -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p5 -+3.1.0-p6 -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-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -@@ -1592,7 +1592,7 @@ - do \ - if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ - (mpfr_log_current <= mpfr_log_level)) \ -- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ -+ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ - #x, mpfr_get_prec (x), mpfr_log_prec, x); \ - while (0) - -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 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.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-p5" -+#define MPFR_VERSION_STRING "3.1.0-p6" - - /* 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 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p5"; -+ return "3.1.0-p6"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 -@@ -0,0 +1 @@ -+large-prec -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p6 -+3.1.0-p7 -diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c ---- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 -@@ -44,12 +44,12 @@ - bq = MPFR_PREC(b); - cq = MPFR_PREC(c); - -- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ -+ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ - aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; - sh = aq2 - aq; /* non-significant bits in low limb */ - -- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ -- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - - ap = MPFR_MANT(a); - bp = MPFR_MANT(b); -@@ -124,7 +124,7 @@ - dif = aq2 - diff_exp; - /* dif is the number of bits of c which overlap with a' */ - -- difn = (dif-1)/GMP_NUMB_BITS + 1; -+ difn = MPFR_PREC2LIMBS (dif); - /* only the highest difn limbs from c have to be considered */ - if (MPFR_UNLIKELY(difn > cn)) - { -diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c ---- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -107,7 +107,7 @@ - - /* Read prec and num of limbs */ - p = MPFR_PREC(b); -- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (p); - MPFR_UNSIGNED_MINUS_MODULO(sh, p); - bx = MPFR_GET_EXP(b); - d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); -diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c ---- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 -@@ -91,7 +91,7 @@ - q = MPFR_PREC(r); - p = q + MPFR_INT_CEIL_LOG2(q) + 15; - MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - - /* b (op2) and a (op1) are the 2 operands but we want b >= a */ - compare = mpfr_cmp (op1, op2); -@@ -285,7 +285,7 @@ - - /* Next iteration */ - MPFR_ZIV_NEXT (loop, p); -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - } - MPFR_ZIV_FREE (loop); - -diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c ---- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,8 +56,8 @@ - if (uexp != vexp) - return 0; /* no bit agree */ - -- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; -- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; -+ usize = MPFR_LIMB_SIZE (u); -+ vsize = MPFR_LIMB_SIZE (v); - - if (vsize > usize) /* exchange u and v */ - { -diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c ---- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -133,7 +133,7 @@ - mp_size_t yn; - int sh; - -- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ yn = MPFR_LIMB_SIZE (y); - sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); - MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; - inexact = 1; -diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c ---- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 -@@ -100,7 +100,7 @@ - nbits += (1021 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c ---- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 -@@ -92,7 +92,7 @@ - nbits += (125 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c ---- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 -@@ -2351,7 +2351,7 @@ - - /* the first digit will contain only r bits */ - prec = (m - 1) * pow2 + r; /* total number of bits */ -- n = (prec - 1) / GMP_NUMB_BITS + 1; -+ n = MPFR_PREC2LIMBS (prec); - - MPFR_TMP_MARK (marker); - x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); -@@ -2417,12 +2417,12 @@ - exact = 1; - - /* number of limbs */ -- n = 1 + (prec - 1) / GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (prec); - - /* a will contain the approximation of the mantissa */ - a = MPFR_TMP_LIMBS_ALLOC (n); - -- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ nx = MPFR_LIMB_SIZE (x); - - if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or - division to perform */ -diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c ---- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 -@@ -51,7 +51,7 @@ - which both have an odd mantissa */ - MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - -- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; -+ xsize = MPFR_PREC2LIMBS (p); - tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); - - MPFR_PREC(x) = p; /* Set prec */ -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -@@ -67,7 +67,7 @@ - - /* Now, the unit bit is represented. */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of represented fractional bits (including the trailing 0's) */ - - x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-08 15:17:03.000000000 +0000 -@@ -646,10 +646,15 @@ - **************** mpfr_t properties ******************* - ******************************************************/ - -+/* In the following macro, p is usually a mpfr_prec_t, but this macro -+ works with other integer types (without integer overflow). */ -+#define MPFR_PREC2LIMBS(p) \ -+ (MPFR_ASSERTD (p >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) -+ - #define MPFR_PREC(x) ((x)->_mpfr_prec) - #define MPFR_EXP(x) ((x)->_mpfr_exp) - #define MPFR_MANT(x) ((x)->_mpfr_d) --#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) -+#define MPFR_LIMB_SIZE(x) (MPFR_PREC2LIMBS (MPFR_PREC ((x)))) - - - /****************************************************** -@@ -1213,8 +1218,8 @@ - _destp = MPFR_MANT (dest); \ - if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ - { \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ - MPN_COPY (_destp + _dests, srcp, _srcs); \ - MPN_ZERO (_destp, _dests); \ - inexact = 0; \ -@@ -1227,8 +1232,8 @@ - mp_limb_t _rb, _sb, _ulp; \ - \ - /* Compute Position and shift */ \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec); \ - MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ - _sp = (srcp) + _srcs - _dests; \ - \ -@@ -1372,7 +1377,7 @@ - if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ - { \ - MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ -- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ -+ MPFR_LIMB_SIZE (src)); \ - inexact = 0; \ - } \ - else \ -@@ -1682,7 +1687,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ - { \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ -@@ -1733,7 +1738,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ - if (MPFR_LIKELY (_oalloc == 0)) \ - (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ -@@ -1886,7 +1891,7 @@ - MPFR_NORETURN_ATTR; - - __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, -- unsigned long)); -+ mpfr_prec_t)); - - __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, - unsigned long)); -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.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-p6" -+#define MPFR_VERSION_STRING "3.1.0-p7" - - /* 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/mul.c mpfr-3.1.0-b/src/mul.c ---- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 -@@ -93,15 +93,15 @@ - - ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); - -- bq = MPFR_PREC(b); -- cq = MPFR_PREC(c); -+ bq = MPFR_PREC (b); -+ cq = MPFR_PREC (c); - -- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - /* <= k, thus no int overflow */ - MPFR_ASSERTD(tn <= k); - -@@ -292,12 +292,12 @@ - bq = MPFR_PREC (b); - cq = MPFR_PREC (c); - -- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ - - /* Check for no size_t overflow*/ -diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c ---- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 -@@ -136,7 +136,7 @@ - (b) all the 'z' bits are zero - */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of z+0 bits */ - - yn = prec / GMP_NUMB_BITS; -diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c ---- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 -@@ -84,7 +84,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - printf("%s ", str); - for(n-- ; n>=0 ; n--) -@@ -109,7 +109,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - for(n-- ; n>=0 ; n--) - { -diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c ---- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -55,12 +55,12 @@ - - MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); - -- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ -+ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ - - /* check if x has enough allocated space for the significand */ - /* Get the number of limbs from the precision. - (Compatible with all allocation methods) */ -- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ ow = MPFR_LIMB_SIZE (x); - if (nw > ow) - { - /* FIXME: Variable can't be created using custom allocation, -diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c ---- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 -@@ -80,7 +80,7 @@ - (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) - return 0; - -- xsize = (xprec-1)/GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (xprec); - nw = yprec / GMP_NUMB_BITS; - rw = yprec & (GMP_NUMB_BITS - 1); - -diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c ---- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 -@@ -48,8 +48,7 @@ - /* Same precision and b is not singular: - * just copy the mantissa, and set the exponent and the sign - * The result is exact. */ -- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), -- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); -+ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); - MPFR_RET (0); - } - else -diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c ---- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 -@@ -43,7 +43,7 @@ - if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) - MPFR_CHANGE_SIGN (y); - -- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ sy = MPFR_LIMB_SIZE (y); - my = MPFR_MANT(y); - mx = PTR(x); - -diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c ---- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - - /* Calculate the new number of limbs */ -- xsize = (p - 1) / GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (p); - - /* Realloc only if the new size is greater than the old */ - xoldsize = MPFR_GET_ALLOC_SIZE (x); -diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c ---- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - mp_limb_t *xp; - - MPFR_SET_EXP (x, e); -- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ xn = MPFR_LIMB_SIZE (x); - sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); - xp = MPFR_MANT(x); - xp[0] = MP_LIMB_T_MAX << sh; -diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c ---- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,11 +56,11 @@ - ax = 2 * MPFR_GET_EXP (b); - bq = MPFR_PREC(b); - -- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); - -- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ -- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, -- 2*bn or 2*bn-1 */ -+ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ -+ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, -+ 2*bn or 2*bn-1 */ - - if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) - return mpfr_mul (a, b, b, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c ---- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 -@@ -26,7 +26,7 @@ - size_t - mpfr_custom_get_size (mpfr_prec_t prec) - { -- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; -+ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; - } - - #undef mpfr_custom_init -diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c ---- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -467,7 +467,7 @@ - /* Set y to the value of the ~prec most significant bits of pstr->mant - (as long as we guarantee correct rounding, we don't need to get - exactly prec bits). */ -- ysize = (prec - 1) / GMP_NUMB_BITS + 1; -+ ysize = MPFR_PREC2LIMBS (prec); - /* prec bits corresponds to ysize limbs */ - ysize_bits = ysize * GMP_NUMB_BITS; - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ -diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c ---- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -155,8 +155,8 @@ - MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); - - /* Read prec and num of limbs */ -- p = MPFR_PREC(b); -- n = (p-1)/GMP_NUMB_BITS+1; -+ p = MPFR_PREC (b); -+ n = MPFR_PREC2LIMBS (p); - - /* Fast cmp of |b| and |c|*/ - bx = MPFR_GET_EXP (b); -diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c ---- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 -@@ -31,13 +31,20 @@ - a sufficient number of limbs */ - void - mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, -- unsigned long int nbits) -+ mpfr_prec_t nbits) - { - mpz_t z; - -+ MPFR_ASSERTN (nbits >= 1); - /* To be sure to avoid the potential allocation of mpz_urandomb */ -- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; -+ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); - PTR(z) = mp; -+#if __MPFR_GMP(5,0,0) -+ /* Check for integer overflow (unless mp_bitcnt_t is signed, -+ but according to the GMP manual, this shouldn't happen). -+ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ -+ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); -+#endif - mpz_urandomb (z, rstate, nbits); - } - -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p6"; -+ return "3.1.0-p7"; - } -diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c ---- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 -@@ -1,4 +1,4 @@ --/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. -+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. - - Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - Contributed by the Arenaire and Caramel projects, INRIA. -@@ -20,18 +20,43 @@ - http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include <stdlib.h> -+ - #include "mpfr-test.h" - - int - main (void) - { - mpfr_t a, b, c; -+ long large_prec; - - tests_start_mpfr (); -+ - mpfr_inits (a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); - mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); -+ -+ /* test for precision 2^31-1, see -+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ -+ large_prec = 2147483647; -+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ { -+ /* We assume that the precision won't be increased internally. */ -+ if (large_prec > MPFR_PREC_MAX) -+ large_prec = MPFR_PREC_MAX; -+ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); -+ mpfr_set_ui (a, 17, MPFR_RNDN); -+ mpfr_set (b, a, MPFR_RNDN); -+ if (mpfr_get_ui (a, MPFR_RNDN) != 17) -+ { -+ printf ("Error in mpfr_init2 with precision 2^31-1\n"); -+ exit (1); -+ } -+ mpfr_clears (a, b, (mpfr_ptr) 0); -+ } -+ - tests_end_mpfr (); -+ - return 0; - } diff --git a/core/procps/PKGBUILD b/core/procps/PKGBUILD deleted file mode 100644 index a43dedf7a..000000000 --- a/core/procps/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# $Id: PKGBUILD 156669 2012-04-22 20:29:46Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=procps -pkgver=3.2.8 -pkgrel=5 -pkgdesc="Utilities for monitoring your system and processes on your system" -arch=('i686' 'x86_64') -url="http://procps.sourceforge.net/" -license=('GPL' 'LGPL') -groups=('base') -depends=('ncurses') -backup=('etc/sysctl.conf') -source=(http://procps.sourceforge.net/procps-${pkgver}.tar.gz sysctl.conf - groff-top-manpage.patch - procps-3.2.7-top-manpage.patch - procps-3.2.7-free-hlmem.patch - procps-3.2.7-ps-man-fmt.patch - procps-3.2.7-longcmd.patch - procps-3.2.7-psman.patch - procps-3.2.7-slabtop-once.patch - procps-3.2.7-top-clrscr.patch - procps-3.2.7-top-cpu0.patch - procps-3.2.7-top-env-cpuloop.patch - procps-3.2.7-top-remcpu.patch - procps-3.2.7-top-sorthigh.patch - procps-3.2.7-watch-unicode.patch - procps-3.2.7-w-best.patch - procps-3.2.8-gmake-3.82.patch - procps-3.2.8-setlocale.patch - procps-3.2.8-threads.patch - procps-3.2.8-linux-ver-init.patch - procps-3.2.8-kernel3-uts.patch) -sha1sums=('a0c86790569dec26b5d9037e8868ca907acc9829' - '9b9a314010d042b5aa487893c06f361531525e6a' - 'bdd627f602ed2e38994d49309de0edbd90b41aff' - '16737700b22eec8f4e8d16bce099f4b1662501e2' - 'da1b9e61f8df4a8e23a7032b245dd99e32e2c01c' - 'ba9ad9f0bde3e84484b5a0238e53534438e924be' - '1a656d8094be41e019b2a9598b07c8a3d47f9de3' - '9944224ed2f5bd7d7fb505127bd71d6f01d88373' - '954026785a9e6c90d796e93563fcea2a693691e8' - '8582cd15346fa939f3fd01081620de0ffc617335' - '80e31310da53baf095e905d94485324932e433df' - '15fe886a2b4bed5885e6d457954e1145d1dcd2a2' - 'bce21809ee0cb917ddf5b0c0bf2a91ea50feb0c6' - '1be00d71e8e16ff2d656e5dd1f9988f2f3c0d5a0' - '52068a433535ec3d5d974141be3d6d3b6a41725a' - '3a8f1ba912112d7520becb28746e97b11d9b0c86' - '3a4908ed8dbc936e39cb9094af8098ef9e656581' - '09b1f6a3f9691b9f1432549a7a74a90ee5cfbdde' - '926b92913201f21c45d48436c0902cffc059ce27' - '171d5352940200c209e0c2d43c17f01c02173a66' - 'e2b2917e5462bd0aa3cb1b62942dbe8e8e81c16b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../groff-top-manpage.patch - patch -p1 < ../procps-3.2.7-top-manpage.patch - patch -p1 < ../procps-3.2.7-free-hlmem.patch - patch -p1 < ../procps-3.2.7-ps-man-fmt.patch - patch -p1 < ../procps-3.2.7-psman.patch - patch -p1 < ../procps-3.2.7-longcmd.patch - patch -p1 < ../procps-3.2.7-slabtop-once.patch - patch -p1 < ../procps-3.2.7-top-clrscr.patch - patch -p1 < ../procps-3.2.7-top-cpu0.patch - patch -p1 < ../procps-3.2.7-top-env-cpuloop.patch - patch -p1 < ../procps-3.2.7-top-remcpu.patch - patch -p1 < ../procps-3.2.7-top-sorthigh.patch - patch -p1 < ../procps-3.2.7-watch-unicode.patch - patch -p1 < ../procps-3.2.7-w-best.patch - patch -p1 < ../procps-3.2.8-gmake-3.82.patch - patch -p1 < ../procps-3.2.8-setlocale.patch - patch -p1 < ../procps-3.2.8-threads.patch - patch -p0 < ../procps-3.2.8-linux-ver-init.patch - patch -p1 < ../procps-3.2.8-kernel3-uts.patch - sed -i "s:\$(lib64):lib:" Makefile - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" lib="${pkgdir}/usr/lib/" ldconfig=/bin/true install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" - install -d "${pkgdir}/usr/include/proc" - install -m644 proc/*.h "${pkgdir}/usr/include/proc" -} diff --git a/core/procps/groff-top-manpage.patch b/core/procps/groff-top-manpage.patch deleted file mode 100644 index 625053c72..000000000 --- a/core/procps/groff-top-manpage.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur procps-3.2.8-orig//top.1 procps-3.2.8/top.1 ---- procps-3.2.8-orig//top.1 2010-11-19 00:43:13.000000000 -0500 -+++ procps-3.2.8/top.1 2010-11-19 00:44:06.000000000 -0500 -@@ -42,7 +42,7 @@ - .ds EM \ \fB\-\-\ \fR - \# - these two are for chuckles, makes great grammar - .ds Me top --.ds ME \fBtop\fR -+.ds MM \fBtop\fR - \# - other misc strings for consistent usage/emphasis - .ds F \fIOff\fR - .ds O \fIOn\fR -@@ -85,7 +85,7 @@ - .\" ---------------------------------------------------------------------- - .SH SYNOPSIS - .\" ---------------------------------------------------------------------- --\*(ME \-\fBhv\fR | \-\fBbcHisS\fR \-\fBd\fI delay\fR \-\fBn\fI -+\*(MM \-\fBhv\fR | \-\fBbcHisS\fR \-\fBd\fI delay\fR \-\fBn\fI - iterations\fR \-\fBp\fI pid\fR [,\fI pid\fR ...] - - The traditional switches '-' and whitespace are optional. -@@ -94,7 +94,7 @@ - .\" ---------------------------------------------------------------------- - .SH DESCRIPTION - .\" ---------------------------------------------------------------------- --The \*(ME program provides a dynamic real-time view of a running system. -+The \*(MM program provides a dynamic real-time view of a running system. - It can display\fB system\fR summary information as well as a list of\fB - tasks\fR currently being managed by the Linux kernel. - The types of system summary information shown and the types, order and -@@ -104,7 +104,7 @@ - The program provides a limited interactive interface for process - manipulation as well as a much more extensive interface for personal - configuration \*(EM encompassing every aspect of its operation. --And while \*(ME is referred to throughout this document, you are free -+And while \*(MM is referred to throughout this document, you are free - to name the program anything you wish. - That new name, possibly an alias, will then be reflected on \*(Me's display - and used when reading and writing a \*(CF. diff --git a/core/procps/procps-3.2.7-free-hlmem.patch b/core/procps/procps-3.2.7-free-hlmem.patch deleted file mode 100644 index c5ef9cc4c..000000000 --- a/core/procps/procps-3.2.7-free-hlmem.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up procps-3.2.7/free.1.hlmem procps-3.2.7/free.1 ---- procps-3.2.7/free.1.hlmem 2009-02-24 10:54:35.000000000 +0100 -+++ procps-3.2.7/free.1 2009-02-24 11:00:26.000000000 +0100 -@@ -7,7 +7,7 @@ free \- Display amount of free and used - .SH SYNOPSIS - .BR "free " [ "\-b" " | " "\-k" " | " "\-m" "] [" "\-o" "] [" "\-s" - .I delay --.RB "] [" "\-t" "] [" "\-V" ] -+.RB "] [" "\-t" "] [" "\-l" "] [" "\-V" "] - .SH DESCRIPTION - \fBfree\fP displays the total amount of free and used physical and swap - memory in the system, as well as the buffers used by the kernel. -@@ -28,7 +28,9 @@ may actually specify any floating point - .BR usleep (3) - is used for microsecond resolution delay times. - .PP --The \fB\-V\fP displays version information. -+The \fB-l\fP switch shows detailed low and high memory statistics. -+.PP -+The \fB\-V\fP switch displays version information. - .SH FILES - .ta - .IR /proc/meminfo "\-\- memory information" diff --git a/core/procps/procps-3.2.7-longcmd.patch b/core/procps/procps-3.2.7-longcmd.patch deleted file mode 100644 index 7c4fdca36..000000000 --- a/core/procps/procps-3.2.7-longcmd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- procps-3.2.7/proc/readproc.c.kzak 2006-06-16 10:18:13.000000000 +0200 -+++ procps-3.2.7/proc/readproc.c 2006-09-27 11:25:13.000000000 +0200 -@@ -432,14 +432,17 @@ - if(fd==-1) return NULL; - - /* read whole file into a memory buffer, allocating as we go */ -- while ((n = read(fd, buf, sizeof buf - 1)) > 0) { -+ while ((n = read(fd, buf, sizeof buf - 1)) >= 0) { - if (n < (int)(sizeof buf - 1)) - end_of_file = 1; -- if (n == 0 && rbuf == 0) -+ if (n == 0 && rbuf == 0) { -+ close(fd); - return NULL; /* process died between our open and read */ -+ } - if (n < 0) { - if (rbuf) - free(rbuf); -+ close(fd); - return NULL; /* read error */ - } - if (end_of_file && buf[n-1]) /* last read char not null */ diff --git a/core/procps/procps-3.2.7-ps-man-fmt.patch b/core/procps/procps-3.2.7-ps-man-fmt.patch deleted file mode 100644 index f3a80dca7..000000000 --- a/core/procps/procps-3.2.7-ps-man-fmt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up procps-3.2.7/ps/ps.1.ps-man-fmt procps-3.2.7/ps/ps.1 ---- procps-3.2.7/ps/ps.1.ps-man-fmt 2008-09-01 11:43:18.000000000 +0200 -+++ procps-3.2.7/ps/ps.1 2008-09-01 11:43:41.000000000 +0200 -@@ -30,7 +30,7 @@ - .\" the space needed for the 1st two columns. - .\" Making it messy: inches, ens, points, scaled points... - .\" --.nr ColSize ((\n(.lu-\n(.iu/\n(.Hu-20u)n) -+.nr ColSize ((\n[.l] - \n[.i]) / 1n - 20) - .\" - .\" This is for command options - .nr OptSize (16u) diff --git a/core/procps/procps-3.2.7-psman.patch b/core/procps/procps-3.2.7-psman.patch deleted file mode 100644 index 7ba6cff34..000000000 --- a/core/procps/procps-3.2.7-psman.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- procps-3.2.7/ps/ps.1.psman 2007-06-20 08:30:47.000000000 +0200 -+++ procps-3.2.7/ps/ps.1 2007-06-20 08:50:10.000000000 +0200 -@@ -21,8 +21,8 @@ - .\" See /usr/share/groff/current/tmac/an-old.tmac for what these do. - .\" Setting them to zero provides extra space, but only do that for - .\" plain text output. PostScript and such will remain indented. --.if n .nr IN 0n --.if n .nr an-prevailing-indent 0n -+.\" .if n .nr IN 0n -+.\" .if n .nr an-prevailing-indent 0n - .\" - .\" - .\" ColSize is used for the format spec table. -@@ -838,6 +838,8 @@ - .\" lB1 lB1 lBw(5.5i) - .\" lB1 l1 l. - .\" -+.RE -+ - .TS - expand; - lB1 lB1 lBw(\n[ColSize]n) diff --git a/core/procps/procps-3.2.7-slabtop-once.patch b/core/procps/procps-3.2.7-slabtop-once.patch deleted file mode 100644 index d3319cfe7..000000000 --- a/core/procps/procps-3.2.7-slabtop-once.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff -up procps-3.2.7/slabtop.c.once procps-3.2.7/slabtop.c ---- procps-3.2.7/slabtop.c.once 2008-12-11 13:24:52.000000000 +0100 -+++ procps-3.2.7/slabtop.c 2008-12-11 13:33:12.000000000 +0100 -@@ -268,9 +268,24 @@ static void parse_input(char c) - } - } - -+/*printw or printf depending on the context*/ -+static void printwf(int once, const char *s,...) -+{ -+va_list va; -+ -+va_start(va,s); -+if(once) -+ vprintf(s,va); -+else -+ vwprintw(stdscr, s, va); -+va_end(va); -+} -+ -+ - int main(int argc, char *argv[]) - { - int o; -+ int once = 0; - unsigned short old_rows; - struct slab_info *slab_list = NULL; - -@@ -307,6 +322,7 @@ int main(int argc, char *argv[]) - break; - case 'o': - delay = 0; -+ once = 1; - break; - case 'V': - display_version(); -@@ -322,12 +338,18 @@ int main(int argc, char *argv[]) - if (tcgetattr(0, &saved_tty) == -1) - perror("tcgetattr"); - -- initscr(); -- term_size(0); -- old_rows = rows; -- resizeterm(rows, cols); -- signal(SIGWINCH, term_size); -- signal(SIGINT, sigint_handler); -+ if(!once) { -+ initscr(); -+ term_size(0); -+ old_rows = rows; -+ resizeterm(rows, cols); -+ signal(SIGWINCH, term_size); -+ signal(SIGINT, sigint_handler); -+ } else { -+ old_rows = rows; -+ rows = 80; -+ cols = 24; -+ } - - do { - struct slab_info *curr; -@@ -341,12 +363,12 @@ int main(int argc, char *argv[]) - break; - - if (old_rows != rows) { -- resizeterm(rows, cols); -+ if(!once) resizeterm(rows, cols); - old_rows = rows; - } - - move(0,0); -- printw( " Active / Total Objects (%% used) : %d / %d (%.1f%%)\n" -+ printwf(once, " Active / Total Objects (%% used) : %d / %d (%.1f%%)\n" - " Active / Total Slabs (%% used) : %d / %d (%.1f%%)\n" - " Active / Total Caches (%% used) : %d / %d (%.1f%%)\n" - " Active / Total Size (%% used) : %.2fK / %.2fK (%.1f%%)\n" -@@ -360,15 +382,15 @@ int main(int argc, char *argv[]) - - slab_list = slabsort(slab_list); - -- attron(A_REVERSE); -- printw( "%6s %6s %4s %8s %6s %8s %10s %-23s\n", -+ if(!once) attron(A_REVERSE); -+ printwf(once, "%6s %6s %4s %8s %6s %8s %10s %-23s\n", - "OBJS", "ACTIVE", "USE", "OBJ SIZE", "SLABS", - "OBJ/SLAB", "CACHE SIZE", "NAME"); -- attroff(A_REVERSE); -+ if(!once) attroff(A_REVERSE); - - curr = slab_list; - for (i = 0; i < rows - 8 && curr->next; i++) { -- printw("%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n", -+ printwf(once, "%6u %6u %3u%% %7.2fK %6u %8u %9uK %-23s\n", - curr->nr_objs, curr->nr_active_objs, curr->use, - curr->obj_size / 1024.0, curr->nr_slabs, - curr->objs_per_slab, (unsigned)(curr->cache_size / 1024), -@@ -376,7 +398,7 @@ int main(int argc, char *argv[]) - curr = curr->next; - } - -- refresh(); -+ if(!once) refresh(); - put_slabinfo(slab_list); - - FD_ZERO(&readfds); -@@ -392,6 +414,6 @@ int main(int argc, char *argv[]) - - tcsetattr(0, TCSAFLUSH, &saved_tty); - free_slabinfo(slab_list); -- endwin(); -+ if(!once) endwin(); - return 0; - } diff --git a/core/procps/procps-3.2.7-top-clrscr.patch b/core/procps/procps-3.2.7-top-clrscr.patch deleted file mode 100644 index 8a0256846..000000000 --- a/core/procps/procps-3.2.7-top-clrscr.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up procps-3.2.7/top.c.clrscr procps-3.2.7/top.c ---- procps-3.2.7/top.c.clrscr 2008-04-08 08:49:48.000000000 +0200 -+++ procps-3.2.7/top.c 2008-04-08 08:50:07.000000000 +0200 -@@ -2109,6 +2109,7 @@ static void fields_sort (void) - *p = x + 'A'; - Curwin->rc.sortindx = x; - putp(Cap_curs_norm); -+ putp(Cap_clr_scr); - } - - -@@ -2134,6 +2135,7 @@ static void fields_toggle (void) - *p = i + 'A'; - } - putp(Cap_curs_norm); -+ putp(Cap_clr_scr); - } - - /*###### Windows/Field Groups support #################################*/ diff --git a/core/procps/procps-3.2.7-top-cpu0.patch b/core/procps/procps-3.2.7-top-cpu0.patch deleted file mode 100644 index eb81121c5..000000000 --- a/core/procps/procps-3.2.7-top-cpu0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- procps-3.2.7/top.c.orig 2007-09-07 21:28:41.000000000 +0100 -+++ procps-3.2.7/top.c 2007-09-07 21:29:15.000000000 +0100 -@@ -959,8 +959,15 @@ - - // and just in case we're 2.2.xx compiled without SMP support... - if (Cpu_tot == 1) { -- cpus[1].id = 0; -- memcpy(cpus, &cpus[1], sizeof(CPU_t)); -+ cpus[0].id = cpus[1].id = 0; -+ cpus[0].u = cpus[1].u; -+ cpus[0].n = cpus[1].n; -+ cpus[0].s = cpus[1].s; -+ cpus[0].i = cpus[1].i; -+ cpus[0].w = cpus[1].w; -+ cpus[0].x = cpus[1].x; -+ cpus[0].y = cpus[1].y; -+ cpus[0].z = cpus[1].z; - } - - // now value each separate cpu's tics diff --git a/core/procps/procps-3.2.7-top-env-cpuloop.patch b/core/procps/procps-3.2.7-top-env-cpuloop.patch deleted file mode 100644 index 0034dcafb..000000000 --- a/core/procps/procps-3.2.7-top-env-cpuloop.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up procps-3.2.7/top.c.p15 procps-3.2.7/top.c ---- procps-3.2.7/top.c.p15 2008-09-01 11:37:51.000000000 +0200 -+++ procps-3.2.7/top.c 2008-09-01 11:37:51.000000000 +0200 -@@ -121,6 +121,7 @@ static int No_ksyms = -1, // set t - Batch = 0, // batch mode, collect no input, dumb output - Loops = -1, // number of iterations, -1 loops forever - Secure_mode = 0; // set if some functionality restricted -+static int CPU_loop = 0; // wait for reliable CPU data - - /* Some cap's stuff to reduce runtime calls -- - to accomodate 'Batch' mode, they begin life as empty strings */ -@@ -1679,6 +1680,9 @@ static void before (char *me) - Fieldstab[P_PPD].fmts = pid_fmt; - Fieldstab[P_PPD].head = " PPID" + 10 - pid_digits; - } -+ -+ if (( getenv("CPULOOP")) && ( atoi(getenv("CPULOOP")) == 1 )) -+ CPU_loop = 1; - } - - -@@ -2978,6 +2981,7 @@ static proc_t **summary_show (void) - { - static proc_t **p_table = NULL; - static CPU_t *smpcpu = NULL; -+ static int first = 0; - - // whoa first time, gotta' prime the pump... - if (!p_table) { -@@ -3025,6 +3029,28 @@ static proc_t **summary_show (void) - - smpcpu = cpus_refresh(smpcpu); - -+ if (first==0 && CPU_loop) -+ { -+ int i; -+ CPU_t *cpu; -+ for (i = 0; i < Cpu_tot; i++) { -+ cpu = &smpcpu[i]; -+ cpu->u_sav = cpu->u; -+ cpu->s_sav = cpu->s; -+ cpu->n_sav = cpu->n; -+ cpu->i_sav = cpu->i; -+ cpu->w_sav = cpu->w; -+ cpu->x_sav = cpu->x; -+ cpu->y_sav = cpu->y; -+ cpu->z_sav = cpu->z; -+ } -+ tv.tv_sec = Rc.delay_time; -+ tv.tv_usec = (Rc.delay_time - (int)Rc.delay_time) * 1000000; -+ select(0, NULL, NULL, NULL, &tv); -+ -+ smpcpu = cpus_refresh(smpcpu); -+ } -+ - if (CHKw(Curwin, View_CPUSUM)) { - // display just the 1st /proc/stat line - summaryhlp(&smpcpu[Cpu_tot], "Cpu(s):"); -@@ -3050,6 +3076,8 @@ static proc_t **summary_show (void) - } - - SETw(Curwin, NEWFRAM_cwo); -+ -+ first = 1; - return p_table; - } - -diff -up procps-3.2.7/top.1.p15 procps-3.2.7/top.1 ---- procps-3.2.7/top.1.p15 2008-09-01 11:37:51.000000000 +0200 -+++ procps-3.2.7/top.1 2008-09-01 11:37:51.000000000 +0200 -@@ -1183,6 +1183,13 @@ Then ponder this: - Send bug reports to: - Albert D\. Cahalan, <albert@users.sf.net> - -+The top command calculates Cpu(s) by looking at the change in CPU time values -+between samples. When you first run it, it has no previous sample to compare -+to, so these initial values are the percentages since boot. It means you need -+at least two loops or you have to ignore summary output from the first loop. -+This is problem for example for batch mode. There is a possible workaround if -+you define the CPULOOP=1 environment variable. The top command will be run one -+extra hidden loop for CPU data before standard output. - - .\" ---------------------------------------------------------------------- - .SH 8. HISTORY Former top diff --git a/core/procps/procps-3.2.7-top-manpage.patch b/core/procps/procps-3.2.7-top-manpage.patch deleted file mode 100644 index 4ce077946..000000000 --- a/core/procps/procps-3.2.7-top-manpage.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up procps-3.2.7/top.1.cpudesc procps-3.2.7/top.1 ---- procps-3.2.7/top.1.cpudesc 2008-01-18 08:04:19.000000000 +0100 -+++ procps-3.2.7/top.1 2008-01-18 08:15:49.000000000 +0100 -@@ -121,6 +121,7 @@ - 2. FIELDS / Columns - a. DESCRIPTIONS of Fields - b. SELECTING and ORDERING Columns -+ c. SUMMARY Area Fields - 3. INTERACTIVE Commands - a. GLOBAL Commands - b. SUMMARY Area Commands -@@ -540,6 +540,20 @@ You\fI move\fR a field to the\fB left\fR - upper case\fR letter and to the\fB right\fR with the\fB lower case\fR - letter. - -+.\" ...................................................................... -+.SS 2c. SUMMARY Area Fields -+.\" ---------------------------------------------------------------------- -+The summary area fields describing CPU statistics are abbreviated. They provide -+information about times spent in: -+ \fR us = user mode -+ \fR sy = system mode -+ \fR ni = low priority user mode (nice) -+ \fR id = idle task -+ \fR wa = I/O waiting -+ \fR hi = servicing IRQs -+ \fR si = servicing soft IRQs -+ \fR st = steal (time given to other DomU instances) -+ - - .\" ---------------------------------------------------------------------- - .SH 3. INTERACTIVE Commands diff --git a/core/procps/procps-3.2.7-top-remcpu.patch b/core/procps/procps-3.2.7-top-remcpu.patch deleted file mode 100644 index 88d14ef0a..000000000 --- a/core/procps/procps-3.2.7-top-remcpu.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- procps-3.2.7/top.c.remcpu 2006-07-10 10:41:11.000000000 +0200 -+++ procps-3.2.7/top.c 2006-07-10 10:41:35.000000000 +0200 -@@ -912,6 +912,7 @@ - static CPU_t *cpus_refresh (CPU_t *cpus) - { - static FILE *fp = NULL; -+ static int cpu_max; - int i; - int num; - // enough for a /proc/stat CPU line (not the intr line) -@@ -926,24 +927,29 @@ - can hold tics representing the /proc/stat cpu summary (the first - line read) -- that slot supports our View_CPUSUM toggle */ - cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t)); -+ cpu_max = Cpu_tot; - } -+ else if (cpu_max > Cpu_tot) -+ /* move saved CUPs summary to cpu_max possition */ -+ memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t)); -+ - rewind(fp); - fflush(fp); - - // first value the last slot with the cpu summary line - if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); -- cpus[Cpu_tot].x = 0; // FIXME: can't tell by kernel version number -- cpus[Cpu_tot].y = 0; // FIXME: can't tell by kernel version number -- cpus[Cpu_tot].z = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].x = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].y = 0; // FIXME: can't tell by kernel version number -+ cpus[cpu_max].z = 0; // FIXME: can't tell by kernel version number - num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu %Lu", -- &cpus[Cpu_tot].u, -- &cpus[Cpu_tot].n, -- &cpus[Cpu_tot].s, -- &cpus[Cpu_tot].i, -- &cpus[Cpu_tot].w, -- &cpus[Cpu_tot].x, -- &cpus[Cpu_tot].y, -- &cpus[Cpu_tot].z -+ &cpus[cpu_max].u, -+ &cpus[cpu_max].n, -+ &cpus[cpu_max].s, -+ &cpus[cpu_max].i, -+ &cpus[cpu_max].w, -+ &cpus[cpu_max].x, -+ &cpus[cpu_max].y, -+ &cpus[cpu_max].z - ); - if (num < 4) - std_err("failed /proc/stat read"); -@@ -955,7 +961,7 @@ - } - - // now value each separate cpu's tics -- for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) { -+ for (i = 0; ; i++) { - if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read"); - cpus[i].x = 0; // FIXME: can't tell by kernel version number - cpus[i].y = 0; // FIXME: can't tell by kernel version number -@@ -964,9 +970,35 @@ - &cpus[i].id, - &cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y, &cpus[i].z - ); -- if (num < 4) -- std_err("failed /proc/stat read"); -+ if (num < 4) { -+ Cpu_tot = i; -+ break; -+ } -+ if (i == cpu_max - 1) { -+ // Bump cpu_max and extend cpus -+ cpu_max++; -+ cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t)); -+ if (!cpus) std_err("realloc failed"); -+ memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t)); -+ } -+ } -+ -+ if (cpu_max > Cpu_tot) -+ memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t)); -+ -+ // and just in case we're 2.2.xx compiled without SMP support... -+ if (Cpu_tot == 1) { -+ cpus[0].id = cpus[1].id = 0; -+ cpus[0].u = cpus[1].u; -+ cpus[0].n = cpus[1].n; -+ cpus[0].s = cpus[1].s; -+ cpus[0].i = cpus[1].i; -+ cpus[0].w = cpus[1].w; -+ cpus[0].x = cpus[1].x; -+ cpus[0].y = cpus[1].y; -+ cpus[0].z = cpus[1].z; - } -+ - return cpus; - } - diff --git a/core/procps/procps-3.2.7-top-sorthigh.patch b/core/procps/procps-3.2.7-top-sorthigh.patch deleted file mode 100644 index e17df1e22..000000000 --- a/core/procps/procps-3.2.7-top-sorthigh.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- procps-3.2.7/top.c.sorthigh 2007-02-05 09:06:34.000000000 +0100 -+++ procps-3.2.7/top.c 2007-02-05 09:09:35.000000000 +0100 -@@ -3121,6 +3121,7 @@ - unsigned w = Fieldstab[i].width; - - int advance = (x==0) && !Rc.mode_altscr; -+ f += advance; - - switch (i) { - case P_CMD: -@@ -3179,7 +3180,7 @@ - break; - case P_PRI: - if (unlikely(-99 > p->priority) || unlikely(999 < p->priority)) { -- f = " RT"; -+ f = advance ? " RT" : " RT"; - MKCOL(""); - } else - MKCOL((int)p->priority); -@@ -3227,7 +3228,7 @@ - break; - case P_WCH: - if (No_ksyms) { -- f = " %08lx "; -+ f = advance ? "%08lx " : " %08lx "; - MKCOL((long)p->wchan); - } else { - MKCOL(lookup_wchan(p->wchan, p->XXXID)); -@@ -3236,7 +3237,7 @@ - - } /* end: switch 'procflag' */ - -- rp = scat(rp, cbuf+advance); -+ rp = scat(rp, cbuf); - } /* end: for 'maxpflgs' */ - - PUFF( diff --git a/core/procps/procps-3.2.7-w-best.patch b/core/procps/procps-3.2.7-w-best.patch deleted file mode 100644 index 86b3e9328..000000000 --- a/core/procps/procps-3.2.7-w-best.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- procps-3.2.7/w.c.kzak 2007-04-02 23:58:30.000000000 +0200 -+++ procps-3.2.7/w.c 2007-04-03 00:09:15.000000000 +0200 -@@ -149,11 +149,11 @@ - const proc_t *restrict const tmp = *pptr; - if(unlikely(tmp->tgid == u->ut_pid)) { - *found_utpid = 1; -- best = tmp; -+ if (!best) -+ best = tmp; - } - if(tmp->tty != line) continue; - (*jcpu) += tmp->utime + tmp->stime; -- secondbest = tmp; - /* same time-logic here as for "best" below */ - if(! (secondbest && tmp->start_time <= secondbest->start_time) ){ - secondbest = tmp; diff --git a/core/procps/procps-3.2.7-watch-unicode.patch b/core/procps/procps-3.2.7-watch-unicode.patch deleted file mode 100644 index 1b3d97488..000000000 --- a/core/procps/procps-3.2.7-watch-unicode.patch +++ /dev/null @@ -1,139 +0,0 @@ -diff -u procps-3.2.7/Makefile procps/Makefile ---- procps-3.2.7/Makefile 2007-01-16 17:24:49.000000000 +0100 -+++ procps/Makefile 2007-01-16 17:29:27.000000000 +0100 -@@ -67,7 +67,7 @@ - # plus the top-level Makefile to make it work stand-alone. - _TARFILES := Makefile - --CURSES := -lncurses -+CURSES := -lncursesw - - # This seems about right for the dynamic library stuff. - # Something like this is probably needed to make the SE Linux -diff -u procps-3.2.7/watch.c procps/watch.c ---- procps-3.2.7/watch.c 2007-01-16 17:24:49.000000000 +0100 -+++ procps/watch.c 2007-01-16 18:06:57.000000000 +0100 -@@ -28,6 +28,8 @@ - #include <termios.h> - #include <locale.h> - #include "proc/procps.h" -+#include <wchar.h> -+#include <wctype.h> - - #ifdef FORCE_8BIT - #undef isprint -@@ -137,6 +139,27 @@ - } - } - -+static wint_t -+readwc(FILE *stream, mbstate_t *mbs) -+{ -+ for (;;) { -+ int chr; -+ char c; -+ wchar_t wc; -+ size_t len; -+ -+ chr = getc(stream); -+ if (chr == EOF) -+ return WEOF; -+ c = chr; -+ len = mbrtowc(&wc, &c, 1, mbs); -+ if (len == (size_t)-1) -+ memset(mbs, 0, sizeof(*mbs)); -+ else if (len != (size_t)-2) -+ return wc; -+ } -+} -+ - int - main(int argc, char *argv[]) - { -@@ -243,6 +266,7 @@ - FILE *p; - int x, y; - int oldeolseen = 1; -+ mbstate_t mbs; - - if (screen_size_changed) { - get_terminal_size(); -@@ -276,49 +300,63 @@ - do_exit(2); - } - -+ memset(&mbs, 0, sizeof(mbs)); - for (y = show_title; y < height; y++) { - int eolseen = 0, tabpending = 0; - for (x = 0; x < width; x++) { -- int c = ' '; -- int attr = 0; -+ wint_t c = L' '; -+ int attr = 0, c_width; -+ cchar_t cc; -+ wchar_t wstr[2]; - - if (!eolseen) { - /* if there is a tab pending, just spit spaces until the - next stop instead of reading characters */ - if (!tabpending) - do -- c = getc(p); -- while (c != EOF && !isprint(c) -- && c != '\n' -- && c != '\t'); -- if (c == '\n') -+ c = readwc(p, &mbs); -+ while (c != WEOF && !iswprint(c) -+ && c != L'\n' -+ && c != L'\t'); -+ if (c == L'\n') - if (!oldeolseen && x == 0) { - x = -1; - continue; - } else - eolseen = 1; -- else if (c == '\t') -+ else if (c == L'\t') - tabpending = 1; -- if (c == EOF || c == '\n' || c == '\t') -- c = ' '; -+ if (c == WEOF || c == L'\n' || c == L'\t') -+ c = L' '; - if (tabpending && (((x + 1) % 8) == 0)) - tabpending = 0; - } -+ wstr[0] = c; -+ wstr[1] = 0; -+ setcchar (&cc, wstr, 0, 0, NULL); - move(y, x); - if (option_differences) { -- chtype oldch = inch(); -- char oldc = oldch & A_CHARTEXT; -+ cchar_t oldc; -+ wchar_t oldwstr[2]; -+ attr_t attrs; -+ short colors; -+ -+ in_wch(&oldc); -+ getcchar(&oldc, oldwstr, &attrs, &colors, NULL); - attr = !first_screen -- && ((char)c != oldc -+ && (wstr[0] != oldwstr[0] - || - (option_differences_cumulative -- && (oldch & A_ATTRIBUTES))); -+ && attrs)); - } - if (attr) - standout(); -- addch(c); -+ add_wch(&cc); - if (attr) - standend(); -+ c_width = wcwidth(c); -+ if (c_width > 1) -+ x += c_width - 1; - } - oldeolseen = eolseen; - } diff --git a/core/procps/procps-3.2.8-gmake-3.82.patch b/core/procps/procps-3.2.8-gmake-3.82.patch deleted file mode 100644 index 87ab13ea4..000000000 --- a/core/procps/procps-3.2.8-gmake-3.82.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: procps-3.2.8/Makefile -=================================================================== ---- procps-3.2.8.orig/Makefile -+++ procps-3.2.8/Makefile -@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) - # want this rule first, use := on ALL, and ALL not filled in yet - all: do_all - ---include */module.mk -+-include proc/module.mk -+-include ps/module.mk - - do_all: $(ALL) - diff --git a/core/procps/procps-3.2.8-kernel3-uts.patch b/core/procps/procps-3.2.8-kernel3-uts.patch deleted file mode 100644 index a72ae59e3..000000000 --- a/core/procps/procps-3.2.8-kernel3-uts.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur procps-3.2.8-20110302git.orig/proc/version.c procps-3.2.8-20110302git/proc/version.c ---- procps-3.2.8-20110302git.orig/proc/version.c 2011-06-10 17:00:33.000000000 +0200 -+++ procps-3.2.8-20110302git/proc/version.c 2011-06-10 17:20:17.000000000 +0200 -@@ -38,10 +38,15 @@ - void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ -+ int version_string_depth; - - if (uname(&uts) == -1) /* failure implies impending death */ - exit(1); -- if (sscanf(uts.release, "%d.%d.%d", &x, &y, &z) < 3) -+ -+ version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ -+ if ((version_string_depth < 2) || /* Non-standard for all known kernels */ -+ ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ - fprintf(stderr, /* *very* unlikely to happen by accident */ - "Non-standard uts for running kernel:\n" - "release %s=%d.%d.%d gives version code %d\n", diff --git a/core/procps/procps-3.2.8-linux-ver-init.patch b/core/procps/procps-3.2.8-linux-ver-init.patch deleted file mode 100644 index 6d4039c91..000000000 --- a/core/procps/procps-3.2.8-linux-ver-init.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/303120 - -make sure the linux version constructor runs before the libproc constructor -since the latter uses variables setup by the former - -fix by Chris Coleman - -Index: proc/version.c -=================================================================== -RCS file: /cvsroot/procps/procps/proc/version.c,v -retrieving revision 1.7 -diff -u -p -r1.7 version.c ---- proc/version.c 9 Feb 2003 07:27:16 -0000 1.7 -+++ proc/version.c 14 Nov 2010 00:22:44 -0000 -@@ -33,7 +33,7 @@ void display_version(void) { - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); -+static void init_Linux_version(void) __attribute__((constructor(100))); - static void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ diff --git a/core/procps/procps-3.2.8-setlocale.patch b/core/procps/procps-3.2.8-setlocale.patch deleted file mode 100644 index c197fd38a..000000000 --- a/core/procps/procps-3.2.8-setlocale.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Nur procps-3.2.8-orig/proc/sysinfo.c procps-3.2.8/proc/sysinfo.c ---- procps-3.2.8-orig/proc/sysinfo.c 2008-03-24 05:33:43.000000000 +0100 -+++ procps-3.2.8/proc/sysinfo.c 2009-12-18 22:50:52.000000000 +0100 -@@ -74,17 +74,19 @@ - /***********************************************************************/ - int uptime(double *restrict uptime_secs, double *restrict idle_secs) { - double up=0, idle=0; -- char *restrict savelocale; -+ char *savelocale; - - FILE_TO_BUF(UPTIME_FILE,uptime_fd); -- savelocale = setlocale(LC_NUMERIC, NULL); -+ savelocale = strdup(setlocale(LC_NUMERIC, NULL)); - setlocale(LC_NUMERIC,"C"); - if (sscanf(buf, "%lf %lf", &up, &idle) < 2) { - setlocale(LC_NUMERIC,savelocale); -+ free(savelocale); - fputs("bad data in " UPTIME_FILE "\n", stderr); - return 0; - } - setlocale(LC_NUMERIC,savelocale); -+ free(savelocale); - SET_IF_DESIRED(uptime_secs, up); - SET_IF_DESIRED(idle_secs, idle); - return up; /* assume never be zero seconds in practice */ -@@ -128,9 +130,9 @@ - double up_1, up_2, seconds; - unsigned long long jiffies; - unsigned h; -- char *restrict savelocale; -+ char *savelocale; - -- savelocale = setlocale(LC_NUMERIC, NULL); -+ savelocale = strdup(setlocale(LC_NUMERIC, NULL)); - setlocale(LC_NUMERIC, "C"); - do{ - FILE_TO_BUF(UPTIME_FILE,uptime_fd); sscanf(buf, "%lf", &up_1); -@@ -141,6 +143,7 @@ - /* uptime(&up_2, NULL); */ - } while((long long)( (up_2-up_1)*1000.0/up_1 )); /* want under 0.1% error */ - setlocale(LC_NUMERIC, savelocale); -+ free(savelocale); - jiffies = user_j + nice_j + sys_j + other_j; - seconds = (up_1 + up_2) / 2; - h = (unsigned)( (double)jiffies/seconds/smp_num_cpus ); -@@ -303,16 +306,18 @@ - /***********************************************************************/ - void loadavg(double *restrict av1, double *restrict av5, double *restrict av15) { - double avg_1=0, avg_5=0, avg_15=0; -- char *restrict savelocale; -+ char *savelocale; - - FILE_TO_BUF(LOADAVG_FILE,loadavg_fd); -- savelocale = setlocale(LC_NUMERIC, NULL); -+ savelocale = strdup(setlocale(LC_NUMERIC, NULL)); - setlocale(LC_NUMERIC, "C"); - if (sscanf(buf, "%lf %lf %lf", &avg_1, &avg_5, &avg_15) < 3) { - fputs("bad data in " LOADAVG_FILE "\n", stderr); -+ free(savelocale); - exit(1); - } - setlocale(LC_NUMERIC, savelocale); -+ free(savelocale); - SET_IF_DESIRED(av1, avg_1); - SET_IF_DESIRED(av5, avg_5); - SET_IF_DESIRED(av15, avg_15); diff --git a/core/procps/procps-3.2.8-threads.patch b/core/procps/procps-3.2.8-threads.patch deleted file mode 100644 index 2491aa4c0..000000000 --- a/core/procps/procps-3.2.8-threads.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up procps-3.2.8/top.c.threads procps-3.2.8/top.c ---- procps-3.2.8/top.c.threads 2009-10-01 07:14:43.000000000 -0400 -+++ procps-3.2.8/top.c 2009-10-05 14:05:00.000000000 -0400 -@@ -1138,6 +1138,7 @@ static proc_t **procs_refresh (proc_t ** - #define ENTsz sizeof(proc_t) - static unsigned savmax = 0; // first time, Bypass: (i) - proc_t *ptsk = (proc_t *)-1; // first time, Force: (ii) -+ proc_t *saved_ptsk; - unsigned curmax = 0; // every time (jeeze) - PROCTAB* PT; - static int show_threads_was_enabled = 0; // optimization -@@ -1172,6 +1173,10 @@ static proc_t **procs_refresh (proc_t ** - while (curmax < savmax) { - proc_t *ttsk; - if (unlikely(!(ptsk = readproc(PT, NULL)))) break; -+ if(!show_threads_was_enabled) -+ saved_ptsk = ptsk; -+ else -+ saved_ptsk = NULL; - show_threads_was_enabled = 1; - while (curmax < savmax) { - unsigned idx; -@@ -1189,7 +1194,7 @@ static proc_t **procs_refresh (proc_t ** - prochlp(ttsk); - ++curmax; - } -- free(ptsk); // readproc() proc_t not used -+ if(!saved_ptsk) free(ptsk); // readproc() proc_t not used - } - } - -@@ -1208,7 +1213,8 @@ static proc_t **procs_refresh (proc_t ** - else { // show each thread in a process separately - while (ptsk) { - proc_t *ttsk; -- if (likely(ptsk = readproc(PT, NULL))) { -+ if (likely(ptsk = readproc(PT, NULL)) || -+ unlikely(saved_ptsk && (ptsk = saved_ptsk)) ) { - show_threads_was_enabled = 1; - while (1) { - table = alloc_r(table, (curmax + 1) * PTRsz); -@@ -1216,6 +1222,7 @@ static proc_t **procs_refresh (proc_t ** - prochlp(ttsk); - table[curmax++] = ttsk; - } -+ saved_ptsk = NULL; - free(ptsk); // readproc() proc_t not used - } - } diff --git a/core/procps/sysctl.conf b/core/procps/sysctl.conf deleted file mode 100644 index e3ebc7bad..000000000 --- a/core/procps/sysctl.conf +++ /dev/null @@ -1,13 +0,0 @@ -# -# Kernel sysctl configuration -# - -# Disable packet forwarding -net.ipv4.ip_forward=0 - -# Disable the magic-sysrq key (console security issues) -kernel.sysrq = 0 - -# Enable TCP SYN Cookie Protection -net.ipv4.tcp_syncookies = 1 - diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD deleted file mode 100644 index f8bcb9274..000000000 --- a/core/syslinux/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 155387 2012-04-03 08:18:06Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=syslinux -pkgver=4.05 -pkgrel=4 -arch=('i686' 'x86_64') -pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" -url="http://syslinux.zytor.com/" -license=('GPL2') -depends=('perl' 'glibc') -optdepends=('perl-passwd-md5: For md5pass' - 'perl-digest-sha1: For sha1pass' - 'mtools: For mkdiskimage and syslinux support' - ) -makedepends=('nasm') -backup=('boot/syslinux/syslinux.cfg') -install=syslinux.install -source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 - syslinux-dont-build-dos-windows-targets.patch - syslinux.cfg - syslinux-install_update) -md5sums=('82299242418385da1274c9479a778cb2' - '1528c376e43f0eaccaa80d8ad1bc13b4' - '832595501944fbcabcdc1207f4724fe7' - '680750f73dc2e587ac567d057d485813') - -build() { - # Do not try to build syslinux with our default LDFLAGS, it will fail - unset LDFLAGS - cd "$srcdir"/$pkgname-${pkgver} - # Do not try to build the Windows or DOS installers - patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch - # Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk - make -} - -package() { - cd "$srcdir"/$pkgname-${pkgver} - make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install - - # Install the default configuration - install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg - # Install the installation and update script - # This script is maintained at git://gist.github.com/772138.git - install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update - # move extlinux binary to /usr/sbin - mv "$pkgdir"/sbin/extlinux "$pkgdir"/usr/sbin/extlinux -} diff --git a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch deleted file mode 100644 index 2b86ab828..000000000 --- a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile ---- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 -+++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 -@@ -54,7 +54,7 @@ - # files that depend only on the B phase, but may have to be regenerated - # for "make installer". - BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -- diag libinstaller dos win32 win64 dosutil -+ libinstaller - ITARGET = - IOBJECTS = $(ITARGET) \ - utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/core/syslinux/syslinux-install_update b/core/syslinux/syslinux-install_update deleted file mode 100644 index cd1baa572..000000000 --- a/core/syslinux/syslinux-install_update +++ /dev/null @@ -1,463 +0,0 @@ -#!/bin/bash -# -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> -# -# 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. -# -#----------------- -# Exit Codes: -# 1 - get_boot_device or other function failed -# 2 - install/update failed -# 3 - set_active failed -# 4 - install_mbr failed -# -shopt -s nullglob - -libpath="/usr/lib/syslinux" -bootpath="/boot/syslinux" -extlinux="/usr/sbin/extlinux" - -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) -pciids_file=/usr/share/hwdata/pci.ids - -## Helper functions ## -# Taken from libui-sh -# $1 needle -# $2 set (array) haystack -check_is_in() { - local needle="$1" element - shift - for element; do - [[ $element = $needle ]] && return 0 - done - return 1 -} - -# return true when blockdevice is an md raid, otherwise return a unset value -# get all devices that are part of raid device $1 -device_is_raid() { - [[ $1 && -f /proc/mdstat ]] || return 1 - local devmajor=$(stat -c %t "$1") - (( devmajor == 9 )) -} - -mdraid_all_slaves() { - local slave slaves - for slave in /sys/class/block/${1##*/}/slaves/*; do - source "$slave/uevent" - slaves="$slaves/dev/$DEVNAME " - unset DEVNAME - done - echo $slaves -} - -# Check /sys/block to see if device is partitioned -# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist -# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist -dev_is_part() { - # $1 - blockdevice - local dev=$1 - - # If block device uevent file should be found - # If a partition is passed in path shouldn't exist - if [[ $dev = *cciss* ]]; then - [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 - elif [[ $dev = *ida* ]]; then - [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 - else - [[ -f /sys/block/${dev##*/}/dev ]] && return 1 - fi - - return 0 -} - -# If EFI PART is present in the first 8 bytes then it must be a GPT disk -device_is_gpt() { - local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) - [[ $partsig = "EFI PART" ]] -} - -clear_gpt_attr2() { - # $1 - Block Device, no partitions - local disk=$1 - - # Special Exception for cciss controllers - if [[ $disk = *cciss* ]]; then - for part in /dev/cciss/${disk##*/}*p*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - # Smart 2 Controllers - elif [[ $disk = *ida* ]]; then - for part in /dev/ida/${disk##*/}*p*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - else - for part in /sys/block/${disk##*/}/${disk##*/}*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - fi - return 0 -} - -usage() { -cat << EOF -usage: $0 options - -This script will install or upgrade Syslinux - -OPTIONS: - -h Show this message - -i Install Syslinux - -u Update Syslinux - -a Set Boot flag on boot partiton - -m Install Syslinux MBR - -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists - - Arguments Required: - -c Chroot install (ex: -c /mnt) - -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) -EOF -} - -# Trys to find the partition that /boot resides on -# This will either be on /boot or / (root) -getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" - echo "Is boot mounted? Is Syslinux installed?" - exit 1 - fi - - syslinux_fs=(ext2 ext3 ext4 btrfs vfat) - - # Use DATA from findmnt see rc.sysint for more info - if [[ -f /proc/self/mountinfo ]]; then - read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") - read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") - else - echo "Could not find /proc/self/mountinfo" - echo "Are you running a kernel greater than 2.6.24?" - exit 1 - fi - - if [[ $bootfs ]]; then - if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then - echo "/boot file system is not supported by Syslinux" - exit 1 - fi - boot="boot" - bootpart="$bootdev" - elif [[ $rootfs ]]; then - if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then - echo "/ (root) file system is not supported by Syslinux" - exit 1 - fi - boot="root" - bootpart="$rootdev" - else - echo "Could not find filesystem on / (root) or /boot." - exit 1 - fi -} - -# We store the partition table type either gpt or mbr in var ptb -# In rare cases a user could have one raid disk using mbr and another using gpt -# In such cases we accept that the output may be incomplete - -# Calls get_ptb() for $bootpart or for all device in RAID -declare -A bootdevs -get_boot_devices() { - if device_is_raid "$bootpart"; then - slaves=$(mdraid_all_slaves "$bootpart") - - for slave in ${slaves[@]}; do - local disk="${slave%%[[:digit:]]*}" - device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" - bootdevs[$slave]="$ptb" - done - else - local disk="${bootpart%%[[:digit:]]*}" - device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" - bootdevs[$bootpart]="$ptb" - fi -} - -# Function Assumes the boot partition should be marked as active -# All other partitions should not have the boot flag set -set_active() { - # If any bootdev is a block device without partitions bail - # we want to set the boot flag on partitioned disk - for dev in "${!bootdevs[@]}"; do - dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } - done - - # Clear BIOS Bootable Legacy Attribute for GPT drives - # In rare cases where a RAID device has slaves on the same block device - # Attribute 2 will be cleared for each partition multiple times - for dev in "${!bootdevs[@]}"; do - local ptb="${bootdevs[$dev]}" - if [[ "$ptb" = GPT ]]; then - local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda - clear_gpt_attr2 "$disk" - fi - done - - # Set the boot flag on bootdevs (generated from get_boot_devices) - for part in "${!bootdevs[@]}"; do - local ptb="${bootdevs[$part]}" - local partnum="${part##*[[:alpha:]]}" - case "$part" in - *[[:digit:]]p[[:digit:]]*) - local disk="${part%%p$partnum}" # get everything before p1 - ;; - *) - local disk="${part%%[[:digit:]]*}" - ;; - esac - - if [[ "$ptb" = MBR ]]; then - if sfdisk "$disk" -A "$partnum" &>/dev/null; then - echo "Boot Flag Set - $part" - else - echo "FAILED to Set the boot flag on $part" - exit 3 - fi - elif [[ "$ptb" = GPT ]]; then - if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then - echo "Attribute Legacy Bios Bootable Set - $part" - else - echo "FAILED to set attribute Legacy BIOS Bootable on $part" - exit 3 - fi - fi - done - return 0 -} - -install_mbr() { - # If any bootdev is a block device without partitions bail - # we want to install the mbr to a partitioned disk - for dev in "${!bootdevs[@]}"; do - dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } - done - - for part in "${!bootdevs[@]}"; do - local partnum="${part##*[[:alpha:]]}" - case "$part" in - *[[:digit:]]p[[:digit:]]*) - local disk="${part%%p$partnum}" # get everything before p1 - ;; - *) - local disk="${part%%[[:digit:]]*}" - ;; - esac - local ptb="${bootdevs[$part]}" - - # We want to install to the root of the block device - # If the device is a partition - ABORT! - dev_is_part "$disk" && \ - { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} - - if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" - elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" - fi - - if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then - echo "Installed MBR ($mbrfile) to $disk" - else - echo "Error Installing MBR ($mbrfile) to $disk" - exit 4 - fi - done - return 0 -} - -_install() { - # Copy files to /boot - for file in "${com32_files[@]}"; do - # Symlink files even if links exist - if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" - fi - done - - # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS - if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then - if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi - - if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 - else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 - fi - - if (( $? )); then - echo "Syslinux install failed" - exit 2 - else - echo "Syslinux install successful" - fi - - touch "$CHROOT/$autoupdate_file" -} - -update() { - # Update any com and c32 files in /boot - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32,com}; do - file=$(basename "$file") - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi - - if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null - else - "$extlinux" --update "$bootpath" &> /dev/null - fi - - if (($?)); then - echo "Syslinux update failed" - exit 2 - else - echo "Syslinux update successful" - fi -} - -if (( $# == 0 )); then - usage - exit 1 -fi - -while getopts "c:uihmas" opt; do - case $opt in - c) - CHROOT=$(readlink -e "$OPTARG") - if [[ -z $CHROOT ]]; then - echo "error: chroot path ``$OPTARG does not exist"; - exit 1 - fi - ;; - h) - USAGE="True" - ;; - i) - INSTALL="True" - ;; - u) - UPDATE="True" - ;; - m) - MBR="True" - ;; - a) - SET_ACTIVE="True" - ;; - s) - # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then - UPDATE="True" - else - exit 0 - fi - ;; - *) - usage - exit 1 - ;; - esac -done - -if [[ $USAGE ]]; then - usage - exit 0 -fi - -# Make sure only root can run our script -if (( $(id -u) != 0 )); then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -# Display Usage Information if both Install and Update are passed -if [[ $INSTALL && $UPDATE ]]; then - usage - exit 1 -fi - -# If a chroot dir is path set variables to reflect chroot -if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" -fi - -# Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" - echo "Is /boot mounted?" - exit 1 -fi - -# Get the boot device if any of these options are passed -if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then - getBoot -fi - -# Install or Update -if [[ $INSTALL ]]; then - _install || exit -elif [[ $UPDATE ]]; then - update || exit -fi - - -# SET_ACTIVE and MBR -if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then - get_boot_devices - - if [[ $SET_ACTIVE ]]; then - set_active || exit - fi - - if [[ $MBR ]]; then - install_mbr || exit - fi -fi - -exit 0 - -# vim: set et sw=4: diff --git a/core/syslinux/syslinux.cfg b/core/syslinux/syslinux.cfg deleted file mode 100644 index 5a588f58c..000000000 --- a/core/syslinux/syslinux.cfg +++ /dev/null @@ -1,79 +0,0 @@ -# Config file for Syslinux - -# /boot/syslinux/syslinux.cfg -# -# Comboot modules: -# * menu.c32 - provides a text menu -# * vesamenu.c32 - provides a graphical menu -# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders -# * hdt.c32 - hardware detection tool -# * reboot.c32 - reboots the system -# * poweroff.com - shutdown the system -# -# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. -# If /usr and /boot are on the same file system, symlink the files instead -# of copying them. -# -# If you do not use a menu, a 'boot:' prompt will be shown and the system -# will boot automatically after 5 seconds. -# -# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux -# The wiki provides further configuration examples - -DEFAULT arch -PROMPT 0 # Set to 1 if you always want to display the boot: prompt -TIMEOUT 50 -# You can create syslinux keymaps with the keytab-lilo tool -#KBDMAP de.ktl - -# Menu Configuration -# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux -UI menu.c32 -#UI vesamenu.c32 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu -MENU TITLE Arch Linux -#MENU BACKGROUND splash.png -MENU COLOR border 30;44 #40ffffff #a0000000 std -MENU COLOR title 1;36;44 #9033ccff #a0000000 std -MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all -MENU COLOR unsel 37;44 #50ffffff #a0000000 std -MENU COLOR help 37;40 #c0ffffff #a0000000 std -MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std -MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std -MENU COLOR msg07 37;40 #90ffffff #a0000000 std -MENU COLOR tabmsg 31;40 #30ffffff #00000000 std - -# boot sections follow -# -# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. -# -#-* - -LABEL arch - MENU LABEL Arch Linux - LINUX ../vmlinuz-linux - APPEND root=/dev/sda3 ro - INITRD ../initramfs-linux.img - -LABEL archfallback - MENU LABEL Arch Linux Fallback - LINUX ../vmlinuz-linux - APPEND root=/dev/sda3 ro - INITRD ../initramfs-linux-fallback.img - -#LABEL windows -# MENU LABEL Windows -# COM32 chain.c32 -# APPEND hd0 1 - -LABEL hdt - MENU LABEL HDT (Hardware Detection Tool) - COM32 hdt.c32 - -LABEL reboot - MENU LABEL Reboot - COM32 reboot.c32 - -LABEL off - MENU LABEL Power Off - COMBOOT poweroff.com diff --git a/core/syslinux/syslinux.install b/core/syslinux/syslinux.install deleted file mode 100644 index 0dc0ece36..000000000 --- a/core/syslinux/syslinux.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo "==> If you want to use syslinux as your bootloader" - echo "==> edit /boot/syslinux/syslinux.cfg and run" - echo "==> # /usr/sbin/syslinux-install_update -i -a -m" - echo "==> to install it." -} - -post_upgrade() { - # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists - /usr/sbin/syslinux-install_update -s -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/amule/gcc4.7.patch b/extra/amule/gcc4.7.patch deleted file mode 100644 index 2bfcbe057..000000000 --- a/extra/amule/gcc4.7.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/ObservableQueue.h 2011-11-20 19:08:59.000000000 +0100 -+++ b/src/ObservableQueue.h 2012-04-11 00:06:28.000000000 +0200 -@@ -331,14 +331,14 @@ - template <typename ValueType> - void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STARTING ), o ); -+ this->NotifyObservers( EventType( EventType::STARTING ), o ); - } - - - template <typename ValueType> - void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o ) - { -- NotifyObservers( EventType( EventType::STOPPING ), o ); -+ this->NotifyObservers( EventType( EventType::STOPPING ), o ); - } - - diff --git a/extra/bind/so_bsdcompat.patch b/extra/bind/so_bsdcompat.patch deleted file mode 100644 index 4d7031fcc..000000000 --- a/extra/bind/so_bsdcompat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c ---- old/lib/isc/unix/socket.c 2011-02-18 05:01:16.000000000 +0100 -+++ new/lib/isc/unix/socket.c 2011-05-27 10:12:01.685269374 +0200 -@@ -712,6 +712,8 @@ - } - #endif - -+#undef SO_BSDCOMPAT -+ - static void - socket_log(isc__socket_t *sock, isc_sockaddr_t *address, - isc_logcategory_t *category, isc_logmodule_t *module, int level, diff --git a/extra/dvdrip/PKGBUILD b/extra/dvdrip/PKGBUILD deleted file mode 100644 index e3be37d2f..000000000 --- a/extra/dvdrip/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 143731 2011-11-28 17:39:01Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com> - -pkgname=dvdrip -pkgver=0.98.11 -pkgrel=10 -pkgdesc="A Gtk frontend for transcode writen in Perl" -arch=('i686' 'x86_64') -license=('custom') -url="http://www.exit1.org/dvdrip/" -install=${pkgname}.install -depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick' - 'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow') -optdepends=('ogmtools: for ogm/odd video creation' - 'lsdvd: fast reading of DVD table' - 'fping: for cluster support') -source=("http://www.exit1.org/dvdrip/dist/${pkgname}-${pkgver}.tar.gz" - 'dvdrip.desktop') -options=('!emptydirs' '!makeflags') -md5sums=('6dfa4199d451757a37eea233a07da4c0' - 'e91cf411928fd0500d07a0022b4ef546') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - install -Dm644 ${srcdir}/${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/dvdrip/dvdrip.desktop b/extra/dvdrip/dvdrip.desktop deleted file mode 100644 index dd19b4aae..000000000 --- a/extra/dvdrip/dvdrip.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=dvd::rip -Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs -Exec=/usr/bin/vendor_perl/dvdrip -Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm -Terminal=false -Type=Application -Categories=Application;AudioVideo;Video; diff --git a/extra/dvdrip/dvdrip.install b/extra/dvdrip/dvdrip.install deleted file mode 100644 index e111ef946..000000000 --- a/extra/dvdrip/dvdrip.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD deleted file mode 100644 index 3d0b13a61..000000000 --- a/extra/gstreamer0.10-good/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 153259 2012-03-12 16:05:31Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gstreamer0.10-good -pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') -pkgver=0.10.31 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') -url="http://gstreamer.freedesktop.org/" -options=(!libtool !emptydirs) -source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz) -sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64') - -build() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - sed -i '/AC_PATH_XTRA/d' configure.ac - autoreconf - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-experimental \ - --disable-schemas-install \ - --disable-hal \ - --disable-esd \ - --with-package-name="GStreamer Good Plugins (Archlinux)" \ - --with-package-origin="http://www.archlinux.org/" - - make - sed -e 's/gst sys ext/gst/' -i Makefile -} - -check() { - cd "${srcdir}/gst-plugins-good-${pkgver}" - make check -} - -package_gstreamer0.10-good() { - depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries" - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}/etc/gconf" -} - -package_gstreamer0.10-good-plugins() { - depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" - groups=('gstreamer0.10-plugins') - replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') - install=gstreamer0.10-good-plugins.install - - cd "${srcdir}/gst-plugins-good-${pkgver}" - make -C sys DESTDIR="${pkgdir}" install - make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - install -m644 gconf/gstreamer-0.10.schemas "${pkgdir}/usr/share/gconf/schemas/gstreamer0.10-good-plugins.schemas" -} diff --git a/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install b/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install deleted file mode 100644 index e343beea5..000000000 --- a/extra/gstreamer0.10-good/gstreamer0.10-good-plugins.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=gstreamer0.10-good-plugins - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - pre_remove - fi -} - -post_upgrade() { - post_install -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch b/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch deleted file mode 100644 index 09e11d888..000000000 --- a/extra/gvfs/gvfs-1.12.2-afp-g_clear_object.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 01161473ed33ee682f340e6f12edcba5334475e0 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Mon, 30 Apr 2012 06:09:30 -0400 -Subject: [PATCH] afp: Use g_clear_object properly - -g_clear_object expects the address of a pointer. A recent -change in its definition makes gcc complain about this. -(cherry picked from commit 7fe5deeae25f2396027f667d8960d2ec84c64716) ---- - daemon/gvfsafpvolume.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/daemon/gvfsafpvolume.c b/daemon/gvfsafpvolume.c -index 3fd33f2..5207459 100644 ---- a/daemon/gvfsafpvolume.c -+++ b/daemon/gvfsafpvolume.c -@@ -1082,7 +1082,7 @@ create_directory_get_filedir_parms_cb (GObject *source_object, GAsyncResult *res - return; - - error: -- g_clear_object (info); -+ g_clear_object (&info); - g_simple_async_result_take_error (simple, err); - g_simple_async_result_complete (simple); - g_object_unref (simple); -@@ -3033,4 +3033,4 @@ g_vfs_afp_volume_read_from_fork_finish (GVfsAfpVolume *volume, - *bytes_read = g_simple_async_result_get_op_res_gssize (simple); - - return TRUE; --} -\ No newline at end of file -+} --- -1.7.8.6 - diff --git a/extra/iperf/PKGBUILD b/extra/iperf/PKGBUILD deleted file mode 100644 index 85694c453..000000000 --- a/extra/iperf/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 153712 2012-03-18 13:40:58Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=iperf -pkgver=2.0.5 -pkgrel=4 -pkgdesc="A tool to measure maximum TCP bandwidth" -arch=('i686' 'x86_64') -license=('custom') -url="http://iperf.sourceforge.net" -depends=('gcc-libs') -source=("http://downloads.sourceforge.net/iperf/iperf-2.0.5.tar.gz" - 'client.cpp.patch') -md5sums=('44b5536b67719f4250faed632a3cd016' - '82ce63c87cc8bb2f0f94069857ac14a9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # FS#25159 - patch -Np1 -i ${srcdir}/client.cpp.patch - - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-threads - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/iperf/LICENSE" -} diff --git a/extra/iperf/client.cpp.patch b/extra/iperf/client.cpp.patch deleted file mode 100644 index 85f89e765..000000000 --- a/extra/iperf/client.cpp.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/Client.cpp 2010-04-01 22:23:17.000000000 +0200 -+++ b/src/Client.cpp 2011-07-19 11:03:42.000000000 +0200 -@@ -212,10 +212,10 @@ - char* readAt = mBuf; - - #if HAVE_THREAD -- if ( !isUDP( mSettings ) ) { -- RunTCP(); -- return; -- } -+// if ( !isUDP( mSettings ) ) { -+// RunTCP(); -+// return; -+// } - #endif - - // Indicates if the stream is readable diff --git a/extra/libreoffice/libreoffice.install b/extra/libreoffice/libreoffice.install deleted file mode 100644 index e66b66f3d..000000000 --- a/extra/libreoffice/libreoffice.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/extra/llvm/clang-plugin-loader-registry.patch b/extra/llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/extra/llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/extra/llvm/fix-gold-lto-linking.patch b/extra/llvm/fix-gold-lto-linking.patch deleted file mode 100644 index 84d166471..000000000 --- a/extra/llvm/fix-gold-lto-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile ---- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 -+++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 -@@ -26,6 +26,6 @@ LINK_COMPONENTS := support - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L $(SharedLibDir) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/extra/mail-notification/PKGBUILD b/extra/mail-notification/PKGBUILD deleted file mode 100644 index b7789212a..000000000 --- a/extra/mail-notification/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 146721 2012-01-16 19:51:02Z dreisner $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> - -pkgname=mail-notification -pkgver=5.4 -pkgrel=10 -pkgdesc="Tray icon application that informs you if you have new mail" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/mailnotify/" -license=('GPL3' 'FDL') -depends=('gmime' 'libnotify' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome') -makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils' 'gtk2') -options=('!libtool' '!emptydirs') -install=mail-notification.install -source=(http://savannah.nongnu.org/download/mailnotify-orig/${pkgname}-${pkgver}.tar.bz2 - dont-update-cache.patch - remove-ubuntu-special-case.patch - mail-notification-5.4-evolution.patch - mail-notification-5.4-sasl_encode64.patch - mail-notification-5.4-evolution-gtkhtml.patch - mail-notification-5.4-camel_headers.patch - mail-notification-5.4-icons.patch - mail-notification-5.4-weak.patch - mail-notification-5.4-popup-attach.patch - mail-notification-5.4-kde-trayicon.patch - mail-notification-5.4-evolution-3-0-support.patch - mail-notification-5.4-gtk3-support.patch - mail-notification-5.4-add-fallback-icon.patch - mail-notification-5.4-gmime.patch - mail-notification-5.4-libx11.patch) -md5sums=('c8dc33a61251acb5474e56eab6b18f43' - '6007bc30e789dab0a8282038e0335eb9' - '9cadd61bbd9c324b2916ec980231e0f2' - 'aa6f80820899f904c25988772f70ade9' - '125513ed059f62469377eb0ab794dbed' - 'c595a3962ab13a65be24a941e28faa9c' - 'f79939f593b2e8659e302df72c2b54b1' - '244b7ef2aec7656e8df390be87c10e2b' - '31bde95dfd39449959d8b3316f91429c' - 'cdead6a88d1779f69a5f40dc75d5cb84' - 'c7991b831834724eddc1c6802c3e06a6' - 'b370b1085ebb2814bd5d345a6d2b45ea' - '1ba948759110787dd57097cff157b75a' - '09df61b4dc29c676ac81ff9054e840ac' - '0944695e9b9b30f39028f85c83c6a7e2' - 'c3f643ef16aab3b4fe9ff5b333bff41a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "${srcdir}/dont-update-cache.patch" - patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch" - patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-gmime.patch" - patch -Np1 -i "${srcdir}/mail-notification-5.4-libx11.patch" - - gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui - gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui - - ./jb configure prefix=/usr sysconfdir=/etc \ - localstatedir=/var destdir="${pkgdir}" \ - gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \ - cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \ - library-mode=0755 - ./jb build - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install - - rm -f "${pkgdir}/usr/share/mail-notification/"*.glade - install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/" - install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/" - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/mail-notification/dont-update-cache.patch b/extra/mail-notification/dont-update-cache.patch deleted file mode 100644 index 81216835e..000000000 --- a/extra/mail-notification/dont-update-cache.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jbsrc/jb.c.~1~ 2008-03-20 16:53:02.000000000 +0100 -+++ jbsrc/jb.c 2008-03-26 20:51:45.641363619 +0100 -@@ -327,7 +327,6 @@ - jb_package_add_resources (void) - { - JBGroup *group; -- JBRule *rule; - JBObject *object; - - if (jb_variable_get_bool("compile-warnings")) -@@ -362,11 +361,6 @@ - if (jb_variable_get_bool("hotmail")) - jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir"); - -- rule = jb_rule_new(); -- jb_rule_set_install_message(rule, "updating the GTK+ icon cache"); -- jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor"); -- jb_group_add_resource(group, JB_GROUP_RESOURCE(rule)); -- - jb_group_add(group); - - /*** data ******************************************************************/ diff --git a/extra/mail-notification/mail-notification-5.4-add-fallback-icon.patch b/extra/mail-notification/mail-notification-5.4-add-fallback-icon.patch deleted file mode 100644 index 41c28e870..000000000 --- a/extra/mail-notification/mail-notification-5.4-add-fallback-icon.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/mn-stock.c.orig 2011-02-17 17:42:39.886767087 +0100 -+++ src/mn-stock.c 2011-02-17 17:49:37.415541177 +0100 -@@ -86,6 +86,13 @@ - gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name); - gtk_icon_set_add_source(icon_set, icon_source); - gtk_icon_source_free(icon_source); -+ -+ /* Add a fallback icon */ -+ icon_source = gtk_icon_source_new(); -+ gtk_icon_source_set_icon_name(icon_source, "mail-notification"); -+ gtk_icon_source_set_state_wildcarded(icon_source, TRUE); -+ gtk_icon_set_add_source(icon_set, icon_source); -+ gtk_icon_source_free(icon_source); - } - else if (icons[i].source_stock_id) - { diff --git a/extra/mail-notification/mail-notification-5.4-camel_headers.patch b/extra/mail-notification/mail-notification-5.4-camel_headers.patch deleted file mode 100644 index 861e3d215..000000000 --- a/extra/mail-notification/mail-notification-5.4-camel_headers.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c ---- mail-notification-5.4/build/src/mn-evolution-message.c 2008-05-22 19:47:51.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-message.c 2010-05-04 18:13:31.000000000 +0400 -@@ -25,7 +25,7 @@ - #line 24 "src/mn-evolution-message.gob" - - #include <glib/gi18n.h> --#include <camel/camel-folder-summary.h> -+#include <camel/camel.h> - #include "mn-evolution-mailbox.h" - #include "mn-message-private.h" - #include "mn-evolution-client.h" -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c ---- mail-notification-5.4/build/src/mn-evolution-server.c 2010-05-04 18:12:56.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c 2010-05-04 18:13:39.000000000 +0400 -@@ -28,7 +28,7 @@ - #include <libintl.h> - #include <gobject/gvaluecollector.h> - #include <libedataserver/eds-version.h> --#include <camel/camel-folder.h> -+#include <camel/camel.h> - #if EDS_CHECK_VERSION(2,29,0) - #include <shell/e-shell.h> - #include <mail/e-mail-browser.h> -diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c ---- mail-notification-5.4/src/mn-evolution-plugin.c 2010-05-04 18:12:56.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c 2010-05-04 18:13:20.000000000 +0400 -@@ -24,7 +24,7 @@ - #include <dbus/dbus.h> - #include <dbus/dbus-glib-lowlevel.h> - #include <dbus/dbus-glib-bindings.h> --#include <camel/camel-folder.h> -+#include <camel/camel.h> - #include <mail/em-event.h> - #include <mail/mail-tools.h> - #include "mn-evolution.h" diff --git a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch deleted file mode 100644 index 51938b5fa..000000000 --- a/extra/mail-notification/mail-notification-5.4-evolution-3-0-support.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30 2011-02-02 00:09:33.945696868 +0100 -+++ jbsrc/lib/src/extras/jb-evolution-plugin.c 2011-02-02 00:28:09.096275028 +0100 -@@ -41,7 +41,7 @@ - if (! minversion) - minversion = "2.12"; - -- packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion); -+ packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion); - result = jb_check_packages("Evolution", "evolution-plugin", packages); - g_free(packages); - -@@ -53,7 +53,7 @@ - char *plugindir; - - jb_message_checking("for the Evolution plugin directory"); -- plugindir = jb_get_package_variable("evolution-plugin", "plugindir"); -+ plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir"); - jb_message_result_string(plugindir ? plugindir : "not found"); - - if (! plugindir) ---- src/mn-evolution-plugin.c.orig 2011-02-09 00:07:37.422002566 +0100 -+++ src/mn-evolution-plugin.c 2011-02-09 00:12:43.652678682 +0100 -@@ -25,6 +25,7 @@ - #include <dbus/dbus-glib-lowlevel.h> - #include <dbus/dbus-glib-bindings.h> - #include <camel/camel.h> -+#include <libedataserver/eds-version.h> - #include <mail/em-event.h> - #include <mail/mail-tools.h> - #include "mn-evolution.h" -@@ -240,7 +241,11 @@ - EMEventTargetFolder *folder) - { - if (evo_server) -+#if EDS_CHECK_VERSION(3,1,0) -+ mn_evolution_server_folder_changed(evo_server, e_mail_folder_uri_build(folder->store, folder->folder_name)); -+#else - mn_evolution_server_folder_changed(evo_server, folder->uri); -+#endif - } - - void -@@ -249,10 +250,16 @@ - { - if (evo_server) - { -- char *url; -+#if EDS_CHECK_VERSION(2,91,0) -+ const char *url = camel_folder_get_uri(message->folder); -+#else -+ char *url = mail_tools_folder_to_url(message->folder); -+#endif - -- url = mail_tools_folder_to_url(message->folder); - mn_evolution_server_message_reading(evo_server, url); -+ -+#if !EDS_CHECK_VERSION(2,91,0) - g_free(url); -+#endif - } - } ---- build/src/mn-evolution-server.c.orig 2011-02-09 00:17:38.850944227 +0100 -+++ build/src/mn-evolution-server.c 2011-02-09 22:21:54.155346478 +0100 -@@ -496,11 +496,15 @@ - - if (! folder) - { -- folder = mail_tool_uri_to_folder(uri, 0, - #if EDS_CHECK_VERSION(2,91,0) -- NULL, -+ static EMailSession * session = NULL; -+ if (!session) -+ session = e_mail_session_new(); -+ -+ folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL); -+#else -+ folder = mail_tool_uri_to_folder(uri, 0, NULL); - #endif -- NULL); - if (folder) - self_cache_folder(uri, folder); - else -@@ -677,7 +681,12 @@ - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(3,1,0) -+ *ret = g_strdup(camel_folder_get_display_name(folder)); -+#else - *ret = g_strdup(camel_folder_get_name(folder)); -+#endif -+ - #if EDS_CHECK_VERSION(2,31,0) - g_object_unref(folder); - #else -@@ -725,8 +734,12 @@ - shell = e_shell_get_default (); - shell_backend = e_shell_get_backend_by_name (shell, "mail"); - -- browser = e_mail_browser_new (shell_backend); -+ browser = e_mail_browser_new (E_MAIL_BACKEND(shell_backend)); -+#if EDS_CHECK_VERSION(3,1,0) -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder); -+#else - e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+#endif - e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); - gtk_widget_show (browser); - #else ---- build/src/mn-evolution-folder-tree-server.c.orig 2011-06-17 22:01:49.226886994 +0200 -+++ build/src/mn-evolution-folder-tree-server.c 2011-06-18 00:34:23.046889847 +0200 -@@ -444,7 +444,9 @@ - { - #line 61 "src/mn-evolution-folder-tree-server.gob" - --#if EDS_CHECK_VERSION(2,91,0) -+#if EDS_CHECK_VERSION(3,1,0) -+ selfp->tree = em_folder_tree_new(NULL, NULL); -+#elif EDS_CHECK_VERSION(2,91,0) - selfp->session = e_mail_session_new(); - selfp->tree = em_folder_tree_new(selfp->session); - #elif EDS_CHECK_VERSION(2,29,0) diff --git a/extra/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch b/extra/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch deleted file mode 100644 index 283ef36d6..000000000 --- a/extra/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c ---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c 2008-04-27 18:47:43.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c 2009-08-21 19:48:22.000000000 +0400 -@@ -41,7 +41,7 @@ - if (! minversion) - minversion = "2.12"; - -- packages = g_strdup_printf("evolution-plugin >= %s", minversion); -+ packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion); - result = jb_check_packages("Evolution", "evolution-plugin", packages); - g_free(packages); - diff --git a/extra/mail-notification/mail-notification-5.4-evolution.patch b/extra/mail-notification/mail-notification-5.4-evolution.patch deleted file mode 100644 index 87514c22d..000000000 --- a/extra/mail-notification/mail-notification-5.4-evolution.patch +++ /dev/null @@ -1,244 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c ---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c 2008-05-22 19:47:48.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c 2010-10-12 16:50:15.000000000 +0400 -@@ -25,7 +25,10 @@ - #line 24 "src/mn-evolution-folder-tree-server.gob" - - #include <dbus/dbus.h> -+#include <libedataserver/eds-version.h> -+#if !EDS_CHECK_VERSION(2,29,0) - #include <mail/mail-component.h> -+#endif - #include <mail/em-folder-tree.h> - #include "mn-evolution-plugin.h" - #include "mn-evolution.h" -@@ -441,10 +444,17 @@ - { - #line 61 "src/mn-evolution-folder-tree-server.gob" - -+#if EDS_CHECK_VERSION(2,91,0) -+ selfp->session = e_mail_session_new(); -+ selfp->tree = em_folder_tree_new(selfp->session); -+#elif EDS_CHECK_VERSION(2,29,0) -+ selfp->tree = em_folder_tree_new(); -+#else - EMFolderTreeModel *model; - - model = mail_component_peek_tree_model(mail_component_peek()); - selfp->tree = em_folder_tree_new_with_model(model); -+#endif - - selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); - gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree); -@@ -469,6 +479,10 @@ - { - #line 80 "src/mn-evolution-folder-tree-server.gob" - -+#if EDS_CHECK_VERSION(2,91,0) -+ g_object_unref(selfp->session); -+ selfp->session = NULL; -+#endif - g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self); - }} - #line 475 "mn-evolution-folder-tree-server.c" -diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c ---- mail-notification-5.4/build/src/mn-evolution-server.c 2008-05-22 19:47:48.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c 2010-10-12 16:50:40.000000000 +0400 -@@ -27,12 +27,22 @@ - #include <stdio.h> - #include <libintl.h> - #include <gobject/gvaluecollector.h> -+#include <libedataserver/eds-version.h> - #include <camel/camel-folder.h> -+#if EDS_CHECK_VERSION(2,29,0) -+#include <shell/e-shell.h> -+#include <mail/e-mail-browser.h> -+#else - #include <mail/em-folder-view.h> - #include <mail/em-format.h> - #include <mail/em-message-browser.h> -+#endif - #include <mail/em-utils.h> -+#if EDS_CHECK_VERSION(2,91,0) -+#include <mail/e-mail-session.h> -+#else - #include <mail/mail-session.h> -+#endif - #include <mail/mail-tools.h> - #include "mn-evolution.h" - #include "mn-evolution-folder-tree-server.h" -@@ -391,10 +397,18 @@ - info = g_new0(FolderInfo, 1); - info->uri = g_strdup(uri); - info->folder = folder; -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_ref(folder); -+#else - camel_object_ref(folder); -+#endif - - /* uncache the folder when it is deleted */ -+#if EDS_CHECK_VERSION(2,31,0) -+ g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info); -+#else - camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info); -+#endif - - g_hash_table_replace(folders, info->uri, info); - }} -@@ -413,8 +427,13 @@ - { - #line 105 "src/mn-evolution-server.gob" - -+#if EDS_CHECK_VERSION(2,31,0) -+ g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info); -+ g_object_unref(info->folder); -+#else - camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info); - camel_object_unref(info->folder); -+#endif - g_free(info->uri); - g_free(info); - }} -@@ -461,7 +480,11 @@ - if (info) - { - folder = info->folder; -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_ref(folder); -+#else - camel_object_ref(folder); -+#endif - } - } - else -@@ -469,7 +492,11 @@ - - if (! folder) - { -- folder = mail_tool_uri_to_folder(uri, 0, NULL); -+ folder = mail_tool_uri_to_folder(uri, 0, -+#if EDS_CHECK_VERSION(2,91,0) -+ NULL, -+#endif -+ NULL); - if (folder) - self_cache_folder(uri, folder); - else -@@ -595,14 +622,23 @@ - - for (i = 0; i < summary->len; i++) - { -+#if EDS_CHECK_VERSION(2,23,5) -+ char *uid = summary->pdata[i]; -+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid); -+#else - CamelMessageInfo *info = summary->pdata[i]; -+#endif - - if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0) - g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info)); - } - - camel_folder_free_summary(folder, summary); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -638,7 +674,11 @@ - if (folder) - { - *ret = g_strdup(camel_folder_get_name(folder)); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -673,6 +713,19 @@ - folder = self_lookup_folder(folder_uri, err); - if (folder) - { -+#if EDS_CHECK_VERSION(2,29,0) -+ EShell *shell; -+ EShellBackend *shell_backend; -+ GtkWidget *browser; -+ -+ shell = e_shell_get_default (); -+ shell_backend = e_shell_get_backend_by_name (shell, "mail"); -+ -+ browser = e_mail_browser_new (shell_backend); -+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri); -+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid); -+ gtk_widget_show (browser); -+#else - GtkWidget *browser; - - /* modelled after Evolution's handleuri_got_folder() */ -@@ -683,8 +736,13 @@ - em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri); - em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE); - gtk_widget_show(((EMMessageBrowser *) browser)->window); -+#endif - -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - } - - GDK_THREADS_LEAVE(); -@@ -721,7 +779,11 @@ - if (folder) - { - status = camel_folder_set_message_flags(folder, message_uid, flags, flags); -+#if EDS_CHECK_VERSION(2,31,0) -+ g_object_unref(folder); -+#else - camel_object_unref(folder); -+#endif - - if (! status) - g_set_error(err, -diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c ---- mail-notification-5.4/src/mn-evolution-plugin.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c 2010-10-12 16:50:15.000000000 +0400 -@@ -204,7 +204,7 @@ - } - - int --e_plugin_lib_enable (EPluginLib *ep, int enable) -+e_plugin_lib_enable (EPlugin *ep, int enable) - { - static gboolean enabled = FALSE; - GError *err = NULL; ---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig 2010-11-13 13:55:01.571934066 +0100 -+++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h 2010-11-13 13:56:07.019487418 +0100 -@@ -4,6 +4,10 @@ - #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__ - - #include "mn-evolution-folder-tree-server.h" -+#include <libedataserver/eds-version.h> -+#if EDS_CHECK_VERSION(2,91,0) -+#include <mail/e-mail-session.h> -+#endif - - #ifdef __cplusplus - extern "C" { -@@ -23,6 +23,9 @@ - #line 41 "src/mn-evolution-folder-tree-server.gob" - GtkWidget * tree; - #line 26 "mn-evolution-folder-tree-server-private.h" -+#if EDS_CHECK_VERSION(2,91,0) -+ EMailSession * session; -+#endif - }; - - #ifdef __cplusplus diff --git a/extra/mail-notification/mail-notification-5.4-gmime.patch b/extra/mail-notification/mail-notification-5.4-gmime.patch deleted file mode 100644 index 5f516a46b..000000000 --- a/extra/mail-notification/mail-notification-5.4-gmime.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c 2008-12-23 14:48:28.000000000 +0300 -@@ -265,7 +265,7 @@ - mime_message = g_mime_parser_construct_message(parser); - if (mime_message) - { -- if (g_mime_message_get_header(mime_message, "X-Mozilla-Status")) -+ if (g_mime_object_get_header(mime_message, "X-Mozilla-Status")) - { - #if WITH_MOZILLA - type = MN_TYPE_MOZILLA_MAILBOX_BACKEND; -diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c ---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:48:49.000000000 +0300 -+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c 2008-12-23 14:46:47.000000000 +0300 -@@ -167,7 +167,7 @@ - - const char *header; - -- header = g_mime_message_get_header(mime_message, header_name); -+ header = g_mime_object_get_header(mime_message, header_name); - if (header && mn_str_ishex(header)) - return strtol(header, NULL, 16); - else -diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c ---- mail-notification-5.4/jbsrc/jb.c 2008-05-22 19:47:04.000000000 +0400 -+++ mail-notification-5.4-OK/jbsrc/jb.c 2008-12-23 14:43:09.000000000 +0300 -@@ -166,7 +166,7 @@ - jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); - jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - -- jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7", -+ jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", - "hotmail", - "imap", - "maildir", -diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c ---- mail-notification-5.4/src/mn-message-mime.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-message-mime.c 2008-12-23 14:46:35.000000000 +0300 -@@ -33,12 +33,12 @@ - g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE); - - /* SpamAssassin */ -- spam = g_mime_message_get_header(mime_message, "X-Spam-Status"); -+ spam = g_mime_object_get_header(mime_message, "X-Spam-Status"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - - /* bogofilter */ -- spam = g_mime_message_get_header(mime_message, "X-Bogosity"); -+ spam = g_mime_object_get_header(mime_message, "X-Bogosity"); - if (spam && mn_ascii_str_case_has_prefix(spam, "yes")) - return TRUE; - -@@ -89,7 +89,7 @@ - { - const char *status; - -- status = g_mime_message_get_header(mime_message, "Status"); -+ status = g_mime_object_get_header(mime_message, "Status"); - if (status && strchr(status, 'R')) - return NULL; /* the message was read */ - else if (status && strchr(status, 'O')) diff --git a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch b/extra/mail-notification/mail-notification-5.4-gtk3-support.patch deleted file mode 100644 index 6a29f8622..000000000 --- a/extra/mail-notification/mail-notification-5.4-gtk3-support.patch +++ /dev/null @@ -1,1416 +0,0 @@ ---- build/src/mn-dialog.c.orig 2011-02-02 23:08:09.816659245 +0100 -+++ build/src/mn-dialog.c 2011-02-02 23:09:16.988113774 +0100 -@@ -106,8 +106,7 @@ - #line 27 "src/mn-dialog.gob" - - gtk_container_set_border_width(GTK_CONTAINER(self), 5); -- gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE); -- gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(self)->vbox), 2); -+ gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), 2); - - #line 113 "mn-dialog.c" - } ---- jbsrc/jb.c.orig 2011-02-02 23:40:33.567924712 +0100 -+++ jbsrc/jb.c 2011-02-02 23:39:39.680803618 +0100 -@@ -163,7 +163,7 @@ - { - jb_check_glibc(); - -- jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1"); -+ jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1"); - jb_require_packages("D-Bus", "dbus", "dbus-glib-1"); - - jb_check_packages_for_options("GMime", "gmime", "gmime-2.6", ---- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:38:01.503049512 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-02 23:38:16.988222034 +0100 -@@ -358,7 +358,7 @@ - g_signal_connect(selfp->dialog, "response", G_CALLBACK(self_response_h), self); - } - -- if (! GTK_WIDGET_VISIBLE(selfp->dialog)) -+ if (! gtk_widget_get_visible(selfp->dialog)) - { - GtkWindow *parent; - ---- build/src/mn-sound-player.c.orig 2011-02-02 23:55:02.436500397 +0100 -+++ build/src/mn-sound-player.c 2011-02-02 23:55:09.125141055 +0100 -@@ -27,7 +27,7 @@ - #include <sys/types.h> - #include <signal.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-conf.h" - #include "mn-locked-callback.h" - #include "mn-util.h" ---- build/src/mn-file-chooser-button.c.orig 2011-02-02 23:55:21.857457045 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-02 23:55:30.422996901 +0100 -@@ -25,7 +25,7 @@ - #line 39 "src/mn-file-chooser-button.gob" - - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - - #line 32 "mn-file-chooser-button.c" ---- build/src/mn-message.c.orig 2011-02-02 23:55:41.160420099 +0100 -+++ build/src/mn-message.c 2011-02-02 23:55:47.755065850 +0100 -@@ -26,7 +26,7 @@ - - #include <errno.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include <libgnomevfs/gnome-vfs.h> - #include "mn-conf.h" - #include "mn-util.h" ---- build/src/mn-file-chooser-button.c.orig 2011-02-03 00:15:16.178407712 +0100 -+++ build/src/mn-file-chooser-button.c 2011-02-03 00:18:17.865681563 +0100 -@@ -463,6 +463,7 @@ - - GDK_THREADS_ENTER(); - -+#if 0 - if (results) - { - GnomeVFSGetFileInfoResult *result = results->data; -@@ -494,6 +495,7 @@ - } - } - } -+#endif - - selfp->async_handle = NULL; - g_object_unref(self); ---- build/src/mn-evolution-folder-tree-server.c.orig 2011-02-07 20:17:09.574274620 +0100 -+++ build/src/mn-evolution-folder-tree-server.c 2011-02-07 20:23:25.196053994 +0100 -@@ -25,6 +25,7 @@ - #line 24 "src/mn-evolution-folder-tree-server.gob" - - #include <dbus/dbus.h> -+#include <gtk/gtkx.h> - #include <libedataserver/eds-version.h> - #if !EDS_CHECK_VERSION(2,29,0) - #include <mail/mail-component.h> -@@ -71,7 +72,7 @@ - static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self); - #line 70 "mn-evolution-folder-tree-server.c" - #line 84 "src/mn-evolution-folder-tree-server.gob" --static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data); -+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data); - #line 73 "mn-evolution-folder-tree-server.c" - #line 104 "src/mn-evolution-folder-tree-server.gob" - static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data); -@@ -456,7 +457,7 @@ - selfp->tree = em_folder_tree_new_with_model(model); - #endif - -- selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id); -+ selfp->plug = gtk_plug_new((Window) selfp->id); - gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree); - gtk_widget_show_all(selfp->plug); - -@@ -490,7 +491,7 @@ - - #line 84 "src/mn-evolution-folder-tree-server.gob" - static void --mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data) -+mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data) - { - #line 482 "mn-evolution-folder-tree-server.c" - #define __GOB_FUNCTION__ "MN:Evolution:Folder:Tree:Server::plug_destroy_h" ---- src/eggtrayicon.h.orig 2011-02-07 20:25:26.352057350 +0100 -+++ src/eggtrayicon.h 2011-02-07 20:27:54.495032920 +0100 -@@ -23,10 +23,9 @@ - #ifndef __EGG_TRAY_ICON_H__ - #define __EGG_TRAY_ICON_H__ - --#include <gtk/gtkplug.h> --#ifdef GDK_WINDOWING_X11 -+#include <gtk/gtk.h> -+#include <gtk/gtkx.h> - #include <gdk/gdkx.h> --#endif - - G_BEGIN_DECLS - ---- build/src/mn-mail-icon.c.orig 2011-02-07 20:24:58.971663075 +0100 -+++ build/src/mn-mail-icon.c 2011-02-07 20:30:33.714401306 +0100 -@@ -833,11 +833,13 @@ - #line 239 "src/mn-mail-icon.gob" - - GtkWidget *widget = user_data; -+ GtkAllocation allocation; - -- gdk_window_get_origin(widget->window, x, y); -+ gdk_window_get_origin(gtk_widget_get_window(widget), x, y); -+ gtk_widget_get_allocation(widget, &allocation); - -- *x += widget->allocation.x; -- *y += widget->allocation.y; -+ *x += allocation.x; -+ *y += allocation.y; - - if (*y > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2) - { -@@ -847,7 +849,7 @@ - *y -= req.height; - } - else -- *y += widget->allocation.height; -+ *y += allocation.height; - - *push_in = TRUE; - }} ---- build/src/mn-mail-icon-widget.c.orig 2011-02-07 20:31:19.475816763 +0100 -+++ build/src/mn-mail-icon-widget.c 2011-02-07 21:53:48.858814715 +0100 -@@ -64,9 +64,13 @@ - #line 65 "mn-mail-icon-widget.c" - #line 110 "src/mn-mail-icon-widget.gob" - static void ___7_mn_mail_icon_widget_size_request (GtkWidget * widget, GtkRequisition * requisition); -+static void -+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width); -+static void -+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height); - #line 68 "mn-mail-icon-widget.c" - #line 132 "src/mn-mail-icon-widget.gob" --static gboolean ___8_mn_mail_icon_widget_expose_event (GtkWidget * widget, GdkEventExpose * event); -+static gboolean ___8_mn_mail_icon_widget_draw (GtkWidget * widget, cairo_t *cr); - #line 71 "mn-mail-icon-widget.c" - #line 244 "src/mn-mail-icon-widget.gob" - static GdkPixbuf * mn_mail_icon_widget_render_icon (MNMailIconWidget * self); -@@ -187,9 +191,10 @@ - parent_class = g_type_class_ref (GTK_TYPE_WIDGET); - - #line 110 "src/mn-mail-icon-widget.gob" -- gtk_widget_class->size_request = ___7_mn_mail_icon_widget_size_request; -+ gtk_widget_class->get_preferred_width = mn_mail_icon_widget_get_preferred_width; -+ gtk_widget_class->get_preferred_height = mn_mail_icon_widget_get_preferred_height; - #line 132 "src/mn-mail-icon-widget.gob" -- gtk_widget_class->expose_event = ___8_mn_mail_icon_widget_expose_event; -+ gtk_widget_class->draw = ___8_mn_mail_icon_widget_draw; - #line 194 "mn-mail-icon-widget.c" - g_object_class->dispose = ___dispose; - g_object_class->finalize = ___finalize; -@@ -234,7 +239,7 @@ - { - #line 93 "src/mn-mail-icon-widget.gob" - -- GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW); -+ gtk_widget_set_has_window(GTK_WIDGET(self), FALSE); - - gtk_widget_set_name(GTK_WIDGET(self), "mn-mail-icon"); - -@@ -457,9 +462,28 @@ - #undef __GOB_FUNCTION__ - #undef PARENT_HANDLER - -+static void -+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint *minimal_width, gint *natural_width) -+{ -+ GtkRequisition requisition; -+ -+ ___7_mn_mail_icon_widget_size_request (widget, &requisition); -+ *minimal_width = *natural_width = requisition.width; -+} -+ -+static void -+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height) -+{ -+ GtkRequisition requisition; -+ -+ ___7_mn_mail_icon_widget_size_request (widget, &requisition); -+ -+ *minimal_height = *natural_height = requisition.height; -+} -+ - #line 132 "src/mn-mail-icon-widget.gob" - static gboolean --___8_mn_mail_icon_widget_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event) -+___8_mn_mail_icon_widget_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr) - #line 464 "mn-mail-icon-widget.c" - #define PARENT_HANDLER(___widget,___event) \ - ((GTK_WIDGET_CLASS(parent_class)->expose_event)? \ -@@ -472,7 +496,7 @@ - - Self *self = SELF(widget); - -- if (! GTK_WIDGET_DRAWABLE(widget) || ! selfp->stock_id) -+ if (! gtk_widget_is_drawable(widget) || ! selfp->stock_id) - return FALSE; - - if (selfp->is_on) -@@ -480,23 +504,34 @@ - int x; - int y; - GdkRectangle image_area; -+ GtkAllocation allocation; -+ GtkRequisition requisition; - - /* note: widget->requisition is the pixbuf size, see size_request() */ - -- x = floor(widget->allocation.x + ((widget->allocation.width - widget->requisition.width) * ICON_XALIGN)); -- y = floor(widget->allocation.y + ((widget->allocation.height - widget->requisition.height) * ICON_YALIGN)); -+ gtk_widget_get_allocation(widget, &allocation); -+ gtk_widget_get_requisition(widget, &requisition); -+ -+ x = floor(allocation.x + ((allocation.width - requisition.width) * ICON_XALIGN)); -+ y = floor(allocation.y + ((allocation.height - requisition.height) * ICON_YALIGN)); - - image_area.x = x; - image_area.y = y; -- image_area.width = widget->requisition.width; -- image_area.height = widget->requisition.height; -+ image_area.width = requisition.width; -+ image_area.height = requisition.height; - -+#if 0 - if (gdk_rectangle_intersect(&event->area, &image_area, &image_area)) -+#endif - { - GdkPixbuf *pixbuf; - - pixbuf = self_render_icon(self); -+ gdk_cairo_set_source_pixbuf(cr, pixbuf, image_area.x, image_area.y); -+ cairo_move_to(cr, image_area.x - x, image_area.y - y); -+ cairo_paint(cr); - -+#if 0 - gdk_draw_pixbuf(widget->window, - NULL, - pixbuf, -@@ -509,6 +544,7 @@ - GDK_RGB_DITHER_NORMAL, - 0, - 0); -+#endif - - g_object_unref(pixbuf); - } -@@ -523,13 +559,16 @@ - int box_y; - int box_width; - int box_height; -+ GtkAllocation allocation; -+ -+ gtk_widget_get_allocation(widget, &allocation); - - if (! selfp->count_layout) - { - const char *size; - char *markup; - -- if (widget->allocation.height < 32) -+ if (allocation.height < 32) - size = "small"; - else - size = "medium"; -@@ -546,17 +585,16 @@ - box_width = count_rect.width + COUNT_BOX_XPAD * 2; - box_height = count_rect.height + COUNT_BOX_YPAD * 2; - -- box_x = widget->allocation.x + widget->allocation.width - box_width - COUNT_BOX_XMARGIN; -- box_y = widget->allocation.y + widget->allocation.height - box_height - COUNT_BOX_YMARGIN; -+ box_x = allocation.x + allocation.width - box_width - COUNT_BOX_XMARGIN; -+ box_y = allocation.y + allocation.height - box_height - COUNT_BOX_YMARGIN; - - count_x = box_x - count_rect.x + COUNT_BOX_XPAD; - count_y = box_y - count_rect.y + COUNT_BOX_YPAD; - -- gtk_paint_box(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_box(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - GTK_SHADOW_OUT, -- &event->area, - widget, - NULL, - box_x, -@@ -564,11 +602,10 @@ - box_width, - box_height); - -- gtk_paint_layout(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_layout(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - FALSE, -- &event->area, - widget, - NULL, - count_x, ---- build/src/mn-mailbox-properties-dialog.c.orig 2011-02-07 21:57:31.257251776 +0100 -+++ build/src/mn-mailbox-properties-dialog.c 2011-02-07 21:56:56.989854854 +0100 -@@ -456,7 +456,7 @@ - MNMailboxProperties *properties; - - mn_container_create_interface(GTK_CONTAINER(self), -- PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.glade", -+ PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.ui", - "notebook", - "mn_mailbox_properties_dialog_", - "notebook", &self->notebook, -@@ -1290,7 +1290,7 @@ - { - #line 686 "src/mn-mailbox-properties-dialog.gob" - -- if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget)) -+ if (gtk_widget_is_sensitive(gtk_window_get_default_widget(GTK_WINDOW(self)))) - gtk_window_activate_default(GTK_WINDOW(self)); - else - { -@@ -1313,9 +1313,9 @@ - if (elem->data == entry) - break; - -- if (GTK_WIDGET_MAPPED(elem->data) -- && GTK_WIDGET_VISIBLE(elem->data) -- && GTK_WIDGET_SENSITIVE(elem->data)) -+ if (gtk_widget_get_mapped(elem->data) -+ && gtk_widget_get_visible(elem->data) -+ && gtk_widget_get_sensitive(elem->data)) - next = elem->data; - } - while (! next); ---- build/src/mn-mailbox-view.c.orig 2011-02-07 22:18:49.962462920 +0100 -+++ build/src/mn-mailbox-view.c 2011-02-07 23:01:39.990363248 +0100 -@@ -412,23 +412,23 @@ - binding_set = gtk_binding_set_by_class(class); - - /* Delete removes a row */ -- gtk_binding_entry_add_signal(binding_set, GDK_Delete, 0, "activate-remove", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_KP_Delete, 0, "activate-remove", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, 0, "activate-remove", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Delete, 0, "activate-remove", 0); - - /* HIG 2.0 cut/copy/paste shortcuts */ -- gtk_binding_entry_add_signal(binding_set, GDK_x, GDK_CONTROL_MASK, "activate-cut", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_c, GDK_CONTROL_MASK, "activate-copy", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK, "activate-paste", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_x, GDK_CONTROL_MASK, "activate-cut", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_c, GDK_CONTROL_MASK, "activate-copy", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK, "activate-paste", 0); - - /* cut/copy/paste shortcuts taken from gtkentry.c */ -- gtk_binding_entry_add_signal(binding_set, GDK_Delete, GDK_SHIFT_MASK, "activate-cut", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_CONTROL_MASK, "activate-copy", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_SHIFT_MASK, "activate-paste", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, "activate-cut", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK, "activate-copy", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK, "activate-paste", 0); - - /* HIG 2.0 properties */ -- gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_MOD1_MASK, "activate-properties", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0); -- gtk_binding_entry_add_signal(binding_set, GDK_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_Return, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0); -+ gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0); - - #line 434 "mn-mailbox-view.c" - } -@@ -934,14 +934,13 @@ - #line 183 "src/mn-mailbox-view.gob" - - GtkSelectionData *data; -- - data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_MAILBOXES].atom); - if (data) - { - GSList *configurations; - GSList *l; - -- memcpy(&configurations, data->data, data->length); -+ memcpy(&configurations, gtk_selection_data_get_data(data), gtk_selection_data_get_length(data)); - - MN_LIST_FOREACH(l, configurations) - { -@@ -962,14 +961,14 @@ - data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_GNOME_COPIED_FILES].atom); - if (data) - { -- if (data->format == 8 && data->length > 0) -+ if (gtk_selection_data_get_format(data) == 8 && gtk_selection_data_get_length(data) > 0) - { - char *gnome_copied_files; - gboolean status; - MNGnomeCopiedFilesType type; - GSList *uri_list; - -- gnome_copied_files = g_strndup(data->data, data->length); -+ gnome_copied_files = g_strndup(gtk_selection_data_get_data(data), gtk_selection_data_get_length(data)); - status = mn_parse_gnome_copied_files(gnome_copied_files, &type, &uri_list); - g_free(gnome_copied_files); - ---- build/src/mn-shell.c.orig 2011-02-07 23:02:17.852293679 +0100 -+++ build/src/mn-shell.c 2011-02-07 23:04:39.223548403 +0100 -@@ -158,7 +158,7 @@ - static void mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data); - #line 160 "mn-shell.c" - #line 499 "src/mn-shell.gob" --static void mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data); -+static void mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data); - #line 163 "mn-shell.c" - #line 508 "src/mn-shell.gob" - static void mn_shell_update_sensitivity (MNShell * self); -@@ -1006,7 +1006,7 @@ - - #line 499 "src/mn-shell.gob" - static void --mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data) -+mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data) - { - #line 1004 "mn-shell.c" - #define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h" ---- build/src/mn-text-table.c.orig 2011-02-07 23:05:08.799927792 +0100 -+++ build/src/mn-text-table.c 2011-02-07 23:18:06.480056895 +0100 -@@ -69,9 +69,11 @@ - #line 70 "mn-text-table.c" - #line 104 "src/mn-text-table.gob" - static void ___4_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition); -+static void mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width); -+static void mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height); - #line 73 "mn-text-table.c" - #line 115 "src/mn-text-table.gob" --static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event); -+static gboolean ___5_mn_text_table_draw (GtkWidget * widget, cairo_t *cr); - #line 76 "mn-text-table.c" - #line 165 "src/mn-text-table.gob" - static void mn_text_table_set_dirty (MNTextTable * self); -@@ -188,9 +190,10 @@ - parent_class = g_type_class_ref (GTK_TYPE_WIDGET); - - #line 104 "src/mn-text-table.gob" -- gtk_widget_class->size_request = ___4_mn_text_table_size_request; -+ gtk_widget_class->get_preferred_width = mn_text_table_get_preferred_width; -+ gtk_widget_class->get_preferred_height = mn_text_table_get_preferred_height; - #line 115 "src/mn-text-table.gob" -- gtk_widget_class->expose_event = ___5_mn_text_table_expose_event; -+ gtk_widget_class->draw = ___5_mn_text_table_draw; - #line 257 "src/mn-text-table.gob" - c->clear = ___real_mn_text_table_clear; - #line 197 "mn-text-table.c" -@@ -216,7 +219,7 @@ - { - #line 80 "src/mn-text-table.gob" - -- GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW); -+ gtk_widget_set_has_window(GTK_WIDGET(self), FALSE); - - g_object_connect(self, - "swapped-signal::style-set", self_context_changed, self, -@@ -290,9 +293,29 @@ - #undef __GOB_FUNCTION__ - #undef PARENT_HANDLER - -+static void -+mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width) -+{ -+ GtkRequisition requisition; -+ -+ ___4_mn_text_table_size_request (widget, &requisition); -+ -+ *minimal_width = *natural_width = requisition.width; -+} -+ -+static void -+mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height) -+{ -+ GtkRequisition requisition; -+ -+ ___4_mn_text_table_size_request (widget, &requisition); -+ -+ *minimal_height = *natural_height = requisition.height; -+} -+ - #line 115 "src/mn-text-table.gob" - static gboolean --___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event) -+___5_mn_text_table_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr) - #line 297 "mn-text-table.c" - #define PARENT_HANDLER(___widget,___event) \ - ((GTK_WIDGET_CLASS(parent_class)->expose_event)? \ -@@ -304,10 +327,14 @@ - #line 117 "src/mn-text-table.gob" - - Self *self = SELF(widget); -+ GtkAllocation allocation; - int i; -- int y = widget->allocation.y; -+ int y; -+ -+ gtk_widget_get_allocation(widget, &allocation); -+ y = 0; - -- if (! GTK_WIDGET_DRAWABLE(widget)) -+ if (! gtk_widget_is_drawable(widget)) - return FALSE; - - self_relayout(self); -@@ -316,7 +343,7 @@ - { - Row *row = g_ptr_array_index(selfp->rows, i); - int j; -- int x = widget->allocation.x; -+ int x = 0; - int column = 0; - - MN_ARRAY_FOREACH(j, row->cells) -@@ -324,11 +351,10 @@ - MNTextTableCell *cell = g_ptr_array_index(row->cells, j); - - if (cell->layout) -- gtk_paint_layout(widget->style, -- widget->window, -- GTK_WIDGET_STATE(widget), -+ gtk_paint_layout(gtk_widget_get_style(widget), -+ cr, -+ gtk_widget_get_state_flags(widget), - FALSE, -- &event->area, - widget, - NULL, - x, ---- build/src/mn-tooltips.c.orig 2011-02-07 23:19:05.903761972 +0100 -+++ build/src/mn-tooltips.c 2011-02-07 23:41:19.368621912 +0100 -@@ -104,7 +104,7 @@ - static void mn_tooltips_set_tip_widget_real (MNTooltips * self, GtkWidget * widget, GtkWidget * tip_widget, int border_width); - #line 106 "mn-tooltips.c" - #line 287 "src/mn-tooltips.gob" --static gboolean mn_tooltips_paint_window (MNTooltips * self); -+static gboolean mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr); - #line 109 "mn-tooltips.c" - #line 308 "src/mn-tooltips.gob" - static void mn_tooltips_draw_tips (MNTooltips * self); -@@ -422,7 +422,13 @@ - - if (! selfp->window) - { -+ GtkStyleContext *ctx; -+ - selfp->window = gtk_window_new(GTK_WINDOW_POPUP); -+ -+ ctx = gtk_widget_get_style_context(GTK_WIDGET(selfp->window)); -+ gtk_style_context_add_class(ctx, "tooltip"); -+ - self_update_screen(self, TRUE); - gtk_widget_set_app_paintable(selfp->window, TRUE); - gtk_window_set_resizable(GTK_WINDOW(selfp->window), FALSE); -@@ -430,7 +430,7 @@ - gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width); - - g_signal_connect_swapped(selfp->window, -- "expose-event", -+ "draw", - G_CALLBACK(self_paint_window), - self); - -@@ -490,7 +490,7 @@ - - if (selfp->active_data - && selfp->active_data->widget == widget -- && GTK_WIDGET_DRAWABLE(selfp->active_data->widget)) -+ && gtk_widget_is_drawable(selfp->active_data->widget)) - { - if (data->tip_widget) - g_object_unref(data->tip_widget); -@@ -594,7 +594,7 @@ - - #line 287 "src/mn-tooltips.gob" - static gboolean --mn_tooltips_paint_window (MNTooltips * self) -+mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr) - { - #line 600 "mn-tooltips.c" - #define __GOB_FUNCTION__ "MN:Tooltips::paint_window" -@@ -608,18 +608,13 @@ - - GtkRequisition req; - -- gtk_widget_size_request(selfp->window, &req); -- gtk_paint_flat_box(selfp->window->style, -- selfp->window->window, -- GTK_STATE_NORMAL, -- GTK_SHADOW_OUT, -- NULL, -- selfp->window, -- "tooltip", -- 0, -- 0, -- req.width, -- req.height); -+ gtk_widget_size_request(GTK_WIDGET(selfp->window), &req); -+ gtk_render_background(gtk_widget_get_style_context(GTK_WIDGET(selfp->window)), -+ cr, -+ 0, -+ 0, -+ req.width, -+ req.height); - - return FALSE; - }} -@@ -651,10 +650,11 @@ - gint monitor_num, px, py; - GdkRectangle monitor; - int screen_width; -+ GtkAllocation allocation; - - if (! selfp->window) - self_force_window(self); -- else if (GTK_WIDGET_VISIBLE(selfp->window)) -+ else if (gtk_widget_get_visible(selfp->window)) - g_get_current_time(&selfp->last_popdown); - - gtk_widget_ensure_style(selfp->window); -@@ -670,7 +670,7 @@ - - data = selfp->active_data; - -- child = GTK_BIN(selfp->window)->child; -+ child = gtk_bin_get_child(GTK_BIN(selfp->window)); - if (child) - gtk_container_remove(GTK_CONTAINER(selfp->window), child); - -@@ -684,14 +684,16 @@ - w = requisition.width; - h = requisition.height; - -- gdk_window_get_origin(widget->window, &x, &y); -- if (GTK_WIDGET_NO_WINDOW(widget)) -+ gtk_widget_get_allocation(selfp->window, &allocation); -+ -+ gdk_window_get_origin(gtk_widget_get_window(widget), &x, &y); -+ if (! gtk_widget_get_has_window(widget)) - { -- x += widget->allocation.x; -- y += widget->allocation.y; -+ x += allocation.x; -+ y += allocation.y; - } - -- x += widget->allocation.width / 2; -+ x += allocation.width / 2; - - if (! keyboard_mode) - gdk_window_get_pointer(gdk_screen_get_root_window(screen), &x, NULL, NULL); -@@ -712,11 +714,11 @@ - else if (x < monitor.x) - x = monitor.x; - -- if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height -+ if ((y + h + allocation.height + 4) > monitor.y + monitor.height - && (y - 4) > monitor.y) - y = y - h - 4; - else -- y = y + widget->allocation.height + 4; -+ y = y + allocation.height + 4; - - /* - * The following block is not part of GTK+ and has been added to -@@ -760,7 +762,7 @@ - - Self *self = SELF(data); - -- if (selfp->active_data && GTK_WIDGET_DRAWABLE(selfp->active_data->widget)) -+ if (selfp->active_data && gtk_widget_is_drawable(selfp->active_data->widget)) - self_draw_tips(self); - - selfp->timeout_id = 0; -@@ -785,7 +787,7 @@ - - if (selfp->window) - { -- if (GTK_WIDGET_VISIBLE(selfp->window)) -+ if (gtk_widget_get_visible(selfp->window)) - g_get_current_time(&selfp->last_popdown); - gtk_widget_hide(selfp->window); - } -@@ -802,7 +804,7 @@ - { - TooltipsData *data = l->data; - -- if (data->widget == widget && GTK_WIDGET_DRAWABLE(widget)) -+ if (data->widget == widget && gtk_widget_is_drawable(widget)) - { - selfp->active_data = data; - break; -@@ -937,7 +939,7 @@ - - if (GTK_IS_WINDOW(toplevel)) - { -- GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget; -+ GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel)); - - g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(TRUE)); - -@@ -966,7 +968,7 @@ - - if (GTK_IS_WINDOW(toplevel)) - { -- GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget; -+ GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel)); - - if (focus) - self_hide_tip(focus); -@@ -1057,24 +1059,24 @@ - break; - - case GDK_ENTER_NOTIFY: -- if (! (GTK_IS_MENU_ITEM(widget) && GTK_MENU_ITEM(widget)->submenu)) -+ if (! (GTK_IS_MENU_ITEM(widget) && gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))) - self_start_delay(self, widget); - break; - - case GDK_LEAVE_NOTIFY: - self_set_active_widget(self, NULL); -- selfp->use_sticky_delay = selfp->window && GTK_WIDGET_VISIBLE(selfp->window); -+ selfp->use_sticky_delay = selfp->window && gtk_widget_get_visible(selfp->window); - break; - - case GDK_MOTION_NOTIFY: - /* Handle menu items specially ... pend popup for each motion - * on other widgets, we ignore motion. - */ -- if (GTK_IS_MENU_ITEM(widget) && ! GTK_MENU_ITEM(widget)->submenu) -+ if (GTK_IS_MENU_ITEM(widget) && ! gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget))) - { - /* Completely evil hack to make sure we get the LEAVE_NOTIFY - */ -- GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING); -+ //GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING); - self_set_active_widget(self, NULL); - self_start_delay(self, widget); - break; ---- src/nautilus-cell-renderer-pixbuf-emblem.c.orig 2011-02-08 00:16:43.847831409 +0100 -+++ src/nautilus-cell-renderer-pixbuf-emblem.c 2011-02-08 00:32:59.128682767 +0100 -@@ -39,17 +39,16 @@ - GtkWidget *widget); - static void nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell, - GtkWidget *widget, -- GdkRectangle *rectangle, -+ const GdkRectangle *rectangle, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height); - static void nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer *cell, -- GdkWindow *window, -+ cairo_t *cr, - GtkWidget *widget, -- GdkRectangle *background_area, -- GdkRectangle *cell_area, -- GdkRectangle *expose_area, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, - GtkCellRendererState flags); - - enum { -@@ -356,7 +355,7 @@ - static void - nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell, - GtkWidget *widget, -- GdkRectangle *cell_area, -+ const GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, -@@ -368,6 +367,10 @@ - gint pixbuf_height = 0; - gint calc_width; - gint calc_height; -+ int xpad; -+ int ypad; -+ gfloat xalign; -+ gfloat yalign; - - if (!cellpixbuf->pixbuf && cellinfo->stock_id) - nautilus_cell_renderer_pixbuf_emblem_create_stock_pixbuf (cellpixbuf, widget); -@@ -385,8 +388,11 @@ - pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed)); - } - -- calc_width = (gint) cell->xpad * 2 + pixbuf_width; -- calc_height = (gint) cell->ypad * 2 + pixbuf_height; -+ gtk_cell_renderer_get_padding(cell, &xpad, &ypad); -+ gtk_cell_renderer_get_alignment(cell, &xalign, &yalign); -+ -+ calc_width = (gint) xpad * 2 + pixbuf_width; -+ calc_height = (gint) ypad * 2 + pixbuf_height; - - if (x_offset) *x_offset = 0; - if (y_offset) *y_offset = 0; -@@ -394,14 +400,14 @@ - if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) { - if (x_offset) { - *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? -- 1.0 - cell->xalign : cell->xalign) * -- (cell_area->width - calc_width - 2 * cell->xpad)); -- *x_offset = MAX (*x_offset, 0) + cell->xpad; -+ 1.0 - xalign : xalign) * -+ (cell_area->width - calc_width - 2 * xpad)); -+ *x_offset = MAX (*x_offset, 0) + xpad; - } - if (y_offset) { -- *y_offset = (cell->yalign * -- (cell_area->height - calc_height - 2 * cell->ypad)); -- *y_offset = MAX (*y_offset, 0) + cell->ypad; -+ *y_offset = (yalign * -+ (cell_area->height - calc_height - 2 * ypad)); -+ *y_offset = MAX (*y_offset, 0) + ypad; - } - } - -@@ -414,11 +420,10 @@ - - static void - nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer *cell, -- GdkWindow *window, -+ cairo_t *cr, - GtkWidget *widget, -- GdkRectangle *background_area, -- GdkRectangle *cell_area, -- GdkRectangle *expose_area, -+ const GdkRectangle *background_area, -+ const GdkRectangle *cell_area, - GtkCellRendererState flags) - - { -@@ -429,13 +434,19 @@ - GdkRectangle pix_emblem_rect; - GdkRectangle draw_rect; - gboolean stock_pixbuf = FALSE; -+ gboolean is_expander = FALSE; -+ gboolean is_expanded = FALSE; -+ int xpad; -+ int ypad; -+ -+ g_object_get(cell, "is-expander", &is_expander, "is-expanded", &is_expanded, NULL); - - pixbuf = cellpixbuf->pixbuf; -- if (cell->is_expander) { -- if (cell->is_expanded && -+ if (is_expander) { -+ if (is_expanded && - cellpixbuf->pixbuf_expander_open != NULL) { - pixbuf = cellpixbuf->pixbuf_expander_open; -- } else if (!cell->is_expanded && -+ } else if (!is_expanded && - cellpixbuf->pixbuf_expander_closed != NULL) { - pixbuf = cellpixbuf->pixbuf_expander_closed; - } -@@ -456,15 +467,20 @@ - if (stock_pixbuf) - pixbuf = cellpixbuf->pixbuf; - -+ gtk_cell_renderer_get_padding(cell, &xpad, &ypad); -+ - pix_rect.x += cell_area->x; - pix_rect.y += cell_area->y; -- pix_rect.width -= cell->xpad * 2; -- pix_rect.height -= cell->ypad * 2; -+ pix_rect.width -= xpad * 2; -+ pix_rect.height -= ypad * 2; - -+ if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) { -+#if 0 - if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) && - gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) { -+ - gdk_draw_pixbuf (window, -- widget->style->black_gc, -+ gtk_widget_get_style(widget)->black_gc, - pixbuf, - /* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */ - draw_rect.x - pix_rect.x, -@@ -475,6 +491,11 @@ - draw_rect.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); -+#endif -+ -+ cairo_move_to (cr, draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y); -+ gdk_cairo_set_source_pixbuf (cr, pixbuf, draw_rect.x, draw_rect.y); -+ cairo_paint (cr); - } - - if (cellpixbuf->pixbuf_emblem) { -@@ -482,8 +503,11 @@ - pix_emblem_rect.height = gdk_pixbuf_get_height (cellpixbuf->pixbuf_emblem); - pix_emblem_rect.x = pix_rect.x; - pix_emblem_rect.y = pix_rect.y + pix_rect.height - pix_emblem_rect.height; -+ if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect)) { -+#if 0 - if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect) && - gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) { -+ - gdk_draw_pixbuf (window, - widget->style->black_gc, - cellpixbuf->pixbuf_emblem, -@@ -496,6 +520,11 @@ - draw_rect.height, - GDK_RGB_DITHER_NORMAL, - 0, 0); -+#endif -+ -+ cairo_move_to (cr, draw_rect.x - pix_emblem_rect.x, draw_rect.y - pix_emblem_rect.y); -+ gdk_cairo_set_source_pixbuf (cr, cellpixbuf->pixbuf_emblem, draw_rect.x, draw_rect.y); -+ cairo_paint (cr); - } - } - } ---- src/nautilus-cell-renderer-pixbuf-emblem.h.orig 2011-02-07 22:18:12.336471764 +0100 -+++ src/nautilus-cell-renderer-pixbuf-emblem.h 2011-02-08 00:20:30.461758697 +0100 -@@ -25,18 +25,18 @@ - #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H - --#include <gtk/gtkcellrenderer.h> -+#include <gtk/gtk.h> - - #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \ - (nautilus_cell_renderer_pixbuf_emblem_get_type ()) - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \ -- (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem)) -+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem)) - #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \ -- (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass)) -+ (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass)) - #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \ -- (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) -+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) - #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \ -- (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) -+ (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM)) - - typedef struct _NautilusCellRendererPixbufEmblem NautilusCellRendererPixbufEmblem; - typedef struct _NautilusCellRendererPixbufEmblemClass NautilusCellRendererPixbufEmblemClass; ---- build/src/mn-authenticated-mailbox.c.orig 2011-02-08 00:34:16.332610802 +0100 -+++ build/src/mn-authenticated-mailbox.c 2011-02-08 00:36:23.706936717 +0100 -@@ -25,7 +25,7 @@ - #line 29 "src/mn-authenticated-mailbox.gob" - - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-mailbox-private.h" - #include "mn-shell.h" - #include "mn-util.h" -@@ -859,6 +859,7 @@ - - /* keep the title in sync with gnome-authentication-manager */ - -+#if 0 - /* translators: header capitalization */ - selfp->auth_dialog = gnome_password_dialog_new(_("Authentication Required"), - message, -@@ -891,6 +892,9 @@ - gtk_widget_destroy(selfp->auth_dialog); - - return ok; -+#else -+ return FALSE; -+#endif - }} - #line 896 "mn-authenticated-mailbox.c" - #undef __GOB_FUNCTION__ ---- build/src/mn-about-dialog.c.orig 2011-02-08 22:20:54.469841262 +0100 -+++ build/src/mn-about-dialog.c 2011-02-08 22:21:13.309839037 +0100 -@@ -111,9 +111,11 @@ - { - #line 32 "src/mn-about-dialog.gob" - -+#if 0 - gtk_about_dialog_set_email_hook(self_activate_link_cb, "mailto:", NULL); - gtk_about_dialog_set_url_hook(self_activate_link_cb, NULL, NULL); -- -+#endif -+ - #line 118 "mn-about-dialog.c" - } - } ---- build/src/mn-autodetect-mailbox-properties.c.orig 2011-02-08 22:21:58.639427345 +0100 -+++ build/src/mn-autodetect-mailbox-properties.c 2011-02-08 22:22:43.564035901 +0100 -@@ -355,10 +355,9 @@ - - toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button)); - /* translators: header capitalization */ -- selfp->chooser = gtk_file_chooser_dialog_new_with_backend(_("Select a File or Folder"), -+ selfp->chooser = gtk_file_chooser_dialog_new(_("Select a File or Folder"), - GTK_WINDOW(toplevel), - GTK_FILE_CHOOSER_ACTION_OPEN, -- "gnome-vfs", - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, 1, - NULL); ---- build/src/mn-pi-mailbox-properties.c.orig 2011-02-08 22:30:08.051375715 +0100 -+++ build/src/mn-pi-mailbox-properties.c 2011-02-08 22:30:21.398665261 +0100 -@@ -415,7 +415,7 @@ - int i; - - for (i = 0; i < MN_PI_MAILBOX_N_CONNECTION_TYPES; i++) -- gtk_widget_set_sensitive(self->port_spin[i], GTK_WIDGET_SENSITIVE(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i]))); -+ gtk_widget_set_sensitive(self->port_spin[i], gtk_widget_get_sensitive(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i]))); - - g_object_notify(G_OBJECT(self), "complete"); - }} ---- src/eggtrayicon.c.orig 2011-02-07 23:42:30.405791829 +0100 -+++ src/eggtrayicon.c 2011-02-08 23:06:16.092968325 +0100 -@@ -25,7 +25,7 @@ - - #include "eggtrayicon.h" - --#include <gdkconfig.h> -+#include <gdk/gdk.h> - #if defined (GDK_WINDOWING_X11) - #include <gdk/gdkx.h> - #include <X11/Xatom.h> -@@ -258,7 +258,7 @@ - { - GdkWindow *gdkwin; - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (widget), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); -@@ -290,7 +290,7 @@ - ev.window = window; - ev.message_type = icon->system_tray_opcode_atom; - ev.format = 32; -- ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window); -+ ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon))); - ev.data.l[1] = message; - ev.data.l[2] = data1; - ev.data.l[3] = data2; -@@ -342,12 +342,12 @@ - { - GdkWindow *gdkwin; - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon); - -- if (dock_if_realized && GTK_WIDGET_REALIZED (icon)) -+ if (dock_if_realized && gtk_widget_get_realized (GTK_WIDGET(icon))) - egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); -@@ -355,10 +355,16 @@ - } - - static gboolean --transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) -+transparent_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data) - { -- gdk_window_clear_area (widget->window, event->area.x, event->area.y, -+#if 0 -+ gdk_window_clear_area (gtk_widget_get_window(widget), event->area.x, event->area.y, - event->area.width, event->area.height); -+#endif -+ cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); -+ //gdk_cairo_region (cr, event->region); -+ cairo_fill (cr); -+ - return FALSE; - } - -@@ -366,20 +372,20 @@ - make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, - gpointer user_data) - { -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -+ //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE); - } - - static void - make_transparent (GtkWidget *widget, gpointer user_data) - { -- if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) -+ if (! gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget)) - return; - - gtk_widget_set_app_paintable (widget, TRUE); - gtk_widget_set_double_buffered (widget, FALSE); -- gdk_window_set_back_pixmap (widget->window, NULL, TRUE); -- g_signal_connect (widget, "expose_event", -- G_CALLBACK (transparent_expose_event), NULL); -+ //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE); -+ g_signal_connect (widget, "draw", -+ G_CALLBACK (transparent_draw), NULL); - g_signal_connect_after (widget, "style_set", - G_CALLBACK (make_transparent_again), NULL); - } -@@ -391,7 +397,7 @@ - - g_return_if_fail (icon->manager_window != None); - -- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), -+ gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)), - icon->manager_window); - - gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon); ---- build/src/mn-properties-dialog.c.orig 2011-02-08 23:37:12.605200174 +0100 -+++ build/src/mn-properties-dialog.c 2011-02-08 23:37:18.601881191 +0100 -@@ -183,7 +183,7 @@ - GtkTreeSelection *selection; - - mn_container_create_interface(GTK_CONTAINER(self), -- PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.glade", -+ PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.ui", - "main_vbox", - "mn_properties_dialog_", - "notebook", &selfp->notebook, ---- src/mn-util.c.orig 2011-02-08 00:01:25.167207512 +0100 -+++ src/mn-util.c 2011-02-09 00:01:35.718285446 +0100 -@@ -26,8 +26,7 @@ - #include <gmodule.h> - #include <glib/gi18n.h> - #include <gobject/gvaluecollector.h> --#include <gnome.h> --#include <glade/glade.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - #include "mn-mailboxes.h" - #include "mn-shell.h" -@@ -303,49 +302,55 @@ - return pixbuf; - } - --static GladeXML * -+static GtkBuilder * - mn_glade_xml_new (const char *filename, const char *root, const char *domain) - { -- GladeXML *xml; -+ GtkBuilder *builder; -+ GError *err = NULL; - - g_return_val_if_fail(filename != NULL, NULL); - -- xml = glade_xml_new(filename, root, domain); -- if (! xml) -- mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\".", filename); -+ builder = gtk_builder_new(); -+ gtk_builder_set_translation_domain(builder, domain); -+ if (! gtk_builder_add_from_file(builder, filename, &err)) { -+ mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\": %s.", filename, err->message); -+ g_error_free(err); -+ g_object_unref(builder); -+ return NULL; -+ } - -- return xml; -+ return builder; - } - - static GtkWidget * --mn_glade_xml_get_widget (GladeXML *xml, const char *widget_name) -+mn_glade_xml_get_widget (GtkBuilder *builder, const char *widget_name) - { - GtkWidget *widget; - -- g_return_val_if_fail(GLADE_IS_XML(xml), NULL); -+ g_return_val_if_fail(GTK_IS_BUILDER(builder), NULL); - g_return_val_if_fail(widget_name != NULL, NULL); - -- widget = glade_xml_get_widget(xml, widget_name); -+ widget = GTK_WIDGET(gtk_builder_get_object(builder, widget_name)); - if (! widget) -- mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface \"%s\".", widget_name, xml->filename); -+ mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface.", widget_name); - - return widget; - } - - static void --create_interface_connect_cb (const char *handler_name, -+create_interface_connect_cb (GtkBuilder *builder, - GObject *object, - const char *signal_name, -- const char *signal_data, -+ const char *handler_name, - GObject *connect_object, -- gboolean after, -+ GConnectFlags flags, - gpointer user_data) - { - static GModule *module = NULL; - ContainerCreateInterfaceConnectInfo *info = user_data; - char *cb_name; - GCallback cb; -- GConnectFlags flags; -+ GConnectFlags cflags; - - if (! module) - { -@@ -359,11 +364,9 @@ - mn_show_fatal_error_dialog(NULL, "Signal handler \"%s\" not found.", cb_name); - g_free(cb_name); - -- flags = G_CONNECT_SWAPPED; -- if (after) -- flags |= G_CONNECT_AFTER; -+ cflags = G_CONNECT_SWAPPED; - -- g_signal_connect_data(object, signal_name, cb, info->container, NULL, flags); -+ g_signal_connect_data(object, signal_name, cb, info->container, NULL, cflags); - } - - void -@@ -373,7 +376,7 @@ - const char *callback_prefix, - ...) - { -- GladeXML *xml; -+ GtkBuilder *xml; - GtkWidget *child; - ContainerCreateInterfaceConnectInfo info; - va_list args; -@@ -387,14 +390,16 @@ - xml = mn_glade_xml_new(filename, child_name, NULL); - child = mn_glade_xml_get_widget(xml, child_name); - -- if (GTK_IS_DIALOG(container)) -- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(container)->vbox), child, TRUE, TRUE, 0); -- else -+ if (GTK_IS_DIALOG(container)) { -+ gtk_widget_unparent(child); -+ gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(container))), child, TRUE, TRUE, 0); -+ } else { - gtk_container_add(container, child); -+ } - - info.container = container; - info.callback_prefix = callback_prefix; -- glade_xml_signal_autoconnect_full(xml, create_interface_connect_cb, &info); -+ gtk_builder_connect_signals_full(xml, create_interface_connect_cb, &info); - - va_start(args, callback_prefix); - -@@ -422,7 +427,7 @@ - - toplevel = gtk_widget_get_toplevel(widget); - -- return GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL; -+ return gtk_widget_get_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL; - } - - static void -@@ -493,9 +498,11 @@ - gpointer user_data) - { - GtkAdjustment *adjustment; -+ GtkAllocation allocation; - -+ gtk_widget_get_allocation(widget, &allocation); - adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(widget)); -- gtk_adjustment_set_value(adjustment, (double) y / (widget->allocation.height - 2) * (adjustment->upper - adjustment->page_size)); -+ gtk_adjustment_set_value(adjustment, (double) y / (allocation.height - 2) * (gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment))); - - return TRUE; /* we're forcibly in a drop zone */ - } -@@ -562,7 +569,7 @@ - MNMailbox *mailbox; - - /* text/x-moz-url is encoded in UCS-2 but in format 8: broken */ -- if (selection_data->format != 8 || selection_data->length <= 0 || (selection_data->length % 2) != 0) -+ if (gtk_selection_data_get_format(selection_data) != 8 || gtk_selection_data_get_length(selection_data) <= 0 || (gtk_selection_data_get_length(selection_data) % 2) != 0) - { - mn_show_error_dialog(mn_widget_get_parent_window(widget), - _("A drag and drop error has occurred"), -@@ -570,8 +577,8 @@ - return; - } - -- char_data = (const guint16 *) selection_data->data; -- char_len = selection_data->length / 2; -+ char_data = (const guint16 *) gtk_selection_data_get_data(selection_data); -+ char_len = gtk_selection_data_get_length(selection_data) / 2; - - url = g_string_new(NULL); - for (i = 0; i < char_len && char_data[i] != '\n'; i++) -@@ -1322,7 +1329,7 @@ - } - - static void --dialog_run_nonmodal_destroy_h (GtkObject *object, gpointer user_data) -+dialog_run_nonmodal_destroy_h (GtkWidget *object, gpointer user_data) - { - RunNonmodalInfo *info = user_data; - -@@ -1375,7 +1382,7 @@ - - g_object_ref(dialog); - -- if (! GTK_WIDGET_VISIBLE(dialog)) -+ if (! gtk_widget_get_visible(dialog)) - gtk_widget_show(GTK_WIDGET(dialog)); - - g_object_connect(dialog, ---- src/mn-main.c.gtk3 2008-05-22 17:45:35.000000000 +0200 -+++ src/mn-main.c 2011-02-08 23:32:33.800030659 +0100 -@@ -21,7 +21,7 @@ - #include <stdlib.h> - #include <signal.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include <libgnomevfs/gnome-vfs.h> - #include <libnotify/notify.h> - #include <dbus/dbus-glib-lowlevel.h> -@@ -452,7 +452,7 @@ - - gnome_program_init(PACKAGE, - VERSION, -- LIBGNOMEUI_MODULE, -+ LIBGNOME_MODULE, - argc, - argv, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"), -@@ -460,6 +460,8 @@ - GNOME_PARAM_GOPTION_CONTEXT, option_context, - NULL); - -+ gtk_init(&argc, &argv); -+ - if (arg_version) - { - print_version(); -@@ -497,7 +499,9 @@ - if (! gnome_vfs_init()) - mn_show_fatal_error_dialog(NULL, _("Unable to initialize the GnomeVFS library.")); - -+#if 0 - gnome_authentication_manager_init(); -+#endif - - /* must be called before init_gmime() */ - mn_conf_init(); ---- src/mn-conf.c.gtk3 2008-05-22 17:45:35.000000000 +0200 -+++ src/mn-conf.c 2011-02-07 20:07:01.630580132 +0100 -@@ -23,7 +23,7 @@ - #include <errno.h> - #include <stdarg.h> - #include <glib/gi18n.h> --#include <gnome.h> -+#include <libgnome/libgnome.h> - #include "mn-util.h" - #include "mn-conf.h" - #include "mn-shell.h" ---- data/mail-notification.desktop.in.orig 2011-07-08 13:46:52.327548264 +0200 -+++ data/mail-notification.desktop.in 2011-07-08 13:47:00.732704467 +0200 -@@ -5,7 +5,7 @@ - _Comment=Get notified when new mail arrives - Type=Application - Categories=GNOME;GTK;Network;Email; --Exec=mail-notification --sm-disable -+Exec=mail-notification - Terminal=false - StartupNotify=true - X-GNOME-DocPath=mail-notification/mail-notification.xml diff --git a/extra/mail-notification/mail-notification-5.4-icons.patch b/extra/mail-notification/mail-notification-5.4-icons.patch deleted file mode 100644 index 48d54742a..000000000 --- a/extra/mail-notification/mail-notification-5.4-icons.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c ---- mail-notification-5.4/src/mn-stock.c 2008-05-22 19:45:35.000000000 +0400 -+++ mail-notification-5.4-OK/src/mn-stock.c 2010-05-24 19:36:03.000000000 +0400 -@@ -32,11 +32,11 @@ - const char *icon_name; - const char *source_stock_id; - } icons[] = { -- { MN_STOCK_MAIL, NULL, "stock_mail" }, -- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" }, -- { MN_STOCK_LOCAL, NULL, "stock_folder" }, -- { MN_STOCK_REMOTE, NULL, "stock_internet" }, -- { MN_STOCK_UNKNOWN, NULL, "stock_unknown" }, -+ { MN_STOCK_MAIL, NULL, "mail-message-new" }, -+ { MN_STOCK_NO_MAIL, NULL, "mail-notification" }, -+ { MN_STOCK_LOCAL, NULL, "folder" }, -+ { MN_STOCK_REMOTE, NULL, "applications-internet" }, -+ { MN_STOCK_UNKNOWN, NULL, "dialog-question" }, - { MN_STOCK_ERROR, NULL, NULL, GTK_STOCK_DIALOG_ERROR }, - #if WITH_GMAIL - { MN_STOCK_GMAIL, PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" }, -@@ -48,14 +48,14 @@ - { MN_STOCK_HOTMAIL, PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" }, - #endif - #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED -- { MN_STOCK_SYSTEM_MAILBOX, NULL, "system" }, -+ { MN_STOCK_SYSTEM_MAILBOX, NULL, "applications-system" }, - #endif - #if WITH_EVOLUTION - { MN_STOCK_EVOLUTION_MAILBOX, NULL, "evolution" }, - #endif -- { MN_STOCK_MAIL_READER, NULL, "stock_mail-handling" }, -- { MN_STOCK_OPEN_MESSAGE, NULL, "stock_mail-open" }, -- { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" } -+ { MN_STOCK_MAIL_READER, NULL, "mail-unread" }, -+ { MN_STOCK_OPEN_MESSAGE, NULL, "mail-read" }, -+ { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" } - }; - GtkIconFactory *factory; - GtkIconTheme *icon_theme; diff --git a/extra/mail-notification/mail-notification-5.4-kde-trayicon.patch b/extra/mail-notification/mail-notification-5.4-kde-trayicon.patch deleted file mode 100644 index a3bdc8372..000000000 --- a/extra/mail-notification/mail-notification-5.4-kde-trayicon.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c ---- mail-notification-5.4/build/src/mn-shell.c 2010-10-11 17:45:23.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-shell.c 2010-10-11 17:45:48.000000000 +0400 -@@ -313,6 +313,29 @@ - #undef __GOB_FUNCTION__ - - static void -+mn_shell_init_icon_base (MNShell * self) -+{ -+ g_return_if_fail (self != NULL); -+ g_return_if_fail (MN_IS_SHELL (self)); -+ -+ self->icon = MN_MAIL_ICON(mn_mail_icon_new()); -+ mn_add_weak_pointer(&self->icon); -+ -+ g_object_connect(self->icon, -+ "signal::activate", self_icon_activate_h, self, -+ "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self, -+ "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self, -+ "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self, -+ "swapped-signal::activate-update", self_update, self, -+ "signal::activate-properties", self_icon_activate_properties_h, self, -+ "signal::activate-help", self_icon_activate_help_h, self, -+ "signal::activate-about", self_icon_activate_about_h, self, -+ "swapped-signal::activate-remove", self_quit, self, -+ "signal::destroy", self_icon_destroy_h, self, -+ NULL); -+} -+ -+static void - mn_shell_init (MNShell * o G_GNUC_UNUSED) - { - #define __GOB_FUNCTION__ "MN:Shell::init" -@@ -793,22 +816,7 @@ - { - #line 360 "src/mn-shell.gob" - -- self->icon = MN_MAIL_ICON(mn_mail_icon_new()); -- mn_add_weak_pointer(&self->icon); -- -- g_object_connect(self->icon, -- "signal::activate", self_icon_activate_h, self, -- "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self, -- "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self, -- "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self, -- "swapped-signal::activate-update", self_update, self, -- "signal::activate-properties", self_icon_activate_properties_h, self, -- "signal::activate-help", self_icon_activate_help_h, self, -- "signal::activate-about", self_icon_activate_about_h, self, -- "swapped-signal::activate-remove", self_quit, self, -- "signal::destroy", self_icon_destroy_h, self, -- NULL); -- -+ mn_shell_init_icon_base(self); - self_update_sensitivity(self); - self_update_tooltip(self); - self_update_icon(self); -@@ -1094,7 +1102,13 @@ - } - else - { -- gtk_widget_hide(GTK_WIDGET(self->icon)); -+ /* Re-create the icon as a regular gtk_widget_hide causes the -+ * icon to remain visible on non-GNOME environments. We can't -+ * use the callback self_icon_destroy_h here as it can cause an -+ * endless recursion */ -+ g_signal_handlers_disconnect_by_func(self->icon, self_icon_destroy_h, self); -+ gtk_widget_destroy(GTK_WIDGET(self->icon)); -+ mn_shell_init_icon_base(self); - mn_mail_icon_set_blinking(self->icon, FALSE); - } - }} diff --git a/extra/mail-notification/mail-notification-5.4-libx11.patch b/extra/mail-notification/mail-notification-5.4-libx11.patch deleted file mode 100644 index bb3574fda..000000000 --- a/extra/mail-notification/mail-notification-5.4-libx11.patch +++ /dev/null @@ -1,13 +0,0 @@ -Link with libX11 explicitly. - ---- mail-notification-5.4.dfsg.1.orig/jbsrc/jb.c -+++ mail-notification-5.4.dfsg.1/jbsrc/jb.c -@@ -445,6 +445,8 @@ - - jb_compile_options_add_libs(object->compile_options, "-lm"); - -+ jb_compile_options_add_libs(object->compile_options, "-lX11"); -+ - jb_compile_options_add_package(object->compile_options, "gettext"); - jb_compile_options_add_package(object->compile_options, "gnome"); - jb_compile_options_add_package(object->compile_options, "dbus"); diff --git a/extra/mail-notification/mail-notification-5.4-popup-attach.patch b/extra/mail-notification/mail-notification-5.4-popup-attach.patch deleted file mode 100644 index b8d5f6a09..000000000 --- a/extra/mail-notification/mail-notification-5.4-popup-attach.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-popup.c mail-notification-5.4-OK/build/src/mn-popup.c ---- mail-notification-5.4/build/src/mn-popup.c 2008-05-22 19:47:49.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-popup.c 2010-10-11 17:42:32.000000000 +0400 -@@ -177,6 +177,29 @@ - #undef __GOB_FUNCTION__ - - static void -+mn_popup_wait_for_icon_to_become_ready (void) -+{ -+ int x, y; -+ int count = 0; -+ -+ /* When the tray icon is created, it can still take some time before -+ * it has arrived at the correct position. This is especially the case -+ * on KDE environments. To work around this, add a little delay of at -+ * most 2 seconds before showing a popup which is attached to the notification */ -+ do { -+ gdk_window_get_origin (gtk_widget_get_window (mn_shell->icon), &x, &y); -+ -+ if (x != 0 || y != 0) { -+ break; -+ } -+ -+ g_usleep(G_USEC_PER_SEC / 10); -+ count++; -+ } while (count < 20); -+} -+ -+ -+static void - mn_popup_init (MNPopup * o G_GNUC_UNUSED) - { - #define __GOB_FUNCTION__ "MN:Popup::init" -@@ -299,8 +322,10 @@ - "icon-name", "stock_mail", - NULL); - -- if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) -+ if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) { -+ mn_popup_wait_for_icon_to_become_ready(); - g_object_set(self, "attach-widget", mn_shell->icon, NULL); -+ } - - g_string_free(body, TRUE); - diff --git a/extra/mail-notification/mail-notification-5.4-sasl_encode64.patch b/extra/mail-notification/mail-notification-5.4-sasl_encode64.patch deleted file mode 100644 index 80a7304d1..000000000 --- a/extra/mail-notification/mail-notification-5.4-sasl_encode64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c ---- mail-notification-5.4/build/src/mn-pop3-mailbox.c 2009-05-19 10:29:58.448201837 +0200 -+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c 2009-05-19 10:23:29.356204287 +0200 -@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS - - if (initial_clientoutlen > 0) - { -- char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; -diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c ---- mail-notification-5.4/src/mn-client-session.c 2008-05-22 17:45:35.000000000 +0200 -+++ mail-notification-5.4-OK/src/mn-client-session.c 2009-05-19 10:29:09.112211055 +0200 -@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession - static int - write_base64 (MNClientSession *session, const char *buf, unsigned int len) - { -- char buf64[len * 2]; /* Base64 is 33% larger than the data it encodes */ -+ char buf64[len * 2 + 1]; /* Base64 is 33% larger than the data it encodes */ - unsigned int outlen; - int result; - char *str; diff --git a/extra/mail-notification/mail-notification-5.4-weak.patch b/extra/mail-notification/mail-notification-5.4-weak.patch deleted file mode 100644 index 2e2a233aa..000000000 --- a/extra/mail-notification/mail-notification-5.4-weak.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c ---- mail-notification-5.4/build/src/mn-shell.c 2008-05-22 19:47:49.000000000 +0400 -+++ mail-notification-5.4-OK/build/src/mn-shell.c 2010-05-24 19:39:48.000000000 +0400 -@@ -1008,6 +1008,7 @@ - Self *self = user_data; - - /* The Notification Area applet has been terminated. Recreate the icon. */ -+ mn_remove_weak_pointer(&self->icon); - self_init_icon(self); - }} - #line 1014 "mn-shell.c" diff --git a/extra/mail-notification/mail-notification.install b/extra/mail-notification/mail-notification.install deleted file mode 100644 index 21cd94399..000000000 --- a/extra/mail-notification/mail-notification.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=mail-notification - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1 - 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() { - kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1 - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/mail-notification/remove-ubuntu-special-case.patch b/extra/mail-notification/remove-ubuntu-special-case.patch deleted file mode 100644 index 4516f32c6..000000000 --- a/extra/mail-notification/remove-ubuntu-special-case.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- jbsrc/lib/src/core/jb-feature.c.~1~ 2008-04-27 16:47:27.000000000 +0200 -+++ jbsrc/lib/src/core/jb-feature.c 2008-07-22 11:40:50.856886210 +0200 -@@ -164,8 +164,6 @@ - static void - gconf_configure (void) - { -- JBVariable *variable; -- - jb_require_program("gconftool-2"); - - if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect")) -@@ -178,21 +176,6 @@ - jb_variable_set_string("gconf-config-source", config_source); - g_free(config_source); - } -- -- /* fix the default schemas dir on Ubuntu */ -- variable = jb_variable_get_variable_or_error("gconf-schemas-dir"); -- if (! variable->user_set) -- { -- static const char *ubuntu_dir = "$datadir/gconf/schemas"; -- char *expanded; -- -- expanded = jb_variable_expand(ubuntu_dir, NULL); -- -- if (g_file_test(expanded, G_FILE_TEST_IS_DIR)) -- jb_variable_set_string("gconf-schemas-dir", ubuntu_dir); -- -- g_free(expanded); -- } - } - - static void diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff deleted file mode 100644 index 09e9b8bda..000000000 --- a/extra/moc/gcc-undefined-symbols.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 -+++ decoder.c 2011-05-10 21:40:48.887941968 +0200 -@@ -259,6 +259,9 @@ - for (i = 0; i < plugins_num; i++) - if (plugins[i].decoder->destroy) - plugins[i].decoder->destroy (); -+ for (i = 0; i < plugins_num; i++) -+ if (plugins[i].handle) -+ lt_dlclose(plugins[i].handle); - - if (lt_dlexit()) - logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/extra/moc/moc-ffmpeg.patch b/extra/moc/moc-ffmpeg.patch deleted file mode 100644 index 7554ea14e..000000000 --- a/extra/moc/moc-ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/nautilus/samba-crash.patch b/extra/nautilus/samba-crash.patch deleted file mode 100644 index b10d39008..000000000 --- a/extra/nautilus/samba-crash.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4e59e4cfc7bc68534664d9f72d0c7ea680b79db3 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Fri, 04 May 2012 18:38:43 +0000 -Subject: places-sidebar: don't double unref GMount objects - -Fixes a lot of reported crashers with NFS/Samba volumes. - -https://bugzilla.gnome.org/show_bug.cgi?id=674659 ---- -diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c -index 61f3658..672a4b0 100644 ---- a/src/nautilus-places-sidebar.c -+++ b/src/nautilus-places-sidebar.c -@@ -774,7 +774,7 @@ update_places (NautilusPlacesSidebar *sidebar) - root = g_mount_get_default_location (mount); - - if (!g_file_is_native (root)) { -- network_mounts = g_list_prepend (network_mounts, g_object_ref (mount)); -+ network_mounts = g_list_prepend (network_mounts, mount); - continue; - } - -@@ -856,7 +856,6 @@ update_places (NautilusPlacesSidebar *sidebar) - name, icon, mount_uri, - NULL, NULL, mount, 0, tooltip); - g_object_unref (root); -- g_object_unref (mount); - g_object_unref (icon); - g_free (name); - g_free (mount_uri); --- -cgit v0.9.0.2 diff --git a/extra/nmap/ChangeLog b/extra/nmap/ChangeLog deleted file mode 100644 index a1ef5e062..000000000 --- a/extra/nmap/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ - -2008-10-28 Douglas Soares de Andrade <douglas@archlinux.org> - - * Python 2.6 rebuild. - -2008-07-23 Hugo Doria <hugo@archlinux.org> - - * Added pygtk in optdepends: 4.68-3 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Fixing the pixmaps path for i686: 4.68 - -2008-07-09 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 4.68 - diff --git a/extra/nxserver/NXproto.h.64bit.diff b/extra/nxserver/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/extra/nxserver/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD deleted file mode 100644 index 242c5f08b..000000000 --- a/extra/nxserver/PKGBUILD +++ /dev/null @@ -1,95 +0,0 @@ -# $Id: PKGBUILD 148864 2012-02-05 11:53:19Z ibiru $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nxserver -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." -arch=(i686 x86_64) -url="http://nomachine.com/" -license=('GPL') -depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver - 'libxpm' 'libpng>=1.5.7' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' - 'xorg-sessreg') -makedepends=('imake') -source=( -#X11 support programs and libraries -http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz -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-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 -http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz -# gcc 43 fix -nxcompsh-gcc43.patch -nx-3.5.0-libpng15.patch) -options=(!libtool) -md5sums=('12060433a74ac61a1c776d1d6d136117' - '84c7f1575d9a1506370125ed050514ab' - 'cf38ec1e5a5f6453946cd387c14f2684' - 'ad8c0f133122c6d07732ca69c8759410' - '0a36c7e6a86c6c741179464b8f79c487' - '84ade443b79ea079380b754aba9d392e' - '488bb4d9b8e9f82dc272b4e6e9c57d30' - 'abde2ccc33e31fc695031c2cfb60f3dd' - '90a762dd9eb19c8c97876ad837923857' - 'b6c279654dac421fc3dd1a27d66ff53c' - '2966353cabb96829eab291212ef078dc') - -build() { - cd ${srcdir} - - # nxcomp - cd ${srcdir}/nxcomp - patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch - ./configure --prefix=/opt/NX - make - # nxcompshad - cd ${srcdir}/nxcompshad - ./configure --prefix=/opt/NX - make - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/opt/NX - make - # nxproxy - cd ${srcdir}/nxproxy - ./configure --prefix=/opt/NX - make - # nx-X11 - cd ${srcdir}/nx-X11 - make World - # nxcompext - cd ${srcdir}/nxcompext - ./configure --prefix=/opt/NX - make -} - -package() { - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - - # nxcompshad - cd ${srcdir}/nxcompshad - cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib - # nxproxy - cd ${srcdir}/nxproxy - make prefix=${pkgdir}/opt/NX install - # nx-X11 - cd ${srcdir}/nx-X11 - cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib - cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib - cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib - install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent - install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth - # nxcompext - cd ${srcdir}/nxcompext - cp -a libXcompext.so* ${pkgdir}/opt/NX/lib -}
\ No newline at end of file diff --git a/extra/nxserver/nx-3.5.0-libpng15.patch b/extra/nxserver/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/extra/nxserver/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/extra/nxserver/nxcompsh-gcc43.patch b/extra/nxserver/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/extra/nxserver/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch deleted file mode 100644 index dc9dcfeae..000000000 --- a/extra/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: If running under Debian fakeroot then its important - that this hook is disabled; a new stat check was introduced in - 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. -Author: James Page <james.page@ubuntu.com> -Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 - -Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c -=================================================================== ---- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 -+++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 -@@ -738,15 +738,6 @@ - check_result_t r1, r2, lp, lpp; - bool want_rcache = false, found_driver = false; - -- /* First, check if ummunotify is present on the system. If it is, -- then we don't need to do the following ptmalloc2 hacks. -- open/mmap on the device may fail during init, but if /dev/ummunotify -- exists, we assume that the user/administrator *wants* to use -- ummunotify. */ -- if (stat("/dev/ummunotify", &st) == 0) { -- return; -- } -- - /* Yes, checking for an MPI MCA parameter here is an abstraction - violation. Cope. Yes, even checking for *any* MCA parameter - here (without going through the MCA param API) is an -@@ -769,6 +760,15 @@ - return; - } - -+ /* Next, check if ummunotify is present on the system. If it is, -+ then we don't need to do the following ptmalloc2 hacks. -+ open/mmap on the device may fail during init, but if /dev/ummunotify -+ exists, we assume that the user/administrator *wants* to use -+ ummunotify. */ -+ if (stat("/dev/ummunotify", &st) == 0) { -+ return; -+ } -+ - /* Look for sentinel files (directories) to see if various network - drivers are loaded (yes, I know, further abstraction - violations...). - diff --git a/extra/php-suhosin/PKGBUILD b/extra/php-suhosin/PKGBUILD deleted file mode 100644 index 45adeb4ee..000000000 --- a/extra/php-suhosin/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 146961 2012-01-19 17:54:16Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=php-suhosin -pkgver=0.9.33 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='An advanced protection system for PHP installations' -url='http://www.hardened-php.net/suhosin/' -license='PHP' -source=("http://download.suhosin.org/suhosin-${pkgver}.tgz" - "http://download.suhosin.org/suhosin-${pkgver}.tgz.sig") -depends=('php') -conflicts=('php-suhosin-extension') -replaces=('php-suhosin-extension') -backup=('etc/php/conf.d/suhosin.ini') -md5sums=('0ce498a02a8281e4274ea8e390c2b487' - '6e9536cc71342bab0efb1e9a84f688a6') - -build() { - cd ${srcdir}/suhosin-${pkgver} - phpize - ./configure --prefix=/usr --enable-suhosin - make -} - -package() { - cd ${srcdir}/suhosin-${pkgver} - make INSTALL_ROOT=${pkgdir} install - # disable by default - sed -i 's|extension = suhosin.so|;extension=suhosin.so|g' suhosin.ini - install -D -m644 suhosin.ini ${pkgdir}/etc/php/conf.d/suhosin.ini -} diff --git a/extra/php/suhosin.patch b/extra/php/suhosin.patch deleted file mode 100644 index e5db52d40..000000000 --- a/extra/php/suhosin.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:55:46.699676255 +0200
-+++ suhosin-patch-5.3.9-0.9.10.patch 2012-04-01 11:56:19.322146479 +0200
-@@ -4515,8 +4515,8 @@
- +#define SUHOSIN_PATCH 1
- +EOF
-
-- echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
-- echo "configure:19377: checking for declared timezone" >&5
-+ echo "$as_me:$LINENO: checking for declared timezone" >&5
-+ echo $ECHO_N "checking for declared timezone... $ECHO_C" >&6
- @@ -115830,7 +115833,7 @@
- php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
- strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
diff --git a/extra/pidgin/port-to-farstream-v3.patch b/extra/pidgin/port-to-farstream-v3.patch deleted file mode 100644 index 93e29af50..000000000 --- a/extra/pidgin/port-to-farstream-v3.patch +++ /dev/null @@ -1,447 +0,0 @@ -diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac ---- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 -+++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 -@@ -780,18 +780,18 @@ else - fi - - dnl ####################################################################### --dnl # Check for Farsight -+dnl # Check for Farstream - dnl ####################################################################### --AC_ARG_ENABLE(farsight, -- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], -- enable_farsight="$enableval", enable_farsight="yes") --if test "x$enable_farsight" != "xno"; then -- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ -- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) -- AC_SUBST(FARSIGHT_CFLAGS) -- AC_SUBST(FARSIGHT_LIBS) -+AC_ARG_ENABLE(farstream, -+ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], -+ enable_farstream="$enableval", enable_farstream="yes") -+if test "x$enable_farstream" != "xno"; then -+ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ -+ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) -+ AC_SUBST(FARSTREAM_CFLAGS) -+ AC_SUBST(FARSTREAM_LIBS) - ], [ -- enable_farsight="no" -+ enable_farstream="no" - ]) - fi - -@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, - [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], - enable_vv="$enableval", enable_vv="yes") - if test "x$enable_vv" != "xno"; then -- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then -+ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then - AC_DEFINE(USE_VV, 1, [Use voice and video]) - else - enable_vv="no" - if test "x$force_deps" = "xyes"; then - AC_MSG_ERROR([ - Dependencies for voice/video were not met. --Install the necessary gstreamer and farsight packages first. -+Install the necessary gstreamer and farstream packages first. - Or use --disable-vv if you do not need voice/video support. - ]) - fi - fi - fi --AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") -+AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") - - dnl ####################################################################### - dnl # Check for Internationalized Domain Name support -diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am ---- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 -@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ - $(LIBXML_LIBS) \ - $(NETWORKMANAGER_LIBS) \ - $(INTLLIBS) \ -- $(FARSIGHT_LIBS) \ -+ $(FARSTREAM_LIBS) \ - $(GSTREAMER_LIBS) \ - $(GSTINTERFACES_LIBS) \ - $(IDN_LIBS) \ -@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ - $(DEBUG_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(LIBXML_CFLAGS) \ -- $(FARSIGHT_CFLAGS) \ -+ $(FARSTREAM_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GSTINTERFACES_CFLAGS) \ - $(IDN_CFLAGS) \ -diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c ---- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 -@@ -1,5 +1,5 @@ - /** -- * @file backend-fs2.c Farsight 2 backend for media API -+ * @file backend-fs2.c Farstream backend for media API - * @ingroup core - */ - -@@ -34,8 +34,9 @@ - #include "network.h" - #include "media-gst.h" - --#include <gst/farsight/fs-conference-iface.h> --#include <gst/farsight/fs-element-added-notifier.h> -+#include <farstream/fs-conference.h> -+#include <farstream/fs-element-added-notifier.h> -+#include <farstream/fs-utils.h> - - /** @copydoc _PurpleMediaBackendFs2Class */ - typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; -@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream - gchar *participant; - FsStream *stream; - -+ gboolean supports_add; -+ - GstElement *src; - GstElement *tee; - GstElement *volume; -@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private - FsConference *conference; - gchar *conference_type; - -+ FsElementAddedNotifier *notifier; -+ - GHashTable *sessions; - GHashTable *participants; - -@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject - - purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); - -+ if (priv->notifier) { -+ g_object_unref(priv->notifier); -+ priv->notifier = NULL; -+ } -+ - if (priv->confbin) { - GstElement *pipeline; - -@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, - priv->conference != FS_CONFERENCE(src)) - return; - -- if (gst_structure_has_name(msg->structure, "farsight-error")) { -+ if (gst_structure_has_name(msg->structure, "farstream-error")) { - FsError error_no; - gst_structure_get_enum(msg->structure, "error-no", - FS_TYPE_ERROR, (gint*)&error_no); -@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, - " strict.")); - purple_media_end(priv->media, NULL, NULL); - break; -- case FS_ERROR_UNKNOWN_CNAME: -- /* -- * Unknown CName is only a problem for the -- * multicast transmitter which isn't used. -- * It is also deprecated. -- */ -- break; - default: - purple_debug_error("backend-fs2", -- "farsight-error: %i: %s\n", -+ "farstream-error: %i: %s\n", - error_no, - gst_structure_get_string( - msg->structure, "error-msg")); -@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, - - if (FS_ERROR_IS_FATAL(error_no)) { - purple_media_error(priv->media, _("A non-recoverable " -- "Farsight2 error has occurred.")); -+ "Farstream error has occurred.")); - purple_media_end(priv->media, NULL, NULL); - } - } else if (gst_structure_has_name(msg->structure, -- "farsight-new-local-candidate")) { -+ "farstream-new-local-candidate")) { - const GValue *value; - FsStream *stream; - FsCandidate *local_candidate; -@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, - session->id, name, candidate); - g_object_unref(candidate); - } else if (gst_structure_has_name(msg->structure, -- "farsight-local-candidates-prepared")) { -+ "farstream-local-candidates-prepared")) { - const GValue *value; - FsStream *stream; - FsParticipant *participant; -@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, - g_signal_emit_by_name(self, "candidates-prepared", - session->id, name); - } else if (gst_structure_has_name(msg->structure, -- "farsight-new-active-candidate-pair")) { -+ "farstream-new-active-candidate-pair")) { - const GValue *value; - FsStream *stream; - FsCandidate *local_candidate; -@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, - g_object_unref(lcandidate); - g_object_unref(rcandidate); - } else if (gst_structure_has_name(msg->structure, -- "farsight-recv-codecs-changed")) { -+ "farstream-recv-codecs-changed")) { - const GValue *value; - GList *codecs; - FsCodec *codec; -@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, - codec = codecs->data; - - purple_debug_info("backend-fs2", -- "farsight-recv-codecs-changed: %s\n", -+ "farstream-recv-codecs-changed: %s\n", - codec->encoding_name); - } else if (gst_structure_has_name(msg->structure, -- "farsight-component-state-changed")) { -+ "farstream-component-state-changed")) { - const GValue *value; - FsStreamState fsstate; - guint component; -@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, - } - - purple_debug_info("backend-fs2", -- "farsight-component-state-changed: " -+ "farstream-component-state-changed: " - "component: %u state: %s\n", - component, state); - } else if (gst_structure_has_name(msg->structure, -- "farsight-send-codec-changed")) { -+ "farstream-send-codec-changed")) { - const GValue *value; - FsCodec *codec; - gchar *codec_str; -@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, - codec_str = fs_codec_to_string(codec); - - purple_debug_info("backend-fs2", -- "farsight-send-codec-changed: codec: %s\n", -+ "farstream-send-codec-changed: codec: %s\n", - codec_str); - - g_free(codec_str); - } else if (gst_structure_has_name(msg->structure, -- "farsight-codecs-changed")) { -+ "farstream-codecs-changed")) { - const GValue *value; - FsSession *fssession; - GList *sessions; -@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl - purple_media_is_initiator(media, sid, name)) - return; - -- fs_stream_set_remote_candidates(stream->stream, -- stream->remote_candidates, &err); -+ if (stream->supports_add) -+ fs_stream_add_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); -+ else -+ fs_stream_force_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); - - if (err == NULL) - return; -@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s - GstElement *pipeline; - GstBus *bus; - gchar *name; -+ GKeyFile *default_props; - - priv->conference = FS_CONFERENCE( - gst_element_factory_make(priv->conference_type, NULL)); -@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s - return FALSE; - } - -+ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); -+ if (default_props != NULL) { -+ priv->notifier = fs_element_added_notifier_new(); -+ fs_element_added_notifier_add(priv->notifier, -+ GST_BIN(priv->confbin)); -+ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); -+ } -+ - g_signal_connect(G_OBJECT(bus), "message", - G_CALLBACK(gst_bus_cb), self); - gst_object_unref(bus); -@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se - * receiving the src-pad-added signal. - * Only works for non-multicast FsRtpSessions. - */ -- if (is_nice || !strcmp(transmitter, "rawudp")) -+ if (!!strcmp(transmitter, "multicast")) - g_object_set(G_OBJECT(session->session), - "no-rtcp-timeout", 0, NULL); - -@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 - GError *err = NULL; - - participant = fs_conference_new_participant( -- priv->conference, name, &err); -+ priv->conference, &err); - - if (err) { - purple_debug_error("backend-fs2", -@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 - return FALSE; - } - -+ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), -+ "cname")) { -+ g_object_set(participant, "cname", name, NULL); -+ } -+ -+ - if (!priv->participants) { - purple_debug_info("backend-fs2", - "Creating hash table for participants\n"); -@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel - } - } - -+ -+ session = get_session(self, sess_id); -+ -+ if (session == NULL) { -+ purple_debug_error("backend-fs2", -+ "Couldn't find session to create stream.\n"); -+ return FALSE; -+ } -+ -+ participant = get_participant(self, who); -+ -+ if (participant == NULL) { -+ purple_debug_error("backend-fs2", "Couldn't find " -+ "participant to create stream.\n"); -+ return FALSE; -+ } -+ -+ fsstream = fs_session_new_stream(session->session, participant, -+ initiator == TRUE ? type_direction : -+ (type_direction & FS_DIRECTION_RECV), &err); -+ -+ if (fsstream == NULL) { -+ if (err) { -+ purple_debug_error("backend-fs2", -+ "Error creating stream: %s\n", -+ err && err->message ? -+ err->message : "NULL"); -+ g_error_free(err); -+ } else -+ purple_debug_error("backend-fs2", -+ "Error creating stream\n"); -+ return FALSE; -+ } -+ - memcpy(_params, params, sizeof(GParameter) * num_params); - - /* set the controlling mode parameter */ -@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel - _num_params++; - } - -- session = get_session(self, sess_id); - -- if (session == NULL) { -- purple_debug_error("backend-fs2", -- "Couldn't find session to create stream.\n"); -- return FALSE; -- } -- -- participant = get_participant(self, who); -- -- if (participant == NULL) { -- purple_debug_error("backend-fs2", "Couldn't find " -- "participant to create stream.\n"); -- return FALSE; -+ if(!fs_stream_set_transmitter(fsstream, transmitter, -+ _params, _num_params, &err)) { -+ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); -+ g_clear_error(&err); -+ g_free(_params); -+ return FALSE; - } -- -- fsstream = fs_session_new_stream(session->session, participant, -- initiator == TRUE ? type_direction : -- (type_direction & FS_DIRECTION_RECV), transmitter, -- _num_params, _params, &err); - g_free(_params); - -- if (fsstream == NULL) { -- if (err) { -- purple_debug_error("backend-fs2", -- "Error creating stream: %s\n", -- err && err->message ? -- err->message : "NULL"); -- g_error_free(err); -- } else -- purple_debug_error("backend-fs2", -- "Error creating stream\n"); -- return FALSE; -- } - - stream = g_new0(PurpleMediaBackendFs2Stream, 1); - stream->participant = g_strdup(who); - stream->session = session; - stream->stream = fsstream; -+ stream->supports_add = !strcmp(transmitter, "nice"); - - priv->streams = g_list_append(priv->streams, stream); - -@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand - if (purple_media_is_initiator(priv->media, sess_id, participant) || - purple_media_accepted( - priv->media, sess_id, participant)) { -- fs_stream_set_remote_candidates(stream->stream, -+ if (stream->supports_add) -+ fs_stream_add_remote_candidates(stream->stream, -+ stream->remote_candidates, &err); -+ else -+ fs_stream_force_remote_candidates(stream->stream, - stream->remote_candidates, &err); - - if (err) { -diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c ---- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 -@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med - { - #ifdef USE_VV - PurpleMediaSession *session; -- PurpleMediaStream *stream = NULL; - - g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); - -@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med - } - - if (purple_media_get_stream(media, sess_id, who) == NULL) { -- stream = purple_media_insert_stream(session, who, initiator); -+ purple_media_insert_stream(session, who, initiator); - - g_signal_emit(media, purple_media_signals[STATE_CHANGED], - 0, PURPLE_MEDIA_STATE_NEW, -diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c ---- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 -+++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 -@@ -39,7 +39,7 @@ - #ifdef USE_VV - #include <media/backend-fs2.h> - --#include <gst/farsight/fs-element-added-notifier.h> -+#include <farstream/fs-element-added-notifier.h> - #include <gst/interfaces/xoverlay.h> - - /** @copydoc _PurpleMediaManagerPrivate */ diff --git a/extra/pm-utils/11netcfg b/extra/pm-utils/11netcfg deleted file mode 100644 index 1b4d05ee7..000000000 --- a/extra/pm-utils/11netcfg +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -. /usr/lib/pm-utils/functions - -suspend_netcfg() { - netcfg2 all-suspend -} - -resume_netcfg() { - netcfg2 all-resume -} - -if [ -x /usr/bin/netcfg2 ]; then - case "$1" in - hibernate|suspend) - suspend_netcfg - ;; - thaw|resume) - resume_netcfg - ;; - *) - ;; - esac -fi - -exit $? diff --git a/extra/qt/fix-buffer-overflow.patch b/extra/qt/fix-buffer-overflow.patch deleted file mode 100644 index f0334f247..000000000 --- a/extra/qt/fix-buffer-overflow.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 827e5c4c689d4ecb4f8c1ab48c9a7ab712fe2ca7 Mon Sep 17 00:00:00 2001 -From: John Tapsell <john.tapsell.ext@basyskom.com> -Date: Mon, 12 Mar 2012 22:07:47 +0000 -Subject: [PATCH] Harfbuzz-thai - fix buffer overflow when setting item - attributes - -Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713 -Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> ---- - src/3rdparty/harfbuzz/src/harfbuzz-thai.c | 9 +++++- - .../qtextscriptengine/tst_qtextscriptengine.cpp | 29 ++++++++++++++++++++ - 2 files changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c -index bf6c35b..3c0ffe8 100644 ---- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c -+++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c -@@ -263,8 +263,13 @@ static HB_Bool HB_ThaiConvertStringToGlyphIndices (HB_ShaperItem *item) - // The only glyphs that should be passed to this function that cannot be mapped to - // tis620 are the ones of type Inherited class. Pass these glyphs untouched. - glyphString[slen++] = string[i]; -- if (string[i] == 0x200D || string[i] == 0x200C) -- item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters -+ if (string[i] == 0x200D || string[i] == 0x200C) { -+ // Check that we do not run out of bounds when setting item->attributes. If we do -+ // run out of bounds then this function will return false, the necessary amount of -+ // memory is reallocated, and this function will then be called again. -+ if (slen <= item->num_glyphs) -+ item->attributes[slen-1].dontPrint = true; // Hide ZWJ and ZWNJ characters -+ } - } else { - glyphString[slen++] = (HB_UChar16) thai_get_glyph_index (font_type, rglyphs[lgi]); - } - diff --git a/extra/qt/fix-cursortox-crash.patch b/extra/qt/fix-cursortox-crash.patch deleted file mode 100644 index fbc9c1370..000000000 --- a/extra/qt/fix-cursortox-crash.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: fix-cursortox-crash.patch -=================================================================== ---- fix-cursortox-crash.patch (revision 0) -+++ fix-cursortox-crash.patch (arbetskopia) -#commit cac12f4592477d99ef6fffaad40345bf85ef53b5 -#Author: Jiang Jiang <jiang.jiang@nokia.com> -#Date: Mon Apr 2 12:32:05 2012 +0200 -# -# Fix a crash in cursorToX() when new block is added -# -# When an empty new block is being added, the layoutData->memory data -# will be 0, thus QTextEngine::attributes() will return 0. We should -# only access the attributes pointer when some text actually exist. -# -# Task-number: QTBUG-24718 -# Change-Id: I9ce9f7b57bccf24099a02832ce30fb6cebfaad33 -# -diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp -index ee658d9..16f7150 100644 ---- a/src/gui/text/qtextlayout.cpp -+++ b/src/gui/text/qtextlayout.cpp -@@ -2508,6 +2508,10 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const - int pos = *cursorPos; - int itm; - const HB_CharAttributes *attributes = eng->attributes(); -+ if (!attributes) { -+ *cursorPos = 0; -+ return x.toReal(); -+ } - while (pos < line.from + line.length && !attributes[pos].charStop) - pos++; - if (pos == line.from + (int)line.length) { diff --git a/extra/qt/gcc47.patch b/extra/qt/gcc47.patch deleted file mode 100644 index 62c436e6a..000000000 --- a/extra/qt/gcc47.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 -@@ -57,9 +57,7 @@ namespace JSC { - - class JSGlobalObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- -- struct JSGlobalObjectData : public JSVariableObjectData { -+ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { - // We use an explicit destructor function pointer instead of a - // virtual destructor because we want to avoid adding a vtable - // pointer to this struct. Adding a vtable pointer would force the -diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h ---- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 -+++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 -@@ -32,8 +32,7 @@ namespace JSC{ - - class JSStaticScopeObject : public JSVariableObject { - protected: -- using JSVariableObject::JSVariableObjectData; -- struct JSStaticScopeObjectData : public JSVariableObjectData { -+ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { - JSStaticScopeObjectData() - : JSVariableObjectData(&symbolTable, ®isterStore + 1) - { diff --git a/extra/qtwebkit/python2-path.patch b/extra/qtwebkit/python2-path.patch deleted file mode 100644 index 2e270e6fc..000000000 --- a/extra/qtwebkit/python2-path.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000 -+++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000 -@@ -88,5 +88,5 @@ - retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h - retgen.wkScript = $$PWD/create_regex_tables - retgen.input = retgen.wkScript --retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT} -+retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT} - addExtraCompiler(retgen) ---- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000 -+++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000 -@@ -640,7 +640,7 @@ - inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl - inspectorJSON.input = INSPECTOR_JSON - inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl --inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json -+inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json - inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl - inspectorJSON.wkAddOutputToSources = false - addExtraCompiler(inspectorJSON) -@@ -723,7 +723,7 @@ - entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp - entities.input = HTML_ENTITIES - entities.wkScript = $$PWD/html/parser/create-html-entity-table --entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES -+entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES - entities.clean = ${QMAKE_FILE_OUT} - entities.depends = $$PWD/html/parser/create-html-entity-table - addExtraCompiler(entities) diff --git a/extra/slim/no-host.patch b/extra/slim/no-host.patch deleted file mode 100644 index c40f25bca..000000000 --- a/extra/slim/no-host.patch +++ /dev/null @@ -1,29 +0,0 @@ -Datum: Sun, 30 Jan 2011 12:49:00 +0200 -Von: Samuli Suominen <ssuominen@gentoo.org> -An: jgc@archlinux.org, andyrtr@archlinux.org, thayer@archlinux.org -Betreff: SLIM and ConsoleKit 0.4.2 (and up) - -People have been coming to #xfce after Arch's ConsoleKit 0.4.3 upgrade -to ask for help why Suspend / Hibernate / and such doesn't work. - -It's because SLIM is using pam_ck_connector.so and SLIM sets Host to localhost -and makes pam_ck_connector.so believe it's actually a *remote host* called -localhost and will refuse access. - -http://bugs.gentoo.org/346037 -https://developer.berlios.de/bugs/?func=detailbug&bug_id=17757&group_id=2663 -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-misc/slim/files/346037-stop_setting_host_for_pam_ck_connector_so.patch?view=log - - -diff -aur old/app.cpp new/app.cpp ---- old/app.cpp 2011-01-30 12:39:34.033337944 +0100 -+++ new/app.cpp 2011-01-30 12:40:25.843337943 +0100 -@@ -228,8 +228,6 @@ - pam.start("slim"); - pam.set_item(PAM::Authenticator::TTY, DisplayName); - pam.set_item(PAM::Authenticator::Requestor, "root"); -- pam.set_item(PAM::Authenticator::Host, "localhost"); -- - } - catch(PAM::Exception& e){ - cerr << APPNAME << ": " << e << endl; diff --git a/extra/slim/restart.patch b/extra/slim/restart.patch deleted file mode 100644 index 4e5049000..000000000 --- a/extra/slim/restart.patch +++ /dev/null @@ -1,144 +0,0 @@ -http://developer.berlios.de/patch/?func=detailpatch&patch_id=2378&group_id=2663 - - -diff -aur slim-1.3.2.b/app.cpp slim-1.3.2.c/app.cpp ---- slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 -+++ slim-1.3.2.c/app.cpp 2010-08-21 15:11:03.946389843 +0200 -@@ -104,6 +104,11 @@ - - extern App* LoginApp; - -+int xioerror(Display *disp) { -+ LoginApp->RestartServer(); -+ return 0; -+} -+ - void CatchSignal(int sig) { - cerr << APPNAME << ": unexpected signal " << sig << endl; - -@@ -114,19 +119,6 @@ - exit(ERR_EXIT); - } - -- --void AlarmSignal(int sig) { -- int pid = LoginApp->GetServerPID(); -- if(waitpid(pid, NULL, WNOHANG) == pid) { -- LoginApp->StopServer(); -- LoginApp->RemoveLock(); -- exit(OK_EXIT); -- } -- signal(sig, AlarmSignal); -- alarm(2); --} -- -- - void User1Signal(int sig) { - signal(sig, User1Signal); - } -@@ -277,7 +269,6 @@ - signal(SIGHUP, CatchSignal); - signal(SIGPIPE, CatchSignal); - signal(SIGUSR1, User1Signal); -- signal(SIGALRM, AlarmSignal); - - #ifndef XNEST_DEBUG - if (!force_nodaemon && cfg->getOption("daemon") == "yes") { -@@ -298,7 +289,6 @@ - - CreateServerAuth(); - StartServer(); -- alarm(2); - #endif - - } -@@ -614,6 +604,8 @@ - int status; - while (wpid != pid) { - wpid = wait(&status); -+ if (wpid == ServerPID) -+ xioerror(Dpy); // Server died, simulate IO error - } - if (WIFEXITED(status) && WEXITSTATUS(status)) { - LoginPanel->Message("Failed to execute login command"); -@@ -659,9 +651,6 @@ - - - void App::Reboot() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -684,9 +673,6 @@ - - - void App::Halt() { -- // Stop alarm clock -- alarm(0); -- - #ifdef USE_PAM - try{ - pam.end(); -@@ -772,6 +758,7 @@ - - StopServer(); - RemoveLock(); -+ while (waitpid(-1, NULL, WNOHANG) > 0); // Collects all dead childrens - Run(); - } - -@@ -842,6 +829,7 @@ - - for(cycles = 0; cycles < ncycles; cycles++) { - if((Dpy = XOpenDisplay(DisplayName))) { -+ XSetIOErrorHandler(xioerror); - return 1; - } else { - if(!ServerTimeout(1, (char *) "X server to begin accepting connections")) -@@ -926,9 +914,6 @@ - ServerPID = -1; - break; - } -- alarm(15); -- pause(); -- alarm(0); - - // Wait for server to start up - if(WaitForServer() == 0) { -@@ -963,15 +948,12 @@ - - - void App::StopServer() { -- // Stop alars clock and ignore signals -- alarm(0); - signal(SIGQUIT, SIG_IGN); - signal(SIGINT, SIG_IGN); - signal(SIGHUP, SIG_IGN); - signal(SIGPIPE, SIG_IGN); - signal(SIGTERM, SIG_DFL); - signal(SIGKILL, SIG_DFL); -- signal(SIGALRM, SIG_DFL); - - // Catch X error - XSetIOErrorHandler(IgnoreXIO); -diff -aur slim-1.3.2.b/app.h slim-1.3.2.c/app.h ---- slim-1.3.2.b/app.h 2010-08-21 15:10:40.499582804 +0200 -+++ slim-1.3.2.c/app.h 2010-08-21 15:11:03.946389843 +0200 -@@ -34,6 +34,7 @@ - ~App(); - void Run(); - int GetServerPID(); -+ void RestartServer(); - void StopServer(); - - bool serverStarted; -@@ -49,7 +50,6 @@ - void Console(); - void Exit(); - void KillAllClients(Bool top); -- void RestartServer(); - void ReadConfig(); - void OpenLog(); - void CloseLog(); diff --git a/extra/slim/sigterm.patch b/extra/slim/sigterm.patch deleted file mode 100644 index fbaeb7116..000000000 --- a/extra/slim/sigterm.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur old/panel.cpp new/panel.cpp ---- old/panel.cpp 2011-04-29 15:15:57.210134850 +0200 -+++ new/panel.cpp 2011-04-29 15:16:17.260285407 +0200 -@@ -10,6 +10,7 @@ - */ - - #include <sstream> -+#include <poll.h> - #include "panel.h" - - using namespace std; -@@ -288,16 +289,24 @@ - field=curfield; - bool loop = true; - OnExpose(); -+ -+ struct pollfd x11_pfd = {0}; -+ x11_pfd.fd = ConnectionNumber(Dpy); -+ x11_pfd.events = POLLIN; - while(loop) { -- XNextEvent(Dpy, &event); -- switch(event.type) { -- case Expose: -- OnExpose(); -- break; -- -- case KeyPress: -- loop=OnKeyPress(event); -- break; -+ if(XPending(Dpy) || poll(&x11_pfd, 1, -1) > 0) { -+ while(XPending(Dpy)) { -+ XNextEvent(Dpy, &event); -+ switch(event.type) { -+ case Expose: -+ OnExpose(); -+ break; -+ -+ case KeyPress: -+ loop=OnKeyPress(event); -+ break; -+ } -+ } - } - } - diff --git a/extra/slim/slim-1.3.2-libpng15.patch b/extra/slim/slim-1.3.2-libpng15.patch deleted file mode 100644 index 720608567..000000000 --- a/extra/slim/slim-1.3.2-libpng15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- png.c -+++ png.c -@@ -57,7 +57,7 @@ - return(0); - } - -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp) NULL); - fclose(infile); diff --git a/extra/streamtuner/PKGBUILD b/extra/streamtuner/PKGBUILD deleted file mode 100644 index ea344e218..000000000 --- a/extra/streamtuner/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 148934 2012-02-05 11:56:39Z ibiru $ -# Contributor: Greg Grabinski <greg@grabinski.ch> -# Maintainer: ndreas Radke <andyrtr@archlinux.org> - -pkgname=streamtuner -pkgver=0.99.99 -pkgrel=12 -pkgdesc="A stream directory browser" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/streamtuner/" -license=('custom') -depends=('taglib' 'libxml2' 'gtk2' 'curl>=7.16.2' 'pygtk>=2.13.0-2') -conflicts=('streamtuner-live365') -replaces=('streamtuner-live365') -source=(http://savannah.nongnu.org/download/streamtuner/$pkgname-$pkgver.tar.gz \ - http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-live365.diff \ - http://savannah.nongnu.org/download/streamtuner/streamtuner-0.99.99-pygtk-2.6.diff - streamtuner-0.99.99-shoutcast.diff - shoutcast-redesign-patch.diff) -options=('!libtool' '!emptydirs') -md5sums=('2027b7c34e85b594524b0b4351c14362' - '8aa1994a849b05d2b8fffbda702b8a25' - '7aff45a41c60358cb2332c7ce644f661' - '1eab6edce130e1a1e5f208cd3ed6766a' - '8a3a17a1719a79353d6ad7ac8564947b') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/streamtuner-0.99.99-live365.diff - patch -p0 -i ${srcdir}/streamtuner-0.99.99-pygtk-2.6.diff - # fix http://bugs.archlinux.org/task/10308 - patch -p0 -i ${srcdir}/streamtuner-0.99.99-shoutcast.diff - # fix http://bugs.archlinux.org/task/11463 - patch -p1 -i ${srcdir}/shoutcast-redesign-patch.diff - - # python2 fixes - sed -i "s:^for ac_prog in python:for ac_prog in python2:" ${srcdir}/${pkgname}-${pkgver}/configure - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=${pkgdir}/usr install - - #Add license file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/extra/streamtuner/shoutcast-redesign-patch.diff b/extra/streamtuner/shoutcast-redesign-patch.diff deleted file mode 100644 index 644e2273e..000000000 --- a/extra/streamtuner/shoutcast-redesign-patch.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -uar streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c ---- streamtuner-0.99.99-orig/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:04:00.229785732 -0400 -+++ streamtuner-0.99.99-patched/src/plugins/shoutcast/shoutcast.c 2008-09-12 18:05:56.716440720 -0400 -@@ -37,7 +37,7 @@ - - /*** cpp *********************************************************************/ - --#define SHOUTCAST_ROOT "http://www.shoutcast.com/" -+#define SHOUTCAST_ROOT "http://classic.shoutcast.com/" - - #define MAX_STREAMS_PER_PAGE 100 /* enforced by SHOUTcast */ - diff --git a/extra/streamtuner/streamtuner-0.99.99-shoutcast.diff b/extra/streamtuner/streamtuner-0.99.99-shoutcast.diff deleted file mode 100644 index e7fcbca94..000000000 --- a/extra/streamtuner/streamtuner-0.99.99-shoutcast.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- src/plugins/shoutcast/shoutcast.c.orig 2004-12-19 15:21:00.000000000 +0000 -+++ src/plugins/shoutcast/shoutcast.c 2008-03-16 10:39:24.000000000 +0000 -@@ -94,6 +94,8 @@ - - GNode *parent_node; - SHOUTcastStream *stream; -+ -+ int parse_genres; - } ReloadInfo; - - /*** variable declarations ***************************************************/ -@@ -518,6 +520,7 @@ - info.npages = 0; - info.parent_node = NULL; - info.stream = NULL; -+ info.parse_genres = 0; - - status = st_transfer_session_get_by_line(session, - url, -@@ -565,10 +568,16 @@ - info->stream = stream_new_cb(NULL); - info->stream->url_postfix = st_sgml_ref_expand_len(s1, s2 - s1); - } -- else if (info->page < 2 -- && (((s1 = st_str_has_prefix_span(line, "\t<OPTION VALUE=\"")) -- || (s1 = st_str_has_prefix_span(line, "\t\t<OPTION VALUE=\""))) -- && (s2 = strstr(s1, "\">")))) -+ else if (info->page < 2 && (s1 = st_strstr_span(line, "<OPTION VALUE=\"TopTen\">"))) -+ { -+ info->parse_genres = 1; -+ } -+ else if (info->page < 2 && info->parse_genres == 1 && (s1 = st_strstr_span(line, "</SELECT>"))) -+ { -+ info->parse_genres = 0; -+ } -+ else if (info->page < 2 && info->parse_genres == 1 -+ && ((s1 = st_strstr_span(line, "<OPTION VALUE=\"")) && (s2 = strstr(s1, "\">")))) - { - STCategory *category; - GNode *node; - diff --git a/extra/sysklogd/sysklogd-debian.patch b/extra/sysklogd/sysklogd-debian.patch deleted file mode 100644 index 0117af5f2..000000000 --- a/extra/sysklogd/sysklogd-debian.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- sysklogd-1.5.orig/syslogd.c -+++ sysklogd-1.5/syslogd.c -@@ -2392,7 +2392,7 @@ - if (*p == '\0' || *p == '#') - continue; - #if CONT_LINE -- strcpy(cline, p); -+ memmove(cline, p, strlen(p)+1); - #endif - for (p = strchr(cline, '\0'); isspace(*--p);); - #if CONT_LINE ---- sysklogd-1.5.orig/ksym_mod.c -+++ sysklogd-1.5/ksym_mod.c -@@ -189,7 +189,6 @@ - else - Syslog(LOG_ERR, "Error loading kernel symbols " \ - "- %s\n", strerror(errno)); -- fclose(ksyms); - return(0); - } - diff --git a/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch deleted file mode 100644 index f8f6d1fa5..000000000 --- a/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Mon, 2 Apr 2012 08:20:34 -0400 -Subject: [PATCH] check for proper return from dirent_ensure_type - -Fixes 'systemctl list-unit-files', which previously returned only: - - Failed to issue method call: No such file or directory ---- - src/install.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/install.c b/src/install.c -index 174d79b..9256116 100644 ---- a/src/install.c -+++ b/src/install.c -@@ -1853,7 +1853,7 @@ int unit_file_get_list( - - r = dirent_ensure_type(d, de); - if (r < 0) { -- if (errno == ENOENT) -+ if (r == -ENOENT) - continue; - - goto finish; --- -1.7.9.5 - diff --git a/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch deleted file mode 100644 index fa133ca3c..000000000 --- a/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Thu, 22 Mar 2012 02:06:40 +0100 -Subject: [PATCH] logind: close FIFO before ending sessions cleanly - -For clean session endings ask logind explicitly to get rid of the FIFO -before closing it so that the FIFO logic doesn't result in su/sudo to be -terminated immediately. ---- - src/login/logind-dbus.c | 30 ++++++++++++++++++++ - src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 98 insertions(+), 3 deletions(-) - -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index d8f4d89..ea6b89f 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -80,6 +80,9 @@ - " <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n" \ - " <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n" \ - " </method>\n" \ -+ " <method name=\"ReleaseSession\">\n" \ -+ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ -+ " </method>\n" \ - " <method name=\"ActivateSession\">\n" \ - " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ - " </method>\n" \ -@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler( - if (r < 0) - return bus_send_error_reply(connection, message, &error, r); - -+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) { -+ const char *name; -+ Session *session; -+ -+ if (!dbus_message_get_args( -+ message, -+ &error, -+ DBUS_TYPE_STRING, &name, -+ DBUS_TYPE_INVALID)) -+ return bus_send_error_reply(connection, message, &error, -EINVAL); -+ -+ session = hashmap_get(m->sessions, name); -+ if (!session) -+ return bus_send_error_reply(connection, message, &error, -ENOENT); -+ -+ /* We use the FIFO to detect stray sessions where the -+ process invoking PAM dies abnormally. We need to make -+ sure that that process is not killed if at the clean -+ end of the session it closes the FIFO. Hence, with -+ this call explicitly turn off the FIFO logic, so that -+ the PAM code can finish clean up on its own */ -+ session_remove_fifo(session); -+ -+ reply = dbus_message_new_method_return(message); -+ if (!reply) -+ goto oom; -+ - } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) { - const char *name; - Session *session; -diff --git a/src/login/pam-module.c b/src/login/pam-module.c -index 8544413..4106d2b 100644 ---- a/src/login/pam-module.c -+++ b/src/login/pam-module.c -@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session( - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "CreateSession"); -- - if (!m) { - pam_syslog(handle, LOG_ERR, "Could not allocate create session message."); - r = PAM_BUF_ERR; -@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session( - int argc, const char **argv) { - - const void *p = NULL; -+ const char *id; -+ DBusConnection *bus = NULL; -+ DBusMessage *m = NULL, *reply = NULL; -+ DBusError error; -+ int r; - -- pam_get_data(handle, "systemd.session-fd", &p); -+ assert(handle); -+ -+ dbus_error_init(&error); -+ -+ id = pam_getenv(handle, "XDG_SESSION_ID"); -+ if (id) { -+ -+ /* Before we go and close the FIFO we need to tell -+ * logind that this is a clean session shutdown, so -+ * that it doesn't just go and slaughter us -+ * immediately after closing the fd */ -+ -+ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); -+ if (!bus) { -+ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ -+ m = dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ "ReleaseSession"); -+ if (!m) { -+ pam_syslog(handle, LOG_ERR, "Could not allocate release session message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } -+ -+ if (!dbus_message_append_args(m, -+ DBUS_TYPE_STRING, &id, -+ DBUS_TYPE_INVALID)) { -+ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } - -+ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); -+ if (!reply) { -+ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ } -+ -+ r = PAM_SUCCESS; -+ -+finish: -+ pam_get_data(handle, "systemd.session-fd", &p); - if (p) - close_nointr(PTR_TO_INT(p) - 1); - -- return PAM_SUCCESS; -+ dbus_error_free(&error); -+ -+ if (bus) { -+ dbus_connection_close(bus); -+ dbus_connection_unref(bus); -+ } -+ -+ if (m) -+ dbus_message_unref(m); -+ -+ if (reply) -+ dbus_message_unref(reply); -+ -+ return r; - } --- -1.7.9.5 - diff --git a/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch deleted file mode 100644 index 7ac9251b3..000000000 --- a/extra/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt <mschmidt@redhat.com> -Date: Fri, 2 Mar 2012 10:39:10 +0100 -Subject: [PATCH] util: never follow symlinks in rm_rf_children() - -The function checks if the entry is a directory before recursing, but -there is a window between the check and the open, during which the -directory could be replaced with a symlink. - -CVE-2012-1174 -https://bugzilla.redhat.com/show_bug.cgi?id=803358 ---- - src/util.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/util.c b/src/util.c -index 20cbc2b..dfc1dc6 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { - if (is_dir) { - int subdir_fd; - -- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { -+ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); -+ if (subdir_fd < 0) { - if (ret == 0 && errno != ENOENT) - ret = -errno; - continue; --- -1.7.9.4 - diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD deleted file mode 100644 index 3a62d466d..000000000 --- a/extra/systemd/PKGBUILD +++ /dev/null @@ -1,127 +0,0 @@ -# $Id: PKGBUILD 158570 2012-05-04 23:57:21Z allan $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgbase=systemd -pkgname=('systemd' 'libsystemd') -pkgver=44 -pkgrel=7 -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' - 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') -options=('!libtool') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" - 0001-util-never-follow-symlinks-in-rm_rf_children.patch - 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch - 0001-check-for-proper-return-from-dirent_ensure_type.patch) -md5sums=('11f44ff74c87850064e4351518bcff17' - '752636def0db3c03f121f8b4f44a63cd' - 'b5863d6d4b47e2b5bda8eb57bde0d327' - 'd37833358ef6c23fad622ea4a0941d1f' - '11f930fd0a3966abc794bf9127a7dde0') - -build() { - cd "$pkgname-$pkgver" - - # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375) - patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" - - # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd) - patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" - - # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) - patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch" - - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-pamlibdir=/usr/lib/security \ - --localstatedir=/var \ - --with-distro=arch \ - --enable-split-usr \ - --disable-ima - - make -} - -package_systemd() { - pkgdesc="system and service manager" - depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') - optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) - install="$pkgname.install" - - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - - printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" - chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" - ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - - # use python2 for systemd-analyze - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # didn't build this... - rm -f "$pkgdir/usr/share/man/man1/systemadm.1" - - # fix .so links in manpage stubs - find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ - -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + - - # rename man pages to avoid conflicts with sysvinit and initscripts - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - cd "$pkgdir/usr/share/man" - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done - - # move bash-completion and symlink for loginctl - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" - rm -rf "$pkgdir/etc/bash_completion.d" - - # fix systemctl where - find "$pkgdir" -type f -name '*.service' -exec \ - sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} + - - ### split off libsystemd (libs, includes, pkgconfig, man3) - install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} - - cd "$srcdir"/libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('libcap' 'xz') - - mv "$srcdir/libsystemd"/* "$pkgdir" -} - -# vim: ft=sh syn=sh et diff --git a/extra/systemd/os-release b/extra/systemd/os-release deleted file mode 100644 index 5e24a6031..000000000 --- a/extra/systemd/os-release +++ /dev/null @@ -1,5 +0,0 @@ -NAME="Arch Linux" -ID=arch -PRETTY_NAME="Arch Linux" -ANSI_COLOR="1;36" - diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install deleted file mode 100644 index 0c3e9abee..000000000 --- a/extra/systemd/systemd.install +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! getent group lock >/dev/null; then - groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroup/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi -} - -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/tunepimp/PKGBUILD b/extra/tunepimp/PKGBUILD deleted file mode 100644 index c28df94a5..000000000 --- a/extra/tunepimp/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 149566 2012-02-08 14:42:07Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=tunepimp -pkgver=0.5.3 -pkgrel=9 -pkgdesc="A development library geared towards developers who wish to create MusicBrainz enabled tagging applications (aka libtunepimp)" -url="http://www.musicbrainz.org/products/tunepimp/" -arch=('i686' 'x86_64') -license=('GPL') -options=('!libtool' '!makeflags') -makedepends=('python2') -depends=('curl' 'musicbrainz' 'zlib' 'libmad' 'flac' 'libvorbis' 'readline' 'libmpcdec' 'libofa' 'taglib' 'libmp4v2') -replaces=('trm') -source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/lib${pkgname}-${pkgver}.tar.gz - tunepimp-gcc43.patch - gcc4.4.patch - mp4v2-1.9.patch - tunepimp-curl-headers.patch) - - build() { - cd ${srcdir}/lib${pkgname}-${pkgver} - sed -i -e 's,-ltermcap,-lncurses,' configure - sed -i -e 's:-lthr:-lpthread:g' lib/threads/posix/Makefile.in - patch -Np0 -i ${srcdir}/tunepimp-gcc43.patch - patch -Np1 -i ${srcdir}/gcc4.4.patch - patch -Np1 -i ${srcdir}/mp4v2-1.9.patch - patch -Np1 -i ${srcdir}/tunepimp-curl-headers.patch - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/lib${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - # install python bindings - cd python - python2 setup.py install --root=${pkgdir} - - # fix includes for kdemultimedia - cd ${pkgdir}/usr/include - ln -s tunepimp-0.5 tunepimp -} -md5sums=('09649f983acef679a548344ba7a9bb2f' - '40f48ad658958b909909b204bf9b1367' - 'b325bf8ed98bc008611ece0c418642f8' - '9f41d473a07e13808762545772fe3435' - '9cefd852995ebd2c4f733f2bef18c12a') diff --git a/extra/tunepimp/gcc4.4.patch b/extra/tunepimp/gcc4.4.patch deleted file mode 100644 index 2c5e4f9db..000000000 --- a/extra/tunepimp/gcc4.4.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ruN libtunepimp-0.5.3.orig/lib/fileio.cpp libtunepimp-0.5.3/lib/fileio.cpp ---- libtunepimp-0.5.3.orig/lib/fileio.cpp 2009-05-28 11:49:43.000000000 -0700 -+++ libtunepimp-0.5.3/lib/fileio.cpp 2009-05-28 11:59:05.000000000 -0700 -@@ -124,7 +124,8 @@ - - void tmktempname(const char *path, char *newPath, int newPathLen) - { -- char *ptr, *temp; -+ const char *ptr; -+ char *temp; - - temp = (char *)malloc(strlen(path) + 32); - ptr = strrchr(path, dirSepChar); diff --git a/extra/tunepimp/mp4v2-1.9.patch b/extra/tunepimp/mp4v2-1.9.patch deleted file mode 100644 index ec3ec7261..000000000 --- a/extra/tunepimp/mp4v2-1.9.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp libtunepimp-0.5.3/plugins/mp4/mp4.cpp ---- libtunepimp-0.5.3.orig/plugins/mp4/mp4.cpp 2009-07-10 15:50:20.000000000 +0300 -+++ libtunepimp-0.5.3/plugins/mp4/mp4.cpp 2009-07-10 15:51:18.000000000 +0300 -@@ -28,7 +28,7 @@ - #include <string.h> - #include <stdio.h> - #include <stdlib.h> --#include <mp4.h> -+#include <mp4v2/mp4v2.h> - #include "metadata.h" - #include "plugin.h" - #ifndef WIN32 -@@ -232,7 +232,7 @@ - - strcpy(mdata->fileFormat, fileName + strlen(fileName) - 3); - -- if (!MP4Close(mp4file)) -+ MP4Close(mp4file); - return 0; - - return 1; -@@ -316,7 +316,7 @@ - sprintf(temp, "%d", mdata->nonAlbum); - MP4SetMetadataFreeForm(mp4file, "MusicBrainz Non-Album", (u_int8_t *)temp, strlen(temp) + 1); - -- if (!MP4Close(mp4file)) -+ MP4Close(mp4file); - return 0; - - #ifndef WIN32 diff --git a/extra/tunepimp/tunepimp-curl-headers.patch b/extra/tunepimp/tunepimp-curl-headers.patch deleted file mode 100644 index 15e059bfa..000000000 --- a/extra/tunepimp/tunepimp-curl-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/protocol.cpp b/lib/protocol.cpp -index 3436f80..5adb2e5 100644 ---- a/lib/protocol.cpp -+++ b/lib/protocol.cpp -@@ -13,7 +13,6 @@ - #include <map> - #include <expat.h> - #include <curl/curl.h> --#include <curl/types.h> - #include <curl/easy.h> - using namespace std; - diff --git a/extra/tunepimp/tunepimp-gcc43.patch b/extra/tunepimp/tunepimp-gcc43.patch deleted file mode 100644 index e6d2a83e8..000000000 --- a/extra/tunepimp/tunepimp-gcc43.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -up lib/metadata.cpp.gcc43 lib/metadata.cpp ---- lib/metadata.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/metadata.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - #include <math.h> - #include <stdio.h> -+#include <stdlib.h> - #include "metadata.h" - #include "../config.h" - using namespace std; -diff -up lib/protocol.cpp.gcc43 lib/protocol.cpp ---- lib/protocol.cpp.gcc43 2006-11-28 14:25:04.000000000 -0600 -+++ lib/protocol.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -8,6 +8,7 @@ - -------------------------------------------------------------------*/ - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <string> - #include <map> - #include <expat.h> -diff -up lib/utf8/utf8util.cpp.gcc43 lib/utf8/utf8util.cpp ---- lib/utf8/utf8util.cpp.gcc43 2006-11-18 04:52:26.000000000 -0600 -+++ lib/utf8/utf8util.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include <stdio.h> -+#include <stdlib.h> - #include "utf8util.h" - #include "utf8.h" - #ifdef WIN32 -diff -up lib/tunepimp.cpp.gcc43 lib/tunepimp.cpp ---- lib/tunepimp.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/tunepimp.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -30,7 +30,9 @@ - #endif - #endif - -+#include <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <map> - using namespace std; - -diff -up lib/c_wrapper.cpp.gcc43 lib/c_wrapper.cpp ---- lib/c_wrapper.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/c_wrapper.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -24,6 +24,7 @@ - $Id: tunepimp-0.5.3-gcc43.patch,v 1.1 2008/04/07 05:49:36 philantrop Exp $ - - ----------------------------------------------------------------------------*/ -+#include <stdlib.h> - #include "tunepimp.h" - #include "mutex.h" - #include "tp_c.h" -diff -up lib/readmeta.cpp.gcc43 lib/readmeta.cpp ---- lib/readmeta.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/readmeta.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -31,6 +31,7 @@ - #endif - - #include <stdio.h> -+#include <stdlib.h> - #ifndef WIN32 - #include <unistd.h> - #endif -diff -up lib/fileio.cpp.gcc43 lib/fileio.cpp ---- lib/fileio.cpp.gcc43 2006-11-18 04:52:33.000000000 -0600 -+++ lib/fileio.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,8 @@ - - #include <assert.h> - #include <errno.h> -+#include <stdlib.h> -+#include <string.h> - #include <string> - #ifndef WIN32 - #include <unistd.h> -diff -up plugins/mp4/mp4.cpp.gcc43 plugins/mp4/mp4.cpp ---- plugins/mp4/mp4.cpp.gcc43 2006-11-18 04:51:08.000000000 -0600 -+++ plugins/mp4/mp4.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - - #include <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <mp4.h> - #include "metadata.h" - #include "plugin.h" -diff -up plugins/mp3/id3_meta.cpp.gcc43 plugins/mp3/id3_meta.cpp ---- plugins/mp3/id3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 -+++ plugins/mp3/id3_meta.cpp 2008-02-21 20:41:35.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include <stdio.h> -+#include <stdlib.h> - #include <time.h> - #include <ctype.h> - #include <musicbrainz/mb_c.h> -diff -up plugins/mp3/id3_2_3_meta.cpp.gcc43 plugins/mp3/id3_2_3_meta.cpp ---- plugins/mp3/id3_2_3_meta.cpp.gcc43 2006-11-18 04:51:07.000000000 -0600 -+++ plugins/mp3/id3_2_3_meta.cpp 2008-02-21 20:41:59.000000000 -0600 -@@ -26,6 +26,7 @@ - ----------------------------------------------------------------------------*/ - - #include <stdio.h> -+#include <stdlib.h> - #include <assert.h> - #include <ctype.h> - #include <musicbrainz/mb_c.h> -diff -up plugins/wma/wma.cpp.gcc43 plugins/wma/wma.cpp ---- plugins/wma/wma.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 -+++ plugins/wma/wma.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - - #include <string.h> - #include <stdio.h> -+#include <stdlib.h> - #include <wmafile.h> - #include "metadata.h" - #include "plugin.h" -diff -up plugins/wma/wmafile.cpp.gcc43 plugins/wma/wmafile.cpp ---- plugins/wma/wmafile.cpp.gcc43 2006-11-18 04:51:28.000000000 -0600 -+++ plugins/wma/wmafile.cpp 2008-02-21 20:39:10.000000000 -0600 -@@ -19,6 +19,7 @@ - * USA * - ***************************************************************************/ - -+#include <string.h> - #include <tstring.h> - #include <wmafile.h> - #include <wmatag.h> -diff -up include/tunepimp-0.5/metadata.h.gcc43 include/tunepimp-0.5/metadata.h ---- include/tunepimp-0.5/metadata.h.gcc43 2006-11-18 04:52:08.000000000 -0600 -+++ include/tunepimp-0.5/metadata.h 2008-02-21 20:39:10.000000000 -0600 -@@ -27,6 +27,7 @@ - #ifndef __METADATA_H__ - #define __METADATA_H__ - -+#include <string.h> - #include <string> - #include <cstdio>
\ No newline at end of file diff --git a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch b/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch deleted file mode 100644 index 90508d777..000000000 --- a/extra/watchdog/watchdog-5.9-use-oom_score_adj.patch +++ /dev/null @@ -1,91 +0,0 @@ -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/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch b/extra/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch deleted file mode 100644 index 5c3b1d7d6..000000000 --- a/extra/xf86-video-intel/0001-uxa-gen3-Remove-special-casing-of-solid-pictures.patch +++ /dev/null @@ -1,533 +0,0 @@ -From fbee314a4194671bfc6dfaa90141498a2f45de4e Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 27 Feb 2012 16:29:38 +0000 -Subject: [PATCH 1/5] uxa/gen3: Remove special casing of solid pictures - -Fixes use of alpha-groups and opacity masks in cairo. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - src/i915_render.c | 366 ++++++++++++++++++----------------------------------- - 1 file changed, 122 insertions(+), 244 deletions(-) - -diff --git a/src/i915_render.c b/src/i915_render.c -index 87d2336..6210035 100644 ---- a/src/i915_render.c -+++ b/src/i915_render.c -@@ -257,11 +257,8 @@ i915_check_composite_texture(ScreenPtr screen, PicturePtr picture) - return FALSE; - } - -- if (picture->pSourcePict) { -- SourcePict *source = picture->pSourcePict; -- if (source->type == SourcePictTypeSolidFill) -- return TRUE; -- } -+ if (picture->pSourcePict) -+ return FALSE; - - if (picture->pDrawable) { - int w, h, i; -@@ -387,23 +384,6 @@ static Bool i915_texture_setup(PicturePtr picture, PixmapPtr pixmap, int unit) - } - - static void --i915_emit_composite_primitive_constant(intel_screen_private *intel, -- int srcX, int srcY, -- int maskX, int maskY, -- int dstX, int dstY, -- int w, int h) --{ -- OUT_VERTEX(dstX + w); -- OUT_VERTEX(dstY + h); -- -- OUT_VERTEX(dstX); -- OUT_VERTEX(dstY + h); -- -- OUT_VERTEX(dstX); -- OUT_VERTEX(dstY); --} -- --static void - i915_emit_composite_primitive_identity_source(intel_screen_private *intel, - int srcX, int srcY, - int maskX, int maskY, -@@ -470,29 +450,6 @@ i915_emit_composite_primitive_affine_source(intel_screen_private *intel, - } - - static void --i915_emit_composite_primitive_constant_identity_mask(intel_screen_private *intel, -- int srcX, int srcY, -- int maskX, int maskY, -- int dstX, int dstY, -- int w, int h) --{ -- OUT_VERTEX(dstX + w); -- OUT_VERTEX(dstY + h); -- OUT_VERTEX((maskX + w) * intel->scale_units[0][0]); -- OUT_VERTEX((maskY + h) * intel->scale_units[0][1]); -- -- OUT_VERTEX(dstX); -- OUT_VERTEX(dstY + h); -- OUT_VERTEX(maskX * intel->scale_units[0][0]); -- OUT_VERTEX((maskY + h) * intel->scale_units[0][1]); -- -- OUT_VERTEX(dstX); -- OUT_VERTEX(dstY); -- OUT_VERTEX(maskX * intel->scale_units[0][0]); -- OUT_VERTEX(maskY * intel->scale_units[0][1]); --} -- --static void - i915_emit_composite_primitive_identity_source_mask(intel_screen_private *intel, - int srcX, int srcY, - int maskX, int maskY, -@@ -536,63 +493,61 @@ i915_emit_composite_primitive(intel_screen_private *intel, - - per_vertex = 2; /* dest x/y */ - -- if (! intel->render_source_is_solid) { -- src_unit = tex_unit++; -- -- is_affine_src = intel_transform_is_affine(intel->transform[src_unit]); -- if (is_affine_src) { -- if (!intel_get_transformed_coordinates(srcX, srcY, -- intel-> -- transform[src_unit], -- &src_x[0], -- &src_y[0])) -- return; -- -- if (!intel_get_transformed_coordinates(srcX, srcY + h, -- intel-> -- transform[src_unit], -- &src_x[1], -- &src_y[1])) -- return; -- -- if (!intel_get_transformed_coordinates(srcX + w, srcY + h, -- intel-> -- transform[src_unit], -- &src_x[2], -- &src_y[2])) -- return; -- -- per_vertex += 2; /* src x/y */ -- } else { -- if (!intel_get_transformed_coordinates_3d(srcX, srcY, -- intel-> -- transform[src_unit], -- &src_x[0], -- &src_y[0], -- &src_w[0])) -- return; -- -- if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, -- intel-> -- transform[src_unit], -- &src_x[1], -- &src_y[1], -- &src_w[1])) -- return; -- -- if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, -- intel-> -- transform[src_unit], -- &src_x[2], -- &src_y[2], -- &src_w[2])) -- return; -- -- per_vertex += 4; /* src x/y/z/w */ -- } -+ src_unit = tex_unit++; -+ -+ is_affine_src = intel_transform_is_affine(intel->transform[src_unit]); -+ if (is_affine_src) { -+ if (!intel_get_transformed_coordinates(srcX, srcY, -+ intel-> -+ transform[src_unit], -+ &src_x[0], -+ &src_y[0])) -+ return; -+ -+ if (!intel_get_transformed_coordinates(srcX, srcY + h, -+ intel-> -+ transform[src_unit], -+ &src_x[1], -+ &src_y[1])) -+ return; -+ -+ if (!intel_get_transformed_coordinates(srcX + w, srcY + h, -+ intel-> -+ transform[src_unit], -+ &src_x[2], -+ &src_y[2])) -+ return; -+ -+ per_vertex += 2; /* src x/y */ -+ } else { -+ if (!intel_get_transformed_coordinates_3d(srcX, srcY, -+ intel-> -+ transform[src_unit], -+ &src_x[0], -+ &src_y[0], -+ &src_w[0])) -+ return; -+ -+ if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, -+ intel-> -+ transform[src_unit], -+ &src_x[1], -+ &src_y[1], -+ &src_w[1])) -+ return; -+ -+ if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, -+ intel-> -+ transform[src_unit], -+ &src_x[2], -+ &src_y[2], -+ &src_w[2])) -+ return; -+ -+ per_vertex += 4; /* src x/y/z/w */ - } - -- if (intel->render_mask && ! intel->render_mask_is_solid) { -+ if (intel->render_mask) { - mask_unit = tex_unit++; - - is_affine_mask = intel_transform_is_affine(intel->transform[mask_unit]); -@@ -650,15 +605,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, - - OUT_VERTEX(dstX + w); - OUT_VERTEX(dstY + h); -- if (! intel->render_source_is_solid) { -- OUT_VERTEX(src_x[2] * intel->scale_units[src_unit][0]); -- OUT_VERTEX(src_y[2] * intel->scale_units[src_unit][1]); -- if (!is_affine_src) { -+ OUT_VERTEX(src_x[2] * intel->scale_units[src_unit][0]); -+ OUT_VERTEX(src_y[2] * intel->scale_units[src_unit][1]); -+ if (!is_affine_src) { - OUT_VERTEX(0.0); - OUT_VERTEX(src_w[2]); -- } - } -- if (intel->render_mask && ! intel->render_mask_is_solid) { -+ if (intel->render_mask) { - OUT_VERTEX(mask_x[2] * intel->scale_units[mask_unit][0]); - OUT_VERTEX(mask_y[2] * intel->scale_units[mask_unit][1]); - if (!is_affine_mask) { -@@ -669,15 +622,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, - - OUT_VERTEX(dstX); - OUT_VERTEX(dstY + h); -- if (! intel->render_source_is_solid) { -- OUT_VERTEX(src_x[1] * intel->scale_units[src_unit][0]); -- OUT_VERTEX(src_y[1] * intel->scale_units[src_unit][1]); -- if (!is_affine_src) { -+ OUT_VERTEX(src_x[1] * intel->scale_units[src_unit][0]); -+ OUT_VERTEX(src_y[1] * intel->scale_units[src_unit][1]); -+ if (!is_affine_src) { - OUT_VERTEX(0.0); - OUT_VERTEX(src_w[1]); -- } - } -- if (intel->render_mask && ! intel->render_mask_is_solid) { -+ if (intel->render_mask) { - OUT_VERTEX(mask_x[1] * intel->scale_units[mask_unit][0]); - OUT_VERTEX(mask_y[1] * intel->scale_units[mask_unit][1]); - if (!is_affine_mask) { -@@ -688,15 +639,13 @@ i915_emit_composite_primitive(intel_screen_private *intel, - - OUT_VERTEX(dstX); - OUT_VERTEX(dstY); -- if (! intel->render_source_is_solid) { -- OUT_VERTEX(src_x[0] * intel->scale_units[src_unit][0]); -- OUT_VERTEX(src_y[0] * intel->scale_units[src_unit][1]); -- if (!is_affine_src) { -+ OUT_VERTEX(src_x[0] * intel->scale_units[src_unit][0]); -+ OUT_VERTEX(src_y[0] * intel->scale_units[src_unit][1]); -+ if (!is_affine_src) { - OUT_VERTEX(0.0); - OUT_VERTEX(src_w[0]); -- } - } -- if (intel->render_mask && ! intel->render_mask_is_solid) { -+ if (intel->render_mask) { - OUT_VERTEX(mask_x[0] * intel->scale_units[mask_unit][0]); - OUT_VERTEX(mask_y[0] * intel->scale_units[mask_unit][1]); - if (!is_affine_mask) { -@@ -729,29 +678,11 @@ i915_prepare_composite(int op, PicturePtr source_picture, - intel->render_dest_picture = dest_picture; - intel->render_dest = dest; - -- intel->render_source_is_solid = FALSE; -- if (source_picture->pSourcePict) { -- SourcePict *source = source_picture->pSourcePict; -- if (source->type == SourcePictTypeSolidFill) { -- intel->render_source_is_solid = TRUE; -- intel->render_source_solid = source->solidFill.color; -- } -- } -- if (!intel->render_source_is_solid && !intel_check_pitch_3d(source)) -+ if (!intel_check_pitch_3d(source)) - return FALSE; - -- intel->render_mask_is_solid = FALSE; -- if (mask) { -- if (mask_picture->pSourcePict) { -- SourcePict *source = mask_picture->pSourcePict; -- if (source->type == SourcePictTypeSolidFill) { -- intel->render_mask_is_solid = TRUE; -- intel->render_mask_solid = source->solidFill.color; -- } -- } -- if (!intel->render_mask_is_solid && !intel_check_pitch_3d(mask)) -- return FALSE; -- } -+ if (mask && !intel_check_pitch_3d(mask)) -+ return FALSE; - - if (!intel_check_pitch_3d(dest)) - return FALSE; -@@ -787,31 +718,27 @@ i915_prepare_composite(int op, PicturePtr source_picture, - intel->scale_units[1][1] = -1; - - floats_per_vertex = 2; /* dest x/y */ -- if (! intel->render_source_is_solid) { -- if (!i915_texture_setup(source_picture, source, tex_unit++)) { -- intel_debug_fallback(scrn, "fail to setup src texture\n"); -- return FALSE; -- } -- -- if (intel_transform_is_affine(source_picture->transform)) -- floats_per_vertex += 2; /* src x/y */ -- else -- floats_per_vertex += 4; /* src x/y/z/w */ -+ if (!i915_texture_setup(source_picture, source, tex_unit++)) { -+ intel_debug_fallback(scrn, "fail to setup src texture\n"); -+ return FALSE; - } - -- if (mask != NULL) { -- if (! intel->render_mask_is_solid) { -- if (!i915_texture_setup(mask_picture, mask, tex_unit++)) { -- intel_debug_fallback(scrn, -- "fail to setup mask texture\n"); -- return FALSE; -- } -+ if (intel_transform_is_affine(source_picture->transform)) -+ floats_per_vertex += 2; /* src x/y */ -+ else -+ floats_per_vertex += 4; /* src x/y/z/w */ - -- if (intel_transform_is_affine(mask_picture->transform)) -- floats_per_vertex += 2; /* mask x/y */ -- else -- floats_per_vertex += 4; /* mask x/y/z/w */ -+ if (mask != NULL) { -+ if (!i915_texture_setup(mask_picture, mask, tex_unit++)) { -+ intel_debug_fallback(scrn, -+ "fail to setup mask texture\n"); -+ return FALSE; - } -+ -+ if (intel_transform_is_affine(mask_picture->transform)) -+ floats_per_vertex += 2; /* mask x/y */ -+ else -+ floats_per_vertex += 4; /* mask x/y/z/w */ - } - - intel->i915_render_state.op = op; -@@ -827,17 +754,13 @@ i915_prepare_composite(int op, PicturePtr source_picture, - - intel->prim_emit = i915_emit_composite_primitive; - if (!mask) { -- if (intel->render_source_is_solid) -- intel->prim_emit = i915_emit_composite_primitive_constant; -- else if (intel->transform[0] == NULL) -+ if (intel->transform[0] == NULL) - intel->prim_emit = i915_emit_composite_primitive_identity_source; - else if (intel_transform_is_affine(intel->transform[0])) - intel->prim_emit = i915_emit_composite_primitive_affine_source; - } else { - if (intel->transform[0] == NULL) { -- if (intel->render_source_is_solid) -- intel->prim_emit = i915_emit_composite_primitive_constant_identity_mask; -- else if (intel->transform[1] == NULL) -+ if (intel->transform[1] == NULL) - intel->prim_emit = i915_emit_composite_primitive_identity_source_mask; - } - } -@@ -856,39 +779,25 @@ i915_composite_emit_shader(intel_screen_private *intel, CARD8 op) - PicturePtr mask_picture = intel->render_mask_picture; - PixmapPtr mask = intel->render_mask; - int src_reg, mask_reg; -- Bool is_solid_src, is_solid_mask; - Bool dest_is_alpha = PIXMAN_FORMAT_RGB(intel->render_dest_picture->format) == 0; -- int tex_unit, t; - FS_LOCALS(); - -- is_solid_src = intel->render_source_is_solid; -- is_solid_mask = intel->render_mask_is_solid; -- - FS_BEGIN(); - - /* Declare the registers necessary for our program. */ -- t = 0; -- if (is_solid_src) { -- i915_fs_dcl(FS_T8); -- src_reg = FS_T8; -- } else { -- i915_fs_dcl(FS_T0); -- i915_fs_dcl(FS_S0); -- t++; -- } -+ i915_fs_dcl(FS_T0); -+ i915_fs_dcl(FS_S0); - if (!mask) { - /* No mask, so load directly to output color */ -- if (! is_solid_src) { -- if (dest_is_alpha) -- src_reg = FS_R0; -- else -- src_reg = FS_OC; -+ if (dest_is_alpha) -+ src_reg = FS_R0; -+ else -+ src_reg = FS_OC; - -- if (intel_transform_is_affine(intel->transform[0])) -- i915_fs_texld(src_reg, FS_S0, FS_T0); -- else -- i915_fs_texldp(src_reg, FS_S0, FS_T0); -- } -+ if (intel_transform_is_affine(intel->transform[0])) -+ i915_fs_texld(src_reg, FS_S0, FS_T0); -+ else -+ i915_fs_texldp(src_reg, FS_S0, FS_T0); - - if (src_reg != FS_OC) { - if (dest_is_alpha) -@@ -897,35 +806,24 @@ i915_composite_emit_shader(intel_screen_private *intel, CARD8 op) - i915_fs_mov(FS_OC, i915_fs_operand_reg(src_reg)); - } - } else { -- if (is_solid_mask) { -- i915_fs_dcl(FS_T9); -- mask_reg = FS_T9; -- } else { -- i915_fs_dcl(FS_T0 + t); -- i915_fs_dcl(FS_S0 + t); -- } -+ i915_fs_dcl(FS_T1); -+ i915_fs_dcl(FS_S1); - -- tex_unit = 0; -- if (! is_solid_src) { -- /* Load the source_picture texel */ -- if (intel_transform_is_affine(intel->transform[tex_unit])) -- i915_fs_texld(FS_R0, FS_S0, FS_T0); -- else -- i915_fs_texldp(FS_R0, FS_S0, FS_T0); -+ /* Load the source_picture texel */ -+ if (intel_transform_is_affine(intel->transform[0])) -+ i915_fs_texld(FS_R0, FS_S0, FS_T0); -+ else -+ i915_fs_texldp(FS_R0, FS_S0, FS_T0); - -- src_reg = FS_R0; -- tex_unit++; -- } -+ src_reg = FS_R0; - -- if (! is_solid_mask) { -- /* Load the mask_picture texel */ -- if (intel_transform_is_affine(intel->transform[tex_unit])) -- i915_fs_texld(FS_R1, FS_S0 + t, FS_T0 + t); -- else -- i915_fs_texldp(FS_R1, FS_S0 + t, FS_T0 + t); -+ /* Load the mask_picture texel */ -+ if (intel_transform_is_affine(intel->transform[1])) -+ i915_fs_texld(FS_R1, FS_S1, FS_T1); -+ else -+ i915_fs_texldp(FS_R1, FS_S1, FS_T1); - -- mask_reg = FS_R1; -- } -+ mask_reg = FS_R1; - - if (dest_is_alpha) { - i915_fs_mul(FS_OC, -@@ -972,7 +870,6 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) - PicturePtr dest_picture = intel->render_dest_picture; - PixmapPtr mask = intel->render_mask; - PixmapPtr dest = intel->render_dest; -- Bool is_solid_src, is_solid_mask; - int tex_count, t; - - intel->needs_render_state_emit = FALSE; -@@ -980,12 +877,7 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) - IntelEmitInvarientState(scrn); - intel->last_3d = LAST_3D_RENDER; - -- is_solid_src = intel->render_source_is_solid; -- is_solid_mask = intel->render_mask_is_solid; -- -- tex_count = 0; -- tex_count += ! is_solid_src; -- tex_count += mask && ! is_solid_mask; -+ tex_count = 1 + (mask != NULL); - - assert(intel->in_batch_atomic); - -@@ -1007,15 +899,6 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) - } - } - -- if (is_solid_src) { -- OUT_BATCH (_3DSTATE_DFLT_DIFFUSE_CMD); -- OUT_BATCH (intel->render_source_solid); -- } -- if (mask && is_solid_mask) { -- OUT_BATCH (_3DSTATE_DFLT_SPEC_CMD); -- OUT_BATCH (intel->render_mask_solid); -- } -- - /* BUF_INFO is an implicit flush, so avoid if the target has not changed. - * XXX However for reasons unfathomed, correct rendering in KDE requires - * at least a MI_FLUSH | INHIBIT_RENDER_CACHE_FLUSH here. -@@ -1058,20 +941,15 @@ static void i915_emit_composite_setup(ScrnInfoPtr scrn) - uint32_t ss2; - - ss2 = ~0; -- t = 0; -- if (! is_solid_src) { -- ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT); -- ss2 |= S2_TEXCOORD_FMT(t, -- intel_transform_is_affine(intel->transform[t]) ? -- TEXCOORDFMT_2D : TEXCOORDFMT_4D); -- t++; -- } -- if (mask && ! is_solid_mask) { -- ss2 &= ~S2_TEXCOORD_FMT(t, TEXCOORDFMT_NOT_PRESENT); -- ss2 |= S2_TEXCOORD_FMT(t, -- intel_transform_is_affine(intel->transform[t]) ? -+ ss2 &= ~S2_TEXCOORD_FMT(0, TEXCOORDFMT_NOT_PRESENT); -+ ss2 |= S2_TEXCOORD_FMT(0, -+ intel_transform_is_affine(intel->transform[0]) ? -+ TEXCOORDFMT_2D : TEXCOORDFMT_4D); -+ if (mask) { -+ ss2 &= ~S2_TEXCOORD_FMT(1, TEXCOORDFMT_NOT_PRESENT); -+ ss2 |= S2_TEXCOORD_FMT(1, -+ intel_transform_is_affine(intel->transform[1]) ? - TEXCOORDFMT_2D : TEXCOORDFMT_4D); -- t++; - } - - if (intel->needs_render_ca_pass) { --- -1.7.10 - diff --git a/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch b/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch deleted file mode 100644 index 89f43459d..000000000 --- a/extra/xf86-video-intel/0002-uxa-Defer-the-call-to-EnterVT-till-after-outputs-are.patch +++ /dev/null @@ -1,50 +0,0 @@ -From fd25a4586b0667b1591d85b23daaa99464e9b0d8 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 19 Mar 2012 15:51:43 +0000 -Subject: [PATCH 2/5] uxa: Defer the call to EnterVT till after outputs are - initialised - -We need to do this apparently or else we never perform the VT switch. -However, we can not do it too early, especially not before we have -finished intialising the outputs. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47395 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - src/intel_driver.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/intel_driver.c b/src/intel_driver.c -index e2e43fa..ff29754 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -1013,13 +1013,6 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - "Hardware cursor initialization failed\n"); - } - -- /* Must force it before EnterVT, so we are in control of VT and -- * later memory should be bound when allocating, e.g rotate_mem */ -- scrn->vtSema = TRUE; -- -- if (!I830EnterVT(scrnIndex, 0)) -- return FALSE; -- - intel->BlockHandler = screen->BlockHandler; - screen->BlockHandler = I830BlockHandler; - -@@ -1092,7 +1085,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv) - I830UeventInit(scrn); - #endif - -- return TRUE; -+ /* Must force it before EnterVT, so we are in control of VT and -+ * later memory should be bound when allocating, e.g rotate_mem */ -+ scrn->vtSema = TRUE; -+ -+ return I830EnterVT(scrnIndex, 0); - } - - static void i830AdjustFrame(int scrnIndex, int x, int y, int flags) --- -1.7.10 - diff --git a/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch b/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch deleted file mode 100644 index c1c4d55e8..000000000 --- a/extra/xf86-video-intel/0003-uxa-Remove-hook-for-CompositeRectangles.patch +++ /dev/null @@ -1,255 +0,0 @@ -From b669f171adece9df7f0c340c664b70e94118a55e Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 23 Mar 2012 14:56:06 +0000 -Subject: [PATCH 3/5] uxa: Remove hook for CompositeRectangles - -It was broken and not flushing damage correctly. With the -improvements made to the kernel, it is no longer a significant advantage -per se and not worth its additional complexity. - -Reported-by: Tilman Sauerbeck <tilman@code-monkey.de> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32547 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - uxa/uxa-priv.h | 1 - - uxa/uxa-render.c | 189 ------------------------------------------------------ - uxa/uxa.c | 4 -- - 3 files changed, 194 deletions(-) - -diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h -index 0de45f5..b24ec4f 100644 ---- a/uxa/uxa-priv.h -+++ b/uxa/uxa-priv.h -@@ -123,7 +123,6 @@ typedef struct { - BitmapToRegionProcPtr SavedBitmapToRegion; - #ifdef RENDER - CompositeProcPtr SavedComposite; -- CompositeRectsProcPtr SavedCompositeRects; - TrianglesProcPtr SavedTriangles; - GlyphsProcPtr SavedGlyphs; - TrapezoidsProcPtr SavedTrapezoids; -diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c -index 877b286..1e88c5d 100644 ---- a/uxa/uxa-render.c -+++ b/uxa/uxa-render.c -@@ -947,195 +947,6 @@ uxa_acquire_mask(ScreenPtr screen, - out_x, out_y); - } - --static Bool --_pixman_region_init_rectangles(pixman_region16_t *region, -- int num_rects, -- xRectangle *rects, -- int tx, int ty) --{ -- pixman_box16_t stack_boxes[64], *boxes = stack_boxes; -- pixman_bool_t ret; -- int i; -- -- if (num_rects > sizeof(stack_boxes) / sizeof(stack_boxes[0])) { -- boxes = malloc(sizeof(pixman_box16_t) * num_rects); -- if (boxes == NULL) -- return FALSE; -- } -- -- for (i = 0; i < num_rects; i++) { -- boxes[i].x1 = rects[i].x + tx; -- boxes[i].y1 = rects[i].y + ty; -- boxes[i].x2 = rects[i].x + tx + rects[i].width; -- boxes[i].y2 = rects[i].y + ty + rects[i].height; -- } -- -- ret = pixman_region_init_rects(region, boxes, num_rects); -- -- if (boxes != stack_boxes) -- free(boxes); -- -- return ret; --} -- --void --uxa_solid_rects (CARD8 op, -- PicturePtr dst, -- xRenderColor *color, -- int num_rects, -- xRectangle *rects) --{ -- ScreenPtr screen = dst->pDrawable->pScreen; -- uxa_screen_t *uxa_screen = uxa_get_screen(screen); -- PixmapPtr dst_pixmap, src_pixmap = NULL; -- pixman_region16_t region; -- pixman_box16_t *boxes, *extents; -- PicturePtr src; -- int dst_x, dst_y; -- int num_boxes; -- -- if (!pixman_region_not_empty(dst->pCompositeClip)) -- return; -- -- if (uxa_screen->info->flags & UXA_USE_GLAMOR) { -- int ok; -- -- uxa_picture_prepare_access(dst, UXA_GLAMOR_ACCESS_RW); -- ok = glamor_composite_rects_nf(op, dst, color, -- num_rects, rects); -- uxa_picture_finish_access(dst, UXA_GLAMOR_ACCESS_RW); -- -- if (!ok) -- goto fallback; -- -- return; -- } -- -- if (dst->alphaMap) -- goto fallback; -- -- dst_pixmap = uxa_get_offscreen_pixmap(dst->pDrawable, &dst_x, &dst_y); -- if (!dst_pixmap) -- goto fallback; -- -- if (!_pixman_region_init_rectangles(®ion, -- num_rects, rects, -- dst->pDrawable->x, dst->pDrawable->y)) -- goto fallback; -- -- if (!pixman_region_intersect(®ion, ®ion, dst->pCompositeClip)) { -- pixman_region_fini(®ion); -- return; -- } -- -- pixman_region_translate(®ion, dst_x, dst_y); -- boxes = pixman_region_rectangles(®ion, &num_boxes); -- extents = pixman_region_extents (®ion); -- -- if (op == PictOpClear) -- color->red = color->green = color->blue = color->alpha = 0; -- if (color->alpha >= 0xff00 && op == PictOpOver) { -- color->alpha = 0xffff; -- op = PictOpSrc; -- } -- -- /* Using GEM, the relocation costs outweigh the advantages of the blitter */ -- if (num_boxes == 1 && (op == PictOpSrc || op == PictOpClear)) { -- CARD32 pixel; -- --try_solid: -- if (uxa_screen->info->check_solid && -- !uxa_screen->info->check_solid(&dst_pixmap->drawable, GXcopy, FB_ALLONES)) -- goto err_region; -- -- if (!uxa_get_pixel_from_rgba(&pixel, -- color->red, -- color->green, -- color->blue, -- color->alpha, -- dst->format)) -- goto err_region; -- -- if (!uxa_screen->info->prepare_solid(dst_pixmap, GXcopy, FB_ALLONES, pixel)) -- goto err_region; -- -- while (num_boxes--) { -- uxa_screen->info->solid(dst_pixmap, -- boxes->x1, boxes->y1, -- boxes->x2, boxes->y2); -- boxes++; -- } -- -- uxa_screen->info->done_solid(dst_pixmap); -- } else { -- int error; -- -- src = CreateSolidPicture(0, color, &error); -- if (!src) -- goto err_region; -- -- if (!uxa_screen->info->check_composite(op, src, NULL, dst, -- extents->x2 - extents->x1, -- extents->y2 - extents->y1)) { -- if (op == PictOpSrc || op == PictOpClear) { -- FreePicture(src, 0); -- goto try_solid; -- } -- -- goto err_src; -- } -- -- if (!uxa_screen->info->check_composite_texture || -- !uxa_screen->info->check_composite_texture(screen, src)) { -- PicturePtr solid; -- int src_off_x, src_off_y; -- -- solid = uxa_acquire_solid(screen, src->pSourcePict); -- if (!solid) -- goto err_src; -- FreePicture(src, 0); -- -- src = solid; -- src_pixmap = uxa_get_offscreen_pixmap(src->pDrawable, -- &src_off_x, &src_off_y); -- if (!src_pixmap) -- goto err_src; -- } -- -- if (!uxa_screen->info->prepare_composite(op, src, NULL, dst, src_pixmap, NULL, dst_pixmap)) -- goto err_src; -- -- while (num_boxes--) { -- uxa_screen->info->composite(dst_pixmap, -- 0, 0, 0, 0, -- boxes->x1, -- boxes->y1, -- boxes->x2 - boxes->x1, -- boxes->y2 - boxes->y1); -- boxes++; -- } -- -- uxa_screen->info->done_composite(dst_pixmap); -- FreePicture(src, 0); -- } -- -- /* XXX xserver-1.8: CompositeRects is not tracked by Damage, so we must -- * manually append the damaged regions ourselves. -- */ -- pixman_region_translate(®ion, -dst_x, -dst_y); -- DamageRegionAppend(dst->pDrawable, ®ion); -- -- pixman_region_fini(®ion); -- return; -- --err_src: -- FreePicture(src, 0); --err_region: -- pixman_region_fini(®ion); --fallback: -- uxa_screen->SavedCompositeRects(op, dst, color, num_rects, rects); --} -- - static int - uxa_try_driver_composite(CARD8 op, - PicturePtr pSrc, -diff --git a/uxa/uxa.c b/uxa/uxa.c -index eb2ae03..b4a1da6 100644 ---- a/uxa/uxa.c -+++ b/uxa/uxa.c -@@ -407,7 +407,6 @@ static Bool uxa_close_screen(int i, ScreenPtr pScreen) - #ifdef RENDER - if (ps) { - ps->Composite = uxa_screen->SavedComposite; -- ps->CompositeRects = uxa_screen->SavedCompositeRects; - ps->Glyphs = uxa_screen->SavedGlyphs; - ps->Trapezoids = uxa_screen->SavedTrapezoids; - ps->AddTraps = uxa_screen->SavedAddTraps; -@@ -536,9 +535,6 @@ Bool uxa_driver_init(ScreenPtr screen, uxa_driver_t * uxa_driver) - uxa_screen->SavedComposite = ps->Composite; - ps->Composite = uxa_composite; - -- uxa_screen->SavedCompositeRects = ps->CompositeRects; -- ps->CompositeRects = uxa_solid_rects; -- - uxa_screen->SavedGlyphs = ps->Glyphs; - ps->Glyphs = uxa_glyphs; - --- -1.7.10 - diff --git a/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch b/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch deleted file mode 100644 index 3bf15c1a1..000000000 --- a/extra/xf86-video-intel/0004-uxa-Remove-broken-render-glyphs-to-dst.patch +++ /dev/null @@ -1,391 +0,0 @@ -From 1aee0af6d8296c108b6b4eb1bcf583aae385d22d Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 30 Mar 2012 12:47:21 +0100 -Subject: [PATCH 4/5] uxa: Remove broken render glyphs-to-dst - -Reported-by: Vincent Untz <vuntz@gnome.org> -Reported-by: Robert Bradford <robert.bradford@intel.com> -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48045 -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - uxa/uxa-glyphs.c | 330 +++--------------------------------------------------- - 1 file changed, 17 insertions(+), 313 deletions(-) - -diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c -index 6172f2f..b754f4e 100644 ---- a/uxa/uxa-glyphs.c -+++ b/uxa/uxa-glyphs.c -@@ -663,190 +663,6 @@ uxa_glyph_cache(ScreenPtr screen, GlyphPtr glyph, int *out_x, int *out_y) - return cache->picture; - } - --static int --uxa_glyphs_to_dst(CARD8 op, -- PicturePtr pSrc, -- PicturePtr pDst, -- INT16 src_x, INT16 src_y, -- INT16 xDst, INT16 yDst, -- int nlist, GlyphListPtr list, GlyphPtr * glyphs, -- BoxPtr extents) --{ -- ScreenPtr screen = pDst->pDrawable->pScreen; -- uxa_screen_t *uxa_screen = uxa_get_screen(screen); -- PixmapPtr src_pixmap, dst_pixmap; -- PicturePtr localSrc, glyph_atlas; -- int x, y, n; -- BoxRec box; -- -- if (uxa_screen->info->check_composite_texture && -- uxa_screen->info->check_composite_texture(screen, pSrc)) { -- if (pSrc->pDrawable) { -- int src_off_x, src_off_y; -- -- src_pixmap = uxa_get_offscreen_pixmap(pSrc->pDrawable, &src_off_x, &src_off_y); -- if (src_pixmap == NULL) -- return -1; -- -- src_x += pSrc->pDrawable->x + src_off_x; -- src_y += pSrc->pDrawable->y + src_off_y; -- } else { -- src_pixmap = NULL; -- } -- localSrc = pSrc; -- } else { -- int width, height; -- -- if (extents == NULL) { -- uxa_glyph_extents(nlist, list, glyphs, &box); -- extents = &box; -- } -- -- width = extents->x2 - extents->x1; -- height = extents->y2 - extents->y1; -- if (width == 0 || height == 0) -- return 0; -- -- if (pSrc->pDrawable) { -- int src_off_x, src_off_y; -- -- src_off_x = extents->x1 - xDst; -- src_off_y = extents->y1 - yDst; -- localSrc = uxa_acquire_drawable(screen, pSrc, -- src_x + src_off_x, src_y + src_off_y, -- width, height, -- &src_x, &src_y); -- if (uxa_screen->info->check_composite_texture && -- !uxa_screen->info->check_composite_texture(screen, localSrc)) { -- if (localSrc != pSrc) -- FreePicture(localSrc, 0); -- return -1; -- } -- -- src_pixmap = uxa_get_offscreen_pixmap(localSrc->pDrawable, &src_off_x, &src_off_y); -- if (src_pixmap == NULL) { -- if (localSrc != pSrc) -- FreePicture(localSrc, 0); -- return -1; -- } -- -- src_x += localSrc->pDrawable->x + src_off_x; -- src_y += localSrc->pDrawable->y + src_off_y; -- } else { -- localSrc = uxa_acquire_pattern(screen, pSrc, -- PICT_a8r8g8b8, x, y, width, height); -- if (!localSrc) -- return 1; -- -- src_pixmap = uxa_get_drawable_pixmap(localSrc->pDrawable); -- if (src_pixmap == NULL) { -- FreePicture(localSrc, 0); -- return -1; -- } -- -- src_x = src_y = 0; -- } -- } -- -- dst_pixmap = uxa_get_offscreen_pixmap(pDst->pDrawable, &x, &y); -- x += xDst + pDst->pDrawable->x - list->xOff; -- y += yDst + pDst->pDrawable->y - list->yOff; -- -- glyph_atlas = NULL; -- while (nlist--) { -- x += list->xOff; -- y += list->yOff; -- n = list->len; -- while (n--) { -- GlyphPtr glyph = *glyphs++; -- PicturePtr this_atlas; -- int mask_x, mask_y, nrect; -- struct uxa_glyph *priv; -- BoxPtr rects; -- -- if (glyph->info.width == 0 || glyph->info.height == 0) -- goto next_glyph; -- -- priv = uxa_glyph_get_private(glyph); -- if (priv != NULL) { -- mask_x = priv->x; -- mask_y = priv->y; -- this_atlas = priv->cache->picture; -- } else { -- if (glyph_atlas) { -- uxa_screen->info->done_composite(dst_pixmap); -- glyph_atlas = NULL; -- } -- this_atlas = uxa_glyph_cache(screen, glyph, &mask_x, &mask_y); -- if (this_atlas == NULL) { -- /* no cache for this glyph */ -- this_atlas = GlyphPicture(glyph)[screen->myNum]; -- mask_x = mask_y = 0; -- } -- } -- -- if (this_atlas != glyph_atlas) { -- PixmapPtr mask_pixmap; -- -- if (glyph_atlas) -- uxa_screen->info->done_composite(dst_pixmap); -- -- mask_pixmap = -- uxa_get_drawable_pixmap(this_atlas->pDrawable); -- if (!uxa_pixmap_is_offscreen(mask_pixmap) || -- !uxa_screen->info->prepare_composite(op, -- localSrc, this_atlas, pDst, -- src_pixmap, mask_pixmap, dst_pixmap)) -- return -1; -- -- glyph_atlas = this_atlas; -- } -- -- rects = REGION_RECTS(pDst->pCompositeClip); -- nrect = REGION_NUM_RECTS(pDst->pCompositeClip); -- while (nrect--) { -- int x1 = x - glyph->info.x, dx = 0; -- int y1 = y - glyph->info.y, dy = 0; -- int x2 = x1 + glyph->info.width; -- int y2 = y1 + glyph->info.height; -- -- if (rects->y1 >= y2) -- break; -- -- if (x1 < rects->x1) -- dx = rects->x1 - x1, x1 = rects->x1; -- if (x2 > rects->x2) -- x2 = rects->x2; -- if (y1 < rects->y1) -- dy = rects->y1 - y1, y1 = rects->y1; -- if (y2 > rects->y2) -- y2 = rects->y2; -- -- if (x1 < x2 && y1 < y2) { -- uxa_screen->info->composite(dst_pixmap, -- x1 + src_x, y1 + src_y, -- dx + mask_x, dy + mask_y, -- x1, y1, -- x2 - x1, y2 - y1); -- } -- rects++; -- } -- --next_glyph: -- x += glyph->info.xOff; -- y += glyph->info.yOff; -- } -- list++; -- } -- if (glyph_atlas) -- uxa_screen->info->done_composite(dst_pixmap); -- -- if (localSrc != pSrc) -- FreePicture(localSrc, 0); -- -- return 0; --} -- - static void - uxa_clear_pixmap(ScreenPtr screen, - uxa_screen_t *uxa_screen, -@@ -894,37 +710,30 @@ uxa_glyphs_via_mask(CARD8 op, - PicturePtr pDst, - PictFormatPtr maskFormat, - INT16 xSrc, INT16 ySrc, -- INT16 xDst, INT16 yDst, -- int nlist, GlyphListPtr list, GlyphPtr * glyphs, -- BoxPtr extents) -+ int nlist, GlyphListPtr list, GlyphPtr * glyphs) - { - ScreenPtr screen = pDst->pDrawable->pScreen; - uxa_screen_t *uxa_screen = uxa_get_screen(screen); - CARD32 component_alpha; - PixmapPtr pixmap; - PicturePtr glyph_atlas, mask; -+ int xDst = list->xOff, yDst = list->yOff; - int x, y, width, height; - int dst_off_x, dst_off_y; - int n, error; - BoxRec box; - -- if (!extents) { -- uxa_glyph_extents(nlist, list, glyphs, &box); -+ uxa_glyph_extents(nlist, list, glyphs, &box); -+ if (box.x2 <= box.x1 || box.y2 <= box.y1) -+ return 0; - -- if (box.x2 <= box.x1 || box.y2 <= box.y1) -- return 0; -+ dst_off_x = box.x1; -+ dst_off_y = box.y1; - -- extents = &box; -- dst_off_x = box.x1; -- dst_off_y = box.y1; -- } else { -- dst_off_x = dst_off_y = 0; -- } -- -- width = extents->x2 - extents->x1; -- height = extents->y2 - extents->y1; -- x = -extents->x1; -- y = -extents->y1; -+ width = box.x2 - box.x1; -+ height = box.y2 - box.y1; -+ x = -box.x1; -+ y = -box.y1; - - if (maskFormat->depth == 1) { - PictFormatPtr a8Format = -@@ -1061,11 +870,6 @@ uxa_glyphs(CARD8 op, - { - ScreenPtr screen = pDst->pDrawable->pScreen; - uxa_screen_t *uxa_screen = uxa_get_screen(screen); -- int xDst = list->xOff, yDst = list->yOff; -- BoxRec extents = { 0, 0, 0, 0 }; -- Bool have_extents = FALSE; -- int width, height, ret; -- PicturePtr localDst = pDst; - - if (uxa_screen->info->flags & UXA_USE_GLAMOR) { - int ok; -@@ -1128,112 +932,12 @@ fallback: - } - } - -- if (!maskFormat && -- uxa_screen->info->check_composite_target && -- !uxa_screen->info->check_composite_target(uxa_get_drawable_pixmap(pDst->pDrawable))) { -- int depth = pDst->pDrawable->depth; -- PixmapPtr pixmap; -- int x, y, error; -- GCPtr gc; -- -- pixmap = uxa_get_drawable_pixmap(pDst->pDrawable); -- if (uxa_screen->info->check_copy && -- !uxa_screen->info->check_copy(pixmap, pixmap, GXcopy, FB_ALLONES)) -- goto fallback; -- -- uxa_glyph_extents(nlist, list, glyphs, &extents); -- -- /* clip against dst bounds */ -- if (extents.x1 < 0) -- extents.x1 = 0; -- if (extents.y1 < 0) -- extents.y1 = 0; -- if (extents.x2 > pDst->pDrawable->width) -- extents.x2 = pDst->pDrawable->width; -- if (extents.y2 > pDst->pDrawable->height) -- extents.y2 = pDst->pDrawable->height; -- -- if (extents.x2 <= extents.x1 || extents.y2 <= extents.y1) -- return; -- width = extents.x2 - extents.x1; -- height = extents.y2 - extents.y1; -- x = -extents.x1; -- y = -extents.y1; -- have_extents = TRUE; -- -- xDst += x; -- yDst += y; -- -- pixmap = screen->CreatePixmap(screen, -- width, height, depth, -- CREATE_PIXMAP_USAGE_SCRATCH); -- if (!pixmap) -- return; -- -- if (!uxa_pixmap_is_offscreen(pixmap)) { -- screen->DestroyPixmap(pixmap); -- goto fallback; -- } -- -- gc = GetScratchGC(depth, screen); -- if (!gc) { -- screen->DestroyPixmap(pixmap); -- return; -- } -- -- ValidateGC(&pixmap->drawable, gc); -- gc->ops->CopyArea(pDst->pDrawable, &pixmap->drawable, gc, -- extents.x1, extents.y1, -- width, height, -- 0, 0); -- FreeScratchGC(gc); -- -- localDst = CreatePicture(0, &pixmap->drawable, -- PictureMatchFormat(screen, depth, pDst->format), -- 0, 0, serverClient, &error); -- screen->DestroyPixmap(pixmap); -- -- if (!localDst) -- return; -- -- ValidatePicture(localDst); -- } -- -- if (maskFormat) { -- ret = uxa_glyphs_via_mask(op, -- pSrc, localDst, maskFormat, -- xSrc, ySrc, -- xDst, yDst, -- nlist, list, glyphs, -- have_extents ? &extents : NULL); -- } else { -- ret = uxa_glyphs_to_dst(op, -- pSrc, localDst, -- xSrc, ySrc, -- xDst, yDst, -- nlist, list, glyphs, -- have_extents ? &extents : NULL); -- } -- if (ret) { -- if (localDst != pDst) -- FreePicture(localDst, 0); -- -+ if (!maskFormat) - goto fallback; -- } - -- if (localDst != pDst) { -- GCPtr gc; -- -- gc = GetScratchGC(pDst->pDrawable->depth, screen); -- if (gc) { -- ValidateGC(pDst->pDrawable, gc); -- gc->ops->CopyArea(localDst->pDrawable, pDst->pDrawable, gc, -- 0, 0, -- width, height, -- extents.x1, extents.y1); -- FreeScratchGC(gc); -- } -- -- FreePicture(localDst, 0); -- } -+ if (uxa_glyphs_via_mask(op, -+ pSrc, pDst, maskFormat, -+ xSrc, ySrc, -+ nlist, list, glyphs)) -+ goto fallback; - } --- -1.7.10 - diff --git a/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch b/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch deleted file mode 100644 index 865679078..000000000 --- a/extra/xf86-video-intel/0005-uxa-Fix-leak-of-glyph-mask-for-unhandled-glyph-compo.patch +++ /dev/null @@ -1,40 +0,0 @@ -From af5c698fd43308c3b799783b662b9cd871f90a62 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sat, 14 Apr 2012 19:03:25 +0100 -Subject: [PATCH 5/5] uxa: Fix leak of glyph mask for unhandled glyph - composition - -==1401== 7,344 bytes in 34 blocks are possibly lost in loss record 570 of 587 -==1401== at 0x4027034: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) -==1401== by 0x8BE5150: drm_intel_gem_bo_alloc_internal (intel_bufmgr_gem.c:689) -==1401== by 0x899FC04: intel_uxa_create_pixmap (intel_uxa.c:1077) -==1401== by 0x89C2C41: uxa_glyphs (uxa-glyphs.c:254) -==1401== by 0x21F05E: damageGlyphs (damage.c:647) -==1401== by 0x218E06: ProcRenderCompositeGlyphs (render.c:1434) -==1401== by 0x15AA40: Dispatch (dispatch.c:439) -==1401== by 0x1499E9: main (main.c:287) - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - uxa/uxa-glyphs.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/uxa/uxa-glyphs.c b/uxa/uxa-glyphs.c -index b754f4e..921b99c 100644 ---- a/uxa/uxa-glyphs.c -+++ b/uxa/uxa-glyphs.c -@@ -812,8 +812,10 @@ uxa_glyphs_via_mask(CARD8 op, - if (!uxa_pixmap_is_offscreen(src_pixmap) || - !uxa_screen->info->prepare_composite(PictOpAdd, - this_atlas, NULL, mask, -- src_pixmap, NULL, pixmap)) -+ src_pixmap, NULL, pixmap)) { -+ FreePicture(mask, 0); - return -1; -+ } - - glyph_atlas = this_atlas; - } --- -1.7.10 - diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD deleted file mode 100644 index 20d562fe2..000000000 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,313 +0,0 @@ -# $Id: PKGBUILD 70454 2012-05-07 19:37:47Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.7.0 -pkgrel=6 -_snapshot=4.7-20120505 -_libstdcppmanver=20120307 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' - 'lib32-glibc>=2.14') -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 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64-multilib.patch - gcc-4.7.0-cloog-0.17.patch) -md5sums=('8e2df3b9a755c9262db0df019cc3542e' - '489d2f5311535800a120efd8d18db719' - 'ec24c32d3d1030c2bc8cb2ad2d1dc629' - '575f7d17b022e609447a590e481b18b5') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch - - # compatibility with latest cloog - patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --enable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release --with-fpmath=sse - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.15' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove stuff in lib32-gcc-libs - rm -r ${pkgdir}/usr/lib32 - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.15' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-multilib() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl') - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - make -j1 DESTDIR=${pkgdir} install - - install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib{,32}/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -s /usr/bin/cpp ${pkgdir}/lib/cpp - ln -s gcc ${pkgdir}/usr/bin/cc - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('gcc-fortran') - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - ln -s gfortran ${pkgdir}/usr/bin/f95 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - cd ../$CHOST/32/libada - make -j1 DESTDIR=${pkgdir} INSTALL="install" \ - INSTALL_DATA="install -m644" install-gnatlib - - ln -s gcc ${pkgdir}/usr/bin/gnatgcc - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go-multilib() -{ - pkgdesc="Go front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-go=$pkgver-$pkgrel") - conflicts=('gcc-go') - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib-testing/gcc-multilib/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-testing/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib-testing/gcc-multilib/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-testing/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -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 - 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 - done -} diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-testing/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch b/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch deleted file mode 100644 index b5576ae0e..000000000 --- a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h ---- gcc-4.7.0/gcc/config/i386/linux64.h 2011-07-07 17:38:34.000000000 +0200 -+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h 2012-03-24 11:52:58.926204014 +0100 -@@ -29,5 +29,5 @@ - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64 ---- gcc-4.7.0/gcc/config/i386/t-linux64 2011-11-02 16:23:48.000000000 +0100 -+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64 2012-03-24 11:52:44.119651885 +0100 -@@ -34,6 +34,6 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 diff --git a/multilib-testing/lib32-cairo/PKGBUILD b/multilib-testing/lib32-cairo/PKGBUILD deleted file mode 100644 index ce8092b83..000000000 --- a/multilib-testing/lib32-cairo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 69357 2012-04-14 13:01:09Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=cairo -pkgname=lib32-$_pkgbasename -pkgver=1.12.0 -pkgrel=1 -pkgdesc="Cairo vector graphics library (32-bit)" -arch=('x86_64') -url="http://cairographics.org/" -license=('LGPL' 'MPL') -depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig' - 'lib32-pixman' 'lib32-glib2' ${_pkgbasename}) -makedepends=('gcc-multilib') -source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz - cairo-1.10.0-buggy_gradients.patch - git_fixes.patch) -md5sums=('e6c85575ba7094f88b637bdfd835a751' - '9b323790dab003e228c6955633cb888e' - 'ce32ba4639d910bce7159c9a67ff2355') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - patch -Np1 -i ${srcdir}/git_fixes.patch - autoreconf -vfi - - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-tee --disable-xlib-xcb - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/multilib-testing/lib32-cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
diff --git a/multilib-testing/lib32-cairo/git_fixes.patch b/multilib-testing/lib32-cairo/git_fixes.patch deleted file mode 100644 index 6ad8979eb..000000000 --- a/multilib-testing/lib32-cairo/git_fixes.patch +++ /dev/null @@ -1,1086 +0,0 @@ -From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Sun, 25 Mar 2012 18:37:14 +0000 -Subject: Fix math in comments - ---- -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index dc07fee..6977e88 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -139,7 +139,7 @@ _arc_segments_needed (double angle, - - From that paper, a very practical value of h is: - -- h = 4/3 * tan(angle/4) -+ h = 4/3 * R * tan(angle/4) - - This value does not give the spline with minimal error, but it does - provide a very good approximation, (6th-order convergence), and the --- -cgit v0.9.0.2-2-gbebe -From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Tue, 27 Mar 2012 21:25:37 +0000 -Subject: gl: use font's antialias option to check whether it needs mask - -There is need to loop over number of glyphs to check wether the glyph -image is a ARGB32 as the font's antialias option can be used for checking. -If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32, -otherwise it will be A8 format. Therefore we will only be using -component-alpha at SUBPIXEL (or better) font quality and only then need -a mask for multiple pass glyph composition. ---- -diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c -index 832956f..9756ea4 100644 ---- a/src/cairo-gl-glyphs.c -+++ b/src/cairo-gl-glyphs.c -@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void *_dst, - - TRACE ((stderr, "%s\n", __FUNCTION__)); - -- /* If any of the glyphs are component alpha, we have to go through a mask, -- * since only _cairo_gl_surface_composite() currently supports component -- * alpha. -+ /* If any of the glyphs require component alpha, we have to go through -+ * a mask, since only _cairo_gl_surface_composite() currently supports -+ * component alpha. - */ -- if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) { -- for (i = 0; i < info->num_glyphs; i++) { -- cairo_scaled_glyph_t *scaled_glyph; -- -- if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index, -- CAIRO_SCALED_GLYPH_INFO_SURFACE, -- &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS && -- scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32) -- { -- info->use_mask = TRUE; -- break; -- } -- } -+ if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER && -+ (info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL || -+ info->font->options.antialias == CAIRO_ANTIALIAS_BEST)) -+ { -+ info->use_mask = TRUE; - } - - if (info->use_mask) { --- -cgit v0.9.0.2-2-gbebe -From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 Mar 2012 23:32:36 +0000 -Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask - -The SOURCE and CLEAR are the odd pair in Cairo's range of operators that -are bound by the shape/mask, but are unbound by the source. This -regularly leads to bugs as only track the bound/unbound rectangles and -confuse the meaning when bound only by the mask. - -What is required is that the unbound extents in this case is only -trimmed by the mask (the bounded extents are still the intersection of -all). - -Fixes bug-source-cu - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c -index 106571e..8c5cd5a 100644 ---- a/src/cairo-composite-rectangles.c -+++ b/src/cairo-composite-rectangles.c -@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents, - if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) - return CAIRO_INT_STATUS_NOTHING_TO_DO; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); - if (_cairo_clip_is_all_clipped (extents->clip)) -@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles - rect.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); -@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t - mask.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); --- -cgit v0.9.0.2-2-gbebe -From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu, 29 Mar 2012 13:48:24 +0000 -Subject: cairoint: Mark PDF surface as requiring the deflate stream output - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairoint.h b/src/cairoint.h -index 9a8003e..9f20d51 100644 ---- a/src/cairoint.h -+++ b/src/cairoint.h -@@ -73,7 +73,10 @@ - #include "cairo-compiler-private.h" - #include "cairo-error-private.h" - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE -+#if CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_SCRIPT_SURFACE || \ -+ CAIRO_HAS_XML_SURFACE - #define CAIRO_HAS_DEFLATE_STREAM 1 - #endif - -@@ -84,7 +87,9 @@ - #define CAIRO_HAS_FONT_SUBSET 1 - #endif - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET -+#if CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_FONT_SUBSET - #define CAIRO_HAS_PDF_OPERATORS 1 - #endif - --- -cgit v0.9.0.2-2-gbebe -From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Thu, 29 Mar 2012 01:08:51 +0000 -Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface - -We need to fix y-axis origin when map a GL surface to image surface for -non-texture GL surface. - -Test cases: extended-blend-alpha-mask, extended-blend-mask. -Although the image outputs is not right, but the image on the first grid -(upper-left corner) is correct comparing to image output. ---- -diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c -index 8bbf939..32ecf63 100644 ---- a/src/cairo-gl-surface.c -+++ b/src/cairo-gl-surface.c -@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - unsigned int cpp; - cairo_bool_t invert; - cairo_status_t status; -+ int y; - - /* Want to use a switch statement here but the compiler gets whiny. */ - if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) { -@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp); - if (invert) - glPixelStorei (GL_PACK_INVERT_MESA, 1); -- glReadPixels (extents->x, extents->y, -+ -+ y = extents->y; -+ if (! _cairo_gl_surface_is_texture (surface)) -+ y = surface->height - extents->y - extents->height; -+ -+ glReadPixels (extents->x, y, - extents->width, extents->height, - format, type, image->data); - if (invert) --- -cgit v0.9.0.2-2-gbebe -From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Mon, 02 Apr 2012 18:43:00 +0000 -Subject: xcb: Fix SHM in _get_image() - -Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM -path when getting the image via SHM failed, we now did the fallback when getting -the image via SHM worked (which means that the SHM operation was a waste of -time). - -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c -index fff4f52..6bedbda 100644 ---- a/src/cairo-xcb-surface.c -+++ b/src/cairo-xcb-surface.c -@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t *surface, - if (use_shm) { - image = _get_shm_image (surface, x, y, width, height); - if (image) { -- if (image->status) { -+ if (image->status == CAIRO_STATUS_SUCCESS) { - _cairo_xcb_connection_release (connection); - return image; - } --- -cgit v0.9.0.2-2-gbebe -From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Mon, 02 Apr 2012 21:29:47 +0000 -Subject: gl: Remove an unused variable - ---- -diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c -index b364b92..ce7c0dd 100644 ---- a/src/cairo-gl-gradient.c -+++ b/src/cairo-gl-gradient.c -@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, - cairo_status_t status; - int tex_width; - void *data; -- cairo_gl_dispatch_t *dispatch = &ctx->dispatch; - - if ((unsigned int) ctx->max_texture_size / 2 <= n_stops) - return CAIRO_INT_STATUS_UNSUPPORTED; --- -cgit v0.9.0.2-2-gbebe -From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Wed, 04 Apr 2012 10:23:09 +0000 -Subject: fix bug in _cairo_image_analyze_color - ---- -diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c -index 8208a15..e860e1b 100644 ---- a/src/cairo-image-surface.c -+++ b/src/cairo-image-surface.c -@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t *image) - if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR) - return image->color; - -- if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8) -+ if (image->format == CAIRO_FORMAT_A1) - return image->color = CAIRO_IMAGE_IS_MONOCHROME; - -+ if (image->format == CAIRO_FORMAT_A8) -+ return image->color = CAIRO_IMAGE_IS_GRAYSCALE; -+ - if (image->format == CAIRO_FORMAT_ARGB32) { - image->color = CAIRO_IMAGE_IS_MONOCHROME; - for (y = 0; y < image->height; y++) { --- -cgit v0.9.0.2-2-gbebe -From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:43:35 +0000 -Subject: type1-subset: use fallback font if glyph widths are calculated - -Bug 48349 has a pdf file with a Type 1 font where the glyph widths are -of the form: - -34 9302 19 div hsbw ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index 607ac8e..ba1008a 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - command = *p++; - switch (command) { - case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; -@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - break; - - case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; --- -cgit v0.9.0.2-2-gbebe -From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:53:50 +0000 -Subject: fix indentation in cairo_type1_font_subset_parse_charstring - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ba1008a..ddef8ae 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -1,3 +1,4 @@ -+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ - /* cairo - a vector graphics library with display and print output - * - * Copyright © 2006 Red Hat, Inc -@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - if (*p < 32) { - command = *p++; - switch (command) { -- case TYPE1_CHARSTRING_COMMAND_HSBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -+ if (font->subset_subrs && -+ last_op_was_integer && -+ font->build_stack.top_value >= 0 && -+ font->build_stack.top_value < font->num_subrs) -+ { -+ subr_num = font->build_stack.top_value; -+ font->subrs[subr_num].used = TRUE; -+ last_op_was_integer = FALSE; -+ status = cairo_type1_font_subset_parse_charstring (font, -+ glyph, -+ font->subrs[subr_num].subr_string, -+ font->subrs[subr_num].subr_length); -+ } else { -+ font->subset_subrs = FALSE; -+ } -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_ESCAPE: -+ command = command << 8 | *p++; -+ switch (command) { -+ case TYPE1_CHARSTRING_COMMAND_SEAC: -+ /* The seac command takes five integer arguments. The -+ * last two are glyph indices into the PS standard -+ * encoding give the names of the glyphs that this -+ * glyph is composed from. All we need to do is to -+ * make sure those glyphs are present in the subset -+ * under their standard names. */ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -+ if (unlikely (status)) -+ return status; -+ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -+ if (unlikely (status)) -+ return status; - -- font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -- if (font->subset_subrs && -- last_op_was_integer && -- font->build_stack.top_value >= 0 && -- font->build_stack.top_value < font->num_subrs) -- { -- subr_num = font->build_stack.top_value; -- font->subrs[subr_num].used = TRUE; -- last_op_was_integer = FALSE; -- status = cairo_type1_font_subset_parse_charstring (font, -- glyph, -- font->subrs[subr_num].subr_string, -- font->subrs[subr_num].subr_length); -- } else { -- font->subset_subrs = FALSE; -- } -+ case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_ESCAPE: -- command = command << 8 | *p++; -- switch (command) { -- case TYPE1_CHARSTRING_COMMAND_SEAC: -- /* The seac command takes five integer arguments. The -- * last two are glyph indices into the PS standard -- * encoding give the names of the glyphs that this -- * glyph is composed from. All we need to do is to -- * make sure those glyphs are present in the subset -- * under their standard names. */ -- status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -- if (unlikely (status)) -- return status; -- -- status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -- if (unlikely (status)) -- return status; -- -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_SBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -- -- font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -- for (i = 0; i < font->build_stack.sp; i++) -- font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -- font->ps_stack.num_other_subr_args = font->build_stack.sp; -- font->ps_stack.cur_other_subr_arg = 0; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_POP: -- if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -- font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -- last_op_was_integer = TRUE; -- } else { -- font->subset_subrs = FALSE; -- } -- break; -- -- default: -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -+ case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -+ for (i = 0; i < font->build_stack.sp; i++) -+ font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -+ font->ps_stack.num_other_subr_args = font->build_stack.sp; -+ font->ps_stack.cur_other_subr_arg = 0; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_POP: -+ if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -+ font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -+ last_op_was_integer = TRUE; -+ } else { -+ font->subset_subrs = FALSE; - } - break; - -@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; -+ } -+ break; -+ -+ default: -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; - } - } else { - /* integer argument */ --- -cgit v0.9.0.2-2-gbebe -From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 00:13:53 +0000 -Subject: type1-subset: if font name is prefixed with a subset tag, strip it off - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ddef8ae..e507abe 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - { - const char *start, *end, *segment_end; - char *s; -+ int i; - - segment_end = font->header_segment + font->header_segment_size; - start = find_token (font->header_segment, segment_end, "/FontName"); -@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - return CAIRO_INT_STATUS_UNSUPPORTED; - } - -+ /* If font name is prefixed with a subset tag, strip it off. */ -+ if (strlen(start) > 7 && start[6] == '+') { -+ for (i = 0; i < 6; i++) { -+ if (start[i] < 'A' || start[i] > 'Z') -+ break; -+ } -+ if (i == 6) -+ start += 7; -+ } -+ - font->base.base_font = strdup (start); - free (s); - if (unlikely (font->base.base_font == NULL)) --- -cgit v0.9.0.2-2-gbebe -From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 11:50:40 +0000 -Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces - -It had caused pdf bbox sizes to regress to page size bboxes. ---- -diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c -index 27ba004..5b3e177 100644 ---- a/src/cairo-pattern.c -+++ b/src/cairo-pattern.c -@@ -37,6 +37,7 @@ - #include "cairo-path-private.h" - #include "cairo-pattern-private.h" - #include "cairo-recording-surface-private.h" -+#include "cairo-surface-snapshot-private.h" - - #include <float.h> - -@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t *pattern, - (const cairo_surface_pattern_t *) pattern; - cairo_surface_t *surface = surface_pattern->surface; - -+ if (_cairo_surface_is_snapshot (surface)) -+ surface = _cairo_surface_snapshot_get_target (surface); -+ - if (_cairo_surface_is_recording (surface)) { - cairo_matrix_t imatrix; - cairo_box_t box; --- -cgit v0.9.0.2-2-gbebe -From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 10:28:59 +0000 -Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes - -A typo using half_line_x instead of half_line_y when emitting dashed -segments of the rectilinear stroke. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c -index 3e8c5a4..cc9dd19 100644 ---- a/src/cairo-path-stroke-boxes.c -+++ b/src/cairo-path-stroke-boxes.c -@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st - box.p1.x = box.p2.x - half_line_x; - } - if (out_slope.dy >= 0) -- box.p1.y -= half_line_x; -+ box.p1.y -= half_line_y; - if (out_slope.dy <= 0) -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { - if (box.p1.y <= box.p2.y) { - box.p1.y = box.p2.y; -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { -- box.p1.y = box.p2.y - half_line_x; -+ box.p1.y = box.p2.y - half_line_y; - } - if (out_slope.dx >= 0) - box.p1.x -= half_line_x; --- -cgit v0.9.0.2-2-gbebe -From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 16:58:13 +0000 -Subject: traps: Clip the trapezoid extents against the clip extents - -Just in case the clip polygon turns out to be much larger than the -operation extents (silly us for not reducing it correctly) and lead to -catastrophe, such as: - -Program received signal SIGSEGV, Segmentation fault. -pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0, -width=3, height=-34811, data=0) at pixman-sse2.c:3369 -3369 *(uint16_t *)d = data; - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c -index 284a0be..c49e208 100644 ---- a/src/cairo-traps-compositor.c -+++ b/src/cairo-traps-compositor.c -@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor, - _cairo_traps_fini (&traps); - cairo_surface_destroy (src); - -- if (status == CAIRO_INT_STATUS_SUCCESS && -- (fixup.width < extents->width || fixup.height < extents->height)) { -+ if (unlikely (status)) -+ return status; -+ -+ if (! _cairo_rectangle_intersect (&fixup, extents)) -+ return CAIRO_STATUS_SUCCESS; -+ -+ if (fixup.width < extents->width || fixup.height < extents->height) { - cairo_boxes_t clear; - - _cairo_boxes_init (&clear); --- -cgit v0.9.0.2-2-gbebe -From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:47:34 +0000 -Subject: build: Disable -Wset-but-unused-variable - -This is too noisy in the current build, and masking more important -warnings. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index 3eb0104..f1b17f4 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \ - -Wno-missing-field-initializers -Wno-unused-parameter \ - -Wno-attributes -Wno-long-long -Winline" - -+# -Wunused-but-set-variable is too noisy at present -+NO_WARN="-Wno-unused-but-set-variable" -+ - dnl Sun Studio 12 likes to rag at us for abusing enums like - dnl having cairo_status_t variables hold cairo_int_status_t - dnl values. It's bad, we know. Now please be quiet. -@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" - dnl Also to turn various gcc/glibc-specific preprocessor checks - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - -+MAYBE_WARN="$MAYBE_WARN $NO_WARN" -+ - # invalidate cached value if MAYBE_WARN has changed - if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then - unset cairo_cv_warn_cflags --- -cgit v0.9.0.2-2-gbebe -From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:49:20 +0000 -Subject: analysis: Apply the integer translation to the bbox as well - -The bbox is used to compute the ink extents (and so the pattern extents -of a recording surface) and if given an integer translation we failed to -transform the bbox into the target space. - -Fixes mask (pdf). - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c -index b8abe02..8878f62 100644 ---- a/src/cairo-analysis-surface.c -+++ b/src/cairo-analysis-surface.c -@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface, - if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) { - rect->x += tx; - rect->y += ty; -+ -+ tx = _cairo_fixed_from_int (tx); -+ bbox.p1.x += tx; -+ bbox.p2.x += tx; -+ -+ ty = _cairo_fixed_from_int (ty); -+ bbox.p1.y += ty; -+ bbox.p2.y += ty; - } else { - _cairo_matrix_transform_bounding_box_fixed (&surface->ctm, - &bbox, NULL); --- -cgit v0.9.0.2-2-gbebe -From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Mon, 09 Apr 2012 08:31:44 +0000 -Subject: pdf: avoid unnecessary use of patterns in mask groups - ---- -diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c -index 4930e72..78537ce 100644 ---- a/src/cairo-pdf-surface.c -+++ b/src/cairo-pdf-surface.c -@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->width = group->width; -- smask_group->height = group->height; -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->mask); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->mask)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->mask, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->width = group->width; -+ smask_group->height = group->height; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->mask); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, &mask_group); -@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->source); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->source)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->source, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->source); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, NULL); --- -cgit v0.9.0.2-2-gbebe -From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001 -From: Maarten Bosmans <mkbosmans@gmail.com> -Date: Mon, 09 Apr 2012 19:33:50 +0000 -Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM - ---- -diff --git a/configure.ac b/configure.ac -index cedfebe..5d2e6ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes") - if test "x$have_dlsym" = "xyes"; then - AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available]) - fi -+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes") - - dnl =========================================================================== - -diff --git a/util/Makefile.am b/util/Makefile.am -index f202f35..82d0a80 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -12,20 +12,24 @@ endif - - if CAIRO_HAS_TRACE - SUBDIRS += cairo-trace -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-fdr - endif - endif - endif -+endif - - if BUILD_SPHINX -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-sphinx - endif - endif - endif -+endif - - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ --- -cgit v0.9.0.2-2-gbebe -From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Tue, 10 Apr 2012 13:04:05 +0000 -Subject: any2ppm: fix missing enumeration warning - ---- -diff --git a/test/any2ppm.c b/test/any2ppm.c -index 6b61c47..2403347 100644 ---- a/test/any2ppm.c -+++ b/test/any2ppm.c -@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd) - break; - case CAIRO_FORMAT_A1: - case CAIRO_FORMAT_RGB16_565: -+ case CAIRO_FORMAT_RGB30: - case CAIRO_FORMAT_INVALID: - default: - return "unhandled image format"; --- -cgit v0.9.0.2-2-gbebe -From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001 -From: Gilles Espinasse <g.esp@free.fr> -Date: Sat, 07 Apr 2012 21:09:51 +0000 -Subject: Cosmetic configure fix - -'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this - -checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes --Wl,--allow-shlib-undefined - -Signed-off-by: Gilles Espinasse <g.esp@free.fr> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f1b17f4..3b2c6f3 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result], - - dnl check linker flags - AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags, -- [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [], -+ [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [], - [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")]) - CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags" - AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS) --- -cgit v0.9.0.2-2-gbebe -From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Wed, 11 Apr 2012 19:37:55 +0000 -Subject: xlib: Disable fallback compositor with xlib-xcb - -When xlib-xcb is enabled, this is just dead code which is never used. Thus, this -shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a -problem? Well, that header contains static inline functions which some compiler -on Solaris will emit even when they are unused. - -This brings us to the real problem: That static inline function refers to a -function which isn't compiled with xlib-xcb and thus linking fails with -undefined symbols. - -This can be reproduced with GCC by adding a call to -_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to -_cairo_xlib_fallback_compositor_get. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489 -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c -index 5391926..7d45cd1 100644 ---- a/src/cairo-xlib-fallback-compositor.c -+++ b/src/cairo-xlib-fallback-compositor.c -@@ -42,6 +42,8 @@ - - #include "cairoint.h" - -+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS -+ - #include "cairo-xlib-private.h" - - #include "cairo-compositor-private.h" -@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void) - /* XXX Do something interesting here to mitigate fallbacks ala xcb */ - return &_cairo_fallback_compositor; - } -+ -+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */ --- -cgit v0.9.0.2-2-gbebe diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD deleted file mode 100644 index 62772f665..000000000 --- a/multilib-testing/lib32-glib2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 69968 2012-04-27 12:03:19Z lcarlier $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=glib2 -pkgname=lib32-$_pkgbasename -pkgver=2.32.1 -pkgrel=3 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" -url="http://www.gtk.org/" -arch=('x86_64') -license=('LGPL') -depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename) -makedepends=('gcc-multilib' python2) -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.32/glib-${pkgver}.tar.xz) -sha256sums=('484d5b7fc09f3fa398355adaf74b369768f5859866c299f229c99721990f8398') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/glib-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ - --enable-static --enable-shared --with-pcre=system --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{share,include}} - - cd "${pkgdir}"/usr/bin - mv gio-querymodules gio-querymodules-32 - rm -f gdbus glib* gobject-query gsettings gtester* - rm -rf "$pkgdir"/usr/{bin,lib32/gdbus-2.0} -} diff --git a/multilib-testing/lib32-libffi/PKGBUILD b/multilib-testing/lib32-libffi/PKGBUILD deleted file mode 100644 index f9d2cf31e..000000000 --- a/multilib-testing/lib32-libffi/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 69958 2012-04-27 07:21:50Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=lib32-libffi -pkgver=3.0.11 -pkgrel=1 -pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)" -arch=('x86_64') -license=('MIT') -url="http://sourceware.org/libffi" -depends=('lib32-glibc') -checkdepends=('dejagnu') -options=('!libtool') -source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('f69b9693227d976835b4857b1ba7d0e3') - -build() { - cd "${srcdir}/libffi-${pkgver}" - - export CC="gcc -m32" - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 - - make -} - -check() { - cd "${srcdir}/libffi-${pkgver}" - - make check -} - -package() { - cd "${srcdir}/libffi-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -r "${pkgdir}"/usr/share/{info,man} -} diff --git a/multilib-testing/lib32-llvm/PKGBUILD b/multilib-testing/lib32-llvm/PKGBUILD deleted file mode 100644 index 143037d3b..000000000 --- a/multilib-testing/lib32-llvm/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 70100 2012-04-29 10:00:59Z lcarlier $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sebastian Nowicki <sebnow@gmail.com> -# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('lib32-llvm') -pkgver=3.0 -pkgrel=3 -arch=('x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('lib32-libffi' 'python2' 'gcc-multilib') -source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz) -sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477') - -build() { - cd "$srcdir/llvm-$pkgver.src" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib32/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-cxx-include-arch=$CHOST \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package() { - pkgdesc="Low Level Virtual Machine (32 bits version)" - depends=('perl' 'lib32-libffi' 'llvm') - - cd "$srcdir/llvm-$pkgver.src" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - # mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib32/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/lib32/llvm:' "$pkgdir/usr/bin/llvm-config" - mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} - mkdir "$pkgdir"/usr/bin - mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32" -} diff --git a/multilib-testing/lib32-llvm/cindexer-clang-path.patch b/multilib-testing/lib32-llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/multilib-testing/lib32-llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch b/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/multilib-testing/lib32-llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/multilib-testing/lib32-llvm/clang-pure64.patch b/multilib-testing/lib32-llvm/clang-pure64.patch deleted file mode 100644 index 9bbbfaa8b..000000000 --- a/multilib-testing/lib32-llvm/clang-pure64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::ppc64) - CmdArgs.push_back("/lib64/ld64.so.1"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/multilib-testing/lib32-llvm/enable-lto.patch b/multilib-testing/lib32-llvm/enable-lto.patch deleted file mode 100644 index 3c8691b17..000000000 --- a/multilib-testing/lib32-llvm/enable-lto.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - } - } - -- if (Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); - } diff --git a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch b/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch deleted file mode 100644 index 84d166471..000000000 --- a/multilib-testing/lib32-llvm/fix-gold-lto-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile ---- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 -+++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 -@@ -26,6 +26,6 @@ LINK_COMPONENTS := support - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L $(SharedLibDir) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch b/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch deleted file mode 100644 index ceb5aa129..000000000 --- a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch +++ /dev/null @@ -1,330 +0,0 @@ -diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c -index 56c26f5..d477c40 100644 ---- a/src/gallium/auxiliary/draw/draw_llvm.c -+++ b/src/gallium/auxiliary/draw/draw_llvm.c -@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var); - * Create LLVM type for struct draw_jit_texture - */ - static LLVMTypeRef --create_jit_texture_type(struct gallivm_state *gallivm) -+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef texture_type; -@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm) - elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = - LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); - -+#if HAVE_LLVM >= 0x0300 -+ texture_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(texture_type, elem_types, -+ Elements(elem_types), 0); -+#else - texture_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); - -+ LLVMAddTypeName(gallivm->module, struct_name, texture_type); -+ - /* Make sure the target's struct layout cache doesn't return - * stale/invalid data. - */ - LLVMInvalidateStructLayout(gallivm->target, texture_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width, - target, texture_type, -@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm) - */ - static LLVMTypeRef - create_jit_context_type(struct gallivm_state *gallivm, -- LLVMTypeRef texture_type) -+ LLVMTypeRef texture_type, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context); -@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm, - elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */ - elem_types[4] = LLVMArrayType(texture_type, - PIPE_MAX_VERTEX_SAMPLERS); /* textures */ -- -+#if HAVE_LLVM >= 0x0300 -+ context_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(context_type, elem_types, -+ Elements(elem_types), 0); -+#else - context_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, context_type); - - LLVMInvalidateStructLayout(gallivm->target, context_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants, - target, context_type, 0); -@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm, - * Create LLVM type for struct pipe_vertex_buffer - */ - static LLVMTypeRef --create_jit_vertex_buffer_type(struct gallivm_state *gallivm) -+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef elem_types[3]; -@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm) - elem_types[1] = LLVMInt32TypeInContext(gallivm->context); - elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */ - -+#if HAVE_LLVM >= 0x0300 -+ vb_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(vb_type, elem_types, -+ Elements(elem_types), 0); -+#else - vb_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, vb_type); - - LLVMInvalidateStructLayout(gallivm->target, vb_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride, - target, vb_type, 0); -@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems) - elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); - elem_types[2] = LLVMArrayType(elem_types[1], data_elems); - -+#if HAVE_LLVM >= 0x0300 -+ vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(vertex_header, elem_types, -+ Elements(elem_types), 0); -+#else - vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, vertex_header); - - LLVMInvalidateStructLayout(gallivm->target, vertex_header); -+#endif - - /* these are bit-fields and we can't take address of them - LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask, -@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems) - target, vertex_header, - DRAW_JIT_VERTEX_DATA); - -- LLVMAddTypeName(gallivm->module, struct_name, vertex_header); -- - return vertex_header; - } - -@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm) - struct gallivm_state *gallivm = llvm->gallivm; - LLVMTypeRef texture_type, context_type, buffer_type, vb_type; - -- texture_type = create_jit_texture_type(gallivm); -- LLVMAddTypeName(gallivm->module, "texture", texture_type); -+ texture_type = create_jit_texture_type(gallivm, "texture"); - -- context_type = create_jit_context_type(gallivm, texture_type); -- LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type); -+ context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context"); - llvm->context_ptr_type = LLVMPointerType(context_type, 0); - - buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0); -- LLVMAddTypeName(gallivm->module, "buffer", buffer_type); - llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0); - -- vb_type = create_jit_vertex_buffer_type(gallivm); -- LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type); -+ vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer"); - llvm->vb_ptr_type = LLVMPointerType(vb_type, 0); - } - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index 8636cd6..f44749d 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -27,17 +27,23 @@ - - #include <llvm-c/Core.h> - #include <llvm/Target/TargetMachine.h> --#include <llvm/Target/TargetRegistry.h> --#include <llvm/Target/TargetSelect.h> - #include <llvm/Target/TargetInstrInfo.h> - #include <llvm/Support/raw_ostream.h> - #include <llvm/Support/MemoryObject.h> - -+#if HAVE_LLVM >= 0x0300 -+#include <llvm/Support/TargetRegistry.h> -+#include <llvm/Support/TargetSelect.h> -+#else /* HAVE_LLVM < 0x0300 */ -+#include <llvm/Target/TargetRegistry.h> -+#include <llvm/Target/TargetSelect.h> -+#endif /* HAVE_LLVM < 0x0300 */ -+ - #if HAVE_LLVM >= 0x0209 - #include <llvm/Support/Host.h> --#else -+#else /* HAVE_LLVM < 0x0209 */ - #include <llvm/System/Host.h> --#endif -+#endif /* HAVE_LLVM < 0x0209 */ - - #if HAVE_LLVM >= 0x0207 - #include <llvm/MC/MCDisassembler.h> -@@ -193,14 +199,23 @@ lp_disassemble(const void* func) - - InitializeAllDisassemblers(); - -+#if HAVE_LLVM >= 0x0300 -+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple)); -+#else - OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple)); -+#endif - - if (!AsmInfo) { - debug_printf("error: no assembly info for target %s\n", Triple.c_str()); - return; - } - -+#if HAVE_LLVM >= 0x0300 -+ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), ""); -+ OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI)); -+#else - OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler()); -+#endif - if (!DisAsm) { - debug_printf("error: no disassembler for target %s\n", Triple.c_str()); - return; -@@ -213,7 +228,11 @@ lp_disassemble(const void* func) - #else - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif --#if HAVE_LLVM >= 0x0208 -+ -+#if HAVE_LLVM >= 0x0300 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); -+#elif HAVE_LLVM >= 0x0208 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo)); - #else -@@ -253,7 +272,11 @@ lp_disassemble(const void* func) - - if (!DisAsm->getInstruction(Inst, Size, memoryObject, - pc, -- nulls())) { -+#if HAVE_LLVM >= 0x0300 -+ nulls(), nulls())) { -+#else -+ nulls())) { -+#endif - debug_printf("invalid\n"); - pc += 1; - } -@@ -276,7 +299,9 @@ lp_disassemble(const void* func) - * Print the instruction. - */ - --#if HAVE_LLVM >= 0x208 -+#if HAVE_LLVM >= 0x0300 -+ Printer->printInst(&Inst, Out, ""); -+#elif HAVE_LLVM >= 0x208 - Printer->printInst(&Inst, Out); - #else - Printer->printInst(&Inst); -@@ -289,7 +314,11 @@ lp_disassemble(const void* func) - - pc += Size; - -+#if HAVE_LLVM >= 0x0300 -+ const MCInstrDesc &TID = TII->get(Inst.getOpcode()); -+#else - const TargetInstrDesc &TID = TII->get(Inst.getOpcode()); -+#endif - - /* - * Keep track of forward jumps to a nearby address. -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c -index c5cf6d4..efd159f 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c -@@ -325,16 +325,18 @@ lp_typekind_name(LLVMTypeKind t) - return "LLVMArrayTypeKind"; - case LLVMPointerTypeKind: - return "LLVMPointerTypeKind"; -+#if HAVE_LLVM < 0x0300 - case LLVMOpaqueTypeKind: - return "LLVMOpaqueTypeKind"; -+#endif - case LLVMVectorTypeKind: - return "LLVMVectorTypeKind"; - case LLVMMetadataTypeKind: - return "LLVMMetadataTypeKind"; -- /* Only in LLVM 2.7 and later??? -+#if HAVE_LLVM == 0x0207 - case LLVMUnionTypeKind: - return "LLVMUnionTypeKind"; -- */ -+#endif - default: - return "unknown LLVMTypeKind"; - } -diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c -index 268f0fa..ce92a80 100644 ---- a/src/gallium/drivers/llvmpipe/lp_jit.c -+++ b/src/gallium/drivers/llvmpipe/lp_jit.c -@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp) - elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = - LLVMArrayType(LLVMFloatTypeInContext(lc), 4); - -+#if HAVE_LLVM >= 0x0300 -+ texture_type = LLVMStructCreateNamed(gallivm->context, "texture"); -+ LLVMStructSetBody(texture_type, elem_types, -+ Elements(elem_types), 0); -+#else - texture_type = LLVMStructTypeInContext(lc, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, "texture", texture_type); - - LLVMInvalidateStructLayout(gallivm->target, texture_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width, - gallivm->target, texture_type, -@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp) - - LP_CHECK_STRUCT_SIZE(struct lp_jit_texture, - gallivm->target, texture_type); -- -- LLVMAddTypeName(gallivm->module, "texture", texture_type); - } - - /* struct lp_jit_context */ -@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp) - elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type, - PIPE_MAX_SAMPLERS); - -+#if HAVE_LLVM >= 0x0300 -+ context_type = LLVMStructCreateNamed(gallivm->context, "context"); -+ LLVMStructSetBody(context_type, elem_types, -+ Elements(elem_types), 0); -+#else - context_type = LLVMStructTypeInContext(lc, elem_types, - Elements(elem_types), 0); - - LLVMInvalidateStructLayout(gallivm->target, context_type); - -+ LLVMAddTypeName(gallivm->module, "context", context_type); -+#endif -+ - LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants, - gallivm->target, context_type, - LP_JIT_CTX_CONSTANTS); -@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp) - LP_CHECK_STRUCT_SIZE(struct lp_jit_context, - gallivm->target, context_type); - -- LLVMAddTypeName(gallivm->module, "context", context_type); -- - lp->jit_context_ptr_type = LLVMPointerType(context_type, 0); - } - diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD deleted file mode 100644 index 9d9043e53..000000000 --- a/staging/bluez/PKGBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# $Id: PKGBUILD 159751 2012-05-26 12:43:04Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> - -pkgname=bluez -pkgver=4.99 -pkgrel=3 -pkgdesc="Libraries and tools for the Bluetooth protocol stack" -url="http://www.bluez.org/" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('dbus-core' 'python2' 'udev') -makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') -optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") -conflicts=('bluez-libs' 'bluez-utils') -provides=('bluez-libs' 'bluez-utils') -replaces=('bluez-libs' 'bluez-utils') -options=('!libtool') -backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf - 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') -source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' - 'rc.bluetooth') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/lib \ - --enable-gstreamer \ - --enable-alsa \ - --enable-usb \ - --enable-tools \ - --enable-bccmd \ - --enable-dfutool \ - --enable-hid2hci \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-wiimote \ - --disable-test - - sed -ri 's,udev_get_(dev|sys)_path([^)]+\)),"/\1",g' tools/hid2hci.c - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth - - install -d ${pkgdir}/etc/bluetooth - install -m644 network/network.conf \ - input/input.conf \ - audio/audio.conf \ - serial/serial.conf \ - ${pkgdir}/etc/bluetooth/ - - install -Dm644 ${srcdir}/bluetooth.conf.d \ - ${pkgdir}/etc/conf.d/bluetooth - - # FS#27630 - install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent - install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device - install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input - sed -i 's#/usr/bin/python#/usr/bin/python2#' \ - "${pkgdir}"/usr/bin/bluez-simple-agent \ - "${pkgdir}"/usr/bin/bluez-test-device \ - "${pkgdir}"/usr/bin/bluez-test-input - - # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html -# rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules -} -md5sums=('2387053eb5a7b02f37df4871df022a02' - '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d deleted file mode 100644 index 1c1e02589..000000000 --- a/staging/bluez/bluetooth.conf.d +++ /dev/null @@ -1,30 +0,0 @@ -# Bluetooth configuraton file - -# Bluetooth services (allowed values are "true" and "false") - -# Run the bluetoothd daemon (default: true) -#DAEMON_ENABLE="false" - -# Run the sdp daemon (default: false) -# If this is disabled, hcid's internal sdp daemon will be used -#SDPD_ENABLE="true" - -# Run the bluetooth HID daemon (default: false) -#HIDD_ENABLE="true" - -# Activate rfcomm ports (default: false) -#RFCOMM_ENABLE="true" - -# Run bluetooth dial-up networking daemon (default: false) -#DUND_ENABLE="true" - -# Run bluetooth PAN daemon (default: false) -#PAND_ENABLE="true" - -# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf) -#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Options for hidd, dund and pand (default: none) -HIDD_OPTIONS="--server" -#DUND_OPTIONS="" -#PAND_OPTIONS="" diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth deleted file mode 100644 index a46ee2abb..000000000 --- a/staging/bluez/rc.bluetooth +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash -# -# Start/stop the Bluetooth daemons -# - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON_NAME="bluetoothd" -HIDD_NAME="hidd" -RFCOMM_NAME="rfcomm" -PAND_NAME="pand" -DUND_NAME="dund" - -DAEMON_EXEC="/usr/sbin/bluetoothd" -HIDD_EXEC="/usr/bin/hidd" -RFCOMM_EXEC="/usr/bin/rfcomm" -PAND_EXEC="/usr/bin/pand" -DUND_EXEC="/usr/bin/dund" - -DAEMON_ENABLE="true" -HIDD_ENABLE="false" -RFCOMM_ENABLE="false" -DUND_ENABLE="false" -PAND_ENABLE="false" - -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -HIDD_OPTIONS="" -DUND_OPTIONS="" -PAND_OPTIONS="" - -[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth - -case "$1" in - start) - stat_busy "Starting bluetooth subsystem:" - if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then - stat_append " $DAEMON_NAME" - $DAEMON_EXEC - sleep 1 - fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi - if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then - stat_append " $HIDD_NAME" - $HIDD_EXEC $HIDD_OPTIONS - fi - if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all - fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi - if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then - stat_append " $PAND_NAME" - $PAND_EXEC $PAND_OPTIONS - fi - add_daemon bluetooth - stat_done - ;; - stop) - stat_busy "Stopping bluetooth subsystem:" - - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - - stat_append " $DUND_NAME" - killall $DUND_NAME >/dev/null 2>&1 - - if [ -x "$RFCOMM_EXEC" ]; then - stat_append " $RFCOMM_NAME" - $RFCOMM_EXEC release all >/dev/null 2>&1 - fi - - stat_append " $HIDD_NAME" - killall $HIDD_NAME >/dev/null 2>&1 - - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - - stat_append " $DAEMON_NAME" - killall $DAEMON_NAME >/dev/null 2>&1 - - rm_daemon bluetooth - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/cairo-perl/PKGBUILD b/staging/cairo-perl/PKGBUILD deleted file mode 100644 index ba76f82c8..000000000 --- a/staging/cairo-perl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159743 2012-05-26 12:14:50Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=cairo-perl -pkgver=1.082 -pkgrel=2 -pkgdesc="Perl wrappers for cairo" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('cairo' 'perl') -makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz - testsuite.patch) -md5sums=('cfd61e519ff20023979c255d4040fe06' - '6a3ceac304a5a53f8fdd5652d98f6855') - -build() { - cd "${srcdir}/Cairo-${pkgver}" - patch -Np1 -i "${srcdir}/testsuite.patch" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Cairo-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Cairo-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/cairo-perl/testsuite.patch b/staging/cairo-perl/testsuite.patch deleted file mode 100644 index 59cb58f28..000000000 --- a/staging/cairo-perl/testsuite.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 21dd8a0600cbfac46723c7745b377fce94c8bdc3 Mon Sep 17 00:00:00 2001 -From: Torsten Schönfeld <kaffeetisch@gmx.de> -Date: Sat, 31 Mar 2012 10:34:11 +0000 -Subject: Fix compiling and testing against older versions of cairo - ---- -(limited to 't/CairoPath.t') - -diff --git a/t/CairoPath.t b/t/CairoPath.t -index e515172..770e464 100644 ---- a/t/CairoPath.t -+++ b/t/CairoPath.t -@@ -11,11 +11,17 @@ use strict; - use warnings; - use Cairo; - --use Test::More tests => 6; -+use Test::More; - - use constant IMG_WIDTH => 256; - use constant IMG_HEIGHT => 256; - -+if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) { -+ plan tests => 6; -+} else { -+ plan skip_all => 'path behavior not predictable on cairo < 1.4'; -+} -+ - my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT); - my $cr = Cairo::Context->create ($surf); - --- -cgit v0.9.0.2 -From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001 -From: Torsten Schönfeld <kaffeetisch@gmx.de> -Date: Sat, 07 Apr 2012 18:01:31 +0000 -Subject: Make t/CairoPath.t more robust - -The end of a path that took a round trip into cairo and back might differ -for different versions of cairo. Hence, compare only the beginning with -the expected path. ---- -diff --git a/t/CairoPath.t b/t/CairoPath.t -index 770e464..27a3aad 100644 ---- a/t/CairoPath.t -+++ b/t/CairoPath.t -@@ -11,17 +11,11 @@ use strict; - use warnings; - use Cairo; - --use Test::More; -+use Test::More tests => 18; - - use constant IMG_WIDTH => 256; - use constant IMG_HEIGHT => 256; - --if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) { -- plan tests => 6; --} else { -- plan skip_all => 'path behavior not predictable on cairo < 1.4'; --} -- - my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT); - my $cr = Cairo::Context->create ($surf); - -@@ -40,14 +34,7 @@ my $expected_path = [ - ]; - - my $path = $cr->copy_path; --is_deeply ($path, $expected_path); -- --sub paths_agree { -- my ($cr, $path, $expected_path) = @_; -- $cr->new_path; -- $cr->append_path ($path); -- is_deeply ($cr->copy_path, $expected_path); --} -+paths_agree ($path, $expected_path); - - # Modifying single point values. - foreach ($path, $expected_path) { -@@ -57,21 +44,21 @@ foreach ($path, $expected_path) { - $_->[2]{points}[2][0] = 99; - $_->[2]{points}[2][1] = 1010; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Modifying single points. - foreach ($path, $expected_path) { - $_->[1]{points}[0] = [333, 444]; - $_->[2]{points}[2] = [77, 88]; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Replacing all points. - foreach ($path, $expected_path) { - $_->[1]{points} = [[3333, 4444]]; - $_->[2]{points} = [[55, 66], [77, 88], [99, 1010]]; - } --paths_agree ($cr, $path, $expected_path); -+path_round_trip_ok ($cr, $path, $expected_path); - - # Replacing and adding path segments. - my @cloned_path = @{$path}; -@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) { - type => 'line-to', - points => [[23, 42]] }; - } --paths_agree ($cr, \@cloned_path, $expected_path); -+path_round_trip_ok ($cr, \@cloned_path, $expected_path); - - # Passing bare arrays into Cairo. - $cr->new_path; - $cr->append_path ($expected_path); --is_deeply ($cr->copy_path, $expected_path); -+paths_agree ($cr->copy_path, $expected_path); -+ -+sub path_round_trip_ok { -+ my ($cr, $path, $expected_path) = @_; -+ $cr->new_path; -+ $cr->append_path ($path); -+ paths_agree ($cr->copy_path, $expected_path); -+} -+ -+sub paths_agree { -+ my ($path, $expected_path) = @_; -+ # Only the first three entries seem to be reliable across cairo versions. -+ for (0..2) { -+ is_deeply ($path->[$_], $expected_path->[$_]); -+ } -+} --- -cgit v0.9.0.2 diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD deleted file mode 100644 index 940e96ab4..000000000 --- a/staging/calligra/PKGBUILD +++ /dev/null @@ -1,264 +0,0 @@ -# $Id: PKGBUILD 158988 2012-05-14 10:08:49Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-interfaces' - 'calligra-libs' - 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' - 'calligra-tools' - 'calligra-karbon' - 'calligra-kexi' - 'calligra-kounavail' - 'calligra-plan' - 'calligra-stage' - 'calligra-krita' - 'calligra-sheets' - 'calligra-words' - 'calligra-handbook' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.4.1 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' - 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' - 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('a4da7e1181e1539850a4fcae466d7d75') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF \ - -DBUILD_mobile=OFF \ - -DIHAVEPATCHEDQT=1 - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer') - conflicts=('koffice-filters') - replaces=('koffice-filters') - install=calligra-filters.install - - cd "${srcdir}"/build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs' 'calligra-filters') - optdepends=('kdeedu-marble: map shape for Calligra') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') - - cd "${srcdir}"/build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-pics() { - pkgdesc="Icons for the Calligra office suite" - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') - optdepends=('calligra-filters: import/export filters' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - install=calligra-karbon.install - - cd "${srcdir}"/build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi() { - pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') - optdepends=('libmysqlclient: MySQL driver' - 'libpqxx: PostgreSQL driver' - 'freetds: Sybase & MS SQL driver' - 'xbase: XBase driver' - 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' - 'kdeedu-marble: map form widget' - 'calligra-plugins: extra calligra plugins') - conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - install=calligra-kexi.install - - cd "${srcdir}"/build/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - conflicts=('koffice-kplato' 'calligra-kplato') - replaces=('koffice-kplato' 'calligra-kplato') - install=calligra-plan.install - - cd "${srcdir}"/build/plan - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') - optdepends=('calligra-plugins: extra calligra plugins') - conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - install=calligra-stage.install - - cd "${srcdir}"/build/stage - make DESTDIR="${pkgdir}" install -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' - 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') - conflicts=('koffice-krita' 'calligra-krita-doc') - replaces=('koffice-krita' 'calligra-krita-doc') - install=calligra-krita.install - - cd "${srcdir}"/build/krita - make DESTDIR="${pkgdir}" install -} - -package_calligra-sheets() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') - optdepends=('calligra-filters: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - install=calligra-sheets.install - - cd "${srcdir}"/build/sheets - make DESTDIR="${pkgdir}" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' - 'calligra-plugins' 'kdegraphics-okular') - optdepends=('calligra-tools: extra calligra tools') - conflicts=('koffice-kword') - replaces=('koffice-kword') - install=calligra-words.install - - cd "${srcdir}"/build/words - make DESTDIR="${pkgdir}" install -} - -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') - - cd "${srcdir}"/build/doc/calligra - make DESTDIR="${pkgdir}" install -} - -package_calligra-braindump() { - pkgdesc="Notes and idea gathering" - depends=('calligra-libs' 'kdebase-runtime') - install=calligra-braindump.install - - cd "${srcdir}"/build/braindump - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow() { - pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-libs' 'kdebase-runtime') - conflicts=('calligra-flow-doc') - replaces=('calligra-flow-doc') - install=calligra-flow.install - - cd "${srcdir}"/build/flow - make DESTDIR="${pkgdir}" install -} diff --git a/staging/calligra/calligra-braindump.install b/staging/calligra/calligra-braindump.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-braindump.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-filters.install b/staging/calligra/calligra-filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/staging/calligra/calligra-filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-flow.install b/staging/calligra/calligra-flow.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-flow.install +++ /dev/null @@ -1,12 +0,0 @@ -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/calligra/calligra-karbon.install b/staging/calligra/calligra-karbon.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-karbon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-kexi.install b/staging/calligra/calligra-kexi.install deleted file mode 100644 index b8c7ebf27..000000000 --- a/staging/calligra/calligra-kexi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/calligra/calligra-krita.install b/staging/calligra/calligra-krita.install deleted file mode 100644 index 33d234a02..000000000 --- a/staging/calligra/calligra-krita.install +++ /dev/null @@ -1,13 +0,0 @@ -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 -}
\ No newline at end of file diff --git a/staging/calligra/calligra-plan.install b/staging/calligra/calligra-plan.install deleted file mode 100644 index c2179f6e2..000000000 --- a/staging/calligra/calligra-plan.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/staging/calligra/calligra-sheets.install b/staging/calligra/calligra-sheets.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-sheets.install +++ /dev/null @@ -1,12 +0,0 @@ -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/calligra/calligra-stage.install b/staging/calligra/calligra-stage.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-stage.install +++ /dev/null @@ -1,12 +0,0 @@ -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/calligra/calligra-tools.install b/staging/calligra/calligra-tools.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -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/calligra/calligra-words.install b/staging/calligra/calligra-words.install deleted file mode 100644 index 6c87527e2..000000000 --- a/staging/calligra/calligra-words.install +++ /dev/null @@ -1,12 +0,0 @@ -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/calligra/calligra.install b/staging/calligra/calligra.install deleted file mode 100644 index e70c054ec..000000000 --- a/staging/calligra/calligra.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD deleted file mode 100644 index 04657c451..000000000 --- a/staging/claws-mail-extra-plugins/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 159502 2012-05-25 16:03:35Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: Mildred <mildred593 at online dot fr> - -pkgname=claws-mail-extra-plugins -pkgver=3.8.0 -pkgrel=3 -pkgdesc="Extra plugins for claws-mail" -url="http://www.claws-mail.org/plugins.php?branch=EXT" -license=('GPL3') -arch=('i686' 'x86_64') -depends=('claws-mail>=3.8.0') -makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7' - 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1' - 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata') -optdepends=('libgtkhtml: for gtkhtml2_viewer plugin' - 'perl: for perl plugin' - 'libnotify: for notification plugin' - 'libcanberra: for notification plugin' - 'dbus-core: for notification plugin' - 'libxml2: for gtkhtml2_viewer and rssyl plugins' - 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins' - 'libarchive: for archive plugin' - 'libytnef: for tnef_parse plugin' - 'libwebkit: for the fancy webkit html plugin' - 'libsoup-gnome: for the fancy webkit html plugin' - 'python2: for python plugin' - 'libgdata: for gdata plugin') -conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin' - 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin' - 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin' - 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn') -replaces=('sylpheed-claws-extra-plugins') -options=('!libtool' '!strip') -source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2) -md5sums=('4776f6e0357a694f384349ac73b6da52') - -build() { - cd "$srcdir/claws-mail-extra-plugins-$pkgver" - - # fix for python2 - export PYTHON="/usr/bin/python2" - - # fix gdata plugin build - sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure - - for dir in */; do - [[ $dir != geolocation_plugin-* ]] && ( - cd $dir - - ./configure --prefix=/usr --disable-static - make - ) - done -} - -package() { - cd "$srcdir/claws-mail-extra-plugins-$pkgver" - for dir in */; do - [[ $dir != geolocation_plugin-* ]] && - make -C $dir DESTDIR="$pkgdir" install - done - - # fix fileconflict with libical, #11485 - rm -f "$pkgdir/usr/include/ical.h" -} diff --git a/staging/cups-filters/PKGBUILD b/staging/cups-filters/PKGBUILD deleted file mode 100644 index 62cbe9a91..000000000 --- a/staging/cups-filters/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 158958 2012-05-13 16:11:10Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.17 -pkgrel=2 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -groups=() -depends=('ghostscript' 'lcms2' 'poppler') # bc ? https://bugs.archlinux.org/task/29808 -makedepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -#options=(!makeflags) -install= -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('5132b018cc503e9338fbd029acf56e55') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make -k check -#} - -package() { - cd "$srcdir/$pkgname-$pkgver" - #make DESTDIR="$pkgdir/" install - make install BUILDROOT="$pkgdir/" - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a -} diff --git a/staging/easytag/PKGBUILD b/staging/easytag/PKGBUILD deleted file mode 100644 index eb59f4ae0..000000000 --- a/staging/easytag/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 159784 2012-05-26 23:49:07Z tomegun $ -# Maintainer: -# Contributor: Kevin Piche <kevin@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=easytag -pkgver=2.1.7 -pkgrel=2 -pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files" -arch=('i686' 'x86_64') -license=('GPL') -url='http://easytag.sourceforge.net/' -depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'desktop-file-utils') -install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9df3e800d80e754670642f2ba5e03539') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/staging/easytag/easytag.install b/staging/easytag/easytag.install deleted file mode 100644 index 93908edac..000000000 --- a/staging/easytag/easytag.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/frozen-bubble/PKGBUILD b/staging/frozen-bubble/PKGBUILD deleted file mode 100644 index c4428993a..000000000 --- a/staging/frozen-bubble/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159777 2012-05-26 19:52:21Z foutrelis $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Brandon Niemczyk <maccorin@cfl.rr.com> - -pkgname=frozen-bubble -_pkgver=2.2.1-beta1 -pkgver=${_pkgver/-/} -pkgrel=4 -pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles" -arch=(i686 x86_64) -url="http://www.frozen-bubble.org" -license=(GPL2) -depends=(perl-sdl perl-ipc-system-simple perl-compress-bzip2 perl-file-which) -makedepends=(perl-file-slurp perl-locale-maketext-lexicon) -options=('!emptydirs') -source=(http://www.frozen-bubble.org/data/$pkgname-$_pkgver.tar.bz2 \ - frozen-bubble.desktop) -md5sums=('825cc23ed806838b9d86de9982a5687a' - '01b10b77ba6ad856f5c199121c582272') - -build() { - cd "$srcdir/$pkgname-$_pkgver" - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build test -} - -package() { - cd "$srcdir/$pkgname-$_pkgver" - perl Build install destdir="$pkgdir" - - install -D -m644 share/icons/frozen-bubble-icon-64x64.png "$pkgdir/usr/share/pixmaps/frozen-bubble.png" - install -D -m644 "$srcdir/frozen-bubble.desktop" "$pkgdir/usr/share/applications/frozen-bubble.desktop" -} diff --git a/staging/frozen-bubble/frozen-bubble.desktop b/staging/frozen-bubble/frozen-bubble.desktop deleted file mode 100644 index 76a7bcd88..000000000 --- a/staging/frozen-bubble/frozen-bubble.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Frozen Bubble -Icon=frozen-bubble.png -Exec=/usr/bin/vendor_perl/frozen-bubble -Terminal=false -Categories=Game; diff --git a/staging/gconf-perl/PKGBUILD b/staging/gconf-perl/PKGBUILD deleted file mode 100644 index e63bf621d..000000000 --- a/staging/gconf-perl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159747 2012-05-26 12:22:57Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gconf-perl -pkgver=1.044 -pkgrel=7 -pkgdesc="Gnome2-GConf perl bindings for gconf" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('glib-perl' 'gconf' 'perl') -options=(!emptydirs) -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz - disable-orbit.patch) -md5sums=('ea386003b18f067524833b0eeb271330' - '14852fc936ce7b552eb204913d55fd1c') - -build() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - patch -Np1 -i "${srcdir}/disable-orbit.patch" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - dbus-launch --exit-with-session make test -} - -package() { - cd "${srcdir}/Gnome2-GConf-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gconf-perl/disable-orbit.patch b/staging/gconf-perl/disable-orbit.patch deleted file mode 100644 index da526ec2e..000000000 --- a/staging/gconf-perl/disable-orbit.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Disable gconf_engine_key_is_writable - This symbol is not available in libgconf when it is configured without - ORBit support, which is currently the case in Debian. -Author: Colin Watson <cjwatson@ubuntu.com> -Bug-Debian: http://bugs.debian.org/649055 -Forwarded: no -Last-Update: 2011-11-17 - -Index: b/xs/GConfEngine.xs -=================================================================== ---- a/xs/GConfEngine.xs -+++ b/xs/GConfEngine.xs -@@ -350,6 +350,8 @@ - if (err) - gperl_croak_gerror (NULL, err); - -+#if 0 /* requires gconf to be configured with ORBit support */ -+ - ##gboolean gconf_engine_key_is_writable (GConfEngine *conf, - ## const gchar *key, - ## GError **err); -@@ -366,6 +368,8 @@ - OUTPUT: - RETVAL - -+#endif -+ - guint - gconf_engine_notify_add (engine, namespace_section, func, data=NULL) - GConfEngine * engine diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD deleted file mode 100644 index 858b8593e..000000000 --- a/staging/gegl/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 158346 2012-05-03 21:27:34Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gegl -pkgver=0.2.0 -pkgrel=1 -pkgdesc="Graph based image processing framework" -arch=('i686' 'x86_64') -url="http://www.gegl.org/" -license=('GPL3' 'LGPL3') -depends=('babl' 'gtk2') -makedepends=('intltool' '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) -sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \ - --with-libavformat --with-jasper --disable-docs - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD deleted file mode 100644 index a4baf7eab..000000000 --- a/staging/gimp-devel/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 158530 2012-05-04 00:33:40Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gimp-devel -pkgver=2.8.0 -pkgrel=1 -pkgdesc="GNU Image Manipulation Program (Development Version)" -arch=('i686' 'x86_64') -url="http://www.gimp.org/" -license=('GPL3' 'LGPL3') -depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \ - 'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript') -optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support' - 'libwebkit: for the help browser or web-page plug-ins' - 'poppler-glib: for pdf support' - 'alsa-lib: for MIDI event controller module' - 'curl: for URI support' - 'ghostscript: for postscript support') -options=('!libtool' '!makeflags') -conflicts=('gimp') -provides=("gimp=${pkgver}") -install=gimp-devel.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl) -md5sums=('28997d14055f15db063eb92e1c8a7ebb' - 'bb27bc214261d36484093e857f015f38') - -build() { - cd "${srcdir}/gimp-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --enable-mp --enable-gimp-console --enable-python --with-libcurl \ - --with-gif-compression=lzw --without-aa --without-gvfs - make -} - -#check() { -# cd "${srcdir}/gimp-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/gimp-${pkgver}" - make DESTDIR="${pkgdir}" install - sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py - install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl" - - rm "${pkgdir}/usr/share/man/man1/gimp-console.1" - ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz" - ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz" - ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool" -} diff --git a/staging/gimp-devel/gimp-devel.install b/staging/gimp-devel/gimp-devel.install deleted file mode 100644 index c317fbaca..000000000 --- a/staging/gimp-devel/gimp-devel.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - 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/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl deleted file mode 100644 index 0a73d8979..000000000 --- a/staging/gimp-devel/linux.gpl +++ /dev/null @@ -1,19 +0,0 @@ -GIMP Palette -Name: linux -# - 0 0 0 - 0 0 170 - 0 170 0 - 0 170 170 -170 0 0 -170 0 170 -170 85 0 -170 170 170 - 85 85 85 - 85 85 255 - 85 255 85 - 85 255 255 -255 85 85 -255 85 255 -255 255 85 -255 255 255 diff --git a/staging/glib-perl/PKGBUILD b/staging/glib-perl/PKGBUILD deleted file mode 100644 index 6f0b83b09..000000000 --- a/staging/glib-perl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159741 2012-05-26 12:00:57Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> - -pkgname=glib-perl -pkgver=1.242 -pkgrel=2 -pkgdesc="Perl wrappers for glib 2.x, including GObject" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -options=('!emptydirs') -depends=('glib2>=2.24.1' 'perl>=5.14') -makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('59c176888e8ef8139c4e1b8c2d45f1d0') - -build() { - cd "${srcdir}/Glib-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Glib-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Glib-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/graphicsmagick/PKGBUILD b/staging/graphicsmagick/PKGBUILD deleted file mode 100644 index 96cb72b92..000000000 --- a/staging/graphicsmagick/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 159767 2012-05-26 17:25:12Z bluewind $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Anton Leontiev <bunder@t-25.ru> - -pkgname=graphicsmagick -pkgver=1.3.15 -pkgrel=2 -pkgdesc='Image processing system' -url='http://www.graphicsmagick.org/' -arch=('i686' 'x86_64') -license=('MIT') -makedepends=('perl') -depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' - 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546') - -build() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - # fix typemap bug - # https://rt.cpan.org/Public/Bug/Display.html?id=70150 - # http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap - echo 'Graphics::Magick T_PTROBJ' > typemap - - ./configure \ - --prefix=/usr \ - --with-perl \ - --enable-shared \ - --disable-static \ - --with-gs-font-dir=/usr/share/fonts/Type1 \ - - make -} - -package() { - cd "${srcdir}/GraphicsMagick-${pkgver}" - - make DESTDIR="${pkgdir}" install - - # Install MIT license - install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt" - - # Install perl bindings - # The patching was introduced in order to build perl module without installing package itself and - # not to introduce unnecessary path into LD_RUN_PATH - cd PerlMagick - sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL - perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}" - sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile - make - make install - - # Remove perllocal.pod and .packlist - rm -rf "${pkgdir}/usr/lib/perl5/core_perl" - rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist" -} diff --git a/staging/graphviz/LICENSE b/staging/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/staging/graphviz/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD deleted file mode 100644 index 0803f3ae3..000000000 --- a/staging/graphviz/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 159450 2012-05-24 13:08:54Z 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=10 -pkgdesc='Graph visualization software' -url='http://www.graphviz.org/' -license=('custom:EPL') -arch=('i686' 'x86_64') -depends=('libltdl' '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' - 'lua: lua bindings' - 'ocaml: ocaml bindings' - 'perl: perl bindings' - 'php: php bindings' - 'python2: python bindings' - 'r: r bindings' - 'ruby: ruby bindings' - 'tcl: tcl bindings' - 'qt: gvedit') -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d' - 'e78277e502c29abb74b9587a5dc951ec392554ea') - -options=('!libtool') -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed \ - -e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \ - -e '/CONFIG/s:site:vendor:' \ - -i config/config_ruby.rb - - sed '/LIBPOSTFIX="64"/d' -i configure - export PYTHON=python2 - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # cf. http://www.graphviz.org/License.php - install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE -} diff --git a/staging/graphviz/install b/staging/graphviz/install deleted file mode 100644 index 65fba522b..000000000 --- a/staging/graphviz/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - rm -f usr/lib/graphviz/config{,6} - usr/bin/dot -c -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/graphviz/config{,6} -} diff --git a/staging/gtkpod/PKGBUILD b/staging/gtkpod/PKGBUILD deleted file mode 100644 index 5e1b1d4f0..000000000 --- a/staging/gtkpod/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159367 2012-05-22 19:05:45Z tomegun $ -# Contributor: Kevin Piche <kevin@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=gtkpod -pkgver=2.1.1 -pkgrel=3 -pkgdesc="A platform independent GUI for Apple's iPod using GTK3" -arch=('i686' 'x86_64') -url="http://gtkpod.sourceforge.net" -license=('GPL') -depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') -makedepends=('flex' 'intltool') -optdepends=('libmp4v2: MP4/h264 support' - 'vorbis-tools: OGG support' - 'id3v2: mp3 conversion support') -install=gtkpod.install -options=('!libtool') -source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") -md5sums=('36fd0324fd1d1da00fcddacef1b09983') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#python#python2#' scripts/sync-palm-jppy.py - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/gtkpod/gtkpod.install b/staging/gtkpod/gtkpod.install deleted file mode 100644 index c5d357a38..000000000 --- a/staging/gtkpod/gtkpod.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD deleted file mode 100644 index bb8fa6d9c..000000000 --- a/staging/gvfs/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 159759 2012-05-26 15:13:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.12.3 -pkgrel=2 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') -url="http://www.gnome.org" -options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2') - -build() { - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gvfs \ - --with-bash-completion-dir=/usr/share/bash-completion/completions - make -} - -package_gvfs() { - pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') - 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 "$pkgbase-$pkgver" - sed -e 's/^am__append_4/#am__append_4/' \ - -e 's/^am__append_5/#am__append_5/' \ - -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 "$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 "$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 "$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 "$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 "$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/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install deleted file mode 100644 index 09d1f11ec..000000000 --- a/staging/gvfs/gvfs-module.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install deleted file mode 100644 index da6a2ab6d..000000000 --- a/staging/gvfs/gvfs-smb.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install deleted file mode 100644 index 3482d99e3..000000000 --- a/staging/gvfs/gvfs.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas - killall -USR1 gvfsd >&/dev/null || : -} - -post_upgrade() { - post_install -} - -post_remove() { - gio-querymodules /usr/lib/gio/modules - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD deleted file mode 100644 index eb31432ca..000000000 --- a/staging/imagemagick/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $Id: PKGBUILD 159474 2012-05-24 20:45:24Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=imagemagick -pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.7.0 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.imagemagick.org/" -license=('custom') -makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper') -source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ - perlmagick.rpath.patch) -sha1sums=('cf60b4e9ae6a55777082c7a0b1adb59f31f0865e' - '23405f80904b1de94ebd7bd6fe2a332471b8c283') - -build() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - - sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --install - patch -p0 -i ../perlmagick.rpath.patch - - ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ - --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ - --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" \ - --without-gvc --without-djvu --without-autotrace --without-webp \ - --without-jbig --without-fpx --without-dps --without-fftw --without-lqr - make -} - -check() { - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} -# make check -} - -package_imagemagick() { - pkgdesc="An image viewing/manipulation program" - depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext') - optdepends=('ghostscript: for Ghostscript support' - 'openexr: for OpenEXR support' - 'libwmf: for WMF support' - 'librsvg: for SVG support' - 'libxml2: for XML support' - 'jasper: for JPEG-2000 support' - 'libpng: for PNG support') - backup=('etc/ImageMagick/coder.xml' - 'etc/ImageMagick/colors.xml' - 'etc/ImageMagick/delegates.xml' - 'etc/ImageMagick/log.xml' - 'etc/ImageMagick/magic.xml' - 'etc/ImageMagick/mime.xml' - 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/quantization-table.xml' - 'etc/ImageMagick/sRGB.icc' - 'etc/ImageMagick/thresholds.xml' - 'etc/ImageMagick/type.xml' - 'etc/ImageMagick/type-dejavu.xml' - 'etc/ImageMagick/type-ghostscript.xml' - 'etc/ImageMagick/type-windows.xml') - options=('!docs' 'libtool' '!emptydirs') - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" - -#Cleaning - find "${pkgdir}" -name '*.bs' -delete - rm -f "${pkgdir}"/usr/lib/*.la -} - -package_imagemagick-doc() { - pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)" - - cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make DESTDIR="${pkgdir}" install-data-html - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE" - install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE" -} diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch deleted file mode 100644 index 958c0f2ee..000000000 --- a/staging/imagemagick/perlmagick.rpath.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- Makefile.in.orig 2009-05-26 16:22:11.000000000 -0300 -+++ Makefile.in 2009-05-26 16:23:27.000000000 -0300 -@@ -10067,6 +10067,7 @@ - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) -+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile - - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE) - @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD deleted file mode 100644 index fbecbdc23..000000000 --- a/staging/inkscape/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 158964 2012-05-13 20:05:21Z bisson $ -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=inkscape -pkgver=0.48.3.1 -pkgrel=3 -pkgdesc='Vector graphics editor using the SVG file format' -url='http://inkscape.sourceforge.net/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' - 'python2' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('pstoedit: latex formulas' - 'texlive-core: latex formulas' - 'python2-numpy: some extensions' - 'python2-lxml: some extensions and filters' - 'pyxml: some extensions' - 'uniconvertor: reading/writing to some proprietary formats') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'poppler20.patch' - 'libpng15.patch') -sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e' - '7316c2903c157781838cce289a709d100dc40fec' - 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - patch -p1 -i ../poppler20.patch - patch -p1 -i ../libpng15.patch - - ./configure \ - --prefix=/usr \ - --with-python \ - --with-perl \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/inkscape/install b/staging/inkscape/install deleted file mode 100644 index 6e803bf1d..000000000 --- a/staging/inkscape/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - 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/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch deleted file mode 100644 index e24913ed6..000000000 --- a/staging/inkscape/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp -+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp -@@ -1443,7 +1443,7 @@ - return NULL; - } - // Set error handler -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; - } ---- inkscape-0.48.1/src/helper/png-write.cpp -+++ inkscape-0.48.1-mod//src/helper/png-write.cpp -@@ -165,7 +165,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); ---- inkscape-0.48.1/src/sp-image.cpp -+++ inkscape-0.48.1-mod//src/sp-image.cpp -@@ -386,9 +386,13 @@ - - #if defined(PNG_iCCP_SUPPORTED) - { -- char* name = 0; -+ png_charp name = 0; - int compression_type = 0; -- char* profile = 0; -+#if (PNG_LIBPNG_VER < 10500) -+ png_charp profile = 0; -+#else -+ png_bytep profile = 0; -+#endif - png_uint_32 proflen = 0; - if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { - // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/staging/inkscape/poppler20.patch b/staging/inkscape/poppler20.patch deleted file mode 100644 index ecb74603f..000000000 --- a/staging/inkscape/poppler20.patch +++ /dev/null @@ -1,642 +0,0 @@ -diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp ---- old/src/extension/internal/pdfinput/pdf-parser.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2012-05-13 21:07:11.334781215 +0200 -@@ -367,14 +367,14 @@ - for (i = 0; i < obj->arrayGetLength(); ++i) { - obj->arrayGet(i, &obj2); - if (!obj2.isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - obj2.free(); - return; - } - obj2.free(); - } - } else if (!obj->isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - return; - } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ - - // too many arguments - something is wrong - } else { -- error(getPos(), const_cast<char*>("Too many args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Too many args in content stream")); - if (printCommands) { - printf("throwing away arg: "); - obj.print(stdout); -@@ -436,7 +436,7 @@ - - // args at end with no command - if (numArgs > 0) { -- error(getPos(), const_cast<char*>("Leftover args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream")); - if (printCommands) { - printf("%d leftovers:", numArgs); - for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ - name = cmd->getCmd(); - if (!(op = findOp(name))) { - if (ignoreUndef == 0) -- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name); -+ error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name); - return; - } - -@@ -510,26 +510,26 @@ - argPtr = args; - if (op->numArgs >= 0) { - if (numArgs < op->numArgs) { -- error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); -+ error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); - return; - } - if (numArgs > op->numArgs) { - #if 0 -- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); -+ error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name); - #endif - argPtr += numArgs - op->numArgs; - numArgs = op->numArgs; - } - } else { - if (numArgs > -op->numArgs) { -- error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), -+ error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), - numArgs, name); - return; - } - } - for (i = 0; i < numArgs; ++i) { - if (!checkArg(&argPtr[i], op->tchk[i])) { -- error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), -+ error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), - i, name, argPtr[i].getTypeName()); - return; - } -@@ -690,7 +690,7 @@ - return; - } - if (!obj1.isDict()) { -- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); -+ error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); - obj1.free(); - return; - } -@@ -705,7 +705,7 @@ - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); - } else { -- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); - } - } - obj2.free(); -@@ -764,7 +764,7 @@ - state->setTransfer(funcs); - } - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); - } - obj2.free(); - -@@ -784,7 +784,7 @@ - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -- error(getPos(), -+ error(errInternal, getPos(), - const_cast<char*>("Invalid transfer function in soft mask in ExtGState")); - delete funcs[0]; - funcs[0] = NULL; -@@ -809,11 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj5); --#endif - } - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -@@ -840,15 +836,15 @@ - delete funcs[0]; - } - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj4.free(); - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj3.free(); - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); - } - } - obj2.free(); -@@ -876,7 +872,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -884,7 +880,7 @@ - dict->lookup(const_cast<char*>("BBox"), &obj1); - if (!obj1.isArray()) { - obj1.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setFillColorSpace(colorSpace); -@@ -1032,7 +1020,7 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)")); - } - } - -@@ -1043,19 +1031,11 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setStrokeColorSpace(colorSpace); -@@ -1063,7 +1043,7 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)")); - } - } - -@@ -1072,7 +1052,7 @@ - int i; - - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); - return; - } - state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ - int i; - - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ - if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setFillPattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ - ->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setStrokePattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ - - void PdfParser::opLineTo(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in lineto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in lineto")); - return; - } - state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto")); - return; - } - x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto1")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto1")); - return; - } - x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto2")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto2")); - return; - } - x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ - - void PdfParser::opClosePath(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in closepath")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in closepath")); - return; - } - state->closePath(); -@@ -1298,7 +1262,7 @@ - - void PdfParser::opStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in stroke")); - return; - } - if (state->isPath()) { -@@ -1314,7 +1278,7 @@ - - void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke")); - return; - } - state->closePath(); -@@ -1331,7 +1295,7 @@ - - void PdfParser::opFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill")); - return; - } - if (state->isPath()) { -@@ -1347,7 +1311,7 @@ - - void PdfParser::opEOFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill")); - return; - } - if (state->isPath()) { -@@ -1363,7 +1327,7 @@ - - void PdfParser::opFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1376,7 +1340,7 @@ - - void PdfParser::opCloseFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1388,7 +1352,7 @@ - - void PdfParser::opEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1399,7 +1363,7 @@ - - void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1440,7 +1404,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), - pattern->getType()); - break; - } -@@ -1459,7 +1423,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), - pattern->getType()); - break; - } -@@ -1579,15 +1543,9 @@ - double *matrix = NULL; - GBool savedState = gFalse; - --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (!(shading = res->lookupShading(args[0].getName(), NULL))) { - return; - } --#else -- if (!(shading = res->lookupShading(args[0].getName()))) { -- return; -- } --#endif - - // save current graphics state - if (shading->getType() != 2 && shading->getType() != 3) { -@@ -2156,7 +2114,7 @@ - - void PdfParser::opShowText(Object args[], int numArgs) { - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show")); - return; - } - if (fontChanged) { -@@ -2170,7 +2128,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/show")); - return; - } - if (fontChanged) { -@@ -2188,7 +2146,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/set/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/set/show")); - return; - } - if (fontChanged) { -@@ -2211,7 +2169,7 @@ - int i; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show/space")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show/space")); - return; - } - if (fontChanged) { -@@ -2236,7 +2194,7 @@ - } else if (obj.isString()) { - doShowText(obj.getString()); - } else { -- error(getPos(), const_cast<char*>("Element of show/space array must be number or string")); -+ error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string")); - } - obj.free(); - } -@@ -2334,7 +2292,7 @@ - if (charProc.isStream()) { - //parse(&charProc, gFalse); // TODO: parse into SVG font - } else { -- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); -+ error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); - } - //out->endType3Char(state); - if (resDict) { -@@ -2410,7 +2368,7 @@ - return; - } - if (!obj1.isStream()) { -- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); -+ error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); - obj1.free(); - return; - } -@@ -2426,9 +2384,9 @@ - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); -+ error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); - } else { -- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); - } - obj2.free(); - obj1.free(); -@@ -2559,11 +2517,7 @@ - } - } - if (!obj1.isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - colorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- colorSpace = GfxColorSpace::parse(&obj1); --#endif - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2648,11 +2602,7 @@ - obj2.free(); - } - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ - err2: - obj1.free(); - err1: -- error(getPos(), const_cast<char*>("Bad image parameters")); -+ error(errInternal, getPos(), const_cast<char*>("Bad image parameters")); - } - - void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -2791,7 +2741,7 @@ - dict->lookup(const_cast<char*>("BBox"), &bboxObj); - if (!bboxObj.isArray()) { - bboxObj.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj3); --#endif - } - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { -@@ -2990,7 +2936,7 @@ - parser->getObj(&obj); - while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) { - if (!obj.isName()) { -- error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); -+ error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); - obj.free(); - } else { - key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ - parser->getObj(&obj); - } - if (obj.isEOF()) { -- error(getPos(), const_cast<char*>("End of file in inline image")); -+ error(errInternal, getPos(), const_cast<char*>("End of file in inline image")); - obj.free(); - dict.free(); - return NULL; -@@ -3020,11 +2966,11 @@ - } - - void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator")); - } - - void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator")); - } - - //------------------------------------------------------------------------ -diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp ---- old/src/extension/internal/pdfinput/svg-builder.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-13 20:45:22.303804308 +0200 -@@ -961,9 +961,7 @@ - _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); - // Store original name -- if (font->getOrigName()) { -- _font_specification = font->getOrigName()->getCString(); -- } else if (font->getName()) { -+ if (font->getName()) { - _font_specification = font->getName()->getCString(); - } else { - _font_specification = (char*) "Arial"; diff --git a/staging/irssi/PKGBUILD b/staging/irssi/PKGBUILD deleted file mode 100644 index e831da8f7..000000000 --- a/staging/irssi/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159478 2012-05-24 21:17:59Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dan McGee <dan@archlinux.org> - -pkgname=irssi -pkgver=0.8.15 -pkgrel=6 -pkgdesc="Modular text mode IRC client with Perl scripting" -arch=('i686' 'x86_64') -url="http://irssi.org/" -license=('GPL') -depends=('glib2' 'openssl') -optdepends=('perl-libwww: for the scriptassist script') -backup=('etc/irssi.conf') -source=("http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2") -options=('!libtool') -md5sums=('1dcb3f511b88df94b0c996f36668c7da') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --enable-ipv6 \ - --with-proxy \ - --sysconfdir=/etc \ - --with-perl-lib=vendor - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD deleted file mode 100644 index 6d6eee696..000000000 --- a/staging/kdebindings-perlkde/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159447 2012-05-24 12:36:20Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlkde -pkgver=4.8.3 -pkgrel=2 -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/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('bfc1c3a86789832cf7747dfc854d586d86c10a99') - -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 deleted file mode 100644 index a51438507..000000000 --- a/staging/kdebindings-perlqt/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159445 2012-05-24 12:35:46Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdebindings-perlqt -pkgver=4.8.3 -pkgrel=2 -pkgdesc="Perl bindings for the Qt libraries" -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -depends=('kdebindings-smokeqt' 'perl-list-moreutils') -makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') -source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('d0d0d5da1fd9c50bd19ff2bb49d6a71a2d97759f') - -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/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD deleted file mode 100644 index ac50aeb7b..000000000 --- a/staging/kdegraphics-okular/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 158978 2012-05-13 22:30:24Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-okular -pkgver=4.8.3 -pkgrel=2 -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/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('7c43076df3e9d6217e2a5cbb8ef6d8af89f8ae37') - -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 deleted file mode 100644 index 81ce5c4b0..000000000 --- a/staging/kdegraphics-okular/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -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/libatasmart/PKGBUILD b/staging/libatasmart/PKGBUILD deleted file mode 100644 index 7981b0536..000000000 --- a/staging/libatasmart/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 159755 2012-05-26 15:06:57Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libatasmart -pkgver=0.18 -pkgrel=2 -pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('udev') -url="http://0pointer.de/blog/projects/being-smart.html" -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 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/libmp4v2/PKGBUILD b/staging/libmp4v2/PKGBUILD deleted file mode 100644 index 79b1214a7..000000000 --- a/staging/libmp4v2/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 159342 2012-05-21 22:25:00Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=libmp4v2 -pkgver=2.0.0 -pkgrel=1 -pkgdesc="MPEG-4 library" -arch=('i686' 'x86_64') -license=('MPL') -url="http://code.google.com/p/mp4v2/" -depends=('gcc-libs') -options=('!libtool') -source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") - -build() { - cd ${srcdir}/mp4v2-${pkgver} - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/mp4v2-${pkgver} - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} install-man -} -md5sums=('c91f06711225b34b4c192c9114887b14') diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD deleted file mode 100644 index ec862da00..000000000 --- a/staging/libreoffice/PKGBUILD +++ /dev/null @@ -1,707 +0,0 @@ -# $Id: PKGBUILD 159255 2012-05-19 19:04:53Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.3.2 -pkgver=3.5.3 -pkgrel=3 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' - #'saxon' - currently broken - # the runtime dependencies - "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' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# 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" -_additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - poppler_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ac68934592ec7d838cf5c22744be8d97aa4a1a47 - fix_broken_hebrew_wordwrapping.diff - buildfix_icu49.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('d22cd79e7463ac4caf0a4b47d78a82ac' - '3455f3f523d739aa391b5a5bf04ff958' - '945fbf7888c464f4e1cf7282d370b257' - '18f577b374d60b3c760a3a3350407632' - '2fa6028324347860e684e75310818d43' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' - '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '72ba8d57cefdc25a6f1bc845edfd4d78' - '025d9b17d9eb90dc282c5c1289a666aa' - '9734ea20c9f67e1b6e1c5a1247fbd3ff' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - #patch -Np0 -i ${srcdir}/buildfix_icu49.diff - patch -Np1 -i ${srcdir}/poppler_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - # python2 fix - export PYTHON=python2 - -# autoconf -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun - ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-sampleicc \ - --without-system-libexttextcat \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --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 \ - $EXTRAOPTS - -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' - 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' - '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' - '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') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # set python-uno PYTHON path - install -dm755 ${pkgdir}/etc/profile.d - install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d -} - -package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry - -# # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done -# # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - install=libreoffice-draw.install - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - install=libreoffice-impress.install - depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." - install=libreoffice-writer.install - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} diff --git a/staging/libreoffice/buildfix_icu49.diff b/staging/libreoffice/buildfix_icu49.diff deleted file mode 100644 index 7a774dee0..000000000 --- a/staging/libreoffice/buildfix_icu49.diff +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=410307 - ---- i18npool/source/breakiterator/data/char_in.txt -+++ i18npool/source/breakiterator/data/char_in.txt -@@ -15,7 +15,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; -@@ -72,7 +72,7 @@ - [^$Control $CR $LF] $Extend; - - [^$Control $CR $LF] $SpacingMark; --$Prepend [^$Control $CR $LF]; -+# $Prepend [^$Control $CR $LF]; - - - ## ------------------------------------------------- -@@ -94,7 +94,7 @@ - - $Extend [^$Control $CR $LF]; - $SpacingMark [^$Control $CR $LF]; --[^$Control $CR $LF] $Prepend; -+# [^$Control $CR $LF] $Prepend; - - - ## ------------------------------------------------- ---- i18npool/source/breakiterator/data/char.txt -+++ i18npool/source/breakiterator/data/char.txt -@@ -16,7 +16,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff b/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff deleted file mode 100644 index ba4850c77..000000000 --- a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff +++ /dev/null @@ -1,360 +0,0 @@ -From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Sun, 13 May 2012 21:41:30 +0000 -Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules - -i.e. sync with svn diff -c 31071 -http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt - -Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 ---- -diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx -index 14051d4..ffd590c 100644 ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -42,6 +42,7 @@ - #include <unotest/bootstrapfixturebase.hxx> - - #include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> - - #include <string.h> - -@@ -58,6 +59,9 @@ public: - void testWeak(); - void testAsian(); - void testThai(); -+#if TODO -+ void testNorthernThai(); -+#endif - - CPPUNIT_TEST_SUITE(TestBreakIterator); - CPPUNIT_TEST(testLineBreaking); -@@ -71,6 +71,9 @@ - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); -+#if TODO -+ CPPUNIT_TEST(testNorthernThai); -+#endif - CPPUNIT_TEST_SUITE_END(); - - private: -@@ -80,28 +83,46 @@ - uno::Reference<i18n::XBreakIterator> m_xBreak; - }; - --//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation - void TestBreakIterator::testLineBreaking() - { -- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -- - i18n::LineBreakHyphenationOptions aHyphOptions; - i18n::LineBreakUserOptions aUserOptions; - lang::Locale aLocale; - -- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -- -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 - { -- //Here we want the line break to leave text here) on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -+ -+ { -+ //Here we want the line break to leave text here) on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ } -+ -+ { -+ //Here we want the line break to leave "here)" on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ } - } - -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 - { -- //Here we want the line break to leave "here)" on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; -+ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); -+ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); -+ -+ { -+ //Here we want the line break to happen at the whitespace -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1); -+ } - } - } - -@@ -295,27 +320,29 @@ void TestBreakIterator::testThai() - aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); - -- i18n::Boundary aBounds; -- { -- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } -+ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -+} - --#ifdef TODO -- { -- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } --#endif -+#if TODO -+void TestBreakIterator::testNorthernThai() -+{ -+ lang::Locale aLocale; -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); -+ -+ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } -+#endif - - void TestBreakIterator::setUp() - { -diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README -new file mode 100644 -index 0000000..8d7598d ---- a/dev/null -+++ b/i18npool/source/breakiterator/data/README -@@ -0,0 +1,12 @@ -+The originals of these come from svn checkout -+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no -+longer appear in the icu tarballs, but are in icu's svn -+ -+At various stages these copies have been customized and are not horribly out of -+sync. It unclear which diffs from the base versions are deliberate and which -+are now accidental :-( -+ -+We need to review the various issues referenced in the commits that caused -+custimizations and see if they're still relevant or not, write regression tests -+for them, if any are still relavant then apply the changes back on top of the -+latest versions. -diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt -index cbabee6..91c8f3d 100644 ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; - $BK = [:LineBreak = Mandatory_Break:]; - $B2 = [:LineBreak = Break_Both:]; - $CB = [:LineBreak = Contingent_Break:]; -+$CJ = [:LineBreak = Conditional_Japanese_Starter:]; - $CL = [:LineBreak = Close_Punctuation:] ; - $CM = [:LineBreak = Combining_Mark:]; - $CR = [:LineBreak = Carriage_Return:]; - $EX = [:LineBreak = Exclamation:]; - $GL = [:LineBreak = Glue:]; -+$HL = [:LineBreak = Hebrew_Letter:]; - $HY = [:LineBreak = Hyphen:]; - $H2 = [:LineBreak = H2:]; - $H3 = [:LineBreak = H3:]; -@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; - $JT = [:LineBreak = JT:]; - $LF = [:LineBreak = Line_Feed:]; - $NL = [:LineBreak = Next_Line:]; --$NS = [:LineBreak = Nonstarter:]; -+$NS = [[:LineBreak = Nonstarter:] $CJ]; - $NU = [:LineBreak = Numeric:]; - $OP = [[:LineBreak = Open_Punctuation:] - $DG]; - $PO = [:LineBreak = Postfix_Numeric:]; -@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; - $CLcm = $CL $CM*; - $EXcm = $EX $CM*; - $GLcm = $GL $CM*; -+$HLcm = $HL $CM*; - $HYcm = $HY $CM*; - $H2cm = $H2 $CM*; - $H3cm = $H3 $CM*; -@@ -150,6 +153,7 @@ $B2 $CM+; - $CL $CM+; - $EX $CM+; - $GL $CM+; -+$HL $CM+; - $HY $CM+; - $H2 $CM+; - $H3 $CM+; -@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs - # so for this one case we need to manually list out longer sequences. - # - $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; --$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; -+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; - $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; - - -@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); - $BBcm [^$CB]; # $BB x - $BBcm $LB20NonBreaks $CM*; - -+# LB 21a Don't break after Hebrew + Hyphen -+# HL (HY | BA) x -+# -+$HLcm ($HYcm | $BAcm) [^$CB]?; -+ - # LB 22 --$ALcm $INcm; -+($ALcm | $HLcm) $INcm; - $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; -@@ -331,16 +340,18 @@ $NUcm $INcm; - # $LB 23 - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 -+$HLcm $NUcm; - $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; -+$NUcm $HLcm; - - # - # LB 24 - # - $PRcm $IDcm; - $ALcm $PRcm; --$PRcm $ALcm; --$POcm $ALcm; -+$PRcm ($ALcm | $HLcm); -+$POcm ($ALcm | $HLcm); - - # - # LB 25 Numbers. -@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - - # LB 28 Do not break between alphabetics - # --$ALcm $ALcm; --$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL -+($ALcm | $HLcm) ($ALcm | $HLcm); -+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); - # Rule 30 Do not break between letters, numbers or ordinary symbols - # and opening or closing punctuation - # --($ALcm | $NUcm) $OPcm; -+($ALcm | $HLcm | $NUcm) $OPcm; - $CM+ $OPcm; --$CLcm ($ALcm | $NUcm); -- -- -+$CLcm ($ALcm | $HLcm | $NUcm); - - # - # Reverse Rules. -@@ -391,6 +400,7 @@ $CM+ $B2; - $CM+ $CL; - $CM+ $EX; - $CM+ $GL; -+$CM+ $HL; - $CM+ $HY; - $CM+ $H2; - $CM+ $H3; -@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) - $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . - [^$CB] $CM* $BB; # - -- -+# LB21a -+[^$CB] $CM* ($HY | $BA) $CM* $HL; - - # LB 22 --$CM* $IN $CM* $ALPlus; -+$CM* $IN $CM* ($ALPlus | $HL); - $CM* $IN $CM* $ID; - $CM* $IN $CM* $IN; - $CM* $IN $CM* $NU; - - # LB 23 - $CM* $PO $CM* $ID; --$CM* $NU $CM* $ALPlus; --$CM* $ALPlus $CM* $NU; -+$CM* $NU $CM* ($ALPlus | $HL); -+$CM* ($ALPlus | $HL) $CM* $NU; - - # LB 24 - $CM* $ID $CM* $PR; - $CM* $PR $CM* $ALPlus; --$CM* $ALPlus $CM* $PR; --$CM* $ALPlus $CM* $PO; -+$CM* ($ALPlus | $HL) $CM* $PR; -+$CM* ($ALPlus | $HL) $CM* $PO; - - $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; - $CM* $NU+ $CM* $HY+ / $SP; -@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); - $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; - - # LB 28 --$CM* $ALPlus $CM* $ALPlus; -- -+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); - - # LB 29 - $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; - - # LB 30 --$CM* $OP $CM* ($NU | $ALPlus); --$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; -+$CM* $OP $CM* ($ALPlus | $HL | $NU); -+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - - - ## ------------------------------------------------- -@@ -609,6 +619,9 @@ $SP+ $CM* $QU; - $SP+ $CM* $CL; - $SP+ $CM* $B2; - -+# LB 21 -+$CM* ($HY | $BA) $CM* $HL; -+ - # LB 18 - ($CM* ($IS | $SY))+ $CM* $NU; - $CL $CM* ($NU | $IS | $SY); -@@ -629,6 +642,6 @@ $dictionary $dictionary; - # turn off rule chaining. We don't want to move more - # than necessary. - # --[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; -+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; - $dictionary $dictionary; - --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/libreoffice/libreoffice-base.install b/staging/libreoffice/libreoffice-base.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-base.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-calc.install b/staging/libreoffice/libreoffice-calc.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-calc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-common.csh b/staging/libreoffice/libreoffice-common.csh deleted file mode 100644 index af31d4432..000000000 --- a/staging/libreoffice/libreoffice-common.csh +++ /dev/null @@ -1 +0,0 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program diff --git a/staging/libreoffice/libreoffice-common.install b/staging/libreoffice/libreoffice-common.install deleted file mode 100644 index e66b66f3d..000000000 --- a/staging/libreoffice/libreoffice-common.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/staging/libreoffice/libreoffice-common.sh b/staging/libreoffice/libreoffice-common.sh deleted file mode 100644 index ee405b1aa..000000000 --- a/staging/libreoffice/libreoffice-common.sh +++ /dev/null @@ -1 +0,0 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" diff --git a/staging/libreoffice/libreoffice-draw.install b/staging/libreoffice/libreoffice-draw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-draw.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-impress.install b/staging/libreoffice/libreoffice-impress.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-impress.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice-writer.install b/staging/libreoffice/libreoffice-writer.install deleted file mode 100644 index 80312d4a6..000000000 --- a/staging/libreoffice/libreoffice-writer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install deleted file mode 100644 index e66b66f3d..000000000 --- a/staging/libreoffice/libreoffice.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/staging/lvm2/11-dm-initramfs.rules b/staging/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/staging/lvm2/11-dm-initramfs.rules +++ /dev/null @@ -1,3 +0,0 @@ -# needed with new udev/mkinitcpio and as implemented in dracut: -# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> -SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/staging/lvm2/PKGBUILD b/staging/lvm2/PKGBUILD deleted file mode 100644 index 496a40266..000000000 --- a/staging/lvm2/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 159668 2012-05-26 01:03:13Z dreisner $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=6 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} - lvm2_install - lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '3e1680f9b76ce9150d08865d99db90fd15532271' - 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${pkgver}" - unset LDFLAGS - - # libudev.so.1.0.0 compat - sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ - tools/dmsetup.c \ - lib/misc/lvm-wrappers.c - - ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --enable-udev_sync --enable-udev_rules - make -} - -package_device-mapper() { - pkgdesc="Device mapper userspace library and tools" - url="http://sourceware.org/dm/" - depends=('glibc' 'udev') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" -} - -package_lvm2() { - pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${pkgver}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - make -C liblvm DESTDIR="${pkgdir}" install - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" -} diff --git a/staging/lvm2/lvm2_hook b/staging/lvm2/lvm2_hook deleted file mode 100644 index e69b3349a..000000000 --- a/staging/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/ash - -run_hook() { - local pvdev - - modprobe -q dm-mod >/dev/null 2>&1 - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - for pvdev in ${lvmwait//,/ }; do - poll_device ${pvdev} ${rootdelay} - done - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && lvm vgscan - - if [ -n "$quiet" ]; then - lvm vgchange --sysinit -a y >/dev/null - else - lvm vgchange --sysinit -a y - fi -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/lvm2/lvm2_install b/staging/lvm2/lvm2_install deleted file mode 100644 index 145ce49b2..000000000 --- a/staging/lvm2/lvm2_install +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -build() { - local mod - for mod in dm-mod dm-snapshot dm-mirror; do - add_module "$mod" - done - - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" - - add_runscript -} - -help() { - cat <<HELPEOF -This hook loads the necessary modules for an LVM2 root device. - -The optional lvmwait= parameter followed by a comma-separated -list of device names can be given on the command line. -It will cause the hook to wait until all given devices exist -before trying to scan and activate any volume groups. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/staging/mesa/LICENSE b/staging/mesa/LICENSE deleted file mode 100644 index ae33d2709..000000000 --- a/staging/mesa/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul 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 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 -BRIAN PAUL 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. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD deleted file mode 100644 index 7bcb4ad10..000000000 --- a/staging/mesa/PKGBUILD +++ /dev/null @@ -1,268 +0,0 @@ -# $Id: PKGBUILD 159718 2012-05-26 09:28:14Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') - -#_git=true -_gitdate=20111031 -_git=false - -if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110709 - #pkgver=7.11 - else - pkgver=8.0.3 -fi -pkgrel=2 -arch=('i686' 'x86_64') -makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(LICENSE - mesa-8.0.3-llvm-3.1-fixes.patch) -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-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[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" -) -fi -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') - -build() { - cd ${srcdir}/?esa-* - - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" - -if [ "${_git}" = "true" ]; then - autoreconf -vfi - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore - #--enable-gbm \ - # --enable-gallium-svga \ - - else - autoreconf -vfi - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore -fi - - make -} - -package_libgl() { - depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" - - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" - - cd src/mesa/drivers/dri - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - - ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" -} - -package_osmesa() { - depends=('mesa') - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3D off-screen rendering library" - - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa -} - -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" -} - -package_libgbm() { - depends=('glibc') - pkgdesc="Mesa gbm library" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" -} - -package_libgles() { - depends=('libglapi' 'khrplatform-devel') - pkgdesc="Mesa GLES libraries and headers" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" -} - -package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') - pkgdesc="Mesa EGL libraries and headers" - - cd ${srcdir}/?esa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" - install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/egl" - 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 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 - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libglapi.so"* - rm -f "${pkgdir}/usr/lib/libgbm.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f "${pkgdir}/usr/lib/libOSMesa"* - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - -package_ati-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" - conflicts=('xf86-video-ati<6.9.0-6') - - # classic mesa drivers for radeon,r200 - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600 - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -} - -package_intel-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install -} - -package_nouveau-dri() { - depends=("libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -} - -package_svga-dri() { - depends=("mesa=${pkgver}") - pkgdesc="Gallium3D VMware guest GL driver" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install -} diff --git a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index a567b5926..000000000 --- a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } - - diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD deleted file mode 100644 index 1802ed461..000000000 --- a/staging/mod_perl/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 159775 2012-05-26 19:41:32Z foutrelis $ -# Maintainer: -# Contributor: Firmicus <francois.archlinux.org> -# Contributor: Tom K <tomk@runbox.com> - -pkgname=mod_perl -pkgver=2.0.6 -pkgrel=1 -pkgdesc="Apache module that embeds the Perl interpreter within the server" -arch=('i686' 'x86_64') -url="http://perl.apache.org/" -license=('APACHE') -depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid') -options=('!emptydirs') -source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz - mod_perl-2.0.6-nolfs.patch - mod_perl-2.0.6-perl-5.16-fixes.patch) -sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc' - '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08' - 'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Patch from openSUSE to fix segfaults on i686 (FS#25008): - # avoid a conflict between apache's LARGEFILE64_SOURCE and perl's - # FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl - # structures to be invalid if only the apache flags are used - patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch" - - # Fix build with Perl 5.16 - # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached - patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make install DESTDIR="$pkgdir" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/mod_perl/mod_perl-2.0.6-nolfs.patch b/staging/mod_perl/mod_perl-2.0.6-nolfs.patch deleted file mode 100644 index 13e5cccee..000000000 --- a/staging/mod_perl/mod_perl-2.0.6-nolfs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/lib/Apache2/Build.pm mod_perl-2.0.6/lib/Apache2/Build.pm ---- mod_perl-2.0.6.orig/lib/Apache2/Build.pm 2012-05-26 22:31:00.000000000 +0300 -+++ mod_perl-2.0.6/lib/Apache2/Build.pm 2012-05-26 22:31:32.000000000 +0300 -@@ -2207,7 +2207,8 @@ sub has_large_files_conflict { - # with it is that we didn't have such a case yet, but may need to - # deal with it later - -- return $perl_lfs64 ^ $apr_lfs64; -+ return 0; -+ # $perl_lfs64 ^ $apr_lfs64; - } - - # if perl is built with uselargefiles, but apr not, the build won't diff --git a/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch deleted file mode 100644 index 4e26fd87d..000000000 --- a/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c ---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c 2012-05-26 21:49:27.000000000 +0300 -+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c 2012-05-26 21:55:39.000000000 +0300 -@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_ - sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid); - --#ifndef WIN32 -- PL_uid = ids->uid; -- PL_euid = ids->euid; -- PL_gid = ids->gid; -- PL_egid = ids->egid; --#endif --#ifdef MP_MAINTAIN_PPID -- PL_ppid = ids->ppid; --#endif - } - diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD deleted file mode 100644 index e9930ec14..000000000 --- a/staging/net-snmp/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 159781 2012-05-26 20:12:07Z foutrelis $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> - -pkgname=net-snmp -pkgver=5.7.1 -pkgrel=3 -pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" -arch=('i686' 'x86_64') -url="http://www.net-snmp.org/" -license=('BSD') -depends=('openssl' 'libnl' 'pciutils') -makedepends=('python2-distribute') -optdepends=('perl-term-readkey: for snmpcheck application' - 'perl-tk: for snmpcheck and tkmib applications' - 'python2: for the python modules') -provides=('ucd-snmp') -backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} - snmpd.confd snmpd.rc libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' - 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' - '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' - '74a9848b95f63378eb1753fc309d2b74de5afb0f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694 - patch -Np1 -i "$srcdir/libnl32.patch" - autoreconf -f -i - - sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in - PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-ucd-snmp-compatibility \ - --enable-ipv6 \ - --with-python-modules \ - --with-default-snmp-version="3" \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-logfile="/var/log/snmpd.log" \ - --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \ - --with-persistent-directory="/var/net-snmp" \ - --disable-static - make NETSNMP_DONT_CHECK_VERSION=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install - install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd" - install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/net-snmp/libnl32.patch b/staging/net-snmp/libnl32.patch deleted file mode 100644 index d93d7ef67..000000000 --- a/staging/net-snmp/libnl32.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c 2012-02-09 20:02:49.136022132 +0100 -@@ -566,8 +566,9 @@ - static int - tcpTable_load_netlink(void) - { -+ int err; - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -575,10 +576,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -590,10 +591,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -604,9 +605,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -655,7 +656,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); -diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 ---- net-snmp-5.7.1/configure.d/config_os_libs2 2011-09-28 06:53:47.000000000 +0200 -+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2 2012-02-09 20:10:44.282165275 +0100 -@@ -224,8 +224,9 @@ - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)" - NETSNMP_SEARCH_LIBS( -- nl_connect, nl, -+ nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS) - ;; - esac diff --git a/staging/net-snmp/snmpd.confd b/staging/net-snmp/snmpd.confd deleted file mode 100644 index 926b09bbf..000000000 --- a/staging/net-snmp/snmpd.confd +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters to be passed to snmpd -# -SNMPD_ARGS="" - diff --git a/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc deleted file mode 100644 index b00c09f4f..000000000 --- a/staging/net-snmp/snmpd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/snmpd - -PID=`pidof -o %PPID /usr/sbin/snmpd` -case "$1" in - start) - stat_busy "Starting Net-SNMP" - [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/snmpd.pid - add_daemon snmpd - stat_done - fi - ;; - stop) - stat_busy "Stopping Net-SNMP" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/snmpd.pid - rm_daemon snmpd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/staging/pango-perl/PKGBUILD b/staging/pango-perl/PKGBUILD deleted file mode 100644 index 64805ec07..000000000 --- a/staging/pango-perl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159745 2012-05-26 12:16:38Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=pango-perl -pkgver=1.223 -pkgrel=2 -pkgdesc="Perl bindings for Pango" -arch=(i686 x86_64) -license=('LGPL') -url="http://gtk2-perl.sourceforge.net/" -makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') -depends=('pango' 'glib-perl' 'cairo-perl') -options=('!emptydirs') -source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz) -md5sums=('628a6de54f47b6791c6b45edfb835215') - -build() { - cd "${srcdir}/Pango-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/Pango-${pkgver}" - make test -} - -package() { - cd "${srcdir}/Pango-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/pciutils/PKGBUILD b/staging/pciutils/PKGBUILD deleted file mode 100644 index 8458d7f6b..000000000 --- a/staging/pciutils/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 159291 2012-05-20 23:30:35Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=pciutils -pkgver=3.1.9 -pkgrel=2 -pkgdesc="PCI bus configuration space access library and tools" -arch=(i686 x86_64) -license=('GPL2') -groups=('base') -url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') -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=('e958f5ffb93b12972964381c38f27eb3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all - cp lib/libpci.a "${srcdir}/" - make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib - install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" - # this is now supplied by the hwids package - rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}} -} diff --git a/staging/perl-async-interrupt/PKGBUILD b/staging/perl-async-interrupt/PKGBUILD deleted file mode 100644 index 1fa3cdbda..000000000 --- a/staging/perl-async-interrupt/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159729 2012-05-26 11:40:38Z bluewind $ - -pkgname=perl-async-interrupt -_ver=1.1 -pkgver=1.10 -pkgrel=2 -pkgdesc='allow C/XS libraries to interrupt perl asynchronously' -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=(perl-common-sense) -url=https://metacpan.org/release/Async-Interrupt -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz") -md5sums=(18f19b1537ecf5d6195a6a243110e64b) -sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e) -_dir="$srcdir/Async-Interrupt-$_ver" - -build() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps - unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL - make -) - -check() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 - unset PERL5LIB - make test -) - -package() -( - cd "$_dir" - make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - 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/staging/perl-bit-vector/PKGBUILD b/staging/perl-bit-vector/PKGBUILD deleted file mode 100644 index 198baa3ac..000000000 --- a/staging/perl-bit-vector/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159490 2012-05-25 02:23:56Z eric $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: K. Piche <kpiche@rogers.com> - -pkgname=perl-bit-vector -_cpanname=Bit-Vector -pkgver=7.2 -pkgrel=2 -pkgdesc='Efficient bit vector, set of integers and "big int" math library' -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_cpanname}/" -depends=('perl-carp-clan' 'perl') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('bc6ae34738b8f889290bf50099ff8aed') - -build() { - cd "${srcdir}/${_cpanname}-$pkgver" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_cpanname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_cpanname}-$pkgver" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/perl-compress-bzip2/PKGBUILD b/staging/perl-compress-bzip2/PKGBUILD deleted file mode 100644 index 6e98cea99..000000000 --- a/staging/perl-compress-bzip2/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 159454 2012-05-24 13:49:08Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=perl-compress-bzip2 -_realname=Compress-Bzip2 -pkgver=2.09 -pkgrel=5 -pkgdesc="Interface to Bzip2 compression library" -arch=(i686 x86_64) -license=(GPL2) -depends=(perl bzip2) -url="http://search.cpan.org/dist/Compress-Bzip2" -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz") -md5sums=('1699fde3e86f2a036f135ae606d456bf') - -build() { - cd "$srcdir/$_realname-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd "$srcdir/$_realname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/staging/perl-crypt-openssl-bignum/PKGBUILD b/staging/perl-crypt-openssl-bignum/PKGBUILD deleted file mode 100644 index e5f881bcc..000000000 --- a/staging/perl-crypt-openssl-bignum/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-bignum -pkgver=0.04 -pkgrel=7 -pkgdesc="OpenSSL's multiprecision integer arithmetic " -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum" -depends=('perl' 'openssl') -license=('GPL') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz) -md5sums=('9369ef722b0705c0604998559988eb18') - -build() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - - -check() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-Bignum-$pkgver" - - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/staging/perl-crypt-openssl-random/PKGBUILD b/staging/perl-crypt-openssl-random/PKGBUILD deleted file mode 100644 index 24ebde127..000000000 --- a/staging/perl-crypt-openssl-random/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-random -pkgver=0.04 -pkgrel=7 -pkgdesc="Interface to OpenSSL PRNG methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-Random" -depends=('perl' 'openssl') -license=('GPL') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz) -md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a') - -build() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-Random-$pkgver" - - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/staging/perl-crypt-openssl-rsa/PKGBUILD b/staging/perl-crypt-openssl-rsa/PKGBUILD deleted file mode 100644 index 3a44bf936..000000000 --- a/staging/perl-crypt-openssl-rsa/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 56402 2011-10-07 09:48:12Z spupykin $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=perl-crypt-openssl-rsa -pkgver=0.28 -pkgrel=3 -pkgdesc="Interface to OpenSSL RSA methods" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA" -depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum') -license=('GPL') -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz") -md5sums=('86217a5036fc63779c30420b5fd84129') - -build() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - - make test -} - -package() { - cd "$srcdir/Crypt-OpenSSL-RSA-$pkgver" - make pure_install doc_install DESTDIR="$pkgdir" - find "$pkgdir" -name '.packlist' -delete - find "$pkgdir" -name '*.pod' -delete -} diff --git a/staging/perl-crypt-ssleay/PKGBUILD b/staging/perl-crypt-ssleay/PKGBUILD deleted file mode 100644 index 1f5842c4a..000000000 --- a/staging/perl-crypt-ssleay/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159482 2012-05-24 21:26:53Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-crypt-ssleay -pkgver=0.58 -pkgrel=4 -pkgdesc="OpenSSL glue that provides LWP https support" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/Crypt-SSLeay" -license=('GPL' 'PerlArtistic') -depends=('openssl') -options=('!emptydirs') -source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) -md5sums=('fbf3d12e58462cee00ea63239c0b13c7') - -build() { - cd "${srcdir}/Crypt-SSLeay-${pkgver}" - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make - make test -} - -package() { - cd "${srcdir}/Crypt-SSLeay-${pkgver}" - make install DESTDIR="${pkgdir}" - - find ${pkgdir} -name '.packlist' -delete - find ${pkgdir} -name '*.pod' -delete -} diff --git a/staging/perl-dbd-mysql/PKGBUILD b/staging/perl-dbd-mysql/PKGBUILD deleted file mode 100644 index 471b3b7a6..000000000 --- a/staging/perl-dbd-mysql/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 159494 2012-05-25 03:17:36Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Eric Johnson <eric@coding-zone.com> - -pkgname=perl-dbd-mysql -_realname=DBD-mysql -pkgver=4.020 -pkgrel=3 -pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD" -arch=(i686 x86_64) -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0') -makedepends=('mysql') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz) -md5sums=('a2bf8808bbd45298e84dde06afbd58e9') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - mkdir -p /tmp/mysql_test - mysql_install_db \ - --basedir=/usr \ - --datadir=/tmp/mysql_test - mysqld -P 17999 \ - --socket=/tmp/socket.mysql \ - --datadir=/tmp/mysql_test & - sleep 10 - DAEMON_PORT=$! - make test || true - kill -9 $DAEMON_PORT -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD deleted file mode 100644 index 7da3b506d..000000000 --- a/staging/perl-dbd-sqlite/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159652 2012-05-26 00:23:42Z eric $ -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: francois at archlinux dot org - -pkgname=perl-dbd-sqlite -_cpanname=DBD-SQLite -pkgver=1.35 -pkgrel=2 -pkgdesc="Self-contained RDBMS in a DBI driver" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('GPL' 'PerlArtistic') -depends=('perl-dbi>=1.61' 'sqlite') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz) -md5sums=('d9752e4a26fa54e74aa893dafd02ceda') - -build() { - cd "${srcdir}/${_cpanname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_cpanname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_cpanname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-dbi/PKGBUILD b/staging/perl-dbi/PKGBUILD deleted file mode 100644 index a6f8b2444..000000000 --- a/staging/perl-dbi/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159492 2012-05-25 02:52:01Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Matt Thompson <mattt@defunct.ca> - -pkgname=perl-dbi -_realname=DBI -pkgver=1.618 -pkgrel=2 -pkgdesc="Database independent interface for Perl" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz) -md5sums=('5ad29b56f7457f22bd1ca1c871b30719') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} - -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD deleted file mode 100644 index 02e3165f2..000000000 --- a/staging/perl-digest-nilsimsa/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159656 2012-05-26 00:30:32Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-digest-nilsimsa -_realname=Digest-Nilsimsa -pkgver=0.06 -pkgrel=8 -pkgdesc="Perl version of Nilsimsa code" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -replaces=('digest-nilsimsa') -provides=('digest-nilsimsa') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz) -md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD deleted file mode 100644 index 4ae6ec164..000000000 --- a/staging/perl-digest-sha1/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 159658 2012-05-26 00:37:46Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-digest-sha1 -_realname=Digest-SHA1 -pkgver=2.13 -pkgrel=3 -pkgdesc="Perl interface to the SHA-1 Algorithm" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -replaces=('digest-sha1') -provides=('digest-sha1') -md5sums=('bd22388f268434f2b24f64e28bf1aa35') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-ev/PKGBUILD b/staging/perl-ev/PKGBUILD deleted file mode 100644 index 41e569b0d..000000000 --- a/staging/perl-ev/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Packager: Justin Davis (juster) <jrcd83@gmail.com> -# $Id: PKGBUILD 159731 2012-05-26 11:42:13Z bluewind $ - -pkgname=perl-ev -pkgver=4.11 -pkgrel=2 -pkgdesc='perl interface to libev, a high performance full-featured event loop' -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=(perl-common-sense) -url=https://metacpan.org/release/EV -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz") -md5sums=(405c6d74f9dff12918b12560c1a57877) -sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8) -_dir="$srcdir/EV-$pkgver" - -build() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps - unset PERL5LIB PERL_MM_OPT - /usr/bin/perl Makefile.PL - make -) - -check() -( - cd "$_dir" - export PERL_MM_USE_DEFAULT=1 - unset PERL5LIB - make test -) - -package() -( - cd "$_dir" - make install INSTALLDIRS=vendor DESTDIR="$pkgdir" - 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/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD deleted file mode 100644 index f12acdbfc..000000000 --- a/staging/perl-event/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159660 2012-05-26 00:45:46Z eric $ -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: François Charette <francois.archlinux.org> - -pkgname=perl-event -_srcname=Event -pkgver=1.20 -pkgrel=2 -pkgdesc="Framework for GUI events" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -url="http://search.cpan.org/dist/${_srcname}/" -depends=('perl') -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) -md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134') - -build() { - cd "${srcdir}/${_srcname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_srcname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_srcname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-fcgi/PKGBUILD b/staging/perl-fcgi/PKGBUILD deleted file mode 100644 index 320844d7e..000000000 --- a/staging/perl-fcgi/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159484 2012-05-24 21:30:37Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: François Charette <firmicus ατ gmx δοτ net> - -pkgname=perl-fcgi -pkgver=0.74 -pkgrel=3 -pkgdesc="Fast CGI" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/FCGI" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz") -md5sums=('462a77a0072480fea791a4d3095eb486') - -build() { - cd "${srcdir}/FCGI-${pkgver}" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/FCGI-${pkgver}" - make test -} - -package() { - cd "${srcdir}/FCGI-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-guard/PKGBUILD b/staging/perl-guard/PKGBUILD deleted file mode 100644 index da440e55c..000000000 --- a/staging/perl-guard/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Packager: Justin Davis <jrcd83@gmail.com> -# $Id: PKGBUILD 159733 2012-05-26 11:43:47Z bluewind $ - -pkgname=perl-guard -pkgver=1.022 -pkgrel=2 -pkgdesc="safe cleanup blocks" -arch=(i686 x86_64) -license=(custom:unknown) -options=(!emptydirs) -depends=('perl') -url=https://metacpan.org/release/Guard -source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz") -md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c) -sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e) -_distdir="${srcdir}/Guard-${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/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD deleted file mode 100644 index e6c38d52f..000000000 --- a/staging/perl-html-parser/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159662 2012-05-26 00:49:53Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis -# Contributor: Firmicus <francois.archlinux.org> - -pkgname=perl-html-parser -_realname=HTML-Parser -pkgver=3.69 -pkgrel=2 -pkgdesc="Perl HTML parser class" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-html-tagset' 'perl>=5.12.1') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('d22cc6468ce670a56034be907e4e7c54') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD deleted file mode 100644 index 9eaec27d6..000000000 --- a/staging/perl-libintl-perl/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159666 2012-05-26 01:00:46Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> - -pkgname=perl-libintl-perl -_realname=libintl-perl -pkgver=1.20 -pkgrel=4 -pkgdesc="Perl Module: Localization support" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl') -options=(!emptydirs) -source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz) -md5sums=('cb36f58a7d2e15974f25b35381548b1b') - -build() { - cd "${srcdir}/${_realname}-$pkgver" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_realname}-$pkgver" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-list-moreutils/PKGBUILD b/staging/perl-list-moreutils/PKGBUILD deleted file mode 100644 index 3b0b7b33f..000000000 --- a/staging/perl-list-moreutils/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 159735 2012-05-26 11:45:02Z bluewind $ -# Maintainer : Justin "juster" Davis <jrcd83@gmail.com> -# Generator : pbjam 0.01 - -pkgname=perl-list-moreutils -pkgver=0.33 -pkgrel=3 -pkgdesc="Provide the stuff missing in List::Util" -arch=(i686 x86_64) -license=(PerlArtistic GPL) -options=(!emptydirs) -depends=('perl>=5.5.30') -url=http://search.cpan.org/dist/List-MoreUtils -source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz") -md5sums=(8a33c84028cc2ff3e92c92434b326c0f) -sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5) -_distdir="${srcdir}/List-MoreUtils-${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/staging/perl-locale-gettext/PKGBUILD b/staging/perl-locale-gettext/PKGBUILD deleted file mode 100644 index cb0d8bc3b..000000000 --- a/staging/perl-locale-gettext/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 159486 2012-05-24 21:34:25Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Mark Rosenstand <mark@borkware.net> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=perl-locale-gettext -_realname=gettext -pkgver=1.05 -pkgrel=9 -pkgdesc="Permits access from Perl to the gettext() family of functions" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('gettext' 'perl') -options=(!emptydirs) -source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz" - 'compatibility-with-POSIX-module.patch') -md5sums=('f3d3f474a1458f37174c410dfef61a46' - '854302f34d01a2f8ae739187788973dd') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete -} diff --git a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch deleted file mode 100644 index ad675516b..000000000 --- a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/gettext.pm 2005-05-31 20:11:16.000000000 -0700 -+++ b/gettext.pm 2009-10-07 12:39:42.000000000 -0700 -@@ -32,6 +32,7 @@ - =cut - - use Carp; -+use POSIX qw(:locale_h); - - require Exporter; - require DynaLoader; diff --git a/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD deleted file mode 100644 index aba8a4e5a..000000000 --- a/staging/perl-net-dns/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159670 2012-05-26 01:09:03Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-net-dns -_realname=Net-DNS -pkgver=0.68 -pkgrel=2 -pkgdesc="Perl Module: Interface to the DNS resolver." -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-digest-hmac' 'perl-net-ip' 'perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz) -md5sums=('05c0f6955747758bb5c9578d9bc6c3a5') - -build() { - cd "$srcdir/${_realname}-${pkgver}" - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "$srcdir/${_realname}-${pkgver}" - make test -} - -package() { - cd "$srcdir/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} -# vim: ts=2 sw=2 et ft=sh diff --git a/staging/perl-net-ssleay/PKGBUILD b/staging/perl-net-ssleay/PKGBUILD deleted file mode 100644 index 78733dbbd..000000000 --- a/staging/perl-net-ssleay/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 159480 2012-05-24 21:23:03Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=perl-net-ssleay -_cpanname=Net-SSLeay -pkgver=1.48 -pkgrel=2 -pkgdesc="Perl extension for using OpenSSL" -arch=('i686' 'x86_64') -license=('custom:BSD') -url="http://search.cpan.org/dist/${_cpanname}/" -depends=('openssl') -options=(!emptydirs) -replaces=('net-ssleay') -provides=('net-ssleay') -source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('4e10d9da28f26732e37807820bf72af5') - -build() { - cd ${srcdir}/${_cpanname}-${pkgver} - - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor - make -} - -package() { - cd ${srcdir}/${_cpanname}-${pkgver} - - make install DESTDIR=${pkgdir} - - # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete - - install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD deleted file mode 100644 index 39df34775..000000000 --- a/staging/perl-netaddr-ip/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159676 2012-05-26 01:15:09Z eric $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgname=perl-netaddr-ip -_realname=NetAddr-IP -pkgver=4.058 -pkgrel=2 -pkgdesc="Perl module to manage IP addresses and subnets" -arch=(i686 x86_64) -license=('PerlArtistic' 'GPL') -depends=('perl') -options=('!emptydirs') -url="http://search.cpan.org/dist/${_realname}/" -source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz) -md5sums=('8829958dd84a8b36e3cd10347564739d') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD deleted file mode 100644 index 5acdbbc4e..000000000 --- a/staging/perl-sdl/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159674 2012-05-26 01:12:57Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=perl-sdl -pkgver=2.536 -pkgrel=1 -pkgdesc="Simple DirectMedia Layer for Perl" -arch=(i686 x86_64) -license=(LGPL) -url="http://sdl.perl.org" -depends=(perl-alien-sdl perl-tie-simple - sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg) -#makedepends=(perl-yaml) -options=('!emptydirs') -replaces=(sdl_perl) -conflicts=(sdl_perl) -provides=("sdl_perl=$pkgver") -# http://search.cpan.org/dist/SDL/ -_author=FROGGS -source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz) -md5sums=('5c682e8a96cd655e959497b034b978ce') - -build() { - cd "$srcdir/SDL-$pkgver" - # Perl selects the proper CFLAGS set for binary modules - unset CFLAGS - # install module in vendor directories - perl Build.PL installdirs=vendor - perl Build -} - -check() { - cd "$srcdir/SDL-$pkgver" - perl Build test || true -} - -package() { - cd "$srcdir/SDL-$pkgver" - perl Build install destdir="$pkgdir" -} diff --git a/staging/perl-socket6/PKGBUILD b/staging/perl-socket6/PKGBUILD deleted file mode 100644 index 88c8acc07..000000000 --- a/staging/perl-socket6/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Generator : CPANPLUS::Dist::Arch 1.18 - -pkgname='perl-socket6' -pkgver='0.23' -pkgrel='2' -pkgdesc="getaddrinfo/getnameinfo support module" -arch=('i686' 'x86_64') -license=('PerlArtistic' 'GPL') -options=('!emptydirs') -depends=('perl') -makedepends=() -url='http://search.cpan.org/dist/Socket6' -source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz') -md5sums=('2c02adb13c449d48d232bb704ddbd492') -sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9') -_distdir="${srcdir}/Socket6-0.23" - -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() { - cd "$_distdir" - ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" - make test - ) -} - -package() { - cd "$_distdir" - make 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/staging/perl-template-toolkit/PKGBUILD b/staging/perl-template-toolkit/PKGBUILD deleted file mode 100644 index fdce31abc..000000000 --- a/staging/perl-template-toolkit/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Firmicus <francois.archlinux.org> -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: FJ <joostef@gmail.com> - -pkgname=perl-template-toolkit -_realname=Template-Toolkit -pkgver=2.22 -pkgrel=5 -pkgdesc="Perl template processing system" -arch=(i686 x86_64) -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl-appconfig' 'perl>=5.10.0') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) -md5sums=('d98277f6420e5da6b93d99a8db2b3934') - -build() { - cd ${srcdir}/${_realname}-$pkgver - # install module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -package() { - cd ${srcdir}/${_realname}-$pkgver - make install DESTDIR=${startdir}/pkg - - # remove perllocal.pod and .packlist - find ${startdir}/pkg -name perllocal.pod -delete - find ${startdir}/pkg -name .packlist -delete -} diff --git a/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD deleted file mode 100644 index 9de54dc1a..000000000 --- a/staging/perl-term-readkey/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159678 2012-05-26 01:25:20Z eric $ -# Maintainer: kevin <kevin@archlinux.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Francois Charette <francois.archlinux.org> - -pkgname=perl-term-readkey -_realname=TermReadKey -pkgver=2.30.02 -pkgrel=2 -pkgdesc="Provides simple control over terminal driver modes" -arch=('i686' 'x86_64') -license=('custom') -depends=('perl' 'glibc') -url="http://search.cpan.org/~stsi/${_realname}/" -options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz) -md5sums=('69b92c8ddca8691c83823c683cd9838a') - -build() { - cd "${srcdir}/TermReadKey-$pkgver" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/TermReadKey-$pkgver" - make test -} - -package() { - cd "${srcdir}/TermReadKey-$pkgver" - make DESTDIR="${pkgdir}" install - chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Term/ReadKey/ReadKey.so" - install -d "${pkgdir}/usr/share/licenses/$pkgname/" - head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD deleted file mode 100644 index 9fa7def9d..000000000 --- a/staging/perl-text-iconv/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 159683 2012-05-26 01:29:23Z eric $ -# Maintainer: -# Contributor: Francois Charette <firmicus@gmx.net> - -pkgname=perl-text-iconv -_realname=Text-Iconv -pkgver=1.7 -pkgrel=7 -pkgdesc="Interface to iconv codeset conversion" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_realname}/" -license=('GPL' 'PerlArtistic') -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) -md5sums=('81b26e069eaebb084e91ea3c009b67ae') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/staging/perl-time-hires/PKGBUILD b/staging/perl-time-hires/PKGBUILD deleted file mode 100644 index d0e8d638f..000000000 --- a/staging/perl-time-hires/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159488 2012-05-24 21:38:51Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: mezcal <fila at pruda dot com> - -pkgname=perl-time-hires -pkgver=1.9725 -pkgrel=2 -pkgdesc="Perl module: high resolution time, sleep, and alarm" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/Time-HiRes/" -depends=('perl') -options=(!emptydirs) -source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz") -md5sums=('cb1108c076d26f3d2fed0bb91313135a') - -build() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - - make -} - -check() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - make test -} - -package() { - cd "${srcdir}/Time-HiRes-${pkgver}" - - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD deleted file mode 100644 index 0396f4bb2..000000000 --- a/staging/perl-tk/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159686 2012-05-26 02:00:46Z 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.030 -pkgrel=3 -pkgdesc="A graphical user interface toolkit for Perl" -arch=('i686' 'x86_64') -url="http://search.cpan.org/dist/${_cpanname}" -license=('PerlArtistic' 'GPL' 'custom') -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=('13275e85f99ee467a86d9598a437abff') - -build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -#check() { -# cd "$srcdir/${_cpanname}-$pkgver" -# make test -#} - -package() { - cd "$srcdir/${_cpanname}-$pkgver" - make install DESTDIR="$pkgdir" - - # license - install -D -m644 pTk/license.terms \ - "${pkgdir}/usr/share/licenses/${pkgname}/tk.license" - install -D -m644 pTk/Tix.license \ - "${pkgdir}/usr/share/licenses/${pkgname}/tix.license" -} diff --git a/staging/perl-unicode-string/PKGBUILD b/staging/perl-unicode-string/PKGBUILD deleted file mode 100644 index b08464be7..000000000 --- a/staging/perl-unicode-string/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159688 2012-05-26 02:19:07Z eric $ -# Maintainer: James Rayner <iphitus@gmail.com> -# Contributor: Andrew Simmons <andrew.simmons@gmail.com> - -pkgname=perl-unicode-string -_realname=Unicode-String -pkgver=2.09 -pkgrel=7 -pkgdesc="String of Unicode characters for perl (UCS2/UTF16)" -arch=('i686' 'x86_64') -license=('PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=(!emptydirs) -source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz) -md5sums=('553e68e603723bf7c631f8701ab0d678') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - # in stall module in vendor directories. - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" -} diff --git a/staging/perl-xml-parser/PKGBUILD b/staging/perl-xml-parser/PKGBUILD deleted file mode 100644 index e46bfce2e..000000000 --- a/staging/perl-xml-parser/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159672 2012-05-26 01:11:32Z heftig $ -# Maintainer: -# Contributor: firmicus <francois@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: herb <hrose@archlinux.org> - -pkgname=perl-xml-parser -_realname=XML-Parser -pkgver=2.41 -pkgrel=3 -pkgdesc="Expat-based XML parser module for perl" -arch=('i686' 'x86_64') -license=('GPL' 'PerlArtistic') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl' 'expat') -replaces=('perlxml') -provides=("perlxml=${pkgver}") -options=('!emptydirs') -source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz") -md5sums=('c320d2ffa459e6cdc6f9f59c1185855e') - -build() { - cd "${srcdir}/${_realname}-${pkgver}" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-${pkgver}" - make test -} - -package() { - cd "${srcdir}/${_realname}-${pkgver}" - make install DESTDIR="${pkgdir}" - - # remove perllocal.pod and .packlist. - find "${pkgdir}" -name perllocal.pod -delete - find "${pkgdir}" -name .packlist -delete -} diff --git a/staging/perl-yaml-syck/PKGBUILD b/staging/perl-yaml-syck/PKGBUILD deleted file mode 100644 index 045509ca5..000000000 --- a/staging/perl-yaml-syck/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 159692 2012-05-26 02:34:17Z eric $ -# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman -# Maintainer: kevin <kevin@archlinux.org> - -pkgname=perl-yaml-syck -_realname=YAML-Syck -pkgver=1.20 -pkgrel=2 -pkgdesc="Fast, lightweight YAML loader and dumper" -arch=('i686' 'x86_64') -license=('custom') -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl') -options=('!emptydirs') -source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('8f6d04ee5817b8479e1234264a8d458d') - -build() { - cd "${srcdir}/${_realname}-$pkgver" - - # install module in vendor directories. - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}/${_realname}-$pkgver" - make test -} - -package() { - cd "${srcdir}/${_realname}-$pkgver" - make install DESTDIR="${pkgdir}" - - # license. - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" -} 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 deleted file mode 100644 index 1404460df..000000000 --- a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch +++ /dev/null @@ -1,83 +0,0 @@ -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 deleted file mode 100644 index 9add39e20..000000000 --- a/staging/perl/ChangeLog +++ /dev/null @@ -1,66 +0,0 @@ -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 deleted file mode 100644 index 4204a4983..000000000 --- a/staging/perl/PKGBUILD +++ /dev/null @@ -1,116 +0,0 @@ -# $Id: PKGBUILD 159441 2012-05-24 12:05:52Z 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.16.0 -pkgrel=2 -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) -install=perl.install -options=('makeflags' '!purge') -md5sums=('15a2f95fb27231e10998240f13acf961' - '5ed2542fdb9a60682f215bd33701e61a' - '1f0cbbee783e8a6d32f01be5118e0d5e' - '999c3eea6464860704abbb055a0f0896') - -# workaround to let the integrity check find the correct provides array -if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then - true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) -fi - -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}" - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness -# make test -} - -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 -} diff --git a/staging/perl/digest_eval_hole.diff b/staging/perl/digest_eval_hole.diff deleted file mode 100644 index 47904137b..000000000 --- a/staging/perl/digest_eval_hole.diff +++ /dev/null @@ -1,61 +0,0 @@ -From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001 -From: "Michael G. Schwern" <schwern@pobox.com> -Date: Mon, 3 Oct 2011 19:05:29 +0100 -Subject: Close the eval "require $module" security hole in - Digest->new($algorithm) - -Also the filter was incomplete. - -Bug-Debian: http://bugs.debian.org/644108 - -Patch-Name: fixes/digest_eval_hole.diff ---- - cpan/Digest/Digest.pm | 6 ++++-- - cpan/Digest/t/security.t | 14 ++++++++++++++ - 2 files changed, 18 insertions(+), 2 deletions(-) - create mode 100644 cpan/Digest/t/security.t - -diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm -index 384dfc8..d714434 100644 ---- a/cpan/Digest/Digest.pm -+++ b/cpan/Digest/Digest.pm -@@ -24,7 +24,7 @@ sub new - shift; # class ignored - my $algorithm = shift; - my $impl = $MMAP{$algorithm} || do { -- $algorithm =~ s/\W+//; -+ $algorithm =~ s/\W+//g; - "Digest::$algorithm"; - }; - $impl = [$impl] unless ref($impl); -@@ -35,7 +35,9 @@ sub new - ($class, @args) = @$class if ref($class); - no strict 'refs'; - unless (exists ${"$class\::"}{"VERSION"}) { -- eval "require $class"; -+ my $pm_file = $class . ".pm"; -+ $pm_file =~ s{::}{/}g; -+ eval { require $pm_file }; - if ($@) { - $err ||= $@; - next; -diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t -new file mode 100644 -index 0000000..5cba122 ---- /dev/null -+++ b/cpan/Digest/t/security.t -@@ -0,0 +1,14 @@ -+#!/usr/bin/env perl -+ -+# Digest->new() had an exploitable eval -+ -+use strict; -+use warnings; -+ -+use Test::More tests => 1; -+ -+use Digest; -+ -+$LOL::PWNED = 0; -+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) }; -+is $LOL::PWNED, 0; diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch deleted file mode 100644 index a2d176ec6..000000000 --- a/staging/perl/fix-h2ph-and-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -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 deleted file mode 100644 index a355c5bbe..000000000 --- a/staging/perl/perl.install +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index 535f0b18d..000000000 --- a/staging/perl/perlbin.csh +++ /dev/null @@ -1,15 +0,0 @@ -# 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 deleted file mode 100755 index 20f830436..000000000 --- a/staging/perl/perlbin.sh +++ /dev/null @@ -1,18 +0,0 @@ -# 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 deleted file mode 100644 index d2cdc762e..000000000 --- a/staging/perl/provides.pl +++ /dev/null @@ -1,299 +0,0 @@ -# provides.pl -## -# Script for printing out a provides list of every CPAN distribution -# that is bundled with perl. You can run it before building perl -# or you can run it after building perl. Required modules are in core -# for perl 5.13 and above. It might be nice if this didn't require -# HTTP::Tiny and maybe just used wget or curl. -# -# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at -# cpanmetadb.plackperl.org to cross-reference module files to their -# providing CPAN distribution. Thank you Miyagawa! -# -# - Justin "juster" Davis <jrcd83@gmail.com> - -use warnings 'FATAL' => 'all'; -use strict; - -package Common; - -sub evalver -{ - my ($path, $mod) = @_; - - open my $fh, '<', $path or die "open $path: $!"; - - my $m = ($mod - ? qr/(?:\$${mod}::VERSION|\$VERSION)/ - : qr/\$VERSION/); - - while (my $ln = <$fh>) { - next unless $ln =~ /\s*$m\s*=\s*.+/; - chomp $ln; - my $ver = do { no strict; eval $ln }; - return $ver unless $@; - die qq{$path:$. bad version string in "$ln"\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.plackperl.org/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/; - return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules - 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, $mod) || 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/pidgin/PKGBUILD b/staging/pidgin/PKGBUILD deleted file mode 100644 index acc50a562..000000000 --- a/staging/pidgin/PKGBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# $Id: PKGBUILD 159680 2012-05-26 01:28:13Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.4 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://pidgin.im/" -license=('GPL') -makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' - 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' - 'networkmanager') -options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Use Python 2 - sed -i 's/env python$/&2/' */plugins/*.py \ - libpurple/purple-{remote,notifications-example,url-handler} - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --disable-schemas-install \ - --disable-meanwhile \ - --disable-gnutls \ - --enable-cyrus-sasl \ - --disable-doxygen \ - --enable-nm \ - --with-python=/usr/bin/python2 \ - --with-system-ssl-certs=/etc/ssl/certs - make -} - -package_pidgin(){ - pkgdesc="Multi-protocol instant messaging client" - depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' - 'gstreamer0.10' 'hicolor-icon-theme') - optdepends=('aspell: for spelling correction' - 'gstreamer0.10-good-plugins: video and voice support') - install=pidgin.install - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C pidgin DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop - - rm "$pkgdir/usr/share/man/man1/finch.1" -} - -package_libpurple(){ - pkgdesc="IM library extracted from Pidgin" - depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') - optdepends=('avahi: Bonjour protocol support' - 'ca-certificates: SSL CA certificates' - 'dbus-python: for purple-remote and purple-url-handler' - 'tk: Tcl/Tk scripting support') - - cd "$srcdir/pidgin-$pkgver" - - for _dir in libpurple share/sounds share/ca-certs m4macros po; do - make -C "$_dir" DESTDIR="$pkgdir" install - done -} - -package_finch(){ - pkgdesc="A ncurses-based messaging client" - depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') - - cd "$srcdir/pidgin-$pkgver" - - # For linking - make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES - - make -C finch DESTDIR="$pkgdir" install - make -C doc DESTDIR="$pkgdir" install - - # Remove files that are packaged in libpurle - make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES - - rm "$pkgdir"/usr/share/man/man1/pidgin.1 -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/pidgin/pidgin.install b/staging/pidgin/pidgin.install deleted file mode 100644 index 1a05f573e..000000000 --- a/staging/pidgin/pidgin.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD deleted file mode 100644 index 139184dd8..000000000 --- a/staging/poppler/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 158950 2012-05-13 15:25:14Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.0 -pkgrel=1 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -options=('!libtool' '!emptydirs') -url="http://poppler.freedesktop.org/" -_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('5bca54b9561bf5b14d9344efce2cd4f3' - '9dc64c254a31e570507bdd4ad4ba629a') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.ac - - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-cairo-output \ - --enable-xpdf-headers \ - --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ - --enable-poppler-glib - make -} - -check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check -} - -package_poppler() { - pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') - conflicts=("poppler-qt3<${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'glib2') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* - rm -f "${pkgdir}/usr/bin/poppler-glib-demo" -} - -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} diff --git a/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch deleted file mode 100644 index 93167b79b..000000000 --- a/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Sat, 26 May 2012 02:58:11 +0200 -Subject: [PATCH] Remove usage of deprecated udev_get_*_path - -These symbols were removed in libudev.so.1.0.0. Replace them with -hardcoded strings. - -Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> ---- - src/modules/module-udev-detect.c | 9 +++------ - src/modules/udev-util.c | 4 ++-- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c -index 1192194..31416bd 100644 ---- a/src/modules/module-udev-detect.c -+++ b/src/modules/module-udev-detect.c -@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) { - pa_assert(u); - pa_assert(d); - -- cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path)); -+ cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path)); - accessible = access(cd, R_OK|W_OK) >= 0; - pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible)); - -@@ -621,7 +621,6 @@ fail: - } - - static int setup_inotify(struct userdata *u) { -- char *dev_snd; - int r; - - if (u->inotify_fd >= 0) -@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) { - return -1; - } - -- dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev)); -- r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); -- pa_xfree(dev_snd); -+ r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF); - - if (r < 0) { - int saved_errno = errno; -diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c -index 2f18bc4..b0bb17d 100644 ---- a/src/modules/udev-util.c -+++ b/src/modules/udev-util.c -@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - -@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) { - goto finish; - } - -- t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx); -+ t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx); - card = udev_device_new_from_syspath(udev, t); - pa_xfree(t); - --- -1.7.10.2 - diff --git a/staging/pulseaudio/PKGBUILD b/staging/pulseaudio/PKGBUILD deleted file mode 100644 index 52965bfa8..000000000 --- a/staging/pulseaudio/PKGBUILD +++ /dev/null @@ -1,115 +0,0 @@ -# $Id: PKGBUILD 159684 2012-05-26 01:31:15Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=pulseaudio -pkgname=(pulseaudio libpulse) -pkgdesc="A featureful, general-purpose sound server" -pkgver=2.0 -pkgrel=2 -arch=(i686 x86_64) -url="http://www.freedesktop.org/wiki/Software/PulseAudio" -license=(GPL LGPL) -makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit - speex tdb udev dbus-core avahi bluez gconf intltool jack - lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing - libsystemd) -options=(!emptydirs !libtool) -source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch) -sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061' - 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803') - -build() { - cd $pkgbase-$pkgver - - # libudev.so.1.0.0 - patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --with-udev-rules-dir=/usr/lib/udev/rules.d \ - --with-database=tdb \ - --disable-hal \ - --disable-tcpwrap \ - --disable-rpath \ - --disable-default-build-tests - - # fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package_pulseaudio() { - depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc - libsamplerate webrtc-audio-processing libsystemd) - optdepends=('avahi: zeroconf support' - 'bluez: bluetooth support' - 'gconf: configuration through gconf (paprefs)' - 'jack: jack support' - 'lirc-utils: infra-red support' - 'openssl: RAOP support' - 'python2-pyqt: Equalizer GUI (qpaeq)') - backup=(etc/pulse/{daemon.conf,default.pa,system.pa}) - install=pulseaudio.install - - cd $pkgbase-$pkgver - make -j1 DESTDIR="$pkgdir" install - - # Lower resample quality, saves CPU - sed -e '/resample-method/iresample-method=speex-float-0' \ - -i "$pkgdir/etc/pulse/daemon.conf" - - # Disable cork-request module, can result in e.g. media players unpausing - # when there's a Skype call incoming - sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \ - -i "$pkgdir/usr/bin/start-pulseaudio-x11" - - # Make ConsoleKit optional - sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \ - -i "$pkgdir/etc/pulse/default.pa" - - # Python fix - sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" - - install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio" - - rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf" - -### Split libpulse - - mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}} - - mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf - - mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \ - "$srcdir/libpulse/usr/lib" - - mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \ - "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \ - "$srcdir/libpulse/usr/lib/pulseaudio" - - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake - mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig - - mv {"$pkgdir","$srcdir/libpulse"}/usr/include - - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5 - mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala -} - -package_libpulse() { - pkgdesc="$pkgdesc (client library)" - depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c) - optdepends=('alsa-plugins: ALSA support' - 'avahi: zeroconf support') - backup=(etc/pulse/client.conf) - - mv "$srcdir"/libpulse/* "$pkgdir" -} diff --git a/staging/pulseaudio/pulseaudio.install b/staging/pulseaudio/pulseaudio.install deleted file mode 100644 index 1dc4cefb3..000000000 --- a/staging/pulseaudio/pulseaudio.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - cat << MES ->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details - on configuring your system for PulseAudio. - ->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio. -MES -} - -post_upgrade() { - cat << MES ->>> If you have per-user copies of configuration files (such as client.conf, - daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync - with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio - may refuse to start due to configuration errors. -MES -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/pulseaudio/pulseaudio.xinit b/staging/pulseaudio/pulseaudio.xinit deleted file mode 100644 index 2d30c0943..000000000 --- a/staging/pulseaudio/pulseaudio.xinit +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -case "$DESKTOP_SESSION" in - gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart - ;; - *) - # Extra checks in case DESKTOP_SESSION is not set correctly - if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then - /usr/bin/start-pulseaudio-x11 - fi - ;; -esac diff --git a/staging/razor/PKGBUILD b/staging/razor/PKGBUILD deleted file mode 100644 index 50d808a21..000000000 --- a/staging/razor/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159771 2012-05-26 18:11:56Z eric $ -# Maintainer: -# Contributor: Dale Blount <dale@archlinux.org> -# Contributor: Manolis Tzanidakis - -pkgname=razor -pkgver=2.84 -pkgrel=7 -pkgdesc="A distributed, collaborative, spam detection and filtering network" -arch=('i686' 'x86_64') -url="http://razor.sourceforge.net" -license=('PerlArtistic') -depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl') -options=('!emptydirs') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2") -md5sums=('8b9a11a6ce020383c32c45d1530d77c2') - -build() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - - # skip install_razor_agents (we'll do the linking later) - # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile - - perl Makefile.PL INSTALLDIRS=vendor - make -} - -check() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - make test -} - -package() { - cd "${srcdir}"/${pkgname}-agents-${pkgver} - make DESTDIR="${pkgdir}" install - - # cd ${pkgdir}/usr/bin - # for i in razor-check razor-report razor-revoke razor-admin; do - # /bin/ln -sf razor-client $i; - # done -} diff --git a/staging/rrdtool/PKGBUILD b/staging/rrdtool/PKGBUILD deleted file mode 100644 index 469ba4ceb..000000000 --- a/staging/rrdtool/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 159769 2012-05-26 17:51:59Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=rrdtool -pkgver=1.4.7 -pkgrel=2 -pkgdesc="Data logging and graphing application" -arch=('i686' 'x86_64') -url="http://www.rrdtool.org" -license=('GPL' 'custom') -depends=('libxml2' 'pango' 'ttf-dejavu') -makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua') -optdepends=('tcl: to use corresponding binding' \ - 'python2: to use corresponding binding' \ - 'ruby: to use corresponding binding' \ - 'lua: to use corresponding binding') -options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby - sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in - - PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ - --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ - --enable-ruby --enable-ruby-site-install --enable-python \ - --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD deleted file mode 100644 index cf8ba275f..000000000 --- a/staging/subversion/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 159761 2012-05-26 15:28:27Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> -# Contributor: Jason Chu <jason@archlinux.org> - -pkgname=subversion -pkgver=1.7.5 -pkgrel=2 -pkgdesc="A Modern Concurrent Version Control System" -arch=('i686' 'x86_64') -license=('APACHE') -depends=('neon' 'apr-util' 'sqlite' 'file') -optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \ - 'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment') -makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' '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' '!emptydirs') -source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} - svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1' - 'b267cba19b4f56360657a5bf5b231950e027a45a' - '64ba3e6ebafc08ac62f59d788f7a825fdce69573' - '73b36c046c09cec2093354911c89e3ba8056af6c' - 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' - '3d1e28408a9abb42af2e531adc0d01ce21acfad6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export PYTHON=/usr/bin/python2 - - patch -p0 -i ../subversion.rpath.fix.patch - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py - - ./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.3 \ - --enable-javahl --with-gnome-keyring --with-kwallet - - make external-all - make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all - make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# export LANG=C LC_ALL=C -# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb -#} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH} - make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \ - swig_pydir=/usr/lib/python2.7/site-packages/libsvn \ - swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \ - install install-swig-py install-swig-pl install-javahl # install-swig-rb - - install -d "${pkgdir}"/usr/share/subversion - cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/ - rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in - - rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist - rm -r "${pkgdir}"/usr/lib/perl5/core_perl - - install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve - install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn - install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve - - install -Dm 644 tools/client-side/bash_completion \ - "${pkgdir}"/usr/share/bash-completion/completions/subversion - for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do - ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i} - done -} diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch deleted file mode 100644 index ba6ee9e4e..000000000 --- a/staging/subversion/subversion.rpath.fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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/svn b/staging/subversion/svn deleted file mode 100644 index 8988aaf63..000000000 --- a/staging/subversion/svn +++ /dev/null @@ -1,11 +0,0 @@ -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/svnserve b/staging/subversion/svnserve deleted file mode 100755 index 670fee742..000000000 --- a/staging/subversion/svnserve +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 deleted file mode 100644 index 37fb7ea10..000000000 --- a/staging/subversion/svnserve.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Parameters to be passed to svnserve -# -#SVNSERVE_ARGS="-r /path/to/some/repos" -SVNSERVE_ARGS="" - -#SVNSERVE_USER="svn" diff --git a/staging/udisks/PKGBUILD b/staging/udisks/PKGBUILD deleted file mode 100644 index 79fd768d9..000000000 --- a/staging/udisks/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 159757 2012-05-26 15:09:57Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=udisks -pkgver=1.0.4 -pkgrel=4 -pkgdesc="Disk Management Service" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/udisks" -license=('GPL') -depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') -makedepends=('intltool' 'docbook-xsl') -options=(!libtool) -source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/udisks --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install - chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh" - # move udev helpers and rules to /usr/lib - mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ - rm -r "${pkgdir}"/lib -} diff --git a/staging/usbutils/PKGBUILD b/staging/usbutils/PKGBUILD deleted file mode 100644 index e4c32eb5a..000000000 --- a/staging/usbutils/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159293 2012-05-20 23:41:16Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> -# Contributor: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> -pkgname=usbutils -pkgver=005 -pkgrel=2 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -depends=('libusb' 'hwids') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') -url="http://linux-usb.sourceforge.net/" -# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - fix-python2.patch) - -build() { - cd $srcdir/$pkgname-$pkgver - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # this is now in the hwids package - rm -rf $pkgdir/usr/{share/hwdata,sbin} -} -md5sums=('6a21f7b6c02b76df5e8a7c208d746654' - '45766196895b4cc50b53cd56e1bbf3d1') diff --git a/staging/usbutils/fix-python2.patch b/staging/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/staging/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/staging/util-linux/PKGBUILD b/staging/util-linux/PKGBUILD deleted file mode 100644 index 8fa507437..000000000 --- a/staging/util-linux/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 159749 2012-05-26 12:39:32Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=util-linux -pkgver=2.21.2 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux" -url="http://www.kernel.org/pub/linux/utils/util-linux/" -arch=('i686' 'x86_64') -groups=('base') -depends=('udev' 'pam') -conflicts=('util-linux-ng') -provides=("util-linux-ng=${pkgver}") -license=('GPL2') -options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h - - ./configure --prefix=/usr \ - --libdir=/usr/lib \ - --enable-fs-paths-extra=/usr/bin:/usr/sbin \ - --enable-write \ - --enable-raw \ - --disable-wall \ - --enable-new-mount - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd "${pkgdir}" - - install -dm755 var/lib/hwclock - - # broken tool, going away in next major release, so just remove it now - rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1} - - # delete stray empty dir, fixed upstream - rm -r usr/share/man/ru -} -md5sums=('54ba880f1d66782c2287ee2c898520e9') diff --git a/staging/vim/PKGBUILD b/staging/vim/PKGBUILD deleted file mode 100644 index 7545d062e..000000000 --- a/staging/vim/PKGBUILD +++ /dev/null @@ -1,216 +0,0 @@ -# $Id: PKGBUILD 159453 2012-05-24 13:34:26Z tdziedzic $ -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Maintainer: tobias [ tobias at archlinux org ] -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=vim -pkgname=('vim' 'gvim' 'vim-runtime') -_topver=7.3 -_patchlevel=515 -__hgrev=8201108e9cf0 -_versiondir="vim${_topver//./}" -pkgver=${_topver}.${_patchlevel} -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom:vim') -url="http://www.vim.org" -makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') -source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" - "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" - 'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872' - 'vimrc' - 'archlinux.vim' - 'gvim.desktop') -sha1sums=('10d7642d5062effdb51f53952622f9338003bbbf' - '0c1c584c1a2a2a279507f793cd5eff82863c625b' - '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' - '3494baf53a63581ba69f86a81293640ff681c5c5' - '25dd3c2ce436e73a367c8f73b68f7f6889682437' - '4a579cf66590d711f49c5dfb4a25e5df116ff7ba') - -# source PKGBUILD && mksource -mksource() { - - [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) - - __hgroot='http://vim.googlecode.com/hg/' - __hgrepo='vim' - __hgbranch='default' - - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - - pushd ${__hgrepo} - if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - printf 'You are not building the latest revision!\n' - printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" - fi - popd - - mv vim ${pkgname}-${pkgver} - find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; - rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} - tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* - rm -r ${pkgname}-${pkgver} - #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz -} - -build() { - # remove -O2 because there is a crash with python because of it - # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196 - export CFLAGS="${CFLAGS/-O2 /}" - - cd "${srcdir}" - - cp -a ${pkgname}-${pkgver} vim-build - - # define the place for the global (g)vimrc file (set to /etc/vimrc) - sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ - vim-build/src/feature.h - # fix python name - sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \ - vim-build/src/configure.in - (cd vim-build/src && autoconf) - - cp -a vim-build gvim-build - - cd "${srcdir}"/vim-build - - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=no \ - --disable-gui --enable-multibyte --enable-cscope \ - --disable-netbeans --enable-perlinterp --disable-pythoninterp \ - --disable-python3interp --disable-rubyinterp --disable-luainterp - - make - - cd "${srcdir}"/gvim-build - - ./configure --prefix=/usr --localstatedir=/var/lib/vim \ - --with-features=big --with-compiledby=ArchLinux \ - --enable-gpm --enable-acl --with-x=yes \ - --enable-gui=gtk2 --enable-multibyte --enable-cscope \ - --enable-netbeans --enable-perlinterp --enable-pythoninterp \ - --disable-python3interp --enable-rubyinterp --enable-luainterp - - make -} - -check() { - # disable tests because they seem to freeze - - cd "${srcdir}"/vim-build - - #make test - - cd "${srcdir}"/gvim-build - - #make test -} - -package_vim() { - pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') - conflicts=('gvim') - - cd "${srcdir}"/vim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - rm -f evim.1 # this does not make sense if we have no GUI - done - - # Runtime provided by runtime package - rm -r "${pkgdir}"/usr/share/vim - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -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' 'lua' 'python2') - provides=("vim=${pkgver}-${pkgrel}") - conflicts=('vim') - install=gvim.install - - cd "${srcdir}"/gvim-build - make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install - - # provided by (n)vi in core - rm "${pkgdir}"/usr/bin/{ex,view} - - # delete some manpages - find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ - while read _mandir; do - cd ${_mandir} - rm -f ex.1 view.1 # provided by (n)vi - done - - # Move the runtime for later packaging - mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install - - # freedesktop links - install -Dm644 "${srcdir}"/gvim.desktop \ - "${pkgdir}"/usr/share/applications/gvim.desktop - install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png - - # license - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt -} - -package_vim-runtime() { - pkgdesc='Runtime for vim and gvim' - depends=('perl' 'gawk') - backup=('etc/vimrc') - - # Install the runtime split from gvim - install -dm755 "${pkgdir}"/usr/share - mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim - - # Don't forget logtalk.dict - install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict - - # fix FS#17216 - sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - - # patch filetype.vim for better handling of pacman related files - sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim - sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ - "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim - - # make Aaron happy - install -Dm644 "${srcdir}"/pythoncomplete.vim \ - "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim - - # rc files - install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc - install -Dm644 "${srcdir}"/archlinux.vim \ - "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim - - # rgb.txt file - install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ - "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt - - # license - install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime - ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ - "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt -} - -# vim:set sw=2 sts=2 et: diff --git a/staging/vim/archlinux.vim b/staging/vim/archlinux.vim deleted file mode 100644 index 148bb930f..000000000 --- a/staging/vim/archlinux.vim +++ /dev/null @@ -1,26 +0,0 @@ -" The ArchLinux global vimrc - setting only a few sane defaults -" -" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] -" -" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION -" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc - -" Normally we use vim-extensions. If you want true vi-compatibility -" remove change the following statements -set nocompatible " Use Vim defaults instead of 100% vi compatibility -set backspace=indent,eol,start " more powerful backspacing - -" Now we set some defaults for the editor -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time - -" Suffixes that get lower priority when doing tab completion for filenames. -" These are files we are not likely to want to edit or read. -set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc - - -if has('gui_running') - " Make shift-insert work like in Xterm - map <S-Insert> <MiddleMouse> - map! <S-Insert> <MiddleMouse> -endif diff --git a/staging/vim/gvim.desktop b/staging/vim/gvim.desktop deleted file mode 100644 index 675357da5..000000000 --- a/staging/vim/gvim.desktop +++ /dev/null @@ -1,63 +0,0 @@ -[Desktop Entry] -Name=Vi IMproved -Name[bg]=Vi Ðåäàêòîð -Name[ca]=Vi Millorat -Name[da]=Vi forbedret -Name[eo]=VIM -Name[et]=Täiustatud Vi (vim) -Name[fr]=Vi étendu (VIM) -Name[he]=רפושמ Vi -Name[hu]=Vi -Name[is]=Vi IMproved ritillinn -Name[it]=Vi iMproved -Name[no]=Vi IMproved (forbedret VI) -Name[pl]=Poprawiony VI (vim) -Name[ro]=VIM -Name[ru]=Улучшенный VI -Name[sk]=Vi IMpreved -Name[sl]=Izboljšani vi (vim) -Name[sv]=Förbättrad Vi -Name[zh_CN.GB2312]=改进的 Vi -Comment=Powerful text editor with scripting functions and macro recorder -Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè -Comment[ca]=Editor vi potent -Comment[cs]=Mocný textový editor vi -Comment[da]=En kraftig vi tekstbehandler -Comment[de]=Ein leistungsfähiger vi-Editor -Comment[el]=Πανίσχυρος διορθωτής vi -Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn -Comment[es]=Una versión mejorada del editor vi -Comment[et]=Võimas tekstiredaktor vi -Comment[fi]=Tehokas vi-tekstieditori -Comment[fr]=Éditeur vi puissant -Comment[gl]=Potente editor vi -Comment[he]=Vi המצועה בר ךרועה -Comment[hr]=Napredni vi uređivač -Comment[hu]=Vi szövegszerkesztő -Comment[is]=Öflug útgáfa vi ritilsins -Comment[it]=Un editor vi potenziato -Comment[ja]=強力なViエディタ -Comment[lt]=Galingas vi redaktorius -Comment[mk]=Моќен VI уредувач -Comment[nl]=Krachtige vi-editor -Comment[no]=En kraftig vi-redigerer -Comment[no_NY]=Kraftig vi-tekstredigeringsprogram -Comment[pl]=Edytor vi -Comment[pt]=Um poderoso editor de texto -Comment[ro]=Un editor de texte VI, puternic -Comment[ru]=Мощный текстовый редактор vi -Comment[sk]=Silný textový procesor vi -Comment[sl]=Zmogljivi urejevalnik vi -Comment[sr]=Moćni vi editor -Comment[sv]=En kraftfull texteditor -Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ -Comment[tr]=Güçlü vi düzenleyicisi -Comment[uk]=Потужний редактор vi -Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 -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=gvim -f %F -Icon=gvim -Type=Application -Terminal=false -X-XClassHintResName=VIM -Categories=Utility;TextEditor; diff --git a/staging/vim/gvim.install b/staging/vim/gvim.install deleted file mode 100644 index 2eaa60550..000000000 --- a/staging/vim/gvim.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/staging/vim/vimrc b/staging/vim/vimrc deleted file mode 100644 index 92d3ff980..000000000 --- a/staging/vim/vimrc +++ /dev/null @@ -1,16 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just -" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime -" you can find below. If you wish to change any of those settings, you should -" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten -" everytime an upgrade of the vim packages is performed. It is recommended to -" make changes after sourcing archlinux.vim since it alters the value of the -" 'compatible' option. - -" This line should not be removed as it ensures that various options are -" properly set to work with the Vim-related packages. -runtime! archlinux.vim - -" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual -" and configure vim to your own liking! - diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD deleted file mode 100644 index 9c48c6b9f..000000000 --- a/staging/vlc/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 159698 2012-05-26 06:51:40Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> -# Contributor: Martin Sandsmark <martin.sandsmark@kde.org> - -pkgname=vlc -pkgver=2.0.1 -pkgrel=2 -pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" -arch=('i686' 'x86_64') -url="http://www.videolan.org/vlc/" -license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' - 'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' - 'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' - 'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' - 'xcb-util-keysyms' 'ttf-freefont') -makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' - 'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils' - 'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd' - 'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') -optdepends=('avahi: for service discovery using bonjour protocol' - 'libnotify: for notification plugin' - 'ncurses: for ncurses interface support' - 'libdvdcss: for decoding encrypted DVDs' - 'lirc-utils: for lirc plugin' - 'libavc1394: for devices using the 1394ta AV/C' - 'libdc1394: for IEEE 1394 plugin' - 'kdelibs: KDE Solid hardware integration' - 'vdpau-video: vdpau back-end for nvidia' - 'libva-driver-intel: back-end for intel cards' - 'libbluray: for Blu-Ray support' - 'flac: for Free Lossless Audio Codec plugin' - 'oss: for OSS audio support' - 'portaudio: for portaudio support' - 'twolame: for TwoLAME mpeg2 encoder plugin' - 'projectm: for ProjectM visualisation plugin' - 'libcaca: for colored ASCII art video output' - 'libgme: for libgme plugin' - 'librsvg: for SVG plugin' - 'gnome-vfs: for GNOME Virtual File System support' - 'libgoom2: for libgoom plugin' - 'vcdimager: navigate VCD with libvcdinfo' - 'xosd: for xosd support' - 'aalib: for ASCII art plugin' - 'libmtp: for MTP devices support' - 'fluidsynth: for synthesizer MIDI FluidSynth' - 'smbclient: for SMB access plugin') -conflicts=('vlc-plugin') -replaces=('vlc-plugin') -backup=('usr/share/vlc/lua/http/.hosts' - 'usr/share/vlc/lua/http/dialogs/.hosts') -options=('!libtool' '!emptydirs') -install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('5ad114755670e4881a2b35354e2f79bc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c - - ./configure --prefix=/usr \ - --disable-rpath \ - --enable-oss \ - --enable-faad \ - --enable-nls \ - --enable-lirc \ - --enable-pvr \ - --enable-ncurses \ - --enable-realrtsp \ - --enable-xosd \ - --enable-aa \ - --enable-vcdx - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - for res in 16 32 48 128; do - install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png" - done -} diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install deleted file mode 100644 index dc4961cae..000000000 --- a/staging/vlc/vlc.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib/vlc/plugins/plugins-*.dat -} - -post_remove() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD deleted file mode 100644 index 70b5ad435..000000000 --- a/staging/weechat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 159476 2012-05-24 21:06:54Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: lucke <lucke at o2 dot pl> - -pkgname=weechat -pkgver=0.3.7 -pkgrel=2 -pkgdesc="Fast, light and extensible IRC client (curses UI)" -arch=('i686' 'x86_64') -url="http://www.weechat.org/" -license=('GPL') -depends=('gnutls' 'curl' 'libgcrypt') -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=('62bb5002b2ba9e5816dfeededc3fa276') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - mkdir build - cd build - cmake .. -DPREFIX=/usr \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - - make DESTDIR="${pkgdir}/" install -} diff --git a/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch deleted file mode 100644 index bcfbf94db..000000000 --- a/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch +++ /dev/null @@ -1,571 +0,0 @@ -From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net> -Date: Fri, 13 Apr 2012 11:12:51 +0200 -Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx - -The patch below implements basic acceleration of solid pictures via -scratch 1x1 pixmaps. It seems to at least alleviate some of the -corruption and performance issues exposed by Cairo 1.12, and should also -improve performance for other toolkits/apps using solid pictures. - -If there are no objections to this approach, maybe someone else can beat -me to extending this for Evergreen+ and R1/2xx. ---- - src/r600_exa.c | 160 ++++++++++++++++++++++++++-------------------- - src/radeon_exa_render.c | 115 ++++++++++++++++++++-------------- - src/radeon_exa_shared.c | 19 ++++++ - src/radeon_exa_shared.h | 1 + - 4 files changed, 179 insertions(+), 116 deletions(-) - -diff --git a/src/r600_exa.c b/src/r600_exa.c -index e1eb62f..c3ae553 100644 ---- a/src/r600_exa.c -+++ b/src/r600_exa.c -@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) { - if (R600TexFormats[i].fmt == pPict->format) -@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix, - vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]); - vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]); - vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]); -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]); - vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]); - vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]); -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } else { - accel_state->is_transform[unit] = FALSE; - - vs_alu_consts[0] = 1.0; - vs_alu_consts[1] = 0.0; - vs_alu_consts[2] = 0.0; -- vs_alu_consts[3] = 1.0 / w; -+ vs_alu_consts[3] = 1.0 / tex_res.w; - - vs_alu_consts[4] = 0.0; - vs_alu_consts[5] = 1.0; - vs_alu_consts[6] = 0.0; -- vs_alu_consts[7] = 1.0 / h; -+ vs_alu_consts[7] = 1.0 / tex_res.h; - } - - /* VS alu constants */ -@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 8192 || -+ pSrcPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 8192 || -+ pDstPixmap->drawable.height >= 8192) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 8192 || -+ pMaskPixmap->drawable.height >= 8192) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (R600BlendOp[op].src_alpha && -- (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (R600BlendOp[op].src_alpha && -+ (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!R600GetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - shader_config_t vs_conf, ps_conf; - struct r600_accel_object src_obj, mask_obj, dst_obj; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); - src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); -@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - #if defined(XF86DRM_MODE) - if (info->cs) { - mask_obj.offset = 0; -@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void R600DoneComposite(PixmapPtr pDst) -+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst) - r600_finish_op(pScrn, vtx_size); - } - -+static void R600DoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ R600FinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void R600Composite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst, - - #ifdef XF86DRM_MODE - if (info->cs && CS_FULL(info->cs)) { -- R600DoneComposite(info->accel_state->dst_pix); -+ R600FinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - R600PrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index e5c231f..b6cc9e4 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict, - if (repeatType == RepeatNormal || repeatType == RepeatReflect) { - Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix); - -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w = pPict->pDrawable ? pPict->pDrawable->width : 1; -+ int h = pPict->pDrawable ? pPict->pDrawable->height : 1; - - if (pPict->transform) { - if (badPitch) -@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - ScreenPtr pScreen = pDstPict->pDrawable->pScreen; - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); -- - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; -- int max_tex_w, max_tex_h; -- -- if (is_r500) { -- max_tex_w = 4096; -- max_tex_h = 4096; -- } else { -- max_tex_w = 2048; -- max_tex_h = 2048; -- } -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++) - { -@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) { -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) { - if (info->cs) { - struct radeon_exa_pixmap_priv *driver_priv; - PixmapPtr pPix; -@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -+ int w, h; - int i, pixel_shift, out_size = 6; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - - TRACE; - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- - if (IS_R500_3D) { - max_tex_w = 4096; - max_tex_h = 4096; -@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - } - } - -- if (pSrcPixmap->drawable.width > max_tex_w || -- pSrcPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > max_dst_w || -@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > max_tex_w || -+ pSrcPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -- -- if (pMaskPixmap->drawable.width > max_tex_w || -- pMaskPixmap->drawable.height > max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > max_tex_w || -+ pMaskPixmap->drawable.height > max_tex_h) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t txenable, colorpitch; - uint32_t blendcntl, output_fmt; -@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - -@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst) - { - RINFO_FROM_SCREEN(pDst->drawable.pScreen); - ACCEL_PREAMBLE(); -@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) - LEAVE_DRAW(0); - } - -+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ FUNC_NAME(RadeonFinishComposite)(pDst); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} - - #ifdef ACCEL_CP - -@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn, - if ((info->cs && CS_FULL(info->cs)) || - (!info->cs && (info->cp->indirectBuffer->used + 4 * 32) > - info->cp->indirectBuffer->total)) { -- FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix); -+ FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix); - if (info->cs) - radeon_cs_flush_indirect(pScrn); - else -diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c -index be1d2fa..28dc335 100644 ---- a/src/radeon_exa_shared.c -+++ b/src/radeon_exa_shared.c -@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp) - return FALSE; - } - -+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid) -+{ -+ PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0); -+ struct radeon_bo *bo; -+ -+ exaMoveInPixmap(pPix); -+ bo = radeon_get_pixmap_bo(pPix); -+ -+ if (radeon_bo_map(bo, 1)) { -+ pScreen->DestroyPixmap(pPix); -+ return NULL; -+ } -+ -+ memcpy(bo->ptr, &solid, 4); -+ radeon_bo_unmap(bo); -+ -+ return pPix; -+} -+ - static Bool radeon_vb_get(ScrnInfoPtr pScrn) - { - RADEONInfoPtr info = RADEONPTR(pScrn); -diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h -index 7b8b5ca..60a1045 100644 ---- a/src/radeon_exa_shared.h -+++ b/src/radeon_exa_shared.h -@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn); - extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2); - extern Bool RADEONValidPM(uint32_t pm, int bpp); - extern Bool RADEONCheckBPP(int bpp); -+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid); - - #define RADEON_TRACE_FALL 0 - #define RADEON_TRACE_DRAW 0 --- -1.7.7.5 - diff --git a/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch deleted file mode 100644 index e6b5433e1..000000000 --- a/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Sat, 14 Apr 2012 08:53:39 -0400 -Subject: [PATCH] poor man's solid picture support for evergreen - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/evergreen_exa.c | 163 ++++++++++++++++++++++++++++++--------------------- - 1 files changed, 95 insertions(+), 68 deletions(-) - -diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c -index cee3ec2..61b47a4 100644 ---- a/src/evergreen_exa.c -+++ b/src/evergreen_exa.c -@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict, - int op, - int unit) - { -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; - unsigned int i; -- int max_tex_w, max_tex_h; -- -- max_tex_w = 16384; -- max_tex_h = 16384; -- -- if ((w > max_tex_w) || (h > max_tex_h)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); - - for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) { - if (EVERGREENTexFormats[i].fmt == pPict->format) -@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int const_offset = unit * 8; -+ int w, h; -+ -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ } else { -+ w = 1; -+ h = 1; -+ } - - if (pPict->transform != 0) { - accel_state->is_transform[unit] = TRUE; -@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ unsigned int repeatType; - unsigned int i; - tex_resource_t tex_res; - tex_sampler_t tex_samp; -@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix, - } - - /* Texture */ -+ if (pPict->pDrawable) { -+ tex_res.w = pPict->pDrawable->width; -+ tex_res.h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ tex_res.w = 1; -+ tex_res.h = 1; -+ repeatType = RepeatNormal; -+ } -+ - tex_res.id = unit; -- tex_res.w = w; -- tex_res.h = h; - tex_res.pitch = accel_state->src_obj[unit].pitch; - tex_res.depth = 0; - tex_res.dim = SQ_TEX_DIM_2D; -@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - { - uint32_t tmp1; - PixmapPtr pSrcPixmap, pDstPixmap; -- int max_tex_w, max_tex_h, max_dst_w, max_dst_h; - - /* Check for unsupported compositing operations. */ - if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0]))) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -+ if (pSrcPicture->pDrawable) { -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); - -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- max_tex_w = 8192; -- max_tex_h = 8192; -- max_dst_w = 8192; -- max_dst_h = 8192; -+ if (pSrcPixmap->drawable.width >= 16384 || -+ pSrcPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } - -- if (pSrcPixmap->drawable.width >= max_tex_w || -- pSrcPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -+ if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -+ return FALSE; -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - -- if (pDstPixmap->drawable.width >= max_dst_w || -- pDstPixmap->drawable.height >= max_dst_h) { -+ if (pDstPixmap->drawable.width >= 16384 || -+ pDstPixmap->drawable.height >= 16384) { - RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n", - pDstPixmap->drawable.width, - pDstPixmap->drawable.height)); -@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture, - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width >= max_tex_w || -- pMaskPixmap->drawable.height >= max_tex_h) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width >= 16384 || -+ pMaskPixmap->drawable.height >= 16384) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } - -- if (pMaskPicture->componentAlpha) { -- /* Check if it's component alpha that relies on a source alpha and -- * on the source value. We can only get one of those into the -- * single source value that we get to blend with. -- */ -- if (EVERGREENBlendOp[op].src_alpha && -- (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -- (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -- RADEON_FALLBACK(("Component alpha not supported with source " -- "alpha and source value blending.\n")); -+ if (pMaskPicture->componentAlpha) { -+ /* Check if it's component alpha that relies on a source alpha and -+ * on the source value. We can only get one of those into the -+ * single source value that we get to blend with. -+ */ -+ if (EVERGREENBlendOp[op].src_alpha && -+ (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) != -+ (BLEND_ZERO << COLOR_SRCBLEND_shift)) { -+ RADEON_FALLBACK(("Component alpha not supported with source " -+ "alpha and source value blending.\n")); -+ } - } -- } - -- if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -- return FALSE; -+ if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1)) -+ return FALSE; -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - } - -- if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0)) -- return FALSE; -- - if (!EVERGREENGetDestFormat(pDstPicture, &tmp1)) - return FALSE; - -@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum]; -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RADEONInfoPtr info = RADEONPTR(pScrn); - struct radeon_accel_state *accel_state = info->accel_state; - uint32_t dst_format; -@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - struct r600_accel_object src_obj, mask_obj, dst_obj; - float *cbuf; - -- if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8) -+ if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8)) - return FALSE; - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - src_obj.offset = 0; - dst_obj.offset = 0; -- src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.bo = radeon_get_pixmap_bo(pDst); -+ src_obj.bo = radeon_get_pixmap_bo(pSrc); - dst_obj.surface = radeon_get_pixmap_surface(pDst); - src_obj.surface = radeon_get_pixmap_surface(pSrc); - dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst); -@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - dst_obj.bpp = pDst->drawable.bitsPerPixel; - dst_obj.domain = RADEON_GEM_DOMAIN_VRAM; - -- if (pMask) { -+ if (pMaskPicture) { -+ if (!pMask) { -+ pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } - mask_obj.offset = 0; - mask_obj.bo = radeon_get_pixmap_bo(pMask); - mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask); -@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture, - return TRUE; - } - --static void EVERGREENDoneComposite(PixmapPtr pDst) -+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst, -+ struct radeon_accel_state *accel_state) - { -- ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum]; -- RADEONInfoPtr info = RADEONPTR(pScrn); -- struct radeon_accel_state *accel_state = info->accel_state; - int vtx_size; - - if (accel_state->vsync) -@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst) - evergreen_finish_op(pScrn, vtx_size); - } - -+static void EVERGREENDoneComposite(PixmapPtr pDst) -+{ -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ RADEONInfoPtr info = RADEONPTR(pScrn); -+ struct radeon_accel_state *accel_state = info->accel_state; -+ -+ EVERGREENFinishComposite(pScrn, pDst, accel_state); -+ -+ if (!accel_state->src_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->src_pix); -+ -+ if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable) -+ pScreen->DestroyPixmap(accel_state->msk_pix); -+} -+ - static void EVERGREENComposite(PixmapPtr pDst, - int srcX, int srcY, - int maskX, int maskY, -@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst, - float *vb; - - if (CS_FULL(info->cs)) { -- EVERGREENDoneComposite(info->accel_state->dst_pix); -+ EVERGREENFinishComposite(pScrn, pDst, info->accel_state); - radeon_cs_flush_indirect(pScrn); - EVERGREENPrepareComposite(info->accel_state->composite_op, - info->accel_state->src_pic, --- -1.7.7.5 - diff --git a/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch deleted file mode 100644 index 3a2779446..000000000 --- a/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch +++ /dev/null @@ -1,182 +0,0 @@ -From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:24:46 -0400 -Subject: [PATCH 2/3] poor man's solid picture support for r100 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index b6cc9e4..451a625 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) { - if (R100TexFormats[i].fmt == pPict->format) - break; -@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - txoffset = 0; - -@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r100 limit should be 2048, there are issues with 2048 -- * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture, - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r100 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - PixmapPtr pMask, - PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch, colorpitch; - uint32_t pp_cntl, blendcntl, cblend, ablend; - int pixel_shift; -@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op, - - CHECK_OFFSET(pDst, 0x0f, "destination"); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch deleted file mode 100644 index 0a448fc93..000000000 --- a/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch +++ /dev/null @@ -1,179 +0,0 @@ -From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Fri, 13 Apr 2012 13:28:10 -0400 -Subject: [PATCH 3/3] poor man's solid picture support for r200 - -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - src/radeon_exa_render.c | 101 +++++++++++++++++++++++++++-------------------- - 1 files changed, 58 insertions(+), 43 deletions(-) - -diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c -index 451a625..7f1a3ff 100644 ---- a/src/radeon_exa_render.c -+++ b/src/radeon_exa_render.c -@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - int unit) - { - unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; - int i; - -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- if ((w > 2047) || (h > 2047)) -- RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h)); -- - for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++) - { - if (R200TexFormats[i].fmt == pPict->format) -@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict, - RADEON_FALLBACK(("Unsupported picture format 0x%x\n", - (int)pPict->format)); - -- if (!RADEONCheckTexturePOT(pPict, unit == 0)) -+ if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) - return FALSE; - - if (pPict->filter != PictFilterNearest && -@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix, - { - RINFO_FROM_SCREEN(pPix->drawable.pScreen); - uint32_t txfilter, txformat, txoffset, txpitch; -- int w = pPict->pDrawable->width; -- int h = pPict->pDrawable->height; -- unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -- Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -- !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -- int i; -+ unsigned int repeatType; -+ Bool repeat; -+ int i, w, h; - struct radeon_exa_pixmap_priv *driver_priv; - ACCEL_PREAMBLE(); - -+ if (pPict->pDrawable) { -+ w = pPict->pDrawable->width; -+ h = pPict->pDrawable->height; -+ repeatType = pPict->repeat ? pPict->repeatType : RepeatNone; -+ } else { -+ w = h = 1; -+ repeatType = RepeatNormal; -+ } -+ -+ repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) && -+ !(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y)); -+ - txpitch = exaGetPixmapPitch(pPix); - - txoffset = 0; -@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0])) - RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op)); - -- if (!pSrcPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- /* r200 limit should be 2048, there are issues with 2048 -- * see bug 19269 -- */ -- -- pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -- -- if (pSrcPixmap->drawable.width > 2047 || -- pSrcPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -- pSrcPixmap->drawable.width, -- pSrcPixmap->drawable.height)); -- } -- - pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable); - - if (pDstPixmap->drawable.width > 2047 || -@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP - pDstPixmap->drawable.height)); - } - -+ if (pSrcPicture->pDrawable) { -+ /* r200 limit should be 2048, there are issues with 2048 -+ * see 197a62704742a4a19736c2637ac92d1dc5ab34ed -+ */ -+ pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable); -+ -+ if (pSrcPixmap->drawable.width > 2047 || -+ pSrcPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Source w/h too large (%d,%d).\n", -+ pSrcPixmap->drawable.width, -+ pSrcPixmap->drawable.height)); -+ } -+ } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); -+ - if (pMaskPicture) { - PixmapPtr pMaskPixmap; - -- if (!pMaskPicture->pDrawable) -- RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n")); -- -- pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); -+ if (pMaskPicture->pDrawable) { -+ pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable); - -- if (pMaskPixmap->drawable.width > 2047 || -- pMaskPixmap->drawable.height > 2047) { -- RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -- pMaskPixmap->drawable.width, -- pMaskPixmap->drawable.height)); -- } -+ if (pMaskPixmap->drawable.width > 2047 || -+ pMaskPixmap->drawable.height > 2047) { -+ RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n", -+ pMaskPixmap->drawable.width, -+ pMaskPixmap->drawable.height)); -+ } -+ } else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill) -+ RADEON_FALLBACK(("Gradient pictures not supported yet\n")); - - if (pMaskPicture->componentAlpha) { - /* Check if it's component alpha that relies on a source alpha and -@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - PicturePtr pMaskPicture, PicturePtr pDstPicture, - PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst) - { -- RINFO_FROM_SCREEN(pDst->drawable.pScreen); -+ ScreenPtr pScreen = pDst->drawable.pScreen; -+ RINFO_FROM_SCREEN(pScreen); - uint32_t dst_format, dst_pitch; - uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch; - int pixel_shift; -@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture, - if (((dst_pitch >> pixel_shift) & 0x7) != 0) - RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch)); - -+ if (!pSrc) { -+ pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color)); -+ if (!pSrc) -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ - if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE)) - return FALSE; - -+ if (pMaskPicture && !pMask) { -+ pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color)); -+ if (!pMask) { -+ if (!pSrcPicture->pDrawable) -+ pScreen->DestroyPixmap(pSrc); -+ RADEON_FALLBACK("Failed to create solid scratch pixmap\n"); -+ } -+ } -+ - RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture, - pSrc, pMask, pDst); - --- -1.7.7.5 - diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD deleted file mode 100644 index 4b8173027..000000000 --- a/staging/xf86-video-ati/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 159723 2012-05-26 09:58:25Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=xf86-video-ati -pkgver=6.14.99 -_gitdate=20120517 -pkgrel=1.${_gitdate} # UMS/EXA: Add reminder for potential solid picture performance issue. -pkgdesc="X.org ati video driver" -arch=('i686' 'x86_64') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri') -makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto') -conflicts=('xorg-server<1.11.99.902') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz - git_fixes.diff - 0000-poor-man-s-solid-picture-support-for-r300-r600.patch - 0001-poor-man-s-solid-picture-support-for-evergreen.patch - 0002-poor-man-s-solid-picture-support-for-r100.patch - 0003-poor-man-s-solid-picture-support-for-r200.patch) -sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92' - '8b774e2f0310075cff2b7d874b0bed38d6245769' - '787f88c428f56ca6e96ba5eaf043a30bddfd0e23' - '69359a6623fe0f2214790c8ad40cac1a680a3825' - 'c0709ab82728e34838a8aeead7d1b79b7faf09bd' - '77a519e250c27a9fb94eeb52da655eed7c5f2eca') -sha1sums=('80c12b88e193354af204b13689b2fae922922c6c' - '8b774e2f0310075cff2b7d874b0bed38d6245769' - '787f88c428f56ca6e96ba5eaf043a30bddfd0e23' - '69359a6623fe0f2214790c8ad40cac1a680a3825' - 'c0709ab82728e34838a8aeead7d1b79b7faf09bd' - '77a519e250c27a9fb94eeb52da655eed7c5f2eca') - -build() { - #cd ${srcdir}/${pkgname}-${pkgver} - cd ${srcdir}/${pkgname}* - #patch -Np1 -i ${srcdir}/git_fixes.diff - - # fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266 - # and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html -# patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch -# patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch -# patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch -# patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch - - ./autogen.sh --prefix=/usr --enable-dri -# ./configure --prefix=/usr --enable-dri - make -} - -package() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - make "DESTDIR=${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} diff --git a/staging/xf86-video-ati/git_fixes.diff b/staging/xf86-video-ati/git_fixes.diff deleted file mode 100644 index 0c4518319..000000000 --- a/staging/xf86-video-ati/git_fixes.diff +++ /dev/null @@ -1,33 +0,0 @@ -From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001 -From: Jerome Glisse <jglisse@redhat.com> -Date: Wed, 04 Apr 2012 21:08:30 +0000 -Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64 - -Due to some old kernel issue, height is 8 aligned insided the ddx -For buffer with height btw 57 & 63 this lead ddx to believe it can -allocate a 2D tiled surface while mesa will not align height and -will assume 1D tiled leading to disagreement and rendering issue. -This patch force buffer with height < 64 to be 1D tiled. - -Signed-off-by: Jerome Glisse <jglisse@redhat.com> ---- -diff --git a/src/radeon_exa.c b/src/radeon_exa.c -index 99a5806..270dad4 100644 ---- a/src/radeon_exa.c -+++ b/src/radeon_exa.c -@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - surface.last_level = 0; - surface.bpe = cpp; - surface.nsamples = 1; -+ if (height < 64) { -+ /* disable 2d tiling for small surface to work around -+ * the fact that ddx align height to 8 pixel for old -+ * obscure reason i can't remember -+ */ -+ tiling &= ~RADEON_TILING_MACRO; -+ } - surface.flags = RADEON_SURF_SCANOUT; - surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE); - surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE); --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD deleted file mode 100644 index d57f65c68..000000000 --- a/staging/xf86-video-intel/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 159725 2012-05-26 10:02:38Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=xf86-video-intel -pkgver=2.19.0 -pkgrel=2 -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>=0.3.8' 'libxfixes' 'udev>=183') -makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') -options=('!libtool') -groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') - -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/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD deleted file mode 100644 index 6e5c8d562..000000000 --- a/staging/xf86-video-nouveau/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159753 2012-05-26 15:02:22Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Contributor: buddabrod <buddabrod@gmail.com> - -pkgname=xf86-video-nouveau -_gitdate=20120512 -pkgver=0.0.16_git${_gitdate} # see configure.ac -pkgrel=2 -pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)" -arch=('i686' 'x86_64') -url="http://nouveau.freedesktop.org/wiki/" -license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e -depends=('libdrm-nouveau' 'udev') -optdepends=('nouveau-dri: experimental gallium3d features') -makedepends=('xorg-server-devel' 'libdrm-new' 'xf86driproto') -conflicts=('xorg-server<1.11.99.902') -options=('!libtool') -install=$pkgname.install -source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('3e27e283219936d64c194eca24cd81cd') - -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/$pkgname-${_gitdate} - pushd /tmp/$pkgname-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau - cd xf86-video-nouveau - git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2 - popd -} - -build() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - ./autogen.sh --prefix=/usr - make -} - -package() { - cd $srcdir/xf86-video-nouveau-${_gitdate} - make DESTDIR=$pkgdir install -} diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install deleted file mode 100644 index 027154ff3..000000000 --- a/staging/xf86-video-nouveau/xf86-video-nouveau.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { - cat << _EOF - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF -} - -post_upgrade() { - if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then - cat << _EOF - ==> ATTENTION: Usermode support has been dropped - ==> make sure you use KernelModeSetting (KMS) - ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more -_EOF - fi -} diff --git a/staging/xfconf/PKGBUILD b/staging/xfconf/PKGBUILD deleted file mode 100644 index 757bcc41d..000000000 --- a/staging/xfconf/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 159773 2012-05-26 18:14:15Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> - -pkgname=xfconf -pkgver=4.10.0 -pkgrel=2 -pkgdesc="A simple client-server configuration storage and query system" -arch=('i686' 'x86_64') -url="http://www.xfce.org/" -license=('GPL2') -groups=('xfce4') -# http://www.xfce.org/documentation/requirements -# keep dbus, see also http://bugs.archlinux.org/task/14536 -depends=('libxfce4util' 'dbus-glib' 'dbus') -makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig' - 'glib-perl' 'intltool' 'gtk-doc' 'chrpath') -options=('!libtool' '!emptydirs') -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --with-perl-options=INSTALLDIRS="vendor" \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # remove unneeded dynloader bootstrap file - rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs" - - # fix insecure rpath, http://bugs.archlinux.org/task/19980 - chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so" -} - -# vim:set ts=2 sw=2 et: diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/staging/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff deleted file mode 100644 index 12c110151..000000000 --- a/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff +++ /dev/null @@ -1,116 +0,0 @@ ---- xorg-server-1.12.1/exa/exa_glyphs.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_glyphs.c.new 2012-04-15 11:48:51.683214230 +0200 -@@ -686,6 +686,7 @@ - PixmapPtr pMaskPixmap = 0; - PicturePtr pMask = NULL; - ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ ExaScreenPriv(pScreen); - int width = 0, height = 0; - int x, y; - int first_xOff = list->xOff, first_yOff = list->yOff; -@@ -697,7 +698,6 @@ - ExaGlyphBuffer buffer; - - if (maskFormat) { -- ExaScreenPriv(pScreen); - GCPtr pGC; - xRectangle rect; - -@@ -719,22 +719,20 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - component_alpha = NeedsComponent(maskFormat->format); - pMask = CreatePicture(0, &pMaskPixmap->drawable, - maskFormat, CPComponentAlpha, &component_alpha, - serverClient, &error); -- if (!pMask || -- (!component_alpha && pExaScr->info->CheckComposite && -- !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))) -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; -+ -+ if (!component_alpha && pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)) - { - PictFormatPtr argbFormat; - -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- -- if (!pMask) -- return; -- - /* The driver can't seem to composite to a8, let's try argb (but - * without component-alpha) */ - FreePicture((pointer) pMask, (XID) 0); -@@ -748,15 +746,25 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - - pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, - serverClient, &error); -- if (!pMask) { -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- return; -- } -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; - } -+ -+ if (pExaScr->info->CheckComposite && -+ (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) || -+ (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) { -+ FreePicture ((pointer) pMask, (XID) 0); -+ goto fallback; -+ } -+ - pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen); - ValidateGC(&pMaskPixmap->drawable, pGC); - rect.x = 0; -@@ -769,6 +777,13 @@ - y = -extents.y1; - } - else { -+ if (pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst))) -+ goto fallback; -+ - x = 0; - y = 0; - } -@@ -834,6 +849,10 @@ - xSrc + x - first_xOff, - ySrc + y - first_yOff, 0, 0, x, y, width, height); - FreePicture((pointer) pMask, (XID) 0); -- (*pScreen->DestroyPixmap) (pMaskPixmap); - } -+ -+ return; -+ -+fallback: -+ ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); - } ---- xorg-server-1.12.1/exa/exa_render.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_render.c.new 2012-04-15 11:50:35.272482047 +0200 -@@ -878,7 +878,7 @@ - Bool saveMaskRepeat = pMask ? pMask->repeat : 0; - RegionRec region; - -- if (pExaScr->swappedOut) -+ if (pExaScr->fallback_counter || pExaScr->swappedOut) - goto fallback; - - /* Remove repeat in source if useless */ diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD deleted file mode 100644 index 78b533fe1..000000000 --- a/staging/xorg-server/PKGBUILD +++ /dev/null @@ -1,200 +0,0 @@ -# $Id: PKGBUILD 159720 2012-05-26 09:47:01Z andyrtr $ -# 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.12.1.902 -pkgrel=2 -arch=('i686' 'x86_64') -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' 'udev>=183' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff - #git-fixes.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509' - '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' - 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # fix glitches and crashes with EXA and cairo 1.12 - # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266 - # and reworked for 1.12.1 changes -# patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff - - # Add post-release patches from 1.12 branch -# patch -Np1 -i ${srcdir}/git-fixes.patch - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-kdrive-evdev \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --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 - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - conflicts=('nvidia-utils<=290.10') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # 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" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -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) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index 6d5220ac7..000000000 --- a/staging/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c ---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 -+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1144,7 +1144,23 @@ - int idx = 0; - - #ifdef __linux__ -- driverList[idx++] = "nouveau"; -+ switch (dev->device_id) -+ { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[idx++] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[idx++] = "nouveau"; -+ break; -+ default: -+ driverList[idx++] = "nouveau"; -+ driverList[idx++] = "nvidia"; -+ break; -+ } - #endif - driverList[idx++] = "nv"; - break; diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch deleted file mode 100644 index 0b50049db..000000000 --- a/staging/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1200,9 +1200,15 @@ - break; - } - break; -- case 0x1039: -- driverList[0] = "sis"; -- break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: - driverList[0] = "siliconmotion"; - break; diff --git a/staging/xorg-server/git-fixes.patch b/staging/xorg-server/git-fixes.patch deleted file mode 100644 index f6ca2426b..000000000 --- a/staging/xorg-server/git-fixes.patch +++ /dev/null @@ -1,1717 +0,0 @@ -From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Wed, 11 Apr 2012 16:28:21 +0000 -Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly - -Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the -function definition for xf86VidModeNotifyEvent had an extra ');' -before the prototype argument declarations. This was harmless for the -compiler as the code never gets used, but completely messed up the -file re-indentation. This patch removes the spurious characters in -preparation for re-indenting the file. - -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4) ---- -diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c -index 6e2a8e9..9f64f8e 100644 ---- a/hw/xfree86/dixmods/extmod/xf86vmode.c -+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c -@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; - #ifdef XF86VIDMODE_EVENTS - static int XF86VidModeEventBase = 0; - --static void SXF86VidModeNotifyEvent(); -+static void SXF86VidModeNotifyEvent( - xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ - ); - --- -cgit v0.9.0.2-2-gbebe -From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001 -From: Keith Packard <keithp@keithp.com> -Date: Wed, 11 Apr 2012 16:33:54 +0000 -Subject: hw/xfree86: Re-indent xf86vmode.c - -This is the result of re-running the 'x-indent.sh' script over -xf86vmode.c to clean up the disaster caused by broken syntax in the -file. - -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc) ---- -diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c -index 9f64f8e..68c4b58 100644 ---- a/hw/xfree86/dixmods/extmod/xf86vmode.c -+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c -@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0; - #ifdef XF86VIDMODE_EVENTS - static int XF86VidModeEventBase = 0; - --static void SXF86VidModeNotifyEvent( --xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ -+static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */ - ); - - static RESTYPE EventType; /* resource type for event masks */ -@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec; - #define DEBUG_P(x) /**/ - #endif - static int -- ClientMajorVersion(ClientPtr client) { -+ClientMajorVersion(ClientPtr client) -+{ - VidModePrivPtr pPriv; - -- pPriv = VM_GETPRIV(client); -+ pPriv = VM_GETPRIV(client); - if (!pPriv) -- return 0; -+ return 0; - else -- return pPriv->major; -+ return pPriv->major; - } -+ - #ifdef XF86VIDMODE_EVENTS - static void -- CheckScreenPrivate(pScreen) -+CheckScreenPrivate(pScreen) - ScreenPtr -- pScreen; -+ pScreen; - { - SetupScreen(pScreen); - -@@ -142,9 +143,10 @@ ScreenPtr - } - } - --static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen) -+static XF86VidModeScreenPrivatePtr -+MakeScreenPrivate(pScreen) - ScreenPtr -- pScreen; -+ pScreen; - { - SetupScreen(pScreen); - -@@ -160,18 +162,22 @@ ScreenPtr - } - - static unsigned long -- getEventMask(ScreenPtr pScreen, ClientPtr client) { -+getEventMask(ScreenPtr pScreen, ClientPtr client) -+{ - SetupScreen(pScreen); - XF86VidModeEventPtr pEv; - - if (!pPriv) -- return 0; -+ return 0; - for (pEv = pPriv->events; pEv; pEv = pEv->next) - if (pEv->client == client) - return pEv->mask; -- return 0; --} static Bool -- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) { -+ return 0; -+} -+ -+static Bool -+setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) -+{ - SetupScreen(pScreen); - XF86VidModeEventPtr pEv, *pPrev; - -@@ -181,7 +187,8 @@ static unsigned long - pPriv = MakeScreenPrivate(pScreen); - if (!pPriv) - return FALSE; -- } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) -+ } -+ for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) - if (pEv->client == client) - break; - if (mask == 0) { -@@ -208,38 +215,43 @@ static unsigned long - } - - static int -- XF86VidModeFreeEvents(pointer value, XID id) { -+XF86VidModeFreeEvents(pointer value, XID id) -+{ - XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value; - ScreenPtr pScreen = pOld->screen; -- SetupScreen(pScreen); -+ -+ SetupScreen(pScreen); - XF86VidModeEventPtr pEv, *pPrev; - - if (!pPriv) -- return TRUE; -+ return TRUE; - for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next) - if (pEv == pOld) - break; - if (!pEv) -- return TRUE; -+ return TRUE; - *pPrev = pEv->next; -- free(pEv); -- CheckScreenPrivate(pScreen); -- return TRUE; --} static void -- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) { -+ free(pEv); -+ CheckScreenPrivate(pScreen); -+ return TRUE; -+} -+ -+static void -+SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) -+{ - XF86VidModeScreenPrivatePtr pPriv; - XF86VidModeEventPtr pEv; - unsigned long mask; - xXF86VidModeNotifyEvent ev; - int kind; - -- UpdateCurrentTimeIf(); -- mask = XF86VidModeNotifyMask; -- pScreen = screenInfo.screens[pScreen->myNum]; -- pPriv = GetScreenPrivate(pScreen); -+ UpdateCurrentTimeIf(); -+ mask = XF86VidModeNotifyMask; -+ pScreen = screenInfo.screens[pScreen->myNum]; -+ pPriv = GetScreenPrivate(pScreen); - if (!pPriv) -- return; -- kind = XF86VidModeModeChange; -+ return; -+ kind = XF86VidModeModeChange; - for (pEv = pPriv->events; pEv; pEv = pEv->next) { - if (!(pEv->mask & mask)) - continue; -@@ -251,8 +263,10 @@ static int - ev.forced = forced; - WriteEventsToClient(pEv->client, 1, (xEvent *) &ev); - }} static void -- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, -- xXF86VidModeNotifyEvent * to) { -+ -+SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from, -+ xXF86VidModeNotifyEvent * to) -+{ - to->type = from->type; - to->state = from->state; - cpswaps(from->sequenceNumber, to->sequenceNumber); -@@ -264,29 +278,31 @@ static int - #endif - - static int -- ProcXF86VidModeQueryVersion(ClientPtr client) { -+ProcXF86VidModeQueryVersion(ClientPtr client) -+{ - xXF86VidModeQueryVersionReply rep; - -- DEBUG_P("XF86VidModeQueryVersion"); -+ DEBUG_P("XF86VidModeQueryVersion"); - -- REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; -- rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; -+ REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION; -+ rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION; - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swaps(&rep.majorVersion); - swaps(&rep.minorVersion); -- } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep); - return Success; - } - - static int -- ProcXF86VidModeGetModeLine(ClientPtr client) { -+ProcXF86VidModeGetModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetModeLineReq); - xXF86VidModeGetModeLineReply rep; - xXF86OldVidModeGetModeLineReply oldrep; -@@ -294,11 +310,11 @@ static int - int dotClock; - int ver; - -- DEBUG_P("XF86VidModeGetModeline"); -+ DEBUG_P("XF86VidModeGetModeline"); - -- ver = ClientMajorVersion(client); -- REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); -- rep.type = X_Reply; -+ ver = ClientMajorVersion(client); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); -+ rep.type = X_Reply; - if (ver < 2) { - rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) - - SIZEOF(xGenericReply)); -@@ -386,7 +402,8 @@ static int - } - - static int -- ProcXF86VidModeGetAllModeLines(ClientPtr client) { -+ProcXF86VidModeGetAllModeLines(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetAllModeLinesReq); - xXF86VidModeGetAllModeLinesReply rep; - xXF86VidModeModeInfo mdinf; -@@ -395,38 +412,39 @@ static int - int modecount, dotClock; - int ver; - -- DEBUG_P("XF86VidModeGetAllModelines"); -+ DEBUG_P("XF86VidModeGetAllModelines"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - -- modecount = VidModeGetNumOfModes(stuff->screen); -+ modecount = VidModeGetNumOfModes(stuff->screen); - if (modecount < 1) -- return VidModeErrorBase + XF86VidModeExtensionDisabled; -+ return VidModeErrorBase + XF86VidModeExtensionDisabled; - - if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock)) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - -+ rep.type = X_Reply; -+ rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) - - SIZEOF(xGenericReply); - if (ver < 2) -- rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); -+ rep.length += modecount * sizeof(xXF86OldVidModeModeInfo); - else -- rep.length += modecount * sizeof(xXF86VidModeModeInfo); -- rep.length >>= 2; -- rep.sequenceNumber = client->sequence; -- rep.modecount = modecount; -+ rep.length += modecount * sizeof(xXF86VidModeModeInfo); -+ rep.length >>= 2; -+ rep.sequenceNumber = client->sequence; -+ rep.modecount = modecount; - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.modecount); -- } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply), -+ (char *) &rep); - - do { - mdinf.dotclock = dotClock; -@@ -492,7 +510,8 @@ static int - && VidModeGetModeValue(mode, VIDMODE_FLAGS) == stuff->flags ) - - static int -- ProcXF86VidModeAddModeLine(ClientPtr client) { -+ProcXF86VidModeAddModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeAddModeLineReq); - xXF86OldVidModeAddModeLineReq *oldstuff = - (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; -@@ -502,9 +521,9 @@ static int - int dotClock; - int ver; - -- DEBUG_P("XF86VidModeAddModeline"); -+ DEBUG_P("XF86VidModeAddModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -533,7 +552,8 @@ static int - stuff->after_vsyncend = oldstuff->after_vsyncend; - stuff->after_vtotal = oldstuff->after_vtotal; - stuff->after_flags = oldstuff->after_flags; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("AddModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -654,7 +674,8 @@ static int - } - - static int -- ProcXF86VidModeDeleteModeLine(ClientPtr client) { -+ProcXF86VidModeDeleteModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeDeleteModeLineReq); - xXF86OldVidModeDeleteModeLineReq *oldstuff = - (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; -@@ -663,9 +684,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeDeleteModeline"); -+ DEBUG_P("XF86VidModeDeleteModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -683,7 +704,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("DeleteModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -777,7 +799,8 @@ static int - } - - static int -- ProcXF86VidModeModModeLine(ClientPtr client) { -+ProcXF86VidModeModModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeModModeLineReq); - xXF86OldVidModeModModeLineReq *oldstuff = - (xXF86OldVidModeModModeLineReq *) client->requestBuffer; -@@ -786,9 +809,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeModModeline"); -+ DEBUG_P("XF86VidModeModModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -805,7 +828,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n", - (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart, - stuff->hsyncend, stuff->htotal); -@@ -903,7 +927,8 @@ static int - } - - static int -- ProcXF86VidModeValidateModeLine(ClientPtr client) { -+ProcXF86VidModeValidateModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeValidateModeLineReq); - xXF86OldVidModeValidateModeLineReq *oldstuff = - (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; -@@ -913,9 +938,9 @@ static int - int len, status, dotClock; - int ver; - -- DEBUG_P("XF86VidModeValidateModeline"); -+ DEBUG_P("XF86VidModeValidateModeline"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -933,7 +958,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("ValidateModeLine - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -1022,7 +1048,8 @@ static int - } - - static int -- ProcXF86VidModeSwitchMode(ClientPtr client) { -+ProcXF86VidModeSwitchMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchModeReq); - - DEBUG_P("XF86VidModeSwitchMode"); -@@ -1035,8 +1062,11 @@ static int - VidModeZoomViewport(stuff->screen, (short) stuff->zoom); - - return Success; --} static int -- ProcXF86VidModeSwitchToMode(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeSwitchToMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchToModeReq); - xXF86OldVidModeSwitchToModeReq *oldstuff = - (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer; -@@ -1045,9 +1075,9 @@ static int - int len, dotClock; - int ver; - -- DEBUG_P("XF86VidModeSwitchToMode"); -+ DEBUG_P("XF86VidModeSwitchToMode"); - -- ver = ClientMajorVersion(client); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - /* convert from old format */ - stuff = &newstuff; -@@ -1065,7 +1095,8 @@ static int - stuff->vtotal = oldstuff->vtotal; - stuff->flags = oldstuff->flags; - stuff->privsize = oldstuff->privsize; -- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { -+ } -+ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) { - ErrorF("SwitchToMode - scrn: %d clock: %ld\n", - (int) stuff->screen, (unsigned long) stuff->dotclock); - ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n", -@@ -1138,7 +1169,8 @@ static int - } - - static int -- ProcXF86VidModeLockModeSwitch(ClientPtr client) { -+ProcXF86VidModeLockModeSwitch(ClientPtr client) -+{ - REQUEST(xXF86VidModeLockModeSwitchReq); - - REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); -@@ -1152,53 +1184,57 @@ static int - return VidModeErrorBase + XF86VidModeZoomLocked; - - return Success; --} static int -- ProcXF86VidModeGetMonitor(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetMonitor(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetMonitorReq); - xXF86VidModeGetMonitorReply rep; - CARD32 *hsyncdata, *vsyncdata; - int i, nHsync, nVrefresh; - pointer monitor; - -- DEBUG_P("XF86VidModeGetMonitor"); -+ DEBUG_P("XF86VidModeGetMonitor"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (!VidModeGetMonitor(stuff->screen, &monitor)) -- return BadValue; -+ return BadValue; - -- nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; -- nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; -+ nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i; -+ nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i; - -- rep.type = X_Reply; -+ rep.type = X_Reply; - if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr) -- rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_VENDOR, -- 0)).ptr); -+ rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor, -+ VIDMODE_MON_VENDOR, -+ 0)).ptr); - else -- rep.vendorLength = 0; -+ rep.vendorLength = 0; - if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr) -- rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_MODEL, -- 0)).ptr); -+ rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor, -+ VIDMODE_MON_MODEL, -+ 0)).ptr); - else -- rep.modelLength = 0; -- rep.length = -+ rep.modelLength = 0; -+ rep.length = - bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) - - SIZEOF(xGenericReply) + (nHsync + - nVrefresh) * sizeof(CARD32) + - pad_to_int32(rep.vendorLength) + - pad_to_int32(rep.modelLength)); -- rep.sequenceNumber = client->sequence; -- rep.nhsync = nHsync; -- rep.nvsync = nVrefresh; -- hsyncdata = malloc(nHsync * sizeof(CARD32)); -+ rep.sequenceNumber = client->sequence; -+ rep.nhsync = nHsync; -+ rep.nvsync = nVrefresh; -+ hsyncdata = malloc(nHsync * sizeof(CARD32)); - if (!hsyncdata) { - return BadAlloc; -- } vsyncdata = malloc(nVrefresh * sizeof(CARD32)); -+ } -+ vsyncdata = malloc(nVrefresh * sizeof(CARD32)); - - if (!vsyncdata) { - free(hsyncdata); -@@ -1208,19 +1244,18 @@ static int - for (i = 0; i < nHsync; i++) { - hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, - VIDMODE_MON_HSYNC_LO, -- i)). -- f | (unsigned -- short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, -- i)).f << 16; -+ i)).f | -+ (unsigned -+ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI, -+ i)).f << 16; - } - for (i = 0; i < nVrefresh; i++) { - vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor, - VIDMODE_MON_VREFRESH_LO, -- i)). -- f | (unsigned -- short) (VidModeGetMonitorValue(monitor, -- VIDMODE_MON_VREFRESH_HI, -- i)).f << 16; -+ i)).f | -+ (unsigned -+ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI, -+ i)).f << 16; - } - - if (client->swapped) { -@@ -1249,38 +1284,40 @@ static int - } - - static int -- ProcXF86VidModeGetViewPort(ClientPtr client) { -+ProcXF86VidModeGetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetViewPortReq); - xXF86VidModeGetViewPortReply rep; - int x, y; - -- DEBUG_P("XF86VidModeGetViewPort"); -+ DEBUG_P("XF86VidModeGetViewPort"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; - -- VidModeGetViewPort(stuff->screen, &x, &y); -- rep.x = x; -- rep.y = y; -+ VidModeGetViewPort(stuff->screen, &x, &y); -+ rep.x = x; -+ rep.y = y; - - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.x); - swapl(&rep.y); -- } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), -- (char *) &rep); -+ } -+ WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep); - return Success; - } - - static int -- ProcXF86VidModeSetViewPort(ClientPtr client) { -+ProcXF86VidModeSetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetViewPortReq); - - DEBUG_P("XF86VidModeSetViewPort"); -@@ -1294,8 +1331,11 @@ static int - return BadValue; - - return Success; --} static int -- ProcXF86VidModeGetDotClocks(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetDotClocks(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetDotClocksReq); - xXF86VidModeGetDotClocksReply rep; - int n; -@@ -1304,31 +1344,33 @@ static int - int *Clocks = NULL; - Bool ClockProg; - -- DEBUG_P("XF86VidModeGetDotClocks"); -+ DEBUG_P("XF86VidModeGetDotClocks"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); -+ numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg); - -- rep.type = X_Reply; -- rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) -- - SIZEOF(xGenericReply) + numClocks); -- rep.sequenceNumber = client->sequence; -- rep.clocks = numClocks; -- rep.maxclocks = MAXCLOCKS; -- rep.flags = 0; -+ rep.type = X_Reply; -+ rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply) -+ - SIZEOF(xGenericReply) + numClocks); -+ rep.sequenceNumber = client->sequence; -+ rep.clocks = numClocks; -+ rep.maxclocks = MAXCLOCKS; -+ rep.flags = 0; - - if (!ClockProg) { - Clocks = malloc(numClocks * sizeof(int)); - if (!Clocks) -- return BadValue; -+ return BadValue; - if (!VidModeGetClocks(stuff->screen, Clocks)) { - free(Clocks); - return BadValue; -- }} if (ClockProg) { -+ } -+ } -+ if (ClockProg) { - rep.flags |= CLKFLAG_PROGRAMABLE; - } - if (client->swapped) { -@@ -1356,7 +1398,8 @@ static int - } - - static int -- ProcXF86VidModeSetGamma(ClientPtr client) { -+ProcXF86VidModeSetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetGammaReq); - - DEBUG_P("XF86VidModeSetGamma"); -@@ -1372,79 +1415,89 @@ static int - return BadValue; - - return Success; --} static int -- ProcXF86VidModeGetGamma(ClientPtr client) { -+} -+ -+static int -+ProcXF86VidModeGetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaReq); - xXF86VidModeGetGammaReply rep; - float red, green, blue; - -- DEBUG_P("XF86VidModeGetGamma"); -+ DEBUG_P("XF86VidModeGetGamma"); - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; - if (!VidModeGetGamma(stuff->screen, &red, &green, &blue)) -- return BadValue; -- rep.red = (CARD32) (red * 10000.); -- rep.green = (CARD32) (green * 10000.); -- rep.blue = (CARD32) (blue * 10000.); -+ return BadValue; -+ rep.red = (CARD32) (red * 10000.); -+ rep.green = (CARD32) (green * 10000.); -+ rep.blue = (CARD32) (blue * 10000.); - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.red); - swapl(&rep.green); - swapl(&rep.blue); -- } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep); - - return Success; - } - - static int -- ProcXF86VidModeSetGammaRamp(ClientPtr client) { -+ProcXF86VidModeSetGammaRamp(ClientPtr client) -+{ - CARD16 *r, *g, *b; - int length; -- REQUEST(xXF86VidModeSetGammaRampReq); -+ -+ REQUEST(xXF86VidModeSetGammaRampReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) -- return BadValue; -+ return BadValue; - -- length = (stuff->size + 1) & ~1; -+ length = (stuff->size + 1) & ~1; - -- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); -+ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6); - -- r = (CARD16 *) &stuff[1]; -- g = r + length; -- b = g + length; -+ r = (CARD16 *) &stuff[1]; -+ g = r + length; -+ b = g + length; - - if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b)) -- return BadValue; -+ return BadValue; - -- return Success; --} static int -- ProcXF86VidModeGetGammaRamp(ClientPtr client) { -+ return Success; -+} -+ -+static int -+ProcXF86VidModeGetGammaRamp(ClientPtr client) -+{ - CARD16 *ramp = NULL; - int length; - size_t ramplen = 0; - xXF86VidModeGetGammaRampReply rep; -- REQUEST(xXF86VidModeGetGammaRampReq); -+ -+ REQUEST(xXF86VidModeGetGammaRampReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - - if (stuff->size != VidModeGetGammaRampSize(stuff->screen)) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); - -- length = (stuff->size + 1) & ~1; -+ length = (stuff->size + 1) & ~1; - - if (stuff->size) { - ramplen = length * 3 * sizeof(CARD16); -@@ -1455,7 +1508,9 @@ static int - ramp, ramp + length, ramp + (length * 2))) { - free(ramp); - return BadValue; -- }} rep.type = X_Reply; -+ } -+ } -+ rep.type = X_Reply; - rep.length = (length >> 1) * 3; - rep.sequenceNumber = client->sequence; - rep.size = stuff->size; -@@ -1476,47 +1531,53 @@ static int - } - - static int -- ProcXF86VidModeGetGammaRampSize(ClientPtr client) { -+ProcXF86VidModeGetGammaRampSize(ClientPtr client) -+{ - xXF86VidModeGetGammaRampSizeReply rep; -- REQUEST(xXF86VidModeGetGammaRampSizeReq); -+ -+ REQUEST(xXF86VidModeGetGammaRampSizeReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.size = VidModeGetGammaRampSize(stuff->screen); -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.size = VidModeGetGammaRampSize(stuff->screen); - if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swaps(&rep.size); -- } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), -- (char *) &rep); -+ } -+ WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply), -+ (char *) &rep); - - return Success; - } - - static int -- ProcXF86VidModeGetPermissions(ClientPtr client) { -+ProcXF86VidModeGetPermissions(ClientPtr client) -+{ - xXF86VidModeGetPermissionsReply rep; -- REQUEST(xXF86VidModeGetPermissionsReq); -+ -+ REQUEST(xXF86VidModeGetPermissionsReq); - - if (stuff->screen >= screenInfo.numScreens) -- return BadValue; -+ return BadValue; - -- REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); - -- rep.type = X_Reply; -- rep.length = 0; -- rep.sequenceNumber = client->sequence; -- rep.permissions = XF86VM_READ_PERMISSION; -+ rep.type = X_Reply; -+ rep.length = 0; -+ rep.sequenceNumber = client->sequence; -+ rep.permissions = XF86VM_READ_PERMISSION; - if (xf86GetVidModeEnabled() && - (xf86GetVidModeAllowNonLocal() || LocalClient(client))) { - rep.permissions |= XF86VM_WRITE_PERMISSION; -- } if (client->swapped) { -+ } -+ if (client->swapped) { - swaps(&rep.sequenceNumber); - swapl(&rep.length); - swapl(&rep.permissions); -@@ -1528,21 +1589,23 @@ static int - } - - static int -- ProcXF86VidModeSetClientVersion(ClientPtr client) { -+ProcXF86VidModeSetClientVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetClientVersionReq); - - VidModePrivPtr pPriv; - -- DEBUG_P("XF86VidModeSetClientVersion"); -+ DEBUG_P("XF86VidModeSetClientVersion"); - -- REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); -+ REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); - - if ((pPriv = VM_GETPRIV(client)) == NULL) { - pPriv = malloc(sizeof(VidModePrivRec)); - if (!pPriv) - return BadAlloc; - VM_SETPRIV(client, pPriv); -- } pPriv->major = stuff->major; -+ } -+ pPriv->major = stuff->major; - - pPriv->minor = stuff->minor; - -@@ -1550,85 +1613,103 @@ static int - } - - static int -- ProcXF86VidModeDispatch(ClientPtr client) { -+ProcXF86VidModeDispatch(ClientPtr client) -+{ - REQUEST(xReq); - switch (stuff->data) { - case X_XF86VidModeQueryVersion: - return ProcXF86VidModeQueryVersion(client); -- case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client); -- case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client); -- case X_XF86VidModeGetAllModeLines:return -- ProcXF86VidModeGetAllModeLines(client); -- case X_XF86VidModeValidateModeLine:return -- ProcXF86VidModeValidateModeLine(client); -- case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client); -- case X_XF86VidModeGetDotClocks:return -- ProcXF86VidModeGetDotClocks(client); -- case X_XF86VidModeSetClientVersion:return -- ProcXF86VidModeSetClientVersion(client); -- case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client); -- case X_XF86VidModeGetGammaRamp:return -- ProcXF86VidModeGetGammaRamp(client); -- case X_XF86VidModeGetGammaRampSize:return -- ProcXF86VidModeGetGammaRampSize(client); -- case X_XF86VidModeGetPermissions:return -- ProcXF86VidModeGetPermissions(client); -- default:if (!xf86GetVidModeEnabled()) -+ case X_XF86VidModeGetModeLine: -+ return ProcXF86VidModeGetModeLine(client); -+ case X_XF86VidModeGetMonitor: -+ return ProcXF86VidModeGetMonitor(client); -+ case X_XF86VidModeGetAllModeLines: -+ return ProcXF86VidModeGetAllModeLines(client); -+ case X_XF86VidModeValidateModeLine: -+ return ProcXF86VidModeValidateModeLine(client); -+ case X_XF86VidModeGetViewPort: -+ return ProcXF86VidModeGetViewPort(client); -+ case X_XF86VidModeGetDotClocks: -+ return ProcXF86VidModeGetDotClocks(client); -+ case X_XF86VidModeSetClientVersion: -+ return ProcXF86VidModeSetClientVersion(client); -+ case X_XF86VidModeGetGamma: -+ return ProcXF86VidModeGetGamma(client); -+ case X_XF86VidModeGetGammaRamp: -+ return ProcXF86VidModeGetGammaRamp(client); -+ case X_XF86VidModeGetGammaRampSize: -+ return ProcXF86VidModeGetGammaRampSize(client); -+ case X_XF86VidModeGetPermissions: -+ return ProcXF86VidModeGetPermissions(client); -+ default: -+ if (!xf86GetVidModeEnabled()) - return VidModeErrorBase + XF86VidModeExtensionDisabled; - if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { - switch (stuff->data) { - case X_XF86VidModeAddModeLine: - return ProcXF86VidModeAddModeLine(client); -- case X_XF86VidModeDeleteModeLine:return -- ProcXF86VidModeDeleteModeLine(client); -- case X_XF86VidModeModModeLine:return -- ProcXF86VidModeModModeLine(client); -- case X_XF86VidModeSwitchMode:return -- ProcXF86VidModeSwitchMode(client); -- case X_XF86VidModeSwitchToMode:return -- ProcXF86VidModeSwitchToMode(client); -- case X_XF86VidModeLockModeSwitch:return -- ProcXF86VidModeLockModeSwitch(client); -- case X_XF86VidModeSetViewPort:return -- ProcXF86VidModeSetViewPort(client); -- case X_XF86VidModeSetGamma:return -- ProcXF86VidModeSetGamma(client); -- case X_XF86VidModeSetGammaRamp:return -- ProcXF86VidModeSetGammaRamp(client); -- default:return BadRequest; -- }} -+ case X_XF86VidModeDeleteModeLine: -+ return ProcXF86VidModeDeleteModeLine(client); -+ case X_XF86VidModeModModeLine: -+ return ProcXF86VidModeModModeLine(client); -+ case X_XF86VidModeSwitchMode: -+ return ProcXF86VidModeSwitchMode(client); -+ case X_XF86VidModeSwitchToMode: -+ return ProcXF86VidModeSwitchToMode(client); -+ case X_XF86VidModeLockModeSwitch: -+ return ProcXF86VidModeLockModeSwitch(client); -+ case X_XF86VidModeSetViewPort: -+ return ProcXF86VidModeSetViewPort(client); -+ case X_XF86VidModeSetGamma: -+ return ProcXF86VidModeSetGamma(client); -+ case X_XF86VidModeSetGammaRamp: -+ return ProcXF86VidModeSetGammaRamp(client); -+ default: -+ return BadRequest; -+ } -+ } - else -- return VidModeErrorBase + XF86VidModeClientNotLocal; -+ return VidModeErrorBase + XF86VidModeClientNotLocal; - } - } - - static int -- SProcXF86VidModeQueryVersion(ClientPtr client) { -+SProcXF86VidModeQueryVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeQueryVersionReq); - swaps(&stuff->length); - return ProcXF86VidModeQueryVersion(client); --} static int -- SProcXF86VidModeGetModeLine(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetModeLine(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetModeLineReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetModeLine(client); --} static int -- SProcXF86VidModeGetAllModeLines(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetAllModeLines(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetAllModeLinesReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetAllModeLines(client); --} static int -- SProcXF86VidModeAddModeLine(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeAddModeLine(ClientPtr client) -+{ - xXF86OldVidModeAddModeLineReq *oldstuff = - (xXF86OldVidModeAddModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeAddModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeAddModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq); -@@ -1666,13 +1747,14 @@ static int - } - - static int -- SProcXF86VidModeDeleteModeLine(ClientPtr client) { -+SProcXF86VidModeDeleteModeLine(ClientPtr client) -+{ - xXF86OldVidModeDeleteModeLineReq *oldstuff = - (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeDeleteModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeDeleteModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq); -@@ -1710,13 +1792,14 @@ static int - } - - static int -- SProcXF86VidModeModModeLine(ClientPtr client) { -+SProcXF86VidModeModModeLine(ClientPtr client) -+{ - xXF86OldVidModeModModeLineReq *oldstuff = - (xXF86OldVidModeModModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeModModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeModModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq); -@@ -1754,13 +1837,14 @@ static int - } - - static int -- SProcXF86VidModeValidateModeLine(ClientPtr client) { -+SProcXF86VidModeValidateModeLine(ClientPtr client) -+{ - xXF86OldVidModeValidateModeLineReq *oldstuff = - (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer; - int ver; - -- REQUEST(xXF86VidModeValidateModeLineReq); -- ver = ClientMajorVersion(client); -+ REQUEST(xXF86VidModeValidateModeLineReq); -+ ver = ClientMajorVersion(client); - if (ver < 2) { - swaps(&oldstuff->length); - REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq); -@@ -1798,44 +1882,60 @@ static int - } - - static int -- SProcXF86VidModeSwitchMode(ClientPtr client) { -+SProcXF86VidModeSwitchMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchModeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq); - swaps(&stuff->screen); - swaps(&stuff->zoom); - return ProcXF86VidModeSwitchMode(client); --} static int -- SProcXF86VidModeSwitchToMode(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSwitchToMode(ClientPtr client) -+{ - REQUEST(xXF86VidModeSwitchToModeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq); - swapl(&stuff->screen); - return ProcXF86VidModeSwitchToMode(client); --} static int -- SProcXF86VidModeLockModeSwitch(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeLockModeSwitch(ClientPtr client) -+{ - REQUEST(xXF86VidModeLockModeSwitchReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); - swaps(&stuff->screen); - swaps(&stuff->lock); - return ProcXF86VidModeLockModeSwitch(client); --} static int -- SProcXF86VidModeGetMonitor(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetMonitor(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetMonitorReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetMonitor(client); --} static int -- SProcXF86VidModeGetViewPort(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetViewPortReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetViewPort(client); --} static int -- SProcXF86VidModeSetViewPort(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetViewPort(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetViewPortReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq); -@@ -1843,23 +1943,32 @@ static int - swapl(&stuff->x); - swapl(&stuff->y); - return ProcXF86VidModeSetViewPort(client); --} static int -- SProcXF86VidModeGetDotClocks(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetDotClocks(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetDotClocksReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetDotClocks(client); --} static int -- SProcXF86VidModeSetClientVersion(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetClientVersion(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetClientVersionReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); - swaps(&stuff->major); - swaps(&stuff->minor); - return ProcXF86VidModeSetClientVersion(client); --} static int -- SProcXF86VidModeSetGamma(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeSetGammaReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq); -@@ -1868,120 +1977,145 @@ static int - swapl(&stuff->green); - swapl(&stuff->blue); - return ProcXF86VidModeSetGamma(client); --} static int -- SProcXF86VidModeGetGamma(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetGamma(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetGamma(client); --} static int -- SProcXF86VidModeSetGammaRamp(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeSetGammaRamp(ClientPtr client) -+{ - int length; -- REQUEST(xXF86VidModeSetGammaRampReq); -- swaps(&stuff->length); -- REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); -- swaps(&stuff->size); -- swaps(&stuff->screen); -- length = ((stuff->size + 1) & ~1) * 6; -- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); -- SwapRestS(stuff); -- return ProcXF86VidModeSetGammaRamp(client); --} static int -- SProcXF86VidModeGetGammaRamp(ClientPtr client) { -+ -+ REQUEST(xXF86VidModeSetGammaRampReq); -+ swaps(&stuff->length); -+ REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq); -+ swaps(&stuff->size); -+ swaps(&stuff->screen); -+ length = ((stuff->size + 1) & ~1) * 6; -+ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length); -+ SwapRestS(stuff); -+ return ProcXF86VidModeSetGammaRamp(client); -+} -+ -+static int -+SProcXF86VidModeGetGammaRamp(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaRampReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq); - swaps(&stuff->size); - swaps(&stuff->screen); - return ProcXF86VidModeGetGammaRamp(client); --} static int -- SProcXF86VidModeGetGammaRampSize(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetGammaRampSize(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetGammaRampSizeReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetGammaRampSize(client); --} static int -- SProcXF86VidModeGetPermissions(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeGetPermissions(ClientPtr client) -+{ - REQUEST(xXF86VidModeGetPermissionsReq); - swaps(&stuff->length); - REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq); - swaps(&stuff->screen); - return ProcXF86VidModeGetPermissions(client); --} static int -- SProcXF86VidModeDispatch(ClientPtr client) { -+} -+ -+static int -+SProcXF86VidModeDispatch(ClientPtr client) -+{ - REQUEST(xReq); - switch (stuff->data) { - case X_XF86VidModeQueryVersion: - return SProcXF86VidModeQueryVersion(client); -- case X_XF86VidModeGetModeLine:return -- SProcXF86VidModeGetModeLine(client); -- case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client); -- case X_XF86VidModeGetAllModeLines:return -- SProcXF86VidModeGetAllModeLines(client); -- case X_XF86VidModeGetViewPort:return -- SProcXF86VidModeGetViewPort(client); -- case X_XF86VidModeValidateModeLine:return -- SProcXF86VidModeValidateModeLine(client); -- case X_XF86VidModeGetDotClocks:return -- SProcXF86VidModeGetDotClocks(client); -- case X_XF86VidModeSetClientVersion:return -- SProcXF86VidModeSetClientVersion(client); -- case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client); -- case X_XF86VidModeGetGammaRamp:return -- SProcXF86VidModeGetGammaRamp(client); -- case X_XF86VidModeGetGammaRampSize:return -- SProcXF86VidModeGetGammaRampSize(client); -- case X_XF86VidModeGetPermissions:return -- SProcXF86VidModeGetPermissions(client); -- default:if (!xf86GetVidModeEnabled()) -+ case X_XF86VidModeGetModeLine: -+ return SProcXF86VidModeGetModeLine(client); -+ case X_XF86VidModeGetMonitor: -+ return SProcXF86VidModeGetMonitor(client); -+ case X_XF86VidModeGetAllModeLines: -+ return SProcXF86VidModeGetAllModeLines(client); -+ case X_XF86VidModeGetViewPort: -+ return SProcXF86VidModeGetViewPort(client); -+ case X_XF86VidModeValidateModeLine: -+ return SProcXF86VidModeValidateModeLine(client); -+ case X_XF86VidModeGetDotClocks: -+ return SProcXF86VidModeGetDotClocks(client); -+ case X_XF86VidModeSetClientVersion: -+ return SProcXF86VidModeSetClientVersion(client); -+ case X_XF86VidModeGetGamma: -+ return SProcXF86VidModeGetGamma(client); -+ case X_XF86VidModeGetGammaRamp: -+ return SProcXF86VidModeGetGammaRamp(client); -+ case X_XF86VidModeGetGammaRampSize: -+ return SProcXF86VidModeGetGammaRampSize(client); -+ case X_XF86VidModeGetPermissions: -+ return SProcXF86VidModeGetPermissions(client); -+ default: -+ if (!xf86GetVidModeEnabled()) - return VidModeErrorBase + XF86VidModeExtensionDisabled; - if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) { - switch (stuff->data) { - case X_XF86VidModeAddModeLine: - return SProcXF86VidModeAddModeLine(client); -- case X_XF86VidModeDeleteModeLine:return -- SProcXF86VidModeDeleteModeLine(client); -- case X_XF86VidModeModModeLine:return -- SProcXF86VidModeModModeLine(client); -- case X_XF86VidModeSwitchMode:return -- SProcXF86VidModeSwitchMode(client); -- case X_XF86VidModeSwitchToMode:return -- SProcXF86VidModeSwitchToMode(client); -- case X_XF86VidModeLockModeSwitch:return -- SProcXF86VidModeLockModeSwitch(client); -- case X_XF86VidModeSetViewPort:return -- SProcXF86VidModeSetViewPort(client); -- case X_XF86VidModeSetGamma:return -- SProcXF86VidModeSetGamma(client); -- case X_XF86VidModeSetGammaRamp:return -- SProcXF86VidModeSetGammaRamp(client); -- default:return BadRequest; -- }} -+ case X_XF86VidModeDeleteModeLine: -+ return SProcXF86VidModeDeleteModeLine(client); -+ case X_XF86VidModeModModeLine: -+ return SProcXF86VidModeModModeLine(client); -+ case X_XF86VidModeSwitchMode: -+ return SProcXF86VidModeSwitchMode(client); -+ case X_XF86VidModeSwitchToMode: -+ return SProcXF86VidModeSwitchToMode(client); -+ case X_XF86VidModeLockModeSwitch: -+ return SProcXF86VidModeLockModeSwitch(client); -+ case X_XF86VidModeSetViewPort: -+ return SProcXF86VidModeSetViewPort(client); -+ case X_XF86VidModeSetGamma: -+ return SProcXF86VidModeSetGamma(client); -+ case X_XF86VidModeSetGammaRamp: -+ return SProcXF86VidModeSetGammaRamp(client); -+ default: -+ return BadRequest; -+ } -+ } - else -- return VidModeErrorBase + XF86VidModeClientNotLocal; -+ return VidModeErrorBase + XF86VidModeClientNotLocal; - } - } - - void -- XFree86VidModeExtensionInit(void) { -+XFree86VidModeExtensionInit(void) -+{ - ExtensionEntry *extEntry; - ScreenPtr pScreen; - int i; - Bool enabled = FALSE; - -- DEBUG_P("XFree86VidModeExtensionInit"); -+ DEBUG_P("XFree86VidModeExtensionInit"); - - if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0)) -- return; -+ return; - #ifdef XF86VIDMODE_EVENTS - if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0)) -- return; -+ return; - #endif - - #ifdef XF86VIDMODE_EVENTS -- EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); -+ EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent"); - #endif - - for (i = 0; i < screenInfo.numScreens; i++) { -@@ -1990,8 +2124,8 @@ void - enabled = TRUE; - } - /* This means that the DDX doesn't want the vidmode extension enabled */ -- if (!enabled) -- return; -+ if (!enabled) -+ return; - - if ( - #ifdef XF86VIDMODE_EVENTS --- -cgit v0.9.0.2-2-gbebe -From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001 -From: Daniel Kurtz <djkurtz@chromium.org> -Date: Thu, 12 Apr 2012 00:11:10 +0000 -Subject: dix: don't BUG_WARN for button events from button-only device - -Events from button-only devices still need coordinates, and they get them -from scale_to_desktop(). Therefore, a dev without valuators is not a bug. -However, a dev with valuators, but less than two of them still is a bug. - -This was noticed when unplugging a "Creative Technology SB Arena Headset", -which has some BTNs and some KEYs, but no REL or ABS valuators. -It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN. - -Signed-off-by: Daniel Kurtz <djkurtz@chromium.org> -Reviewed-by: Chase Douglas <chase.douglas@canonical.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328) ---- -diff --git a/dix/getevents.c b/dix/getevents.c -index 4e0af45..9dc9617 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask, - ScreenPtr scr = miPointerGetScreen(dev); - double x, y; - -- BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2); -+ BUG_WARN(dev->valuator && dev->valuator->numAxes < 2); - if (!dev->valuator || dev->valuator->numAxes < 2) { - /* if we have no axes, last.valuators must be in screen coords - * anyway */ --- -cgit v0.9.0.2-2-gbebe -From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed, 18 Apr 2012 05:56:37 +0000 -Subject: dix: indentation fix - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05) ---- -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 9a2e22f..d971805 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -416,8 +416,8 @@ Dispatch(void) - if (XSERVER_REQUEST_START_ENABLED()) - XSERVER_REQUEST_START(LookupMajorName(client->majorOp), - client->majorOp, -- ((xReq *) client->requestBuffer)-> -- length, client->index, -+ ((xReq *) client->requestBuffer)->length, -+ client->index, - client->requestBuffer); - #endif - if (result > (maxBigRequestSize << 2)) --- -cgit v0.9.0.2-2-gbebe -From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001 -From: Michal Suchanek <hramrach@gmail.com> -Date: Thu, 26 Apr 2012 13:11:20 +0000 -Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN - -and fix resulting printf warning in dmxLogVisual - -Signed-off-by: Michal Suchanek <hramrach@gmail.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd) ---- -diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c -index b56bb93..151f672 100644 ---- a/hw/dmx/dmxlog.c -+++ b/hw/dmx/dmxlog.c -@@ -86,6 +86,8 @@ ErrorF(const char *format, ...) - - /** Provide an VFatalError function when used stand-alone. */ - static void -+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; -+static void - VFatalError(const char *format, va_list args) - { - vfprintf(stderr, format, args); /* RATS: We assume the format string -@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args) - } - #else - /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */ --extern void AbortServer(void); -+extern void AbortServer(void) _X_NORETURN; -+static void -+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN; - static void - VFatalError(const char *format, va_list args) - { -@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput, - /* Prints the error message with the appropriate low-level X output - * routine. */ - static void -+dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0); -+static void - dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) - { - if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) { -@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) - class = "DirectColor"; - break; - } -+#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n" - - if (dmxScreen) { - dmxLogOutput(dmxScreen, -- "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", -+ VisualLogFormat, - vi->visualid, class, vi->depth, vi->bits_per_rgb, - vi->colormap_size, - vi->red_mask, vi->green_mask, vi->blue_mask, -@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual) - } - else { - dmxLog(dmxInfo, -- " 0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n", -+ " " VisualLogFormat, - vi->visualid, class, vi->depth, vi->bits_per_rgb, - vi->colormap_size, - vi->red_mask, vi->green_mask, vi->blue_mask, -diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h -index 4d4cd26..162484b 100644 ---- a/hw/dmx/dmxlog.h -+++ b/hw/dmx/dmxlog.h -@@ -55,18 +55,23 @@ typedef enum { - /* Logging functions used by Xserver/hw/dmx routines. */ - extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel); - extern dmxLogLevel dmxGetLogLevel(void); --extern void dmxLog(dmxLogLevel logLevel, const char *format, ...); --extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...); -+extern void dmxLog(dmxLogLevel logLevel, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogCont(dmxLogLevel logLevel, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern const char *dmxEventName(int type); - - #ifndef DMX_LOG_STANDALONE --extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...); -+extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format, -- ...); -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format, -- ...); --extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...); --extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...); -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); -+extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, -+ ...) _X_ATTRIBUTE_PRINTF(2, 3); - extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv); - extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, - int defaultVisual); --- -cgit v0.9.0.2-2-gbebe -From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Thu, 10 May 2012 07:53:20 +0000 -Subject: Revert "dix: when disabling a device, release all buttons and keys" - -This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7. - -The commit being reverted triggered a segfault on server shutdown when a -device posts raw events after the root windows are forced to NULL. - -https://lists.debian.org/debian-x/2012/05/msg00240.html - -Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> ---- -diff --git a/dix/devices.c b/dix/devices.c -index d0e99bd..0125504 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent) - if (*prev != dev) - return FALSE; - -- ReleaseButtonsAndKeys(dev); -- - /* float attached devices */ - if (IsMaster(dev)) { - for (other = inputInfo.devices; other; other = other->next) { --- -cgit v0.9.0.2-2-gbebe diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/staging/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/staging/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may 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 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 with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/staging/xpdf/PKGBUILD b/staging/xpdf/PKGBUILD deleted file mode 100644 index 7545e3692..000000000 --- a/staging/xpdf/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 158960 2012-05-13 16:58:43Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=xpdf -#pkgver=3.03_pl1 -pkgver=3.03 -pkgrel=2 -pkgdesc='Viewer for Portable Document Format (PDF) files' -url='http://www.foolabs.com/xpdf/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('lesstif' 'gsfonts' 'libxt') -optdepends=('poppler: tools that used to be included in xpdf' - 'desktop-file-utils: for desktop environments') -# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch" -source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" - 'char.patch' - 'desktop') -sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' - '5c471944685a6b24a2b0c0e000562d1a3263aeeb' - '3b6fe01636253676ffa0efe1b237a75af4721f6d') - -install=install -backup=('etc/xpdfrc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - -# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch" - patch -p1 -i ../char.patch - - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc - sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-multithreaded \ - --enable-wordlist \ - --with-freetype2-library=/usr/lib \ - --with-freetype2-includes=/usr/include/freetype2 \ - --x-includes=/usr/include \ - --with-Xm-library=/usr/lib \ - --with-Xm-includes=/usr/include \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" - install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - - # stuff provided by poppler - for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do - rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1" - done -} diff --git a/staging/xpdf/char.patch b/staging/xpdf/char.patch deleted file mode 100644 index 8e49393a6..000000000 --- a/staging/xpdf/char.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc ---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700 -+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700 -@@ -1803,7 +1803,7 @@ - menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); - for (i = 0; i < nZoomMenuItems; ++i) { - n = 0; -- s = XmStringCreateLocalized(zoomMenuInfo[i].label); -+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label); - XtSetArg(args[n], XmNlabelString, s); ++n; - XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; - sprintf(buf, "zoom%d", i); diff --git a/staging/xpdf/desktop b/staging/xpdf/desktop deleted file mode 100644 index 06830ecda..000000000 --- a/staging/xpdf/desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Xpdf -Comment=Views Adobe PDF (acrobat) files -Exec=xpdf -Terminal=false -Type=Application -Icon=xpdf -Categories=Office; -MimeType=application/pdf; diff --git a/staging/xpdf/install b/staging/xpdf/install deleted file mode 100644 index c6cf149dd..000000000 --- a/staging/xpdf/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/acl/PKGBUILD b/testing/acl/PKGBUILD deleted file mode 100644 index f3d4796dc..000000000 --- a/testing/acl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 157730 2012-04-29 04:51:57Z dreisner $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=acl -pkgver=2.2.51 -pkgrel=2 -pkgdesc="Access control list utilities, libraries and headers" -arch=('i686' 'x86_64') -url="http://savannah.nongnu.org/projects/acl" -license=('LGPL') -depends=('attr>=2.4.46') -replaces=('xfsacl') -provides=('xfsacl') -conflicts=('xfsacl') -options=('!libtool') -source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225' - '10893e2a044905acc88e2d98291e739b7b858b36c836ff66a3532909964067ce') - -build() { - cd "$pkgname-$pkgver" - - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib - make -} - -package() { - make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev - - # tidy up - rm -f "$pkgdir"/usr/lib/libacl.a - chmod 0755 "$pkgdir"/usr/lib/libacl.so.*.*.* -} diff --git a/testing/attr/PKGBUILD b/testing/attr/PKGBUILD deleted file mode 100644 index 29e263c80..000000000 --- a/testing/attr/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 157732 2012-04-29 04:55:24Z dreisner $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=attr -pkgver=2.4.46 -pkgrel=2 -pkgdesc="Extended attribute support library for ACL support" -arch=('i686' 'x86_64') -url="http://savannah.nongnu.org/projects/attr" -license=('LGPL') -depends=('glibc') -makedepends=('gettext') -replaces=('xfsattr') -provides=('xfsattr') -conflicts=('xfsattr') -options=('!libtool') -source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig}) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f' - 'a8ee37a0d02c0365049b8a06dc6963e6698a448ff2c0a54ed040f0c60f27bca3') - -build() { - cd "$pkgname-$pkgver" - - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib - make -} - -package() { - make -C "$pkgname-$pkgver" DIST_ROOT="$pkgdir" install install-lib install-dev - - # tidy up - rm -f "$pkgdir"/usrlib/libattr.a - chmod 0755 "$pkgdir"/usr/lib/libattr.so.*.*.* - - # remove conflicting manpages - rm -rf "$pkgdir"/usr/share/man/man2 -} diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD deleted file mode 100644 index 7a29ea957..000000000 --- a/testing/bash/PKGBUILD +++ /dev/null @@ -1,137 +0,0 @@ -# $Id: PKGBUILD 158578 2012-05-05 00:20:21Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> - -pkgname=bash -_basever=4.2 -_patchlevel=028 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=1 -pkgdesc="The GNU Bourne Again shell" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.gnu.org/software/bash/bash.html" -groups=('base') -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{,.sig} - dot.bashrc - dot.bash_profile - dot.bash_logout - system.bashrc - 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){,.sig}) - done -fi - -build() { - cd ${srcdir}/${pkgname}-$_basever - 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\"\' - -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\' - -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\' - -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\') - export CFLAGS="${CFLAGS} ${_bashconfig[@]}" - - ./configure --prefix=/usr --with-curses --enable-readline \ - --without-bash-malloc --with-installed-readline \ - --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info - make -} - -check() { - cd ${srcdir}/${pkgname}-$_basever - make check -} - -package() { - cd ${srcdir}/${pkgname}-$_basever - make DESTDIR=${pkgdir} install - - # for now, bash is our default /bin/sh - cd ${pkgdir}/bin - ln -s bash sh - - install -dm755 ${pkgdir}/etc/skel/ - - # system-wide configuration files - install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc - install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout - - # user configuration file skeletons - install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc - install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile - install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout -} - -md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' - '8d37a3f97a48c1e56e1a4ded877ed944' - '027d6bd8f5f6a06b75bb7698cb478089' - '2902e0fee7a9168f3a4fd2ccd60ff047' - '42f4400ed2314bd7519c020d0187edc5' - '3546099a1b2f667adc9794f52e78e35b' - '472f536d7c9e8250dc4568ec4cfaf294' - '1100bc1dda2cdc06ac44d7e5d17864a3' - 'a7184b76eb4a079f10174a0a8f574819' - '30e7948079921d3261efcc6a40722135' - 'c4d45307f7e69fe508ce347c4cec1955' - '9ea06decec43a198f3d7cf29acc602f8' - '74bddae6eeb9227a04a467d42597a34d' - 'fb48f6134d7b013135929476aa0c250c' - '3e6a18226b16c773229246abd07a1f5e' - 'e70e45de33426b38153b390be0dbbcd4' - 'e667dc9348ebc3e0e14bfdd87f4b6ff2' - 'ce4e5c484993705b27daa151eca242c2' - '41cbd8e57589bc081a546a014ddb12f8' - '88d1f96db29461767602e2546803bda7' - 'b8b781520f4c7493a2a1ac3010a44a44' - '24c574bf6d6a581e300823d9c1276af6' - '354a0899a7c4b446454c52546562b55b' - '4c5835f2fbab36c4292bb334977e5b6d' - 'ff4547ca7b508d52101729d61f5b77b6' - '0a51602b535ef661ee707be6c8bdb373' - 'cec7c92a4d8052ea4b29216365d16566' - '58deacf3d57cbd75575444ff6a3b0806' - '9ed2a08e549c3c17745f19e8413cfb31' - '72d5059820015231483bb7415d09e9db' - '45b04b41a4230f469d3e47ab9952c2df' - '608336ebe215984ef126e3c29d2d3409' - '623f63025d155a84977b62531e260ee2' - 'ed19da878e3f630834c62b9d9dcc6fce' - 'eef2dd4a0e4505dc8f8e664b40c6cd66' - '2d07daba0b8ca8f876d2aa052ff594b4' - '0cb823a44e6dc1cde7ac97ae5c8163c9' - '53d246537e1fffd1aaa02ba5c056211c' - '60f983a1dded5f0b28040ff4b3f1e9b5' - '304fd129a58fee2d8a34f8b4704db0aa' - '9df4bf4f46aaadc436f430187741f815' - '6921a0b4228fe89b6537a5c29f027c89' - '4ef0e2a2cbfbdd53346f927000b7e112' - '1195d85447f3d048d2c9bcd075fa765c' - 'b0f3a651ce29a1feee687d93177870f1' - 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a' - '09d3f96a16b881334cfaee0cf320b47e' - 'aab415350bcc2bb0c29943b413499d96' - '597bf71a2aac6feb510b7505cdd3d4f7' - 'b0db384bdedecafbdd70c8d22c56af5f' - '3fab459b4e09daea529cacad025b13b3' - 'bab99835ad6198cb1109fac89a085262' - '4ad8d11e72afc6090e701073ff034cf4' - '5658ef10c9d0d804126ec1ce700e4e2c' - 'c7d2493e44490f01dd20bdc8feb0a6a7' - 'e4855dbc4b743618b54d408bd5878637' - '9f19c199dd8d1fa9254eebe738759272' - '600c8e90c2fb13cdbc7aa3f18566df03' - 'a6ed82daf034587aee2f2581ba5fe829' - '821620a0389df723644911c56796ca8c' - 'da9265aa2527fd4a7481baa3e0550287' - '0043f8b75f46f43608a67b863e300fe8') diff --git a/testing/bash/bash.install b/testing/bash/bash.install deleted file mode 100644 index bc75e9b6a..000000000 --- a/testing/bash/bash.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(bash.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout deleted file mode 100644 index 0e4e4f184..000000000 --- a/testing/bash/dot.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# ~/.bash_logout -# diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile deleted file mode 100644 index 5545f007e..000000000 --- a/testing/bash/dot.bash_profile +++ /dev/null @@ -1,5 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc deleted file mode 100644 index a355b0cd3..000000000 --- a/testing/bash/dot.bashrc +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -PS1='[\u@\h \W]\$ ' diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout deleted file mode 100644 index a76e48e4a..000000000 --- a/testing/bash/system.bash_logout +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/bash.bash_logout -# diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc deleted file mode 100644 index a2231e861..000000000 --- a/testing/bash/system.bashrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# /etc/bash.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -PS1='[\u@\h \W]\$ ' -PS2='> ' -PS3='> ' -PS4='+ ' - -case ${TERM} in - xterm*|rxvt*|Eterm|aterm|kterm|gnome*) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - - ;; - screen) - PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"' - ;; -esac - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD deleted file mode 100644 index b24c6bf25..000000000 --- a/testing/cairo/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 157981 2012-04-30 14:18:17Z andyrtr $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Brice Carpentier <brice@daknet.org> - -pkgname=cairo -#_gitdate=20120426 -#_gitver=957a9cc619965178a8927d114fe852034fc2385c -pkgver=1.12.2 -pkgrel=1 -pkgdesc="Cairo vector graphics library" -arch=(i686 x86_64) -license=('LGPL' 'MPL') -url="http://cairographics.org/" -depends=('libpng' 'libxrender' 'fontconfig' 'pixman' 'glib2' 'sh') -makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm') -optdepends=('xcb-util: for XCB backend') # really needed? -provides=('cairo-xcb') -replaces=('cairo-xcb') -options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz - #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz - cairo-1.10.0-buggy_gradients.patch - #git_fixes.patch -) -md5sums=('87649eb75789739d517c743e94879e51' - '9b323790dab003e228c6955633cb888e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - #cd ${srcdir}/${pkgname}-${_gitver} - patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch - # status is 2012-04-26 last commit: image: Fix typo in _blit_spans() - #patch -Np1 -i ${srcdir}/git_fixes.patch - autoreconf -vfi - #./autogen.sh --prefix=/usr \ - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --enable-tee \ - --disable-xlib-xcb \ - # --enable-test-surfaces \ takes ages - #--enable-drm # breaks build - make -} - -#check() { -# #cd "$srcdir/$pkgname-$pkgver" -# cd $srcdir/$pkgname-${_gitver} -# make -k check || /bin/true # 165 Passed, 316 Failed [3 crashed, 10 expected], 23 Skipped -#} - -package() { - cd "$srcdir/$pkgname-$pkgver" - #cd $srcdir/$pkgname-${_gitver} - make DESTDIR="$pkgdir" install -} diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/testing/cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
diff --git a/testing/cairo/git_fixes.patch b/testing/cairo/git_fixes.patch deleted file mode 100644 index 6ad8979eb..000000000 --- a/testing/cairo/git_fixes.patch +++ /dev/null @@ -1,1086 +0,0 @@ -From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Sun, 25 Mar 2012 18:37:14 +0000 -Subject: Fix math in comments - ---- -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index dc07fee..6977e88 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -139,7 +139,7 @@ _arc_segments_needed (double angle, - - From that paper, a very practical value of h is: - -- h = 4/3 * tan(angle/4) -+ h = 4/3 * R * tan(angle/4) - - This value does not give the spline with minimal error, but it does - provide a very good approximation, (6th-order convergence), and the --- -cgit v0.9.0.2-2-gbebe -From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Tue, 27 Mar 2012 21:25:37 +0000 -Subject: gl: use font's antialias option to check whether it needs mask - -There is need to loop over number of glyphs to check wether the glyph -image is a ARGB32 as the font's antialias option can be used for checking. -If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32, -otherwise it will be A8 format. Therefore we will only be using -component-alpha at SUBPIXEL (or better) font quality and only then need -a mask for multiple pass glyph composition. ---- -diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c -index 832956f..9756ea4 100644 ---- a/src/cairo-gl-glyphs.c -+++ b/src/cairo-gl-glyphs.c -@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void *_dst, - - TRACE ((stderr, "%s\n", __FUNCTION__)); - -- /* If any of the glyphs are component alpha, we have to go through a mask, -- * since only _cairo_gl_surface_composite() currently supports component -- * alpha. -+ /* If any of the glyphs require component alpha, we have to go through -+ * a mask, since only _cairo_gl_surface_composite() currently supports -+ * component alpha. - */ -- if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) { -- for (i = 0; i < info->num_glyphs; i++) { -- cairo_scaled_glyph_t *scaled_glyph; -- -- if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index, -- CAIRO_SCALED_GLYPH_INFO_SURFACE, -- &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS && -- scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32) -- { -- info->use_mask = TRUE; -- break; -- } -- } -+ if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER && -+ (info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL || -+ info->font->options.antialias == CAIRO_ANTIALIAS_BEST)) -+ { -+ info->use_mask = TRUE; - } - - if (info->use_mask) { --- -cgit v0.9.0.2-2-gbebe -From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 Mar 2012 23:32:36 +0000 -Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask - -The SOURCE and CLEAR are the odd pair in Cairo's range of operators that -are bound by the shape/mask, but are unbound by the source. This -regularly leads to bugs as only track the bound/unbound rectangles and -confuse the meaning when bound only by the mask. - -What is required is that the unbound extents in this case is only -trimmed by the mask (the bounded extents are still the intersection of -all). - -Fixes bug-source-cu - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c -index 106571e..8c5cd5a 100644 ---- a/src/cairo-composite-rectangles.c -+++ b/src/cairo-composite-rectangles.c -@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents, - if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) - return CAIRO_INT_STATUS_NOTHING_TO_DO; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); - if (_cairo_clip_is_all_clipped (extents->clip)) -@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles - rect.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); -@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t - mask.height == extents->bounded.height) - return CAIRO_INT_STATUS_SUCCESS; - -- if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) -+ if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) { - extents->unbounded = extents->bounded; -+ } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) { -+ if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask)) -+ return CAIRO_INT_STATUS_NOTHING_TO_DO; -+ } - - clip = extents->clip; - extents->clip = _cairo_clip_reduce_for_composite (clip, extents); --- -cgit v0.9.0.2-2-gbebe -From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu, 29 Mar 2012 13:48:24 +0000 -Subject: cairoint: Mark PDF surface as requiring the deflate stream output - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairoint.h b/src/cairoint.h -index 9a8003e..9f20d51 100644 ---- a/src/cairoint.h -+++ b/src/cairoint.h -@@ -73,7 +73,10 @@ - #include "cairo-compiler-private.h" - #include "cairo-error-private.h" - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE -+#if CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_SCRIPT_SURFACE || \ -+ CAIRO_HAS_XML_SURFACE - #define CAIRO_HAS_DEFLATE_STREAM 1 - #endif - -@@ -84,7 +87,9 @@ - #define CAIRO_HAS_FONT_SUBSET 1 - #endif - --#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET -+#if CAIRO_HAS_PS_SURFACE || \ -+ CAIRO_HAS_PDF_SURFACE || \ -+ CAIRO_HAS_FONT_SUBSET - #define CAIRO_HAS_PDF_OPERATORS 1 - #endif - --- -cgit v0.9.0.2-2-gbebe -From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Thu, 29 Mar 2012 01:08:51 +0000 -Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface - -We need to fix y-axis origin when map a GL surface to image surface for -non-texture GL surface. - -Test cases: extended-blend-alpha-mask, extended-blend-mask. -Although the image outputs is not right, but the image on the first grid -(upper-left corner) is correct comparing to image output. ---- -diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c -index 8bbf939..32ecf63 100644 ---- a/src/cairo-gl-surface.c -+++ b/src/cairo-gl-surface.c -@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - unsigned int cpp; - cairo_bool_t invert; - cairo_status_t status; -+ int y; - - /* Want to use a switch statement here but the compiler gets whiny. */ - if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) { -@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void *abstract_surface, - glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp); - if (invert) - glPixelStorei (GL_PACK_INVERT_MESA, 1); -- glReadPixels (extents->x, extents->y, -+ -+ y = extents->y; -+ if (! _cairo_gl_surface_is_texture (surface)) -+ y = surface->height - extents->y - extents->height; -+ -+ glReadPixels (extents->x, y, - extents->width, extents->height, - format, type, image->data); - if (invert) --- -cgit v0.9.0.2-2-gbebe -From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Mon, 02 Apr 2012 18:43:00 +0000 -Subject: xcb: Fix SHM in _get_image() - -Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM -path when getting the image via SHM failed, we now did the fallback when getting -the image via SHM worked (which means that the SHM operation was a waste of -time). - -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c -index fff4f52..6bedbda 100644 ---- a/src/cairo-xcb-surface.c -+++ b/src/cairo-xcb-surface.c -@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t *surface, - if (use_shm) { - image = _get_shm_image (surface, x, y, width, height); - if (image) { -- if (image->status) { -+ if (image->status == CAIRO_STATUS_SUCCESS) { - _cairo_xcb_connection_release (connection); - return image; - } --- -cgit v0.9.0.2-2-gbebe -From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001 -From: Henry (Yu) Song <hsong@sisa.samsung.com> -Date: Mon, 02 Apr 2012 21:29:47 +0000 -Subject: gl: Remove an unused variable - ---- -diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c -index b364b92..ce7c0dd 100644 ---- a/src/cairo-gl-gradient.c -+++ b/src/cairo-gl-gradient.c -@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t *ctx, - cairo_status_t status; - int tex_width; - void *data; -- cairo_gl_dispatch_t *dispatch = &ctx->dispatch; - - if ((unsigned int) ctx->max_texture_size / 2 <= n_stops) - return CAIRO_INT_STATUS_UNSUPPORTED; --- -cgit v0.9.0.2-2-gbebe -From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Wed, 04 Apr 2012 10:23:09 +0000 -Subject: fix bug in _cairo_image_analyze_color - ---- -diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c -index 8208a15..e860e1b 100644 ---- a/src/cairo-image-surface.c -+++ b/src/cairo-image-surface.c -@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t *image) - if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR) - return image->color; - -- if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8) -+ if (image->format == CAIRO_FORMAT_A1) - return image->color = CAIRO_IMAGE_IS_MONOCHROME; - -+ if (image->format == CAIRO_FORMAT_A8) -+ return image->color = CAIRO_IMAGE_IS_GRAYSCALE; -+ - if (image->format == CAIRO_FORMAT_ARGB32) { - image->color = CAIRO_IMAGE_IS_MONOCHROME; - for (y = 0; y < image->height; y++) { --- -cgit v0.9.0.2-2-gbebe -From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:43:35 +0000 -Subject: type1-subset: use fallback font if glyph widths are calculated - -Bug 48349 has a pdf file with a Type 1 font where the glyph widths are -of the form: - -34 9302 19 div hsbw ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index 607ac8e..ba1008a 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - command = *p++; - switch (command) { - case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; -@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - break; - - case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ - font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; --- -cgit v0.9.0.2-2-gbebe -From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Thu, 05 Apr 2012 23:53:50 +0000 -Subject: fix indentation in cairo_type1_font_subset_parse_charstring - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ba1008a..ddef8ae 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -1,3 +1,4 @@ -+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ - /* cairo - a vector graphics library with display and print output - * - * Copyright © 2006 Red Hat, Inc -@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - if (*p < 32) { - command = *p++; - switch (command) { -- case TYPE1_CHARSTRING_COMMAND_HSBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -+ case TYPE1_CHARSTRING_COMMAND_HSBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -+ if (font->subset_subrs && -+ last_op_was_integer && -+ font->build_stack.top_value >= 0 && -+ font->build_stack.top_value < font->num_subrs) -+ { -+ subr_num = font->build_stack.top_value; -+ font->subrs[subr_num].used = TRUE; -+ last_op_was_integer = FALSE; -+ status = cairo_type1_font_subset_parse_charstring (font, -+ glyph, -+ font->subrs[subr_num].subr_string, -+ font->subrs[subr_num].subr_length); -+ } else { -+ font->subset_subrs = FALSE; -+ } -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_ESCAPE: -+ command = command << 8 | *p++; -+ switch (command) { -+ case TYPE1_CHARSTRING_COMMAND_SEAC: -+ /* The seac command takes five integer arguments. The -+ * last two are glyph indices into the PS standard -+ * encoding give the names of the glyphs that this -+ * glyph is composed from. All we need to do is to -+ * make sure those glyphs are present in the subset -+ * under their standard names. */ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -+ if (unlikely (status)) -+ return status; -+ -+ status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -+ if (unlikely (status)) -+ return status; - -- font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em; - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_CALLSUBR: -- if (font->subset_subrs && -- last_op_was_integer && -- font->build_stack.top_value >= 0 && -- font->build_stack.top_value < font->num_subrs) -- { -- subr_num = font->build_stack.top_value; -- font->subrs[subr_num].used = TRUE; -- last_op_was_integer = FALSE; -- status = cairo_type1_font_subset_parse_charstring (font, -- glyph, -- font->subrs[subr_num].subr_string, -- font->subrs[subr_num].subr_length); -- } else { -- font->subset_subrs = FALSE; -- } -+ case TYPE1_CHARSTRING_COMMAND_SBW: -+ if (! last_op_was_integer) -+ return CAIRO_INT_STATUS_UNSUPPORTED; -+ -+ font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; - break; - -- case TYPE1_CHARSTRING_COMMAND_ESCAPE: -- command = command << 8 | *p++; -- switch (command) { -- case TYPE1_CHARSTRING_COMMAND_SEAC: -- /* The seac command takes five integer arguments. The -- * last two are glyph indices into the PS standard -- * encoding give the names of the glyphs that this -- * glyph is composed from. All we need to do is to -- * make sure those glyphs are present in the subset -- * under their standard names. */ -- status = use_standard_encoding_glyph (font, font->build_stack.stack[3]); -- if (unlikely (status)) -- return status; -- -- status = use_standard_encoding_glyph (font, font->build_stack.stack[4]); -- if (unlikely (status)) -- return status; -- -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_SBW: -- if (! last_op_was_integer) -- return CAIRO_INT_STATUS_UNSUPPORTED; -- -- font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -- for (i = 0; i < font->build_stack.sp; i++) -- font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -- font->ps_stack.num_other_subr_args = font->build_stack.sp; -- font->ps_stack.cur_other_subr_arg = 0; -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -- -- case TYPE1_CHARSTRING_COMMAND_POP: -- if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -- font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -- last_op_was_integer = TRUE; -- } else { -- font->subset_subrs = FALSE; -- } -- break; -- -- default: -- font->build_stack.sp = 0; -- last_op_was_integer = FALSE; -- break; -+ case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR: -+ for (i = 0; i < font->build_stack.sp; i++) -+ font->ps_stack.other_subr_args[i] = font->build_stack.stack[i]; -+ font->ps_stack.num_other_subr_args = font->build_stack.sp; -+ font->ps_stack.cur_other_subr_arg = 0; -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; -+ -+ case TYPE1_CHARSTRING_COMMAND_POP: -+ if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) { -+ font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++]; -+ last_op_was_integer = TRUE; -+ } else { -+ font->subset_subrs = FALSE; - } - break; - -@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font, - font->build_stack.sp = 0; - last_op_was_integer = FALSE; - break; -+ } -+ break; -+ -+ default: -+ font->build_stack.sp = 0; -+ last_op_was_integer = FALSE; -+ break; - } - } else { - /* integer argument */ --- -cgit v0.9.0.2-2-gbebe -From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 00:13:53 +0000 -Subject: type1-subset: if font name is prefixed with a subset tag, strip it off - ---- -diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c -index ddef8ae..e507abe 100644 ---- a/src/cairo-type1-subset.c -+++ b/src/cairo-type1-subset.c -@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - { - const char *start, *end, *segment_end; - char *s; -+ int i; - - segment_end = font->header_segment + font->header_segment_size; - start = find_token (font->header_segment, segment_end, "/FontName"); -@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font) - return CAIRO_INT_STATUS_UNSUPPORTED; - } - -+ /* If font name is prefixed with a subset tag, strip it off. */ -+ if (strlen(start) > 7 && start[6] == '+') { -+ for (i = 0; i < 6; i++) { -+ if (start[i] < 'A' || start[i] > 'Z') -+ break; -+ } -+ if (i == 6) -+ start += 7; -+ } -+ - font->base.base_font = strdup (start); - free (s); - if (unlikely (font->base.base_font == NULL)) --- -cgit v0.9.0.2-2-gbebe -From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Fri, 06 Apr 2012 11:50:40 +0000 -Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces - -It had caused pdf bbox sizes to regress to page size bboxes. ---- -diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c -index 27ba004..5b3e177 100644 ---- a/src/cairo-pattern.c -+++ b/src/cairo-pattern.c -@@ -37,6 +37,7 @@ - #include "cairo-path-private.h" - #include "cairo-pattern-private.h" - #include "cairo-recording-surface-private.h" -+#include "cairo-surface-snapshot-private.h" - - #include <float.h> - -@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t *pattern, - (const cairo_surface_pattern_t *) pattern; - cairo_surface_t *surface = surface_pattern->surface; - -+ if (_cairo_surface_is_snapshot (surface)) -+ surface = _cairo_surface_snapshot_get_target (surface); -+ - if (_cairo_surface_is_recording (surface)) { - cairo_matrix_t imatrix; - cairo_box_t box; --- -cgit v0.9.0.2-2-gbebe -From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 10:28:59 +0000 -Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes - -A typo using half_line_x instead of half_line_y when emitting dashed -segments of the rectilinear stroke. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c -index 3e8c5a4..cc9dd19 100644 ---- a/src/cairo-path-stroke-boxes.c -+++ b/src/cairo-path-stroke-boxes.c -@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st - box.p1.x = box.p2.x - half_line_x; - } - if (out_slope.dy >= 0) -- box.p1.y -= half_line_x; -+ box.p1.y -= half_line_y; - if (out_slope.dy <= 0) -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { - if (box.p1.y <= box.p2.y) { - box.p1.y = box.p2.y; -- box.p2.y += half_line_x; -+ box.p2.y += half_line_y; - } else { -- box.p1.y = box.p2.y - half_line_x; -+ box.p1.y = box.p2.y - half_line_y; - } - if (out_slope.dx >= 0) - box.p1.x -= half_line_x; --- -cgit v0.9.0.2-2-gbebe -From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sun, 08 Apr 2012 16:58:13 +0000 -Subject: traps: Clip the trapezoid extents against the clip extents - -Just in case the clip polygon turns out to be much larger than the -operation extents (silly us for not reducing it correctly) and lead to -catastrophe, such as: - -Program received signal SIGSEGV, Segmentation fault. -pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0, -width=3, height=-34811, data=0) at pixman-sse2.c:3369 -3369 *(uint16_t *)d = data; - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c -index 284a0be..c49e208 100644 ---- a/src/cairo-traps-compositor.c -+++ b/src/cairo-traps-compositor.c -@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor, - _cairo_traps_fini (&traps); - cairo_surface_destroy (src); - -- if (status == CAIRO_INT_STATUS_SUCCESS && -- (fixup.width < extents->width || fixup.height < extents->height)) { -+ if (unlikely (status)) -+ return status; -+ -+ if (! _cairo_rectangle_intersect (&fixup, extents)) -+ return CAIRO_STATUS_SUCCESS; -+ -+ if (fixup.width < extents->width || fixup.height < extents->height) { - cairo_boxes_t clear; - - _cairo_boxes_init (&clear); --- -cgit v0.9.0.2-2-gbebe -From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:47:34 +0000 -Subject: build: Disable -Wset-but-unused-variable - -This is too noisy in the current build, and masking more important -warnings. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index 3eb0104..f1b17f4 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \ - -Wno-missing-field-initializers -Wno-unused-parameter \ - -Wno-attributes -Wno-long-long -Winline" - -+# -Wunused-but-set-variable is too noisy at present -+NO_WARN="-Wno-unused-but-set-variable" -+ - dnl Sun Studio 12 likes to rag at us for abusing enums like - dnl having cairo_status_t variables hold cairo_int_status_t - dnl values. It's bad, we know. Now please be quiet. -@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" - dnl Also to turn various gcc/glibc-specific preprocessor checks - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - -+MAYBE_WARN="$MAYBE_WARN $NO_WARN" -+ - # invalidate cached value if MAYBE_WARN has changed - if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then - unset cairo_cv_warn_cflags --- -cgit v0.9.0.2-2-gbebe -From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Mon, 09 Apr 2012 11:49:20 +0000 -Subject: analysis: Apply the integer translation to the bbox as well - -The bbox is used to compute the ink extents (and so the pattern extents -of a recording surface) and if given an integer translation we failed to -transform the bbox into the target space. - -Fixes mask (pdf). - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c -index b8abe02..8878f62 100644 ---- a/src/cairo-analysis-surface.c -+++ b/src/cairo-analysis-surface.c -@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface, - if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) { - rect->x += tx; - rect->y += ty; -+ -+ tx = _cairo_fixed_from_int (tx); -+ bbox.p1.x += tx; -+ bbox.p2.x += tx; -+ -+ ty = _cairo_fixed_from_int (ty); -+ bbox.p1.y += ty; -+ bbox.p2.y += ty; - } else { - _cairo_matrix_transform_bounding_box_fixed (&surface->ctm, - &bbox, NULL); --- -cgit v0.9.0.2-2-gbebe -From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Mon, 09 Apr 2012 08:31:44 +0000 -Subject: pdf: avoid unnecessary use of patterns in mask groups - ---- -diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c -index 4930e72..78537ce 100644 ---- a/src/cairo-pdf-surface.c -+++ b/src/cairo-pdf-surface.c -@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->width = group->width; -- smask_group->height = group->height; -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->mask); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->mask)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->mask, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->width = group->width; -+ smask_group->height = group->height; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->mask); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, &mask_group); -@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t *surface, - if (unlikely (status)) - return status; - -- pattern_res.id = 0; -- gstate_res.id = 0; -- status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -- &pattern_res, &gstate_res); -- if (unlikely (status)) -- return status; -- -- if (gstate_res.id != 0) { -- smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -- if (unlikely (smask_group == NULL)) -- return _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- smask_group->operation = PDF_PAINT; -- smask_group->source = cairo_pattern_reference (group->source); -- smask_group->source_res = pattern_res; -- status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -- if (unlikely (status)) { -- _cairo_pdf_smask_group_destroy (smask_group); -- return status; -- } -- -- status = _cairo_pdf_surface_add_smask (surface, gstate_res); -- if (unlikely (status)) -- return status; -- -- status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (_can_paint_pattern (group->source)) { -+ _cairo_output_stream_printf (surface->output, "q\n"); -+ status = _cairo_pdf_surface_paint_pattern (surface, -+ group->source, -+ &group->extents, -+ FALSE); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "q /s%d gs /x%d Do Q\n", -- gstate_res.id, -- smask_group->group_res.id); -+ _cairo_output_stream_printf (surface->output, "Q\n"); - } else { -- status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ pattern_res.id = 0; -+ gstate_res.id = 0; -+ status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL, -+ &pattern_res, &gstate_res); - if (unlikely (status)) - return status; - -- _cairo_output_stream_printf (surface->output, -- "%f %f %f %f re f\n", -- bbox.p1.x, -- bbox.p1.y, -- bbox.p2.x - bbox.p1.x, -- bbox.p2.y - bbox.p1.y); -+ if (gstate_res.id != 0) { -+ smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents); -+ if (unlikely (smask_group == NULL)) -+ return _cairo_error (CAIRO_STATUS_NO_MEMORY); - -- status = _cairo_pdf_surface_unselect_pattern (surface); -- if (unlikely (status)) -- return status; -+ smask_group->operation = PDF_PAINT; -+ smask_group->source = cairo_pattern_reference (group->source); -+ smask_group->source_res = pattern_res; -+ status = _cairo_pdf_surface_add_smask_group (surface, smask_group); -+ if (unlikely (status)) { -+ _cairo_pdf_smask_group_destroy (smask_group); -+ return status; -+ } -+ -+ status = _cairo_pdf_surface_add_smask (surface, gstate_res); -+ if (unlikely (status)) -+ return status; -+ -+ status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "q /s%d gs /x%d Do Q\n", -+ gstate_res.id, -+ smask_group->group_res.id); -+ } else { -+ status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE); -+ if (unlikely (status)) -+ return status; -+ -+ _cairo_output_stream_printf (surface->output, -+ "%f %f %f %f re f\n", -+ bbox.p1.x, -+ bbox.p1.y, -+ bbox.p2.x - bbox.p1.x, -+ bbox.p2.y - bbox.p1.y); -+ -+ status = _cairo_pdf_surface_unselect_pattern (surface); -+ if (unlikely (status)) -+ return status; -+ } - } - - status = _cairo_pdf_surface_close_group (surface, NULL); --- -cgit v0.9.0.2-2-gbebe -From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001 -From: Maarten Bosmans <mkbosmans@gmail.com> -Date: Mon, 09 Apr 2012 19:33:50 +0000 -Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM - ---- -diff --git a/configure.ac b/configure.ac -index cedfebe..5d2e6ec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes") - if test "x$have_dlsym" = "xyes"; then - AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available]) - fi -+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes") - - dnl =========================================================================== - -diff --git a/util/Makefile.am b/util/Makefile.am -index f202f35..82d0a80 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -12,20 +12,24 @@ endif - - if CAIRO_HAS_TRACE - SUBDIRS += cairo-trace -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-fdr - endif - endif - endif -+endif - - if BUILD_SPHINX -+if CAIRO_HAS_DLSYM - if CAIRO_HAS_SCRIPT_SURFACE - if CAIRO_HAS_TEE_SURFACE - SUBDIRS += cairo-sphinx - endif - endif - endif -+endif - - AM_CPPFLAGS = -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ --- -cgit v0.9.0.2-2-gbebe -From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Tue, 10 Apr 2012 13:04:05 +0000 -Subject: any2ppm: fix missing enumeration warning - ---- -diff --git a/test/any2ppm.c b/test/any2ppm.c -index 6b61c47..2403347 100644 ---- a/test/any2ppm.c -+++ b/test/any2ppm.c -@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd) - break; - case CAIRO_FORMAT_A1: - case CAIRO_FORMAT_RGB16_565: -+ case CAIRO_FORMAT_RGB30: - case CAIRO_FORMAT_INVALID: - default: - return "unhandled image format"; --- -cgit v0.9.0.2-2-gbebe -From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001 -From: Gilles Espinasse <g.esp@free.fr> -Date: Sat, 07 Apr 2012 21:09:51 +0000 -Subject: Cosmetic configure fix - -'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this - -checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes --Wl,--allow-shlib-undefined - -Signed-off-by: Gilles Espinasse <g.esp@free.fr> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f1b17f4..3b2c6f3 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result], - - dnl check linker flags - AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags, -- [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [], -+ [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [], - [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")]) - CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags" - AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS) --- -cgit v0.9.0.2-2-gbebe -From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Wed, 11 Apr 2012 19:37:55 +0000 -Subject: xlib: Disable fallback compositor with xlib-xcb - -When xlib-xcb is enabled, this is just dead code which is never used. Thus, this -shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a -problem? Well, that header contains static inline functions which some compiler -on Solaris will emit even when they are unused. - -This brings us to the real problem: That static inline function refers to a -function which isn't compiled with xlib-xcb and thus linking fails with -undefined symbols. - -This can be reproduced with GCC by adding a call to -_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to -_cairo_xlib_fallback_compositor_get. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489 -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- -diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c -index 5391926..7d45cd1 100644 ---- a/src/cairo-xlib-fallback-compositor.c -+++ b/src/cairo-xlib-fallback-compositor.c -@@ -42,6 +42,8 @@ - - #include "cairoint.h" - -+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS -+ - #include "cairo-xlib-private.h" - - #include "cairo-compositor-private.h" -@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void) - /* XXX Do something interesting here to mitigate fallbacks ala xcb */ - return &_cairo_fallback_compositor; - } -+ -+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */ --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD deleted file mode 100644 index fc1586c19..000000000 --- a/testing/calligra/PKGBUILD +++ /dev/null @@ -1,264 +0,0 @@ -# $Id: PKGBUILD 159321 2012-05-21 16:27:46Z jgc $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-interfaces' - 'calligra-libs' - 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' - 'calligra-tools' - 'calligra-karbon' - 'calligra-kexi' - 'calligra-kounavail' - 'calligra-plan' - 'calligra-stage' - 'calligra-krita' - 'calligra-sheets' - 'calligra-words' - 'calligra-handbook' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.4.1 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org/' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('cmake' 'automoc4' 'boost ' 'eigen2' - 'kdepimlibs' 'libpqxx' 'freetds' 'xbase' - 'kdegraphics-okular' 'gsl' 'kdeedu-marble' - 'libwpd' 'libwpg' 'pstoedit' 'glew' - 'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2') -groups=('calligra') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('a4da7e1181e1539850a4fcae466d7d75') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_active=OFF \ - -DBUILD_mobile=OFF \ - -DIHAVEPATCHEDQT=1 - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - optdepends=('libwpg: Corel WordPerfect Graphics image importer') - conflicts=('koffice-filters') - replaces=('koffice-filters') - install=calligra-filters.install - - cd "${srcdir}"/build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs' 'calligra-filters') - optdepends=('kdeedu-marble: map shape for Calligra') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula') - - cd "${srcdir}"/build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-pics() { - pkgdesc="Icons for the Calligra office suite" - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') - optdepends=('calligra-filters: import/export filters' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') - install=calligra-karbon.install - - cd "${srcdir}"/build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi() { - pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') - optdepends=('libmysqlclient: MySQL driver' - 'libpqxx: PostgreSQL driver' - 'freetds: Sybase & MS SQL driver' - 'xbase: XBase driver' - 'calligra-sheets: Spreadsheet-to-Kexi-table import plugin' - 'kdeedu-marble: map form widget' - 'calligra-plugins: extra calligra plugins') - conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') - install=calligra-kexi.install - - cd "${srcdir}"/build/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - -package_calligra-plan() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - conflicts=('koffice-kplato' 'calligra-kplato') - replaces=('koffice-kplato' 'calligra-kplato') - install=calligra-plan.install - - cd "${srcdir}"/build/plan - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') - optdepends=('calligra-plugins: extra calligra plugins') - conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') - install=calligra-stage.install - - cd "${srcdir}"/build/stage - make DESTDIR="${pkgdir}" install -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' - 'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw') - conflicts=('koffice-krita' 'calligra-krita-doc') - replaces=('koffice-krita' 'calligra-krita-doc') - install=calligra-krita.install - - cd "${srcdir}"/build/krita - make DESTDIR="${pkgdir}" install -} - -package_calligra-sheets() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') - optdepends=('calligra-filters: import/export filters' - 'calligra-plugins: extra calligra plugins' - 'calligra-tools: extra calligra tools') - conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables') - install=calligra-sheets.install - - cd "${srcdir}"/build/sheets - make DESTDIR="${pkgdir}" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail' - 'calligra-plugins' 'kdegraphics-okular') - optdepends=('calligra-tools: extra calligra tools') - conflicts=('koffice-kword') - replaces=('koffice-kword') - install=calligra-words.install - - cd "${srcdir}"/build/words - make DESTDIR="${pkgdir}" install -} - -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') - - cd "${srcdir}"/build/doc/calligra - make DESTDIR="${pkgdir}" install -} - -package_calligra-braindump() { - pkgdesc="Notes and idea gathering" - depends=('calligra-libs' 'kdebase-runtime') - install=calligra-braindump.install - - cd "${srcdir}"/build/braindump - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow() { - pkgdesc="Flowchart & Diagram Editing" - depends=('calligra-libs' 'kdebase-runtime') - conflicts=('calligra-flow-doc') - replaces=('calligra-flow-doc') - install=calligra-flow.install - - cd "${srcdir}"/build/flow - make DESTDIR="${pkgdir}" install -} diff --git a/testing/calligra/calligra-braindump.install b/testing/calligra/calligra-braindump.install deleted file mode 100644 index c2179f6e2..000000000 --- a/testing/calligra/calligra-braindump.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/testing/calligra/calligra-filters.install b/testing/calligra/calligra-filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/testing/calligra/calligra-filters.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/calligra/calligra-flow.install b/testing/calligra/calligra-flow.install deleted file mode 100644 index 6c87527e2..000000000 --- a/testing/calligra/calligra-flow.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/calligra/calligra-karbon.install b/testing/calligra/calligra-karbon.install deleted file mode 100644 index c2179f6e2..000000000 --- a/testing/calligra/calligra-karbon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/testing/calligra/calligra-kexi.install b/testing/calligra/calligra-kexi.install deleted file mode 100644 index b8c7ebf27..000000000 --- a/testing/calligra/calligra-kexi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/calligra/calligra-krita.install b/testing/calligra/calligra-krita.install deleted file mode 100644 index 33d234a02..000000000 --- a/testing/calligra/calligra-krita.install +++ /dev/null @@ -1,13 +0,0 @@ -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 -}
\ No newline at end of file diff --git a/testing/calligra/calligra-plan.install b/testing/calligra/calligra-plan.install deleted file mode 100644 index c2179f6e2..000000000 --- a/testing/calligra/calligra-plan.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/testing/calligra/calligra-sheets.install b/testing/calligra/calligra-sheets.install deleted file mode 100644 index 6c87527e2..000000000 --- a/testing/calligra/calligra-sheets.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/calligra/calligra-stage.install b/testing/calligra/calligra-stage.install deleted file mode 100644 index 6c87527e2..000000000 --- a/testing/calligra/calligra-stage.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/calligra/calligra-tools.install b/testing/calligra/calligra-tools.install deleted file mode 100644 index 6c87527e2..000000000 --- a/testing/calligra/calligra-tools.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/calligra/calligra-words.install b/testing/calligra/calligra-words.install deleted file mode 100644 index 6c87527e2..000000000 --- a/testing/calligra/calligra-words.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/calligra/calligra.install b/testing/calligra/calligra.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/calligra/calligra.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD deleted file mode 100644 index d2098289c..000000000 --- a/testing/coreutils/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 158837 2012-05-12 03:38:51Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=coreutils -pkgver=8.17 -pkgrel=1 -pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/coreutils" -groups=('base') -depends=('glibc' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') -install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} - coreutils-pam.patch - su.pam) -md5sums=('bbda656ce8ca2c6903948f9faa204ba3' - 'ebecd29b095aa21b0b2f833f1ec20d70' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'fa85e5cce5d723275b14365ba71a8aad') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - autoreconf -v - ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ - --enable-install-program=su \ - --enable-no-install-program=groups,hostname,kill,uptime \ - --enable-pam - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make RUN_EXPENSIVE_TESTS=yes check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} - - # binaries required by FHS - _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' - 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' - 'true' 'uname') - mv ${_fhs[@]} ${pkgdir}/bin - - # makepkg uses the full path to this... - ln -s /usr/bin/du ${pkgdir}/bin/du - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su -} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch deleted file mode 100644 index e61908f3f..000000000 --- a/testing/coreutils/coreutils-pam.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac ---- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 -+++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 -@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then - AC_SUBST([GNULIB_WARN_CFLAGS]) - fi - -+dnl Give the chance to enable PAM -+AC_ARG_ENABLE(pam, dnl -+[ --enable-pam Enable use of the PAM libraries], -+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) -+LIB_PAM="-ldl -lpam -lpam_misc" -+AC_SUBST(LIB_PAM)]) -+ - AC_FUNC_FORK - - optional_bin_progs= -diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi ---- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 -@@ -15081,8 +15081,11 @@ to certain shells, etc.). - @findex syslog - @command{su} can optionally be compiled to use @code{syslog} to report - failed, and optionally successful, @command{su} attempts. (If the system --supports @code{syslog}.) However, GNU @command{su} does not check if the --user is a member of the @code{wheel} group; see below. -+supports @code{syslog}.) -+ -+This version of @command{su} has support for using PAM for -+authentication. You can edit @file{/etc/pam.d/su} to customize its -+behaviour. - - The program accepts the following options. Also see @ref{Common options}. - -@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, - @env{PATH} to a compiled-in default value. Change to @var{user}'s home - directory. Prepend @samp{-} to the shell's name, intended to make it - read its login startup file(s). -+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables -+are preserved as well for PAM functionality. - - @item -m - @itemx -p -@@ -15163,33 +15168,6 @@ Exit status: - the exit status of the subshell otherwise - @end display - --@cindex wheel group, not supported --@cindex group wheel, not supported --@cindex fascism --@subsection Why GNU @command{su} does not support the @samp{wheel} group -- --(This section is by Richard Stallman.) -- --@cindex Twenex --@cindex MIT AI lab --Sometimes a few of the users try to hold total power over all the --rest. For example, in 1984, a few users at the MIT AI lab decided to --seize power by changing the operator password on the Twenex system and --keeping it secret from everyone else. (I was able to thwart this coup --and give power back to the users by patching the kernel, but I --wouldn't know how to do that in Unix.) -- --However, occasionally the rulers do tell someone. Under the usual --@command{su} mechanism, once someone learns the root password who --sympathizes with the ordinary users, he or she can tell the rest. The --``wheel group'' feature would make this impossible, and thus cement the --power of the rulers. -- --I'm on the side of the masses, not that of the rulers. If you are --used to supporting the bosses and sysadmins in whatever they do, you --might find this idea strange at first. -- -- - @node timeout invocation - @section @command{timeout}: Run a command with a time limit - -diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am ---- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 -@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) - uptime_LDADD += $(GETLOADAVG_LIBS) - - # for crypt --su_LDADD += $(LIB_CRYPT) -+su_LDADD += $(LIB_CRYPT) @LIB_PAM@ - - # for various ACL functions - copy_LDADD += $(LIB_ACL) -diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c ---- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 -+++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 -@@ -37,6 +37,16 @@ - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - -+#ifdef USE_PAM -+ -+ Actually, with PAM, su has nothing to do with whether or not a -+ wheel group is enforced by su. RMS tries to restrict your access -+ to a su which implements the wheel group, but PAM considers that -+ to be fascist, and gives the user/sysadmin the opportunity to -+ enforce a wheel group by proper editing of /etc/pam.conf -+ -+#endif -+ - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. -@@ -53,6 +63,15 @@ - #include <pwd.h> - #include <grp.h> - -+#ifdef USE_PAM -+# include <signal.h> -+# include <sys/wait.h> -+# include <sys/fsuid.h> -+# include <unistd.h> -+# include <security/pam_appl.h> -+# include <security/pam_misc.h> -+#endif /* USE_PAM */ -+ - #include "system.h" - #include "getpass.h" - -@@ -120,10 +139,17 @@ - /* The user to become if none is specified. */ - #define DEFAULT_USER "root" - -+#ifndef USE_PAM - char *crypt (char const *key, char const *salt); -+#endif - --static void run_shell (char const *, char const *, char **, size_t) -+static void run_shell (char const *, char const *, char **, size_t, -+ const struct passwd *) -+#ifdef USE_PAM -+ ; -+#else - ATTRIBUTE_NORETURN; -+#endif - - /* If true, pass the `-f' option to the subshell. */ - static bool fast_startup; -@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su - } - #endif - -+#ifdef USE_PAM -+static pam_handle_t *pamh = NULL; -+static int retval; -+static struct pam_conv conv = { -+ misc_conv, -+ NULL -+}; -+ -+#define PAM_BAIL_P if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+ return 0; \ -+} -+#define PAM_BAIL_P_VOID if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+return; \ -+} -+#endif -+ - /* Ask the user for a password. -+ If PAM is in use, let PAM ask for the password if necessary. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ -@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su - static bool - correct_password (const struct passwd *pw) - { -+#ifdef USE_PAM -+ struct passwd *caller; -+ char *tty_name, *ttyn; -+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); -+ PAM_BAIL_P; -+ -+ if (getuid() != 0 && !isatty(0)) { -+ fprintf(stderr, "standard in must be a tty\n"); -+ exit(1); -+ } -+ -+ caller = getpwuid(getuid()); -+ if(caller != NULL && caller->pw_name != NULL) { -+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); -+ PAM_BAIL_P; -+ } -+ -+ ttyn = ttyname(0); -+ if (ttyn) { -+ if (strncmp(ttyn, "/dev/", 5) == 0) -+ tty_name = ttyn+5; -+ else -+ tty_name = ttyn; -+ retval = pam_set_item(pamh, PAM_TTY, tty_name); -+ PAM_BAIL_P; -+ } -+ retval = pam_authenticate(pamh, 0); -+ PAM_BAIL_P; -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_NEW_AUTHTOK_REQD) { -+ /* password has expired. Offer option to change it. */ -+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); -+ PAM_BAIL_P; -+ } -+ PAM_BAIL_P; -+ /* must be authenticated if this point was reached */ -+ return 1; -+#else /* !USE_PAM */ - char *unencrypted, *encrypted, *correct; - #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ -@@ -241,6 +324,7 @@ correct_password (const struct passwd *p - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -+#endif /* !USE_PAM */ - } - - /* Update `environ' for the new shell based on PW, with SHELL being -@@ -254,12 +338,18 @@ modify_environment (const struct passwd - /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. - Unset all other environment variables. */ - char const *term = getenv ("TERM"); -+ char const *display = getenv ("DISPLAY"); -+ char const *xauthority = getenv ("XAUTHORITY"); - if (term) - term = xstrdup (term); - environ = xmalloc ((6 + !!term) * sizeof (char *)); - environ[0] = NULL; - if (term) - xsetenv ("TERM", term); -+ if (display) -+ xsetenv ("DISPLAY", display); -+ if (xauthority) -+ xsetenv ("XAUTHORITY", xauthority); - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - xsetenv ("USER", pw->pw_name); -@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw - { - #ifdef HAVE_INITGROUPS - errno = 0; -- if (initgroups (pw->pw_name, pw->pw_gid) == -1) -+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { -+#ifdef USE_PAM -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+#endif - error (EXIT_CANCELED, errno, _("cannot set groups")); -+ } - endgrent (); - #endif - if (setgid (pw->pw_gid)) -@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw - error (EXIT_CANCELED, errno, _("cannot set user id")); - } - -+#ifdef USE_PAM -+static int caught=0; -+/* Signal handler for parent process later */ -+static void su_catch_sig(int sig) -+{ -+ ++caught; -+} -+ -+int -+pam_copyenv (pam_handle_t *pamh) -+{ -+ char **env; -+ -+ env = pam_getenvlist(pamh); -+ if(env) { -+ while(*env) { -+ if (putenv (*env)) -+ xalloc_die (); -+ env++; -+ } -+ } -+ return(0); -+} -+#endif -+ - /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. - If COMMAND is nonzero, pass it to the shell with the -c option. - Pass ADDITIONAL_ARGS to the shell as more arguments; there -@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw - - static void - run_shell (char const *shell, char const *command, char **additional_args, -- size_t n_additional_args) -+ size_t n_additional_args, const struct passwd *pw) - { - size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; - char const **args = xnmalloc (n_args, sizeof *args); - size_t argno = 1; -+#ifdef USE_PAM -+ int child; -+ sigset_t ourset; -+ int status; -+ -+ retval = pam_open_session(pamh,0); -+ if (retval != PAM_SUCCESS) { -+ fprintf (stderr, "could not open session\n"); -+ exit (1); -+ } -+ -+/* do this at the last possible moment, because environment variables may -+ be passed even in the session phase -+*/ -+ if(pam_copyenv(pamh) != PAM_SUCCESS) -+ fprintf (stderr, "error copying PAM environment\n"); -+ -+ /* Credentials should be set in the parent */ -+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { -+ pam_close_session(pamh, 0); -+ fprintf(stderr, "could not set PAM credentials\n"); -+ exit(1); -+ } -+ -+ child = fork(); -+ if (child == 0) { /* child shell */ -+ change_identity (pw); -+ pam_end(pamh, 0); -+#endif - - if (simulate_login) - { - char *arg0; - char *shell_basename; - -+ if(chdir(pw->pw_dir)) -+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+ - shell_basename = last_component (shell); - arg0 = xmalloc (strlen (shell_basename) + 2); - arg0[0] = '-'; -@@ -344,6 +496,67 @@ run_shell (char const *shell, char const - error (0, errno, "%s", shell); - exit (exit_status); - } -+#ifdef USE_PAM -+ } else if (child == -1) { -+ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+ exit(1); -+ } -+ /* parent only */ -+ sigfillset(&ourset); -+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ if (!caught) { -+ struct sigaction action; -+ action.sa_handler = su_catch_sig; -+ sigemptyset(&action.sa_mask); -+ action.sa_flags = 0; -+ sigemptyset(&ourset); -+ if (sigaddset(&ourset, SIGTERM) -+ || sigaddset(&ourset, SIGALRM) -+ || sigaction(SIGTERM, &action, NULL) -+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ } -+ if (!caught) { -+ do { -+ int pid; -+ -+ pid = waitpid(-1, &status, WUNTRACED); -+ -+ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { -+ kill(getpid(), WSTOPSIG(status)); -+ /* once we get here, we must have resumed */ -+ kill(pid, SIGCONT); -+ } -+ } while (0 != WIFSTOPPED(status)); -+ } -+ -+ if (caught) { -+ fprintf(stderr, "\nSession terminated, killing shell..."); -+ kill (child, SIGTERM); -+ } -+ /* Not checking retval on this because we need to call close session */ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ retval = pam_close_session(pamh, 0); -+ PAM_BAIL_P_VOID; -+ retval = pam_end(pamh, PAM_SUCCESS); -+ PAM_BAIL_P_VOID; -+ if (caught) { -+ sleep(2); -+ kill(child, SIGKILL); -+ fprintf(stderr, " ...killed.\n"); -+ exit(-1); -+ } -+ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) -+ : WTERMSIG (status) + 128); -+#endif /* USE_PAM */ - } - - /* Return true if SHELL is a restricted shell (one not returned by -@@ -511,9 +724,9 @@ main (int argc, char **argv) - shell = xstrdup (shell ? shell : pw->pw_shell); - modify_environment (pw, shell); - -+#ifndef USE_PAM - change_identity (pw); -- if (simulate_login && chdir (pw->pw_dir) != 0) -- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+#endif - - /* error() flushes stderr, but does not check for write failure. - Normally, we would catch this via our atexit() hook of -@@ -523,5 +736,5 @@ main (int argc, char **argv) - if (ferror (stderr)) - exit (EXIT_CANCELED); - -- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); -+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); - } diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install deleted file mode 100644 index 8caae6686..000000000 --- a/testing/coreutils/coreutils.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(coreutils.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/testing/coreutils/su.pam b/testing/coreutils/su.pam deleted file mode 100644 index cf15f40f1..000000000 --- a/testing/coreutils/su.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD deleted file mode 100644 index 1202d7890..000000000 --- a/testing/crda/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 157767 2012-04-29 08:23:51Z allan $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=crda -pkgver=1.1.2 -pkgrel=3 -pkgdesc="Central Regulatory Domain Agent for wireless networks" -arch=(i686 x86_64) -url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" -license=('custom') -depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw') -makedepends=('python-m2crypto') -install=crda.install -source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2 - crda.rc libnl32.patch) -md5sums=('5226f65aebacf94baaf820f8b4e06df4' - '014eef3f8655e9a130064ec6891317fc' - 'c1f7aff29f15a0364ae6f7905a1d4ae6') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i "$srcdir/libnl32.patch" - sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py - make crda regdbdump -} - -package() { - # Install crda, regdbdump and udev rules - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install - # This rule automatically sets the regulatory domain when cfg80211 is loaded - echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules - - install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE - - install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom -} diff --git a/testing/crda/crda.install b/testing/crda/crda.install deleted file mode 100644 index c18e15f71..000000000 --- a/testing/crda/crda.install +++ /dev/null @@ -1,18 +0,0 @@ -## arg 1: the new package version -post_install() { - echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom." - echo "It will automatically be set when necessary." -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package - # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one - # from wireless-regdb by the user-defined one - if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then - if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then - mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom - fi - fi -} diff --git a/testing/crda/crda.rc b/testing/crda/crda.rc deleted file mode 100755 index 13dbd870e..000000000 --- a/testing/crda/crda.rc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/wireless-regdom - -case "$1" in - start) - if [ -n "${WIRELESS_REGDOM}" ]; then - stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}" - if iw reg set ${WIRELESS_REGDOM}; then - stat_done - else - stat_fail - fi - fi - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 start" -esac -exit 0 diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch deleted file mode 100644 index 682b6c5de..000000000 --- a/testing/crda/libnl32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile ---- crda-1.1.2/Makefile 2011-08-10 01:36:19.000000000 +0200 -+++ crda-1.1.2-libnl32/Makefile 2012-02-09 18:53:33.376430180 +0100 -@@ -51,7 +51,7 @@ - - ifeq ($(NL3FOUND),Y) - CFLAGS += -DCONFIG_LIBNL30 --NLLIBS += -lnl-genl -+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0) - NLLIBNAME = libnl-3.0 - else - ifeq ($(NL2FOUND),Y) diff --git a/testing/cups-filters/PKGBUILD b/testing/cups-filters/PKGBUILD deleted file mode 100644 index a21ad5f26..000000000 --- a/testing/cups-filters/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159323 2012-05-21 16:27:48Z jgc $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -pkgname=cups-filters -pkgver=1.0.17 -pkgrel=2 -pkgdesc="OpenPrinting CUPS Filters" -arch=('i686' 'x86_64') -url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" -license=('GPL') -groups=() -depends=('ghostscript' 'lcms2' 'poppler') # bc ? https://bugs.archlinux.org/task/29808 -makedepends=() -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -#options=(!makeflags) -install= -source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) -md5sums=('5132b018cc503e9338fbd029acf56e55') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc - make -} - -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make -k check -#} - -package() { - cd "$srcdir/$pkgname-$pkgver" - #make DESTDIR="$pkgdir/" install - make install BUILDROOT="$pkgdir/" - # drop static lib - rm -f ${pkgdir}/usr/lib/*.a -} diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD deleted file mode 100644 index c709b306c..000000000 --- a/testing/curl/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 159498 2012-05-25 14:33:21Z 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.26.0 -pkgrel=1 -pkgdesc="An URL retrival utility and library" -arch=('i686' 'x86_64') -url="http://curl.haxx.se" -license=('MIT') -depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') -options=('!libtool') -source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - curlbuild.h) -md5sums=('3fa4d5236f2a36ca5c3af6715e837691' - '61b594830d5acba3c99e4af0ba39a14e' - '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 "$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-certificates.crt - - make -} - -package() { - cd "$pkgname-$pkgver" - - 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/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/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index de669eb6c..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 159346 2012-05-22 02:13:38Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: kevin <kevin@archlinux.org> -# Contributor: mario <mario_vazq@hotmail.com> - -pkgname=dnsutils - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1 -_pkgver=9.9.1 -pkgrel=1 - -pkgdesc='DNS utilities: dig host nslookup' -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -arch=('i686' 'x86_64') -options=('!makeflags') -depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'remove-bind.patch') -sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c' - 'b465ef6160b004838f04de9978fe1be8422af777') - -replaces=('bind-tools' 'host') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../remove-bind.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - # hack to remove unused bloat from the binaries - CFLAGS+=' -fdata-sections -ffunction-sections' - LDFLAGS+=' -Wl,--gc-sections' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-idn \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}" - install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - cd bin; make DESTDIR="${pkgdir}" install -} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch deleted file mode 100644 index 19d650964..000000000 --- a/testing/dnsutils/remove-bind.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 -+++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig - TARGETS = - - @BIND9_MAKE_RULES@ -diff -aur old/lib/Makefile.in new/lib/Makefile.in ---- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 -+++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 -@@ -23,7 +23,7 @@ - # Attempt to disable parallel processing. - .NOTPARALLEL: - .NO_PARALLEL: --SUBDIRS = isc isccc dns isccfg bind9 lwres tests -+SUBDIRS = isc dns isccfg bind9 lwres - TARGETS = - - @BIND9_MAKE_RULES@ diff --git a/testing/fprintd/PKGBUILD b/testing/fprintd/PKGBUILD deleted file mode 100644 index fdeddae5b..000000000 --- a/testing/fprintd/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 157506 2012-04-28 21:41:01Z dreisner $ -# Maintainer: -# Contributor: Nikolay Rysev <mad.f3ka@gmail.com> - -pkgname=fprintd -pkgver=0.4.1 -pkgrel=4 -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="/usr/lib/security" install -} diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD deleted file mode 100644 index d77e3af1f..000000000 --- a/testing/gcc/PKGBUILD +++ /dev/null @@ -1,265 +0,0 @@ -# $Id: PKGBUILD 158685 2012-05-07 06:38:30Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.7.0 -pkgrel=6 -_snapshot=4.7-20120505 -_libstdcppmanver=20120307 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') -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 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 - gcc_pure64.patch - gcc-4.7.0-cloog-0.17.patch) -md5sums=('8e2df3b9a755c9262db0df019cc3542e' - '489d2f5311535800a120efd8d18db719' - 'ced48436c1b3c981d721a829f1094de1' - '575f7d17b022e609447a590e481b18b5') - - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - if [ "${CARCH}" = "x86_64" ]; then - patch -p1 -i ${srcdir}/gcc_pure64.patch - fi - - # compatibility with latest cloog - patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --disable-multilib --disable-libssp \ - --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC" - groups=('base') - depends=('glibc>=2.15') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src libitm; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') - groups=('base-devel') - install=gcc.install - - cd gcc-build - - make -j1 DESTDIR=${pkgdir} install - - install -d $pkgdir/usr/share/gdb/auto-load/usr/lib - mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -s /usr/bin/cpp ${pkgdir}/lib/cpp - ln -s gcc ${pkgdir}/usr/bin/cc - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran() -{ - pkgdesc="Fortran front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - ln -s gfortran ${pkgdir}/usr/bin/f95 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc() -{ - pkgdesc="Objective-C front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada() -{ - pkgdesc="Ada front-end for GCC (GNAT)" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - ln -s gcc ${pkgdir}/usr/bin/gnatgcc - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go() -{ - pkgdesc="Go front-end for GCC" - depends=("gcc=$pkgver-$pkgrel") - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/testing/gcc/gcc-4.7.0-cloog-0.17.patch b/testing/gcc/gcc-4.7.0-cloog-0.17.patch deleted file mode 100644 index c7146fa04..000000000 --- a/testing/gcc/gcc-4.7.0-cloog-0.17.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/testing/gcc/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/testing/gcc/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/testing/gcc/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/testing/gcc/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -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 - 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 - done -} diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/testing/gcc/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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 - done -} - -post_upgrade() { - post_install $1 -} - -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 - done -} diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch deleted file mode 100644 index a9b09bbcf..000000000 --- a/testing/gcc/gcc_pure64.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h ---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 -@@ -28,6 +28,6 @@ - #define GNU_USER_LINK_EMULATION64 "elf_x86_64" - #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" - --#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 ---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 -+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 -@@ -34,8 +34,8 @@ - comma=, - MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) - MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) --MULTILIB_OSDIRNAMES = m64=../lib64 --MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = m64=../lib -+MULTILIB_OSDIRNAMES+= m32=../lib32 - MULTILIB_OSDIRNAMES+= mx32=../libx32 - - LIBGCC = stmp-multilib diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD deleted file mode 100644 index 582ace300..000000000 --- a/testing/glib2/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 159077 2012-05-15 11:51:25Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=glib2 -pkgver=2.32.3 -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=('pkg-config' 'python2') -optdepends=('python2: for gdbus-codegen') -options=('!libtool' '!docs' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz - glib2.sh - glib2.csh - revert-warn-glib-compile-schemas.patch) -sha256sums=('b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d' - '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' - '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') - -build() { - cd glib-$pkgver - patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ - --sysconfdir=/etc \ - --with-pcre=system \ - --disable-fam - make -} - -package() { - cd glib-$pkgver - make completiondir=/usr/share/bash-completion/completions 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/usr/share/bash-completion/completions/"*; 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/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch deleted file mode 100644 index 75b05103c..000000000 --- a/testing/glib2/revert-warn-glib-compile-schemas.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Thu, 12 Apr 2012 23:55:34 +0000 -Subject: glib-compile-schemas: warn about bad dconf paths - -For quite some time the recommended usage of GSettings and dconf has -been to use paths like /org/gnome/example/. Use of /apps/ has spilled -over from GConf and is continuing to make its way into a number of -applications as they port. - -glib-compile-schemas will now warn about these types of paths being -used. This generates a lot of noise, but hopefully it will reduce the -number of ported applications making this mistake. ---- -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index cf02389..27d0181 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, - return; - } - -+ if (path && (g_str_has_prefix (path, "/apps/") || -+ g_str_has_prefix (path, "/desktop/") || -+ g_str_has_prefix (path, "/system/"))) -+ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " -+ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); -+ - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - --- -cgit v0.9.0.2 diff --git a/testing/gmp/PKGBUILD b/testing/gmp/PKGBUILD deleted file mode 100644 index eb0da5a66..000000000 --- a/testing/gmp/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 158687 2012-05-07 08:43:27Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gmp -pkgver=5.0.5 -pkgrel=1 -pkgdesc="A free library for arbitrary precision arithmetic" -arch=('i686' 'x86_64') -url="http://gmplib.org/" -depends=('gcc-libs' 'sh') -license=('LGPL3') -options=(!libtool) -install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig}) -md5sums=('8aef50959acec2a1ad41d144ffe0f3b5' - '406e8878aadc51b134d1b3dd845261ee') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - [ "${CARCH}" = "i686" ] && export ABI="32" - ./configure --build=${CHOST} \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/gmp/gmp.install b/testing/gmp/gmp.install deleted file mode 100644 index cad3354f9..000000000 --- a/testing/gmp/gmp.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(gmp.info gmp.info-1 gmp.info-2) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD deleted file mode 100644 index adc16a27e..000000000 --- a/testing/gnome-keyring/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -#$Id: PKGBUILD 157508 2012-04-28 21:41:03Z dreisner $ -# Maintainer: Jan De Groot <jgc@archlinux.org> - -pkgname=gnome-keyring -pkgver=3.4.1 -pkgrel=2 -pkgdesc="GNOME Password Management daemon" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('gtk3' 'gcr' 'libcap-ng') -makedepends=('intltool') -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=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249') - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-keyring \ - --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile - make -} - -package() { - cd "$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 c351377a2..000000000 --- a/testing/gnome-keyring/gnome-keyring.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD deleted file mode 100644 index 63ad30abd..000000000 --- a/testing/gtk3/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 158331 2012-05-03 17:11:18Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=gtk3 -pkgver=3.4.2 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI 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') -backup=(etc/gtk-3.0/settings.ini) -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz - settings.ini) -sha256sums=('b1ab72bc61434418160ff0c7edfd93c74758ed8a35e2ed3d07e3e218c2705480' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') -build() { - cd "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 "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 ca20d2865..000000000 --- a/testing/gtk3/gtk3.install +++ /dev/null @@ -1,16 +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/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD deleted file mode 100644 index 5411b3554..000000000 --- a/testing/hwloc/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 159010 2012-05-15 01:03:17Z stephane $ -# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sylvain HENRY <hsyl20@yahoo.fr> -# Contributor: Hervé YVIQUEL <elldekaa@gmail.com> - -pkgname=hwloc -pkgver=1.4.2 -pkgrel=1 -pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures" -arch=('i686' 'x86_64') -url="http://www.open-mpi.org/projects/hwloc/" -license=('BSD') -depends=('sh' 'pciutils' 'cairo' 'libxml2') -makedepends=('pkg-config') -options=('!libtool' '!docs') -source=(http://www.open-mpi.org/software/hwloc/v1.4/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2c2ca4101b4ea6782393b555a320c566da50cb68') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD deleted file mode 100644 index 2b10c0dc8..000000000 --- a/testing/inkscape/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 159325 2012-05-21 16:27:51Z jgc $ -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Maintainer: Gaetan Bisson <bisson@archlinux.org> - -pkgname=inkscape -pkgver=0.48.3.1 -pkgrel=3 -pkgdesc='Vector graphics editor using the SVG file format' -url='http://inkscape.sourceforge.net/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -makedepends=('boost' 'intltool') -depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt' - 'python2' 'desktop-file-utils' 'hicolor-icon-theme') -optdepends=('pstoedit: latex formulas' - 'texlive-core: latex formulas' - 'python2-numpy: some extensions' - 'python2-lxml: some extensions and filters' - 'pyxml: some extensions' - 'uniconvertor: reading/writing to some proprietary formats') -options=('!libtool') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'poppler20.patch' - 'libpng15.patch') -sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e' - '7316c2903c157781838cce289a709d100dc40fec' - 'd6512f3cb38ca8e2436dc485aa652490d17b3a52') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py - sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py - sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp - sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py - sed -i 's|"python"|"python2"|g' src/main.cpp - - patch -p1 -i ../poppler20.patch - patch -p1 -i ../libpng15.patch - - ./configure \ - --prefix=/usr \ - --with-python \ - --with-perl \ - --enable-lcms \ - --enable-poppler-cairo \ - --disable-dependency-tracking \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/testing/inkscape/install b/testing/inkscape/install deleted file mode 100644 index 6e803bf1d..000000000 --- a/testing/inkscape/install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - 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/inkscape/libpng15.patch b/testing/inkscape/libpng15.patch deleted file mode 100644 index e24913ed6..000000000 --- a/testing/inkscape/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp -+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp -@@ -1443,7 +1443,7 @@ - return NULL; - } - // Set error handler -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; - } ---- inkscape-0.48.1/src/helper/png-write.cpp -+++ inkscape-0.48.1-mod//src/helper/png-write.cpp -@@ -165,7 +165,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); ---- inkscape-0.48.1/src/sp-image.cpp -+++ inkscape-0.48.1-mod//src/sp-image.cpp -@@ -386,9 +386,13 @@ - - #if defined(PNG_iCCP_SUPPORTED) - { -- char* name = 0; -+ png_charp name = 0; - int compression_type = 0; -- char* profile = 0; -+#if (PNG_LIBPNG_VER < 10500) -+ png_charp profile = 0; -+#else -+ png_bytep profile = 0; -+#endif - png_uint_32 proflen = 0; - if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { - // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); diff --git a/testing/inkscape/poppler20.patch b/testing/inkscape/poppler20.patch deleted file mode 100644 index ecb74603f..000000000 --- a/testing/inkscape/poppler20.patch +++ /dev/null @@ -1,642 +0,0 @@ -diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp ---- old/src/extension/internal/pdfinput/pdf-parser.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/pdf-parser.cpp 2012-05-13 21:07:11.334781215 +0200 -@@ -367,14 +367,14 @@ - for (i = 0; i < obj->arrayGetLength(); ++i) { - obj->arrayGet(i, &obj2); - if (!obj2.isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - obj2.free(); - return; - } - obj2.free(); - } - } else if (!obj->isStream()) { -- error(-1, const_cast<char*>("Weird page contents")); -+ error(errInternal, -1, const_cast<char*>("Weird page contents")); - return; - } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ - - // too many arguments - something is wrong - } else { -- error(getPos(), const_cast<char*>("Too many args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Too many args in content stream")); - if (printCommands) { - printf("throwing away arg: "); - obj.print(stdout); -@@ -436,7 +436,7 @@ - - // args at end with no command - if (numArgs > 0) { -- error(getPos(), const_cast<char*>("Leftover args in content stream")); -+ error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream")); - if (printCommands) { - printf("%d leftovers:", numArgs); - for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ - name = cmd->getCmd(); - if (!(op = findOp(name))) { - if (ignoreUndef == 0) -- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name); -+ error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name); - return; - } - -@@ -510,26 +510,26 @@ - argPtr = args; - if (op->numArgs >= 0) { - if (numArgs < op->numArgs) { -- error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); -+ error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name); - return; - } - if (numArgs > op->numArgs) { - #if 0 -- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); -+ error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name); - #endif - argPtr += numArgs - op->numArgs; - numArgs = op->numArgs; - } - } else { - if (numArgs > -op->numArgs) { -- error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), -+ error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"), - numArgs, name); - return; - } - } - for (i = 0; i < numArgs; ++i) { - if (!checkArg(&argPtr[i], op->tchk[i])) { -- error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), -+ error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"), - i, name, argPtr[i].getTypeName()); - return; - } -@@ -690,7 +690,7 @@ - return; - } - if (!obj1.isDict()) { -- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); -+ error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName()); - obj1.free(); - return; - } -@@ -705,7 +705,7 @@ - if (state->parseBlendMode(&obj2, &mode)) { - state->setBlendMode(mode); - } else { -- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState")); - } - } - obj2.free(); -@@ -764,7 +764,7 @@ - state->setTransfer(funcs); - } - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState")); - } - obj2.free(); - -@@ -784,7 +784,7 @@ - funcs[0] = Function::parse(&obj3); - if (funcs[0]->getInputSize() != 1 || - funcs[0]->getOutputSize() != 1) { -- error(getPos(), -+ error(errInternal, getPos(), - const_cast<char*>("Invalid transfer function in soft mask in ExtGState")); - delete funcs[0]; - funcs[0] = NULL; -@@ -809,11 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj5); --#endif - } - obj5.free(); - if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) { -@@ -840,15 +836,15 @@ - delete funcs[0]; - } - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj4.free(); - } else { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group")); - } - obj3.free(); - } else if (!obj2.isNull()) { -- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); -+ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState")); - } - } - obj2.free(); -@@ -876,7 +872,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -884,7 +880,7 @@ - dict->lookup(const_cast<char*>("BBox"), &obj1); - if (!obj1.isArray()) { - obj1.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setFillColorSpace(colorSpace); -@@ -1032,7 +1020,7 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)")); - } - } - -@@ -1043,19 +1031,11 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (obj.isNull()) { - colorSpace = GfxColorSpace::parse(&args[0], NULL); - } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setStrokeColorSpace(colorSpace); -@@ -1063,7 +1043,7 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast<char*>("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)")); - } - } - -@@ -1072,7 +1052,7 @@ - int i; - - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command")); - return; - } - state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ - int i; - - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ - if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setFillPattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setFillPattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command")); - return; - } - state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ - ->getUnder() || - numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace()) - ->getUnder()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (args[numArgs-1].isName() && - (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { - state->setStrokePattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setStrokePattern(pattern); -- builder->updateStyle(state); -- } --#endif - - } else { - if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command")); - return; - } - state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ - - void PdfParser::opLineTo(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in lineto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in lineto")); - return; - } - state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto")); - return; - } - x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto1")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto1")); - return; - } - x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ - double x1, y1, x2, y2, x3, y3; - - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in curveto2")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in curveto2")); - return; - } - x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ - - void PdfParser::opClosePath(Object args[], int numArgs) { - if (!state->isCurPt()) { -- error(getPos(), const_cast<char*>("No current point in closepath")); -+ error(errInternal, getPos(), const_cast<char*>("No current point in closepath")); - return; - } - state->closePath(); -@@ -1298,7 +1262,7 @@ - - void PdfParser::opStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in stroke")); - return; - } - if (state->isPath()) { -@@ -1314,7 +1278,7 @@ - - void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke")); - return; - } - state->closePath(); -@@ -1331,7 +1295,7 @@ - - void PdfParser::opFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill")); - return; - } - if (state->isPath()) { -@@ -1347,7 +1311,7 @@ - - void PdfParser::opEOFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill")); - return; - } - if (state->isPath()) { -@@ -1363,7 +1327,7 @@ - - void PdfParser::opFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1376,7 +1340,7 @@ - - void PdfParser::opCloseFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1388,7 +1352,7 @@ - - void PdfParser::opEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1399,7 +1363,7 @@ - - void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); -+ //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1440,7 +1404,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"), - pattern->getType()); - break; - } -@@ -1459,7 +1423,7 @@ - doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse); - break; - default: -- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), -+ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"), - pattern->getType()); - break; - } -@@ -1579,15 +1543,9 @@ - double *matrix = NULL; - GBool savedState = gFalse; - --#ifdef POPPLER_NEW_COLOR_SPACE_API - if (!(shading = res->lookupShading(args[0].getName(), NULL))) { - return; - } --#else -- if (!(shading = res->lookupShading(args[0].getName()))) { -- return; -- } --#endif - - // save current graphics state - if (shading->getType() != 2 && shading->getType() != 3) { -@@ -2156,7 +2114,7 @@ - - void PdfParser::opShowText(Object args[], int numArgs) { - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show")); - return; - } - if (fontChanged) { -@@ -2170,7 +2128,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/show")); - return; - } - if (fontChanged) { -@@ -2188,7 +2146,7 @@ - double tx, ty; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in move/set/show")); -+ error(errInternal, getPos(), const_cast<char*>("No font in move/set/show")); - return; - } - if (fontChanged) { -@@ -2211,7 +2169,7 @@ - int i; - - if (!state->getFont()) { -- error(getPos(), const_cast<char*>("No font in show/space")); -+ error(errInternal, getPos(), const_cast<char*>("No font in show/space")); - return; - } - if (fontChanged) { -@@ -2236,7 +2194,7 @@ - } else if (obj.isString()) { - doShowText(obj.getString()); - } else { -- error(getPos(), const_cast<char*>("Element of show/space array must be number or string")); -+ error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string")); - } - obj.free(); - } -@@ -2334,7 +2292,7 @@ - if (charProc.isStream()) { - //parse(&charProc, gFalse); // TODO: parse into SVG font - } else { -- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); -+ error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry")); - } - //out->endType3Char(state); - if (resDict) { -@@ -2410,7 +2368,7 @@ - return; - } - if (!obj1.isStream()) { -- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); -+ error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name); - obj1.free(); - return; - } -@@ -2426,9 +2384,9 @@ - /* out->psXObject(obj1.getStream(), - obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ - } else if (obj2.isName()) { -- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); -+ error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName()); - } else { -- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type")); - } - obj2.free(); - obj1.free(); -@@ -2559,11 +2517,7 @@ - } - } - if (!obj1.isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - colorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- colorSpace = GfxColorSpace::parse(&obj1); --#endif - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2648,11 +2602,7 @@ - obj2.free(); - } - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ - err2: - obj1.free(); - err1: -- error(getPos(), const_cast<char*>("Bad image parameters")); -+ error(errInternal, getPos(), const_cast<char*>("Bad image parameters")); - } - - void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ - // check form type - dict->lookup(const_cast<char*>("FormType"), &obj1); - if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast<char*>("Unknown form type")); -+ error(errInternal, getPos(), const_cast<char*>("Unknown form type")); - } - obj1.free(); - -@@ -2791,7 +2741,7 @@ - dict->lookup(const_cast<char*>("BBox"), &bboxObj); - if (!bboxObj.isArray()) { - bboxObj.free(); -- error(getPos(), const_cast<char*>("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ - if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { - transpGroup = gTrue; - if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj3); --#endif - } - obj3.free(); - if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) { -@@ -2990,7 +2936,7 @@ - parser->getObj(&obj); - while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) { - if (!obj.isName()) { -- error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); -+ error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object")); - obj.free(); - } else { - key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ - parser->getObj(&obj); - } - if (obj.isEOF()) { -- error(getPos(), const_cast<char*>("End of file in inline image")); -+ error(errInternal, getPos(), const_cast<char*>("End of file in inline image")); - obj.free(); - dict.free(); - return NULL; -@@ -3020,11 +2966,11 @@ - } - - void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator")); - } - - void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast<char*>("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator")); - } - - //------------------------------------------------------------------------ -diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp ---- old/src/extension/internal/pdfinput/svg-builder.cpp 2011-07-08 20:25:09.468790000 +0200 -+++ new/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-13 20:45:22.303804308 +0200 -@@ -961,9 +961,7 @@ - _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); - // Store original name -- if (font->getOrigName()) { -- _font_specification = font->getOrigName()->getCString(); -- } else if (font->getName()) { -+ if (font->getName()) { - _font_specification = font->getName()->getCString(); - } else { - _font_specification = (char*) "Arial"; diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD deleted file mode 100644 index dc908de63..000000000 --- a/testing/isl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 158590 2012-05-05 00:51:50Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -pkgname=isl -pkgver=0.09 -pkgrel=2 -pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" -arch=('i686' 'x86_64') -url="http://www.kotnet.org/~skimo/isl/" -license=('LGPL2.1') -options=('!libtool') -source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('6873f0b3c9f4d1fb8efae4aea53f2ab2') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 DESTDIR="$pkgdir/" install - - install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.9.0.0-gdb.py -} diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD deleted file mode 100644 index 4b4d5d723..000000000 --- a/testing/iw/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 158934 2012-05-13 13:15:10Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=iw -pkgver=3.4 -pkgrel=1 -pkgdesc="nl80211 based CLI configuration utility for wireless devices" -arch=("i686" "x86_64") -url="http://wireless.kernel.org/en/users/Documentation/iw" -license=("GPL") -depends=("libnl") -makedepends=("kernel-headers") -source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/testing/kdegraphics-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD deleted file mode 100644 index d2f71393b..000000000 --- a/testing/kdegraphics-okular/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159327 2012-05-21 16:27:55Z jgc $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdegraphics-okular -pkgver=4.8.3 -pkgrel=2 -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/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('7c43076df3e9d6217e2a5cbb8ef6d8af89f8ae37') - -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/testing/kdegraphics-okular/kdegraphics-okular.install b/testing/kdegraphics-okular/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/testing/kdegraphics-okular/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -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/testing/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch b/testing/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch deleted file mode 100644 index 30c92b280..000000000 --- a/testing/kmod/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c7d5a60d3df735a3816bbc1ff1b416a803a4f7a6 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Mon, 7 May 2012 19:41:41 -0400 -Subject: [PATCH 1/2] libkmod-file: gracefully handle errors from zlib - -zlib won't necessarily set the system errno, and this is particularly -evident on corrupted data (which results in a double free). Use zlib's -gzerror to detect the failure, returning a generic EINVAL when zlib -doesn't provide us with an errno. ---- - libkmod/libkmod-file.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/libkmod/libkmod-file.c b/libkmod/libkmod-file.c -index 46ad8d9..8beb7e3 100644 ---- a/libkmod/libkmod-file.c -+++ b/libkmod/libkmod-file.c -@@ -199,7 +199,13 @@ static int load_zlib(struct kmod_file *file) - if (r == 0) - break; - else if (r < 0) { -- err = -errno; -+ int gzerr; -+ const char *gz_errmsg = gzerror(file->gzf, &gzerr); -+ -+ ERR(file->ctx, "gzip: %s\n", gz_errmsg); -+ -+ /* gzip might not set errno here */ -+ err = gzerr == Z_ERRNO ? -errno : -EINVAL; - goto error; - } - did += r; --- -1.7.10.1 - diff --git a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch deleted file mode 100644 index bf2c3501f..000000000 --- a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sat, 3 Mar 2012 12:37:06 +0100 -Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d} - -This allows rootprefix to be set to /usr, even if not all other packages -have been fixed to read from this dir. ---- - libkmod/libkmod.c | 5 +++-- - tools/kmod-depmod.c | 1 + - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c -index 36ca629..12c1112 100644 ---- a/libkmod/libkmod.c -+++ b/libkmod/libkmod.c -@@ -62,6 +62,7 @@ static const char *default_config_paths[] = { - SYSCONFDIR "/modprobe.d", - "/run/modprobe.d", - ROOTPREFIX "/lib/modprobe.d", -+ "/lib/modprobe.d", - NULL - }; - -@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname) - * @config_paths: ordered array of paths (directories or files) where - * to load from user-defined configuration parameters such as - * alias, blacklists, commands (install, remove). If -- * NULL defaults to /run/modprobe.d, /etc/modprobe.d and -- * $rootprefix/lib/modprobe.d. Give an empty vector if -+ * NULL defaults to /run/modprobe.d, /etc/modprobe.d, -+ * $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if - * configuration should not be read. This array must be null - * terminated. - * -diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c -index 1871e18..7bb1c5d 100644 ---- a/tools/kmod-depmod.c -+++ b/tools/kmod-depmod.c -@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = { - "/run/depmod.d", - SYSCONFDIR "/depmod.d", - ROOTPREFIX "/lib/depmod.d", -+ "/lib/depmod.d", - NULL - }; - --- -1.7.9.5 - diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch deleted file mode 100644 index f39f36ace..000000000 --- a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sat, 31 Mar 2012 12:17:39 +0200 -Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules - -This means that we can move the configuration paths from /lib -to /usr/lib without having to touch the kernel and related -packages. - -That can be dealt with separately at a later location, in which case -all we have to do is revert this patch. - -Signed-off-by: Tom Gundersen <teg@jklm.no> ---- - libkmod/libkmod.c | 2 +- - tools/kmod-depmod.c | 2 +- - tools/kmod-modinfo.c | 4 ++-- - tools/kmod-modprobe.c | 4 ++-- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c -index 12c1112..11edfa0 100644 ---- a/libkmod/libkmod.c -+++ b/libkmod/libkmod.c -@@ -196,7 +196,7 @@ static int log_priority(const char *priority) - return 0; - } - --static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules"; -+static const char *dirname_default_prefix = "/lib/modules"; - - static char *get_kernel_release(const char *dirname) - { -diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c -index 7bb1c5d..454d538 100644 ---- a/tools/kmod-depmod.c -+++ b/tools/kmod-depmod.c -@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[]) - } - - cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, -- "%s" ROOTPREFIX "/lib/modules/%s", -+ "%s/lib/modules/%s", - root == NULL ? "" : root, cfg.kversion); - - if (optind == argc) -diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c -index aa5223f..b13cd4b 100644 ---- a/tools/kmod-modinfo.c -+++ b/tools/kmod-modinfo.c -@@ -339,7 +339,7 @@ static void help(const char *progname) - "\t-0, --null Use \\0 instead of \\n\n" - "\t-F, --field=FIELD Print only provided FIELD\n" - "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n" -- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" -+ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n" - "\t-V, --version Show version\n" - "\t-h, --help Show this help\n", - progname); -@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[]) - } - kversion = u.release; - } -- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s", -+ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s", - root, kversion); - dirname = dirname_buf; - } -diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c -index 4760682..ccb41d8 100644 ---- a/tools/kmod-modprobe.c -+++ b/tools/kmod-modprobe.c -@@ -128,7 +128,7 @@ static void help(const char *progname) - "\t-n, --show Same as --dry-run\n" - - "\t-C, --config=FILE Use FILE instead of default search paths\n" -- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" -+ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n" - "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" - - "\t-s, --syslog print to syslog, not stderr\n" -@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv) - kversion = u.release; - } - snprintf(dirname_buf, sizeof(dirname_buf), -- "%s" ROOTPREFIX "/lib/modules/%s", root, -+ "%s/lib/modules/%s", root, - kversion); - dirname = dirname_buf; - } --- -1.7.9.5 - diff --git a/testing/kmod/0002-depmod-report-failures-in-loading-symbols.patch b/testing/kmod/0002-depmod-report-failures-in-loading-symbols.patch deleted file mode 100644 index 90c58d5da..000000000 --- a/testing/kmod/0002-depmod-report-failures-in-loading-symbols.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 819f79a24d58e3c8429f1631df2f8f85a2f95d4a Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Mon, 7 May 2012 19:41:42 -0400 -Subject: [PATCH 2/2] depmod: report failures in loading symbols - -Previously, depmod would relegate failures of kmod_module_get_symbols() -to debug output, assuming the "error" was simply a lack of symbols. -Leave the ENOENT return to debug output, but report anything else as a -real error. ---- - tools/kmod-depmod.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c -index e89dff6..bceb407 100644 ---- a/tools/kmod-depmod.c -+++ b/tools/kmod-depmod.c -@@ -1542,8 +1542,11 @@ static int depmod_load_symbols(struct depmod *depmod) - struct kmod_list *l, *list = NULL; - int err = kmod_module_get_symbols(mod->kmod, &list); - if (err < 0) { -- DBG("ignoring %s: no symbols: %s\n", -- mod->path, strerror(-err)); -+ if (err == -ENOENT) -+ DBG("ignoring %s: no symbols\n", mod->path); -+ else -+ ERR("failed to load symbols from %s: %s\n", -+ mod->path, strerror(-err)); - continue; - } - kmod_list_foreach(l, list) { --- -1.7.10.1 - diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD deleted file mode 100644 index c51fc4d07..000000000 --- a/testing/kmod/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 158817 2012-05-11 01:49:20Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=kmod -pkgver=8 -pkgrel=2 -pkgdesc="Linux kernel module handling" -arch=('i686' 'x86_64') -url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' -license=('GPL2') -depends=('glibc' 'zlib') -options=('!libtool') -provides=('module-init-tools=3.16') -conflicts=('module-init-tools') -replaces=('module-init-tools') -source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" - "depmod-search.conf" - "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" - "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch" - "0001-libkmod-file-gracefully-handle-errors-from-zlib.patch" - "0002-depmod-report-failures-in-loading-symbols.patch") -md5sums=('d4e3d038b5370b1e8ff237c55666aa64' - 'dd62cbf62bd8f212f51ef8c43bec9a77' - 'ba73b9e98db1abbf41274f922fcfbd55' - 'c9af56636c5667cf4ce3a31ea56e03d9' - '1a877b9863b94f91c8d3aec97c021c6b' - '1a9f132779f90556852e70279577ed22') - -build() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir"/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch - patch -Np1 <"$srcdir"/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch - - # fix crash on corrupted zlib compression - patch -Np1 <"$srcdir"/0001-libkmod-file-gracefully-handle-errors-from-zlib.patch - patch -Np1 <"$srcdir"/0002-depmod-report-failures-in-loading-symbols.patch - - ./configure \ - --sysconfdir=/etc \ - --with-zlib \ - --with-rootprefix=/usr - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - - # extra directories - install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" - - # add symlinks to kmod - ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" - - for tool in {ins,ls,rm}mod modinfo; do - ln -s kmod "$pkgdir/usr/bin/$tool" - done - - # install depmod.d file for search/ dir - install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" -} - -# vim: ft=sh syn=sh et diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf deleted file mode 100644 index 36f2cf7db..000000000 --- a/testing/kmod/depmod-search.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# /usr/lib/depmod.d/search.conf -# - -search updates extramodules built-in diff --git a/testing/ldns/PKGBUILD b/testing/ldns/PKGBUILD deleted file mode 100644 index 18573ced5..000000000 --- a/testing/ldns/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 159317 2012-05-21 14:35:28Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: mathieui <mathieui@mathieui.net> -# Contributor: jiribb <jiribb@gmail.com> - -pkgname=ldns -pkgver=1.6.13 -pkgrel=1 -pkgdesc='Fast DNS library supporting recent RFCs' -url='http://www.nlnetlabs.nl/projects/ldns/' -license=('custom:BSD') -arch=('i686' 'x86_64') -options=('!libtool') -depends=('openssl' 'dnssec-anchors') -optdepends=('libpcap: ldns-dpa tool') -makedepends=('libpcap') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('859f633d10b763f06b602e2113828cbbd964c7eb') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-static=no \ - --disable-rpath \ - --with-drill \ - --with-examples \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/libcap/PKGBUILD b/testing/libcap/PKGBUILD deleted file mode 100644 index 8c99b8d7f..000000000 --- a/testing/libcap/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -#$Id: PKGBUILD 157510 2012-04-28 21:41:05Z dreisner $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=libcap -pkgver=2.22 -pkgrel=3 -pkgdesc="POSIX 1003.1e capabilities" -arch=('i686' 'x86_64') -url="http://sites.google.com/site/fullycapable/" -license=('GPL2') -depends=('glibc' 'attr') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('b4896816b626bea445f0b3849bdd4077' - '9d0983e25e5a251d098507f9561d2b27') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make prefix=/usr DESTDIR=${pkgdir} RAISE_SETFCAP=no install - - chmod 755 ${pkgdir}/usr/lib/libcap.so.${pkgver} - rm ${pkgdir}/usr/lib/libcap.a - - install -Dm644 pam_cap/capability.conf \ - $pkgdir/usr/share/doc/$pkgname/capability.conf.example -} diff --git a/testing/libdrm-new/COPYING b/testing/libdrm-new/COPYING deleted file mode 100644 index 6e74c337c..000000000 --- a/testing/libdrm-new/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/testing/libdrm-new/PKGBUILD b/testing/libdrm-new/PKGBUILD deleted file mode 100644 index 32a85fcd1..000000000 --- a/testing/libdrm-new/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -#Id$ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=libdrm-new -pkgname=(libdrm-new libdrm-nouveau) -pkgver=2.4.34 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services" -arch=(i686 x86_64) -license=('custom') -depends=('glibc' 'libpciaccess') -makedepends=('cairo' 'valgrind') -options=('!libtool' '!emptydirs') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2 - no-pthread-stubs.patch - COPYING -) -sha1sums=('861757baff4b37e564e13f5350c1b5d01c66a181' - '2a5410baa3e6e078f9378ce486a88f41d22fd838' - 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') - -build() { - cd "libdrm-$pkgver" - patch -Np1 -i "$srcdir/no-pthread-stubs.patch" - - #libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr \ - --disable-libkms \ - --disable-intel \ - --disable-radeon - make -} - -package_libdrm-new() { - pkgdesc="Userspace interface to kernel DRM services - used as makedepends for xf86-video-nouveau" - conflicts=('libdrm') - provides=("libdrm=$pkgver") - cd "libdrm-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/lib/libdrm_nouveau.so.2* -} - -package_libdrm-nouveau() { - pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for xf86-video-nouveau" - depends=(libdrm) - cd "libdrm-$pkgver" - make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES - make -C nouveau DESTDIR="$pkgdir" install - make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES - rm "$pkgdir"/usr/include/libdrm/nouveau.h "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc "$pkgdir"/usr/lib/libdrm_nouveau.so -} diff --git a/testing/libdrm-new/no-pthread-stubs.patch b/testing/libdrm-new/no-pthread-stubs.patch deleted file mode 100644 index 6745f4bc4..000000000 --- a/testing/libdrm-new/no-pthread-stubs.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac ---- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000 -+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000 -@@ -47,10 +47,6 @@ - LT_INIT([disable-static]) - - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - pkgconfigdir=${libdir}/pkgconfig - AC_SUBST(pkgconfigdir) - AC_ARG_ENABLE([udev], -diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am ---- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000 -+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000 -@@ -26,7 +26,6 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - -I$(top_srcdir)/include/drm -@@ -35,7 +34,6 @@ - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ -- @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ - @CLOCK_LIB@ - -diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am ---- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000 -+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000 -@@ -2,14 +2,13 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm \ - -DDEBUG - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = nouveau.c \ - pushbuf.c \ -diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am ---- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000 -+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/radeon \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la - - libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD deleted file mode 100644 index 7a3ff2dee..000000000 --- a/testing/libevent/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 159341 2012-05-21 22:24:00Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=libevent -pkgver=2.0.19 -pkgrel=1 -pkgdesc="An event notification library" -arch=('i686' 'x86_64') -url="http://www.monkey.org/~provos/libevent/" -license=('BSD') -depends=('openssl') -optdepends=('python2: to use event_rpcgen.py') -options=('!libtool') -source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) - -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 || true # this never worked, should be taken upstream -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - make DESTDIR="${pkgdir}" install -} -md5sums=('91111579769f46055b0a438f5cc59572' - 'a211997b20913954f744a665f31f77d2') diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD deleted file mode 100644 index 461397764..000000000 --- a/testing/libnl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 158932 2012-05-13 13:10:53Z thomas $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libnl -pkgver=3.2.9 -pkgrel=1 -pkgdesc="Library for applications dealing with netlink sockets" -arch=(i686 x86_64) -url="http://www.infradead.org/~tgr/libnl/" -license=(GPL) -depends=(glibc) -backup=(etc/libnl/classid etc/libnl/pktloc) -options=(!libtool) -source=("$url/files/$pkgname-$pkgver.tar.gz") -sha256sums=('9f23e9460bd9bb7fbe09af5eb281e4a43a26fa245ea864ed5e28fe4e8118af63') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --sbindir=/usr/bin \ - --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD deleted file mode 100644 index 0167edfdf..000000000 --- a/testing/libreoffice/PKGBUILD +++ /dev/null @@ -1,707 +0,0 @@ -# $Id: PKGBUILD 159329 2012-05-21 16:28:00Z jgc $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-scripting-beanshell' - 'libreoffice-scripting-javascript' - 'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built -_LOver=3.5.3.2 -pkgver=3.5.3 -pkgrel=3 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' - #'saxon' - currently broken - # the runtime dependencies - "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' 'libxslt' 'librsvg' "icu>=49.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# 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" -_additional_source_url="http://dev-www.libreoffice.org/src" -source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz - ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e - smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - poppler_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ac68934592ec7d838cf5c22744be8d97aa4a1a47 - fix_broken_hebrew_wordwrapping.diff - buildfix_icu49.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 - ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz - e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2 - 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('d22cd79e7463ac4caf0a4b47d78a82ac' - '3455f3f523d739aa391b5a5bf04ff958' - '945fbf7888c464f4e1cf7282d370b257' - '18f577b374d60b3c760a3a3350407632' - '2fa6028324347860e684e75310818d43' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '0ff7d225d087793c8c2c680d77aac3e7' - 'e1c178b18f130b40494561f02bc1a948' - '7c2549f6b0a8bb604e6c4c729ffdcfe6' - '185d60944ea767075d27247c3162b3bc' - '60ce5dc9bd098f95c2e621a930c98dd9' - '661a52a02a31b3afbe4b3b3146061afd' - '72ba8d57cefdc25a6f1bc845edfd4d78' - '025d9b17d9eb90dc282c5c1289a666aa' - '9734ea20c9f67e1b6e1c5a1247fbd3ff' - 'f0e72d0e1bc93a50a3aa9d31350b156c' - '867c682b45f477f916786e00c45d7ab7') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - cd ${srcdir}/libreoffice-core-$_LOver - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - ln -s ../libreoffice-help-$_LOver/helpcontent2 . - ln -s ../libreoffice-translations-$_LOver/translations . - - # buildfixes & bugfixes - # one late fix to solve make distro-pack-install issue - patch -Np1 -i ${srcdir}/gmake_install.diff - patch -Np1 -i ${srcdir}/smp_buildfix.diff - #patch -Np0 -i ${srcdir}/buildfix_icu49.diff - patch -Np1 -i ${srcdir}/poppler_buildfix.diff - # https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e - patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff - - # unset C(XX)FLAGS - # http://www.openoffice.org/issues/show_bug.cgi?id=103205 -# unset CFLAGS -# unset CXXFLAGS - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - # python2 fix - export PYTHON=python2 - -# autoconf -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ -# touch autogen.lastrun - ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --enable-split-app-modules \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --disable-verbose \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-lockdown\ - --enable-mergelibs \ - --enable-opengl \ - --enable-odk\ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-librsvg=system \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-sampleicc \ - --without-system-libexttextcat \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --disable-mozilla \ - --without-system-mozilla \ - --without-system-mozilla-headers \ - --with-ant-home="/usr/share/java/apache-ant"\ - --with-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --with-system-hsqldb \ - --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 \ - $EXTRAOPTS - -# --disable-ext-lightproof \ - - -#--with-install-dirname="${pkgbase}" -# --enable-cairo\ -# --with-system-libtextcat \ -# --with-external-libtextcat-data \ -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - -#--with-servlet-api-jar=JARFILE -# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136 -# --with-system-saxon\ -# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\ - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' - 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' - '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' - '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') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # set python-uno PYTHON path - install -dm755 ${pkgdir}/etc/profile.d - install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d -} - -package_libreoffice-base() { - pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common' 'hsqldb-java') - optdepends=('libreoffice-postgresql-connector') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry - -# # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done -# # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` -# # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname -# # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - install=libreoffice-draw.install - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib' - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - install=libreoffice-impress.install - depends=('libreoffice-common') - optdepends=('mesa: for the OGLTrans extension') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Applicationfor LibreOffice." - depends=('libreoffice-common') - optdepends=() - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Applicationfor LibreOffice." - install=libreoffice-writer.install - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - backup=() - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice-common' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport -} - -package_libreoffice-extension-presenter-screen() { - - pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services} - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/ - mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/ -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice-common' 'python2') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} diff --git a/testing/libreoffice/buildfix_icu49.diff b/testing/libreoffice/buildfix_icu49.diff deleted file mode 100644 index 7a774dee0..000000000 --- a/testing/libreoffice/buildfix_icu49.diff +++ /dev/null @@ -1,42 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=410307 - ---- i18npool/source/breakiterator/data/char_in.txt -+++ i18npool/source/breakiterator/data/char_in.txt -@@ -15,7 +15,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; -@@ -72,7 +72,7 @@ - [^$Control $CR $LF] $Extend; - - [^$Control $CR $LF] $SpacingMark; --$Prepend [^$Control $CR $LF]; -+# $Prepend [^$Control $CR $LF]; - - - ## ------------------------------------------------- -@@ -94,7 +94,7 @@ - - $Extend [^$Control $CR $LF]; - $SpacingMark [^$Control $CR $LF]; --[^$Control $CR $LF] $Prepend; -+# [^$Control $CR $LF] $Prepend; - - - ## ------------------------------------------------- ---- i18npool/source/breakiterator/data/char.txt -+++ i18npool/source/breakiterator/data/char.txt -@@ -16,7 +16,7 @@ - $CR = [\p{Grapheme_Cluster_Break = CR}]; - $LF = [\p{Grapheme_Cluster_Break = LF}]; - $Control = [\p{Grapheme_Cluster_Break = Control}]; --$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; -+# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; - $Extend = [\p{Grapheme_Cluster_Break = Extend}]; - $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; - # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff b/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff deleted file mode 100644 index ba4850c77..000000000 --- a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff +++ /dev/null @@ -1,360 +0,0 @@ -From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Sun, 13 May 2012 21:41:30 +0000 -Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules - -i.e. sync with svn diff -c 31071 -http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt - -Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6 ---- -diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx -index 14051d4..ffd590c 100644 ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -42,6 +42,7 @@ - #include <unotest/bootstrapfixturebase.hxx> - - #include <rtl/strbuf.hxx> -+#include <rtl/ustrbuf.hxx> - - #include <string.h> - -@@ -58,6 +59,9 @@ public: - void testWeak(); - void testAsian(); - void testThai(); -+#if TODO -+ void testNorthernThai(); -+#endif - - CPPUNIT_TEST_SUITE(TestBreakIterator); - CPPUNIT_TEST(testLineBreaking); -@@ -71,6 +71,9 @@ - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); -+#if TODO -+ CPPUNIT_TEST(testNorthernThai); -+#endif - CPPUNIT_TEST_SUITE_END(); - - private: -@@ -80,28 +83,46 @@ - uno::Reference<i18n::XBreakIterator> m_xBreak; - }; - --//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation - void TestBreakIterator::testLineBreaking() - { -- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -- - i18n::LineBreakHyphenationOptions aHyphOptions; - i18n::LineBreakUserOptions aUserOptions; - lang::Locale aLocale; - -- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -- -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271 - { -- //Here we want the line break to leave text here) on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)")); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US")); -+ -+ { -+ //Here we want the line break to leave text here) on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6); -+ } -+ -+ { -+ //Here we want the line break to leave "here)" on the next line -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ } - } - -+ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849 - { -- //Here we want the line break to leave "here)" on the next line -- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions); -- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11); -+ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD }; -+ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1)); -+ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear()); -+ -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL")); -+ -+ { -+ //Here we want the line break to happen at the whitespace -+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions); -+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1); -+ } - } - } - -@@ -295,27 +320,29 @@ void TestBreakIterator::testThai() - aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th")); - aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); - -- i18n::Boundary aBounds; -- { -- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } -+ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -+} - --#ifdef TODO -- { -- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -- i18n::WordType::DICTIONARY_WORD, true); -- CPPUNIT_ASSERT_MESSAGE("Should skip full word", -- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); -- } --#endif -+#if TODO -+void TestBreakIterator::testNorthernThai() -+{ -+ lang::Locale aLocale; -+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod")); -+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH")); -+ -+ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A }; -+ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1)); -+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale, -+ i18n::WordType::DICTIONARY_WORD, true); -+ CPPUNIT_ASSERT_MESSAGE("Should skip full word", -+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength()); - } -+#endif - - void TestBreakIterator::setUp() - { -diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README -new file mode 100644 -index 0000000..8d7598d ---- a/dev/null -+++ b/i18npool/source/breakiterator/data/README -@@ -0,0 +1,12 @@ -+The originals of these come from svn checkout -+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no -+longer appear in the icu tarballs, but are in icu's svn -+ -+At various stages these copies have been customized and are not horribly out of -+sync. It unclear which diffs from the base versions are deliberate and which -+are now accidental :-( -+ -+We need to review the various issues referenced in the commits that caused -+custimizations and see if they're still relevant or not, write regression tests -+for them, if any are still relavant then apply the changes back on top of the -+latest versions. -diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt -index cbabee6..91c8f3d 100644 ---- a/i18npool/source/breakiterator/data/line.txt -+++ b/i18npool/source/breakiterator/data/line.txt -@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:]; - $BK = [:LineBreak = Mandatory_Break:]; - $B2 = [:LineBreak = Break_Both:]; - $CB = [:LineBreak = Contingent_Break:]; -+$CJ = [:LineBreak = Conditional_Japanese_Starter:]; - $CL = [:LineBreak = Close_Punctuation:] ; - $CM = [:LineBreak = Combining_Mark:]; - $CR = [:LineBreak = Carriage_Return:]; - $EX = [:LineBreak = Exclamation:]; - $GL = [:LineBreak = Glue:]; -+$HL = [:LineBreak = Hebrew_Letter:]; - $HY = [:LineBreak = Hyphen:]; - $H2 = [:LineBreak = H2:]; - $H3 = [:LineBreak = H3:]; -@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:]; - $JT = [:LineBreak = JT:]; - $LF = [:LineBreak = Line_Feed:]; - $NL = [:LineBreak = Next_Line:]; --$NS = [:LineBreak = Nonstarter:]; -+$NS = [[:LineBreak = Nonstarter:] $CJ]; - $NU = [:LineBreak = Numeric:]; - $OP = [[:LineBreak = Open_Punctuation:] - $DG]; - $PO = [:LineBreak = Postfix_Numeric:]; -@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*; - $CLcm = $CL $CM*; - $EXcm = $EX $CM*; - $GLcm = $GL $CM*; -+$HLcm = $HL $CM*; - $HYcm = $HY $CM*; - $H2cm = $H2 $CM*; - $H3cm = $H3 $CM*; -@@ -150,6 +153,7 @@ $B2 $CM+; - $CL $CM+; - $EX $CM+; - $GL $CM+; -+$HL $CM+; - $HY $CM+; - $H2 $CM+; - $H3 $CM+; -@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs - # so for this one case we need to manually list out longer sequences. - # - $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP]; --$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; -+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP]; - $AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM]; - - -@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm); - $BBcm [^$CB]; # $BB x - $BBcm $LB20NonBreaks $CM*; - -+# LB 21a Don't break after Hebrew + Hyphen -+# HL (HY | BA) x -+# -+$HLcm ($HYcm | $BAcm) [^$CB]?; -+ - # LB 22 --$ALcm $INcm; -+($ALcm | $HLcm) $INcm; - $CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL - $IDcm $INcm; - $INcm $INcm; -@@ -331,16 +340,18 @@ $NUcm $INcm; - # $LB 23 - $IDcm $POcm; - $ALcm $NUcm; # includes $LB19 -+$HLcm $NUcm; - $CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL - $NUcm $ALcm; -+$NUcm $HLcm; - - # - # LB 24 - # - $PRcm $IDcm; - $ALcm $PRcm; --$PRcm $ALcm; --$POcm $ALcm; -+$PRcm ($ALcm | $HLcm); -+$POcm ($ALcm | $HLcm); - - # - # LB 25 Numbers. -@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm); - - # LB 28 Do not break between alphabetics - # --$ALcm $ALcm; --$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL -+($ALcm | $HLcm) ($ALcm | $HLcm); -+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL - - # LB 29 - $IScm ($ALcm | $NUcm); -@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm); - # Rule 30 Do not break between letters, numbers or ordinary symbols - # and opening or closing punctuation - # --($ALcm | $NUcm) $OPcm; -+($ALcm | $HLcm | $NUcm) $OPcm; - $CM+ $OPcm; --$CLcm ($ALcm | $NUcm); -- -- -+$CLcm ($ALcm | $HLcm | $NUcm); - - # - # Reverse Rules. -@@ -391,6 +400,7 @@ $CM+ $B2; - $CM+ $CL; - $CM+ $EX; - $CM+ $GL; -+$CM+ $HL; - $CM+ $HY; - $CM+ $H2; - $CM+ $H3; -@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS) - $CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x . - [^$CB] $CM* $BB; # - -- -+# LB21a -+[^$CB] $CM* ($HY | $BA) $CM* $HL; - - # LB 22 --$CM* $IN $CM* $ALPlus; -+$CM* $IN $CM* ($ALPlus | $HL); - $CM* $IN $CM* $ID; - $CM* $IN $CM* $IN; - $CM* $IN $CM* $NU; - - # LB 23 - $CM* $PO $CM* $ID; --$CM* $NU $CM* $ALPlus; --$CM* $ALPlus $CM* $NU; -+$CM* $NU $CM* ($ALPlus | $HL); -+$CM* ($ALPlus | $HL) $CM* $NU; - - # LB 24 - $CM* $ID $CM* $PR; - $CM* $PR $CM* $ALPlus; --$CM* $ALPlus $CM* $PR; --$CM* $ALPlus $CM* $PO; -+$CM* ($ALPlus | $HL) $CM* $PR; -+$CM* ($ALPlus | $HL) $CM* $PO; - - $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP; - $CM* $NU+ $CM* $HY+ / $SP; -@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL); - $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR; - - # LB 28 --$CM* $ALPlus $CM* $ALPlus; -- -+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL); - - # LB 29 - $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP]; - - # LB 30 --$CM* $OP $CM* ($NU | $ALPlus); --$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP]; -+$CM* $OP $CM* ($ALPlus | $HL | $NU); -+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP]; - - - ## ------------------------------------------------- -@@ -609,6 +619,9 @@ $SP+ $CM* $QU; - $SP+ $CM* $CL; - $SP+ $CM* $B2; - -+# LB 21 -+$CM* ($HY | $BA) $CM* $HL; -+ - # LB 18 - ($CM* ($IS | $SY))+ $CM* $NU; - $CL $CM* ($NU | $IS | $SY); -@@ -629,6 +642,6 @@ $dictionary $dictionary; - # turn off rule chaining. We don't want to move more - # than necessary. - # --[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary]; -+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary]; - $dictionary $dictionary; - --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/libreoffice/libreoffice-base.install b/testing/libreoffice/libreoffice-base.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/libreoffice/libreoffice-base.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/libreoffice/libreoffice-calc.install b/testing/libreoffice/libreoffice-calc.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/libreoffice/libreoffice-calc.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/libreoffice/libreoffice-common.csh b/testing/libreoffice/libreoffice-common.csh deleted file mode 100644 index af31d4432..000000000 --- a/testing/libreoffice/libreoffice-common.csh +++ /dev/null @@ -1 +0,0 @@ -#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program diff --git a/testing/libreoffice/libreoffice-common.install b/testing/libreoffice/libreoffice-common.install deleted file mode 100644 index e66b66f3d..000000000 --- a/testing/libreoffice/libreoffice-common.install +++ /dev/null @@ -1,47 +0,0 @@ -post_install() { - -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see https://wiki.archlinux.org/index.php/LibreOffice" -echo "-------------------------------------------------------------------" -echo "LibreOffice has been split into several packages:" -echo "- libreoffice-common" -echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" -echo "- libreoffice-{gnome,kde4} - desktop integration plugins" -echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" -echo " the LibreOffice APIs and for creating" -echo " extensions (UNO components)." -echo "-------------------------------------------------------------------" -echo " * you need to install at least one libreoffice-langpack" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what additional extensions are prepared to install" -echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg - for spell checking" -echo " * make sure you have installed some ttf font (ttf-dejavu recommended)" -} - -post_upgrade() { -# post_install $1 -xdg-icon-resource forceupdate --theme hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then - # important upgrade notice - echo "LibreOffice has been split into several packages:" - echo "- libreoffice-common" - echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications" - echo "- libreoffice-{gnome,kde4} - desktop integration plugins" - echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using" - echo " the LibreOffice APIs and for creating" - echo " extensions (UNO components)." - echo "Now you need to install at least one libreoffice-langpack!" - fi -} - -post_remove() { -update-desktop-database -q -xdg-icon-resource forceupdate --theme hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/testing/libreoffice/libreoffice-common.sh b/testing/libreoffice/libreoffice-common.sh deleted file mode 100644 index ee405b1aa..000000000 --- a/testing/libreoffice/libreoffice-common.sh +++ /dev/null @@ -1 +0,0 @@ -#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" diff --git a/testing/libreoffice/libreoffice-draw.install b/testing/libreoffice/libreoffice-draw.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/libreoffice/libreoffice-draw.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/libreoffice/libreoffice-impress.install b/testing/libreoffice/libreoffice-impress.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/libreoffice/libreoffice-impress.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/libreoffice/libreoffice-writer.install b/testing/libreoffice/libreoffice-writer.install deleted file mode 100644 index 80312d4a6..000000000 --- a/testing/libreoffice/libreoffice-writer.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/libssh2/PKGBUILD b/testing/libssh2/PKGBUILD deleted file mode 100644 index d6c09c9cd..000000000 --- a/testing/libssh2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159245 2012-05-19 04:14:54Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: ice-man <icemanf@gmail.com> - -pkgname=libssh2 -pkgver=1.4.2 -pkgrel=1 -pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" -url="http://www.libssh2.org/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('openssl') -makedepends=('zlib') -provides=('libssh2.so') -options=('!libtool') -source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) -md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3' - '872cfb1d61dbd5acd0481ab030e8f130') - -build() { - cd "$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/testing/libusb-compat/PKGBUILD b/testing/libusb-compat/PKGBUILD deleted file mode 100644 index cd0722960..000000000 --- a/testing/libusb-compat/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 158681 2012-05-07 05:49:00Z eric $ -# Maintainer: -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=libusb-compat -pkgver=0.1.4 -pkgrel=1 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('i686' 'x86_64') -url="http://libusb.sourceforge.net/" -license=('LGPL') -depends=('libusb' 'sh') -options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/linux-atm/PKGBUILD b/testing/linux-atm/PKGBUILD deleted file mode 100644 index 14e98013c..000000000 --- a/testing/linux-atm/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 157771 2012-04-29 09:40:54Z allan $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Surain Mallawa Arachchi <mas@crc32.net> - -pkgname=linux-atm -pkgver=2.5.2 -pkgrel=2 -pkgdesc="Drivers and tools to support ATM networking under Linux." -arch=('i686' 'x86_64') -depends=('glibc') -url="http://linux-atm.sourceforge.net/" -license=(GPL) -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz - man-pages.patch) -options=(!libtool !makeflags) -md5sums=('d49499368c3cf15f73a05d9bce8824a8' - '181390736336cdb615ae32f1ae5acfa6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../man-pages.patch - - # install firmware in /usr/lib - sed -i "s#/lib/firmware#/usr/lib/firmware#" src/extra/Makefile.in - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/linux-atm/man-pages.patch b/testing/linux-atm/man-pages.patch deleted file mode 100644 index c504cfe87..000000000 --- a/testing/linux-atm/man-pages.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up linux-atm-2.5.1/src/led/zeppelin.8.fixman linux-atm-2.5.1/src/led/zeppelin.8 ---- linux-atm-2.5.1/src/led/zeppelin.8.fixman 2003-05-02 19:35:04.000000000 +0200 -+++ linux-atm-2.5.1/src/led/zeppelin.8 2010-10-13 12:58:18.000000000 +0200 -@@ -99,7 +99,7 @@ Ring and ATM parts of the ELAN, so using - recommended. Token Ring support has received less testing than its - Ethernet counterpart. - .SH FILES --.IP \fI/var/run/lec[interface number].pid\fP -+\fI/var/run/lec[interface number].pid\fP - The file containing the process id of zeppelin. - .SH BUGS - John Bonham died 1980 and Led Zeppelin broke. -diff -up linux-atm-2.5.1/src/mpoad/mpcd.8.fixman linux-atm-2.5.1/src/mpoad/mpcd.8 ---- linux-atm-2.5.1/src/mpoad/mpcd.8.fixman 2001-10-10 00:33:07.000000000 +0200 -+++ linux-atm-2.5.1/src/mpoad/mpcd.8 2010-10-13 12:59:14.000000000 +0200 -@@ -28,7 +28,7 @@ mpcd \- ATM MPOA (Multi\-Protocol Over A - .B ]] - .SH DESCRIPTION - MPOA client --.SM(MPC) is responsible for creating and receiving -+.SM (MPC) is responsible for creating and receiving - internetwork layer shortcuts. Using these shortcuts MPCs forward - unicast internetwork layer packets effectively over ATM without need - for routing protocols. -@@ -43,7 +43,7 @@ accepts shortcuts and packets arriving o - shortcuts is done with the help of - .SM MPOA - server --.SM(MPS). -+.SM (MPS). - .PP - Just as the Linux - .SM LAN -diff -up linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman linux-atm-2.5.1/src/sigd/atmsigd.conf.4 ---- linux-atm-2.5.1/src/sigd/atmsigd.conf.4.fixman 2001-10-10 00:33:07.000000000 +0200 -+++ linux-atm-2.5.1/src/sigd/atmsigd.conf.4 2010-10-13 12:58:49.000000000 +0200 -@@ -125,7 +125,7 @@ a comment. The `#' character cannot be e - .P - If an option is specified in \fBatmsigd.conf\fP and on the command - line, the command line has priority. --.COMPATIBILITY -+.SH COMPATIBILITY - Certain options used by past versions of \fBatmsigd\fP but no longer documented - on the man page are still recognized and supported, but they also yield a - warning message. Future versions of \fBatmsigd\fP will not recognize those diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD deleted file mode 100644 index 002ea62ea..000000000 --- a/testing/llvm/PKGBUILD +++ /dev/null @@ -1,229 +0,0 @@ -# $Id: PKGBUILD 159399 2012-05-23 19:31:18Z foutrelis $ -# 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> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=3.1 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml') -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz - http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz - llvm-Config-config.h - llvm-Config-llvm-config.h - cindexer-clang-path.patch - clang-pure64.patch - enable-lto.patch - clang-3.1-fix-libprofile_rt.a-location.patch) -sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab' - 'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786' - '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558' - '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' - '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' - '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' - '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' - 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7' - '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') - -build() { - cd "$srcdir/$pkgname-$pkgver.src" - - # At the present, clang must reside inside the LLVM source code tree to build - # See http://llvm.org/bugs/show_bug.cgi?id=4840 - rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver.src" tools/clang - - rm -rf projects/compiler-rt - cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib/llvm:' \ - tools/llvm-config/llvm-config.cpp - sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib/llvm":' \ - autoconf/configure.ac \ - configure - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) - patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" - - if [[ $CARCH == x86_64 ]]; then - # Adjust linker path - patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" - fi - - # Make -flto work - # Use gold instead of default linker, and always use the plugin - patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" - - # Fix FS#29984: [clang] -coverage is broken - patch -d tools/clang -Np1 -i \ - "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # Use Python 2 - mkdir "$srcdir/python2-path" - ln -s /usr/bin/python2 "$srcdir/python2-path/python" - export PATH="$srcdir/python2-path:$PATH" - - # Force the use of GCC instead of clang - CC=gcc CXX=g++ \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm() { - pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') - - cd "$srcdir/$pkgname-$pkgver.src" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" - - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools - - # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" - - # Symlink LLVMgold.so into /usr/lib/bfd-plugins - # (https://bugs.archlinux.org/task/28479) - install -d "$pkgdir/usr/lib/bfd-plugins" - ln -s ../llvm/LLVMgold.so "$pkgdir/usr/lib/bfd-plugins/LLVMgold.so" - - if [[ $CARCH == x86_64 ]]; then - # Needed for multilib (https://bugs.archlinux.org/task/29951) - # Header stubs are taken from Fedora - for _header in config llvm-config; do - mv "$pkgdir/usr/include/llvm/Config/$_header"{,-64}.h - cp "$srcdir/llvm-Config-$_header.h" \ - "$pkgdir/usr/include/llvm/Config/$_header.h" - done - fi - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-ocaml() { - pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') - - cd "$srcdir/llvm-$pkgver.src" - - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" -} - -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - depends=("llvm=$pkgver-$pkgrel" 'gcc') - - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" - - cd "$srcdir/llvm-$pkgver.src/tools/clang" - make DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Revert the path change in case we want to do a repackage later - sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ - "$srcdir/llvm-$pkgver.src/Makefile.config" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" -} - -package_clang-analyzer() { - pkgdesc="A source code analysis framework" - url="http://clang-analyzer.llvm.org/" - depends=("clang=$pkgver-$pkgrel" 'python2') - - cd "$srcdir/llvm-$pkgver.src/tools/clang" - - install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for _tool in scan-{build,view}; do - cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" - ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" - done - - # Use Python 2 - sed -i \ - -e 's|env python$|&2|' \ - -e 's|/usr/bin/python$|&2|' \ - "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ - "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" - - # Compile Python scripts - python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" - python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/testing/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch deleted file mode 100644 index 080aa4fca..000000000 --- a/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp ---- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300 -+++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300 -@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain - // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is - // not supported by old linkers. - std::string ProfileRT = -- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; -+ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a"; - - CmdArgs.push_back(Args.MakeArgString(ProfileRT)); - } diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch deleted file mode 100644 index 9bbbfaa8b..000000000 --- a/testing/llvm/clang-pure64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::ppc64) - CmdArgs.push_back("/lib64/ld64.so.1"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch deleted file mode 100644 index 3205fbf69..000000000 --- a/testing/llvm/enable-lto.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - // Tell the linker to load the plugin. This has to come before AddLinkerInputs - // as gold requires -plugin to come before any -plugin-opt that -Wl might - // forward. -- if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (D.IsUsingLTO(Args) || Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs); - } diff --git a/testing/llvm/llvm-Config-config.h b/testing/llvm/llvm-Config-config.h deleted file mode 100644 index c369b4551..000000000 --- a/testing/llvm/llvm-Config-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "config-32.h" -#elif __WORDSIZE == 64 -#include "config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/llvm/llvm-Config-llvm-config.h b/testing/llvm/llvm-Config-llvm-config.h deleted file mode 100644 index 2fa08c9be..000000000 --- a/testing/llvm/llvm-Config-llvm-config.h +++ /dev/null @@ -1,9 +0,0 @@ -#include <bits/wordsize.h> - -#if __WORDSIZE == 32 -#include "llvm-config-32.h" -#elif __WORDSIZE == 64 -#include "llvm-config-64.h" -#else -#error "Unknown word size" -#endif diff --git a/testing/misdnuser/PKGBUILD b/testing/misdnuser/PKGBUILD deleted file mode 100644 index b60832b11..000000000 --- a/testing/misdnuser/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 158985 2012-05-14 05:41:34Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=misdnuser -pkgver=2.0.13_20120513 -pkgrel=1 -pkgdesc="Tools and library for mISDN" -arch=('i686' 'x86_64') -url="http://www.misdn.org" -license=('GPL') -depends=('isdn4k-utils' 'spandsp') -backup=('etc/capi20.conf') -options=('!makeflags' '!libtool' '!strip') -source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz - misdncapid.rc - mISDNcapid.service - mISDNcapid.conf) - -build() { - # only enable for debugging! - #export CFLAGS+=" -g -O0" - #export CXXFLAGS+=" -g -O0" - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-capi --enable-softdsp --with-mISDN_group=uucp - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid - # fix udev rule - mkdir -p ${pkgdir}/usr/lib/udev/rules.d - mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d - rm -r ${pkgdir}/etc/udev/ - # remove temporary dir /var/run/mISDNcapid - rm -r ${pkgdir}/var - # add systemd files - install -D -m644 ${srcdir}/mISDNcapid.service ${pkgdir}/usr/lib/systemd/system/mISDNcapid.service - install -D -m644 ${srcdir}/mISDNcapid.conf ${pkgdir}/usr/lib/tmpfiles.d/mISDNcapid.conf -} -md5sums=('f61339c3a28a370cd971957e6ef07f5c' - '2009563b144de037ecb20f8d727a772e' - '638b399f7e0937639960c4dfb3d5138e' - '42c3b46880a68c3883ee1ed00af34b45') diff --git a/testing/misdnuser/mISDNcapid.conf b/testing/misdnuser/mISDNcapid.conf deleted file mode 100644 index 7607e262d..000000000 --- a/testing/misdnuser/mISDNcapid.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/mISDNcapid 0755 root root - diff --git a/testing/misdnuser/mISDNcapid.service b/testing/misdnuser/mISDNcapid.service deleted file mode 100644 index b2b08a0a5..000000000 --- a/testing/misdnuser/mISDNcapid.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=mISDN CAPI daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/mISDNcapid -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/misdnuser/misdncapid.rc b/testing/misdnuser/misdncapid.rc deleted file mode 100755 index 5c47ca0a9..000000000 --- a/testing/misdnuser/misdncapid.rc +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID="$(pidof -o %PPID /usr/sbin/mISDNcapid)" -case "$1" in - start) - stat_busy "Starting misdncapid" - if [ ! -x /var/run/mISDNcapid ] ; then - install -m755 -d /var/run/mISDNcapid - fi - - [ -z "$PID" ] && /usr/sbin/mISDNcapid >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - PID=$(pidof -o %PPID /usr/sbin/mISDNcapid) - echo $PID > /var/run/misdncapid.pid - add_daemon misdncapid - stat_done - fi - ;; - stop) - stat_busy "Stopping misdncapid" - [ -f /var/run/misdncapid.pid ] && kill `cat /var/run/misdncapid.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/misdncapid.pid - rm_daemon misdncapid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac -exit 0 diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index e079d2ebe..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 158716 2012-05-08 09:42:21Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: damir <damir@archlinux.org> - -pkgname=mpfr -_pkgver=3.1.0 -_patchlevel=p10 -pkgver=${_pkgver}.${_patchlevel} -pkgrel=1 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc} - mpfr-${_pkgver}.${_patchlevel}.patch) -md5sums=('6e495841bb026481567006cec0f821c3' - '293374ee4b01527f8f7889fdfa9016f8' - '776954381923739ef0e618d992188535') - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr-3.1.0.p10.patch b/testing/mpfr/mpfr-3.1.0.p10.patch deleted file mode 100644 index 0073be709..000000000 --- a/testing/mpfr/mpfr-3.1.0.p10.patch +++ /dev/null @@ -1,1896 +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 -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 -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2011-11-28 12:22:52.000000000 +0000 -@@ -0,0 +1 @@ -+gmp41compat -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2011-11-28 12:22:52.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p3 -+3.1.0-p4 -diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info ---- mpfr-3.1.0-a/doc/mpfr.info 2011-10-03 09:43:04.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.info 2011-11-28 12:22:52.000000000 +0000 -@@ -2994,11 +2994,12 @@ - - * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1. Their - behavior no longer depends on the platform (assuming this is also -- true for GMP's random generator). As a consequence, the returned -- values can be different between MPFR 3.1 and previous MPFR -- versions. Note: as the reproducibility of these functions was not -- specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded -- as backward incompatible with previous versions. -+ true for GMP's random generator, which is not the case between GMP -+ 4.1 and 4.2 if `gmp_randinit_default' is used). As a consequence, -+ the returned values can be different between MPFR 3.1 and previous -+ MPFR versions. Note: as the reproducibility of these functions -+ was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ -+ regarded as backward incompatible with previous versions. - - - -@@ -4239,13 +4240,13 @@ - Node: Type and Macro Changes129308 - Node: Added Functions132029 - Node: Changed Functions134972 --Node: Removed Functions139167 --Node: Other Changes139579 --Node: Contributors141108 --Node: References143574 --Node: GNU Free Documentation License145315 --Node: Concept Index167758 --Node: Function and Type Index173677 -+Node: Removed Functions139253 -+Node: Other Changes139665 -+Node: Contributors141194 -+Node: References143660 -+Node: GNU Free Documentation License145401 -+Node: Concept Index167844 -+Node: Function and Type Index173763 - - End Tag Table - -diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi ---- mpfr-3.1.0-a/doc/mpfr.texi 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/doc/mpfr.texi 2011-11-28 12:22:52.000000000 +0000 -@@ -3466,8 +3466,9 @@ - a lack of specification. - - @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1. --Their behavior no longer depends on the platform (assuming this is also --true for GMP's random generator). As a consequence, the returned values -+Their behavior no longer depends on the platform (assuming this is also true -+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if -+@code{gmp_randinit_default} is used). As a consequence, the returned values - can be different between MPFR 3.1 and previous MPFR versions. - Note: as the reproducibility of these functions was not specified - before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as -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-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2011-11-28 12:22:52.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-p3" -+#define MPFR_VERSION_STRING "3.1.0-p4" - - /* 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-11-03 15:15:11.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2011-11-28 12:22:52.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p3"; -+ return "3.1.0-p4"; - } -diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c ---- mpfr-3.1.0-a/tests/trandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/trandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -114,21 +114,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.895943" -+# define C2 "0.848824" -+#else -+# define C1 "0.479652" -+# define C2 "0.648529" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.895943") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.895943, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandomb (x, s); -- if (mpfr_cmp_str1 (x, "0.848824") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.848824, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c ---- mpfr-3.1.0-a/tests/turandom.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/turandom.c 2011-11-28 12:22:52.000000000 +0000 -@@ -160,23 +160,29 @@ - mpfr_t x; - gmp_randstate_t s; - -+#if __MPFR_GMP(4,2,0) -+# define C1 "0.8488312" -+# define C2 "0.8156509" -+#else -+# define C1 "0.6485367" -+# define C2 "0.9362717" -+#endif -+ - gmp_randinit_default (s); - gmp_randseed_ui (s, 42); - mpfr_init2 (x, 17); - mpfr_urandom (x, s, MPFR_RNDN); -- /* the following values are obtained on a 32-bit computer, we should get -- the same values on a 64-bit computer */ -- if (mpfr_cmp_str1 (x, "0.8488312") != 0) -+ if (mpfr_cmp_str1 (x, C1) != 0) - { -- printf ("Error in bug20100914, expected 0.8488312, got "); -+ printf ("Error in bug20100914, expected " C1 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); - } - mpfr_urandom (x, s, MPFR_RNDN); -- if (mpfr_cmp_str1 (x, "0.8156509") != 0) -+ if (mpfr_cmp_str1 (x, C2) != 0) - { -- printf ("Error in bug20100914, expected 0.8156509, got "); -+ printf ("Error in bug20100914, expected " C2 ", got "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); - printf ("\n"); - exit (1); -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 12:44:49.000000000 +0000 -@@ -0,0 +1 @@ -+logging-freeze -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2011-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 12:44:49.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p4 -+3.1.0-p5 -diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c ---- mpfr-3.1.0-a/src/add_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c ---- mpfr-3.1.0-a/src/add_ui.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add_ui.c 2012-02-24 12:44:49.000000000 +0000 -@@ -29,7 +29,7 @@ - MPFR_LOG_FUNC - (("x[%Pu]=%.*Rg u=%d rnd=%d", - mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode), -- ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y)); -+ ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y)); - - if (MPFR_LIKELY(u != 0) ) /* if u=0, do nothing */ - { -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-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 12:44:49.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-p4" -+#define MPFR_VERSION_STRING "3.1.0-p5" - - /* 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/mul_d.c mpfr-3.1.0-b/src/mul_d.c ---- mpfr-3.1.0-a/src/mul_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul_d.c 2012-02-24 12:44:49.000000000 +0000 -@@ -34,7 +34,7 @@ - (("b[%Pu]=%.*Rg c=%.20g rnd=%d", - mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode), - ("a[%Pu]=%.*Rg inexact=%d", -- mpfr_get_prec (a), mpfr_get_prec, a, inexact)); -+ mpfr_get_prec (a), mpfr_log_prec, a, inexact)); - - MPFR_SAVE_EXPO_MARK (expo); - -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-11-28 12:22:52.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 12:44:49.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p4"; -+ return "3.1.0-p5"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-02-24 13:50:05.000000000 +0000 -@@ -0,0 +1 @@ -+logging-varfmt -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-02-24 13:50:05.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p5 -+3.1.0-p6 -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-05 21:39:57.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-02-24 13:50:05.000000000 +0000 -@@ -1592,7 +1592,7 @@ - do \ - if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) && \ - (mpfr_log_current <= mpfr_log_level)) \ -- LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__, \ -+ LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__, \ - #x, mpfr_get_prec (x), mpfr_log_prec, x); \ - while (0) - -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 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-02-24 13:50:05.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-p5" -+#define MPFR_VERSION_STRING "3.1.0-p6" - - /* 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 2012-02-24 12:44:49.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-02-24 13:50:05.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p5"; -+ return "3.1.0-p6"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-08 15:17:03.000000000 +0000 -@@ -0,0 +1 @@ -+large-prec -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-08 15:17:03.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p6 -+3.1.0-p7 -diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c ---- mpfr-3.1.0-a/src/add1.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1.c 2012-03-08 15:17:03.000000000 +0000 -@@ -44,12 +44,12 @@ - bq = MPFR_PREC(b); - cq = MPFR_PREC(c); - -- an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */ -+ an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */ - aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS; - sh = aq2 - aq; /* non-significant bits in low limb */ - -- bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */ -- cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - - ap = MPFR_MANT(a); - bp = MPFR_MANT(b); -@@ -124,7 +124,7 @@ - dif = aq2 - diff_exp; - /* dif is the number of bits of c which overlap with a' */ - -- difn = (dif-1)/GMP_NUMB_BITS + 1; -+ difn = MPFR_PREC2LIMBS (dif); - /* only the highest difn limbs from c have to be considered */ - if (MPFR_UNLIKELY(difn > cn)) - { -diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c ---- mpfr-3.1.0-a/src/add1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/add1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -107,7 +107,7 @@ - - /* Read prec and num of limbs */ - p = MPFR_PREC(b); -- n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (p); - MPFR_UNSIGNED_MINUS_MODULO(sh, p); - bx = MPFR_GET_EXP(b); - d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c)); -diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c ---- mpfr-3.1.0-a/src/agm.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/agm.c 2012-03-08 15:17:03.000000000 +0000 -@@ -91,7 +91,7 @@ - q = MPFR_PREC(r); - p = q + MPFR_INT_CEIL_LOG2(q) + 15; - MPFR_ASSERTD (p >= 7); /* see algorithms.tex */ -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - - /* b (op2) and a (op1) are the 2 operands but we want b >= a */ - compare = mpfr_cmp (op1, op2); -@@ -285,7 +285,7 @@ - - /* Next iteration */ - MPFR_ZIV_NEXT (loop, p); -- s = (p - 1) / GMP_NUMB_BITS + 1; -+ s = MPFR_PREC2LIMBS (p); - } - MPFR_ZIV_FREE (loop); - -diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c ---- mpfr-3.1.0-a/src/eq.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/eq.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,8 +56,8 @@ - if (uexp != vexp) - return 0; /* no bit agree */ - -- usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1; -- vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1; -+ usize = MPFR_LIMB_SIZE (u); -+ vsize = MPFR_LIMB_SIZE (v); - - if (vsize > usize) /* exchange u and v */ - { -diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c ---- mpfr-3.1.0-a/src/exp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/exp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -133,7 +133,7 @@ - mp_size_t yn; - int sh; - -- yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ yn = MPFR_LIMB_SIZE (y); - sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y); - MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh; - inexact = 1; -diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c ---- mpfr-3.1.0-a/src/get_d.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_d.c 2012-03-08 15:17:03.000000000 +0000 -@@ -100,7 +100,7 @@ - nbits += (1021 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE ); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c ---- mpfr-3.1.0-a/src/get_flt.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_flt.c 2012-03-08 15:17:03.000000000 +0000 -@@ -92,7 +92,7 @@ - nbits += (125 + e); - MPFR_ASSERTD (nbits >= 1); - } -- np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ np = MPFR_PREC2LIMBS (nbits); - MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT); - carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative, - nbits, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c ---- mpfr-3.1.0-a/src/get_str.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/get_str.c 2012-03-08 15:17:03.000000000 +0000 -@@ -2351,7 +2351,7 @@ - - /* the first digit will contain only r bits */ - prec = (m - 1) * pow2 + r; /* total number of bits */ -- n = (prec - 1) / GMP_NUMB_BITS + 1; -+ n = MPFR_PREC2LIMBS (prec); - - MPFR_TMP_MARK (marker); - x1 = MPFR_TMP_LIMBS_ALLOC (n + 1); -@@ -2417,12 +2417,12 @@ - exact = 1; - - /* number of limbs */ -- n = 1 + (prec - 1) / GMP_NUMB_BITS; -+ n = MPFR_PREC2LIMBS (prec); - - /* a will contain the approximation of the mantissa */ - a = MPFR_TMP_LIMBS_ALLOC (n); - -- nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ nx = MPFR_LIMB_SIZE (x); - - if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or - division to perform */ -diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c ---- mpfr-3.1.0-a/src/init2.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/init2.c 2012-03-08 15:17:03.000000000 +0000 -@@ -51,7 +51,7 @@ - which both have an odd mantissa */ - MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - -- xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1; -+ xsize = MPFR_PREC2LIMBS (p); - tmp = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize)); - - MPFR_PREC(x) = p; /* Set prec */ -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -@@ -67,7 +67,7 @@ - - /* Now, the unit bit is represented. */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of represented fractional bits (including the trailing 0's) */ - - x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS); -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr-impl.h 2012-03-09 12:06:26.000000000 +0000 -@@ -646,10 +646,24 @@ - **************** mpfr_t properties ******************* - ******************************************************/ - -+/* In the following macro, p is usually a mpfr_prec_t, but this macro -+ works with other integer types (without integer overflow). Checking -+ that p >= 1 in debug mode is useful here because this macro can be -+ used on a computed precision (in particular, this formula does not -+ work for a degenerate case p = 0, and could give different results -+ on different platforms). But let us not use an assertion checking -+ in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid -+ too much expansion for assertions (in practice, this should be a -+ problem just when testing MPFR with the --enable-assert configure -+ option and the -ansi -pedantic-errors gcc compiler flags). */ -+#define MPFR_PREC2LIMBS(p) \ -+ (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1) -+ - #define MPFR_PREC(x) ((x)->_mpfr_prec) - #define MPFR_EXP(x) ((x)->_mpfr_exp) - #define MPFR_MANT(x) ((x)->_mpfr_d) --#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1) -+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS) -+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1) - - - /****************************************************** -@@ -749,7 +763,8 @@ - #define MPFR_IS_FP(x) (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x)) - #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF) - #define MPFR_IS_PURE_FP(x) (!MPFR_IS_SINGULAR(x) && \ -- (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1)) -+ (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)] \ -+ & MPFR_LIMB_HIGHBIT) != 0), 1)) - - #define MPFR_ARE_SINGULAR(x,y) \ - (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y))) -@@ -1061,7 +1076,7 @@ - /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */ - #define MPFR_SET_ONE(x) \ - do { \ -- mp_size_t _size = MPFR_LIMB_SIZE(x) - 1; \ -+ mp_size_t _size = MPFR_LAST_LIMB(x); \ - MPFR_SET_POS(x); \ - MPFR_EXP(x) = 1; \ - MPN_ZERO ( MPFR_MANT(x), _size); \ -@@ -1213,8 +1228,8 @@ - _destp = MPFR_MANT (dest); \ - if (MPFR_UNLIKELY (_destprec >= _srcprec)) \ - { \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec) - _srcs; \ - MPN_COPY (_destp + _dests, srcp, _srcs); \ - MPN_ZERO (_destp, _dests); \ - inexact = 0; \ -@@ -1227,8 +1242,8 @@ - mp_limb_t _rb, _sb, _ulp; \ - \ - /* Compute Position and shift */ \ -- _srcs = (_srcprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -- _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS; \ -+ _srcs = MPFR_PREC2LIMBS (_srcprec); \ -+ _dests = MPFR_PREC2LIMBS (_destprec); \ - MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec); \ - _sp = (srcp) + _srcs - _dests; \ - \ -@@ -1372,7 +1387,7 @@ - if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src))) \ - { \ - MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src), \ -- (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \ -+ MPFR_LIMB_SIZE (src)); \ - inexact = 0; \ - } \ - else \ -@@ -1682,7 +1697,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE)) \ - { \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ -@@ -1733,7 +1748,7 @@ - MPFR_ASSERTD (_prec >= MPFR_PREC_MIN); \ - if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX)) \ - mpfr_abort_prec_max (); \ -- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; \ -+ _size = MPFR_PREC2LIMBS (_prec); \ - (g).alloc = (num) * _size * sizeof (mp_limb_t); \ - if (MPFR_LIKELY (_oalloc == 0)) \ - (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc); \ -@@ -1886,7 +1901,7 @@ - MPFR_NORETURN_ATTR; - - __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t, -- unsigned long)); -+ mpfr_prec_t)); - - __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*, - unsigned long)); -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-08 15:17:03.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-p6" -+#define MPFR_VERSION_STRING "3.1.0-p7" - - /* 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/mul.c mpfr-3.1.0-b/src/mul.c ---- mpfr-3.1.0-a/src/mul.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/mul.c 2012-03-08 15:17:03.000000000 +0000 -@@ -93,15 +93,15 @@ - - ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c); - -- bq = MPFR_PREC(b); -- cq = MPFR_PREC(c); -+ bq = MPFR_PREC (b); -+ cq = MPFR_PREC (c); - -- MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - /* <= k, thus no int overflow */ - MPFR_ASSERTD(tn <= k); - -@@ -292,12 +292,12 @@ - bq = MPFR_PREC (b); - cq = MPFR_PREC (c); - -- MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX); - -- bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */ -- cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */ -+ bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */ -+ cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */ - k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */ -- tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ tn = MPFR_PREC2LIMBS (bq + cq); - MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */ - - /* Check for no size_t overflow*/ -diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c ---- mpfr-3.1.0-a/src/pow.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/pow.c 2012-03-08 15:17:03.000000000 +0000 -@@ -136,7 +136,7 @@ - (b) all the 'z' bits are zero - */ - -- prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo; -+ prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo; - /* number of z+0 bits */ - - yn = prec / GMP_NUMB_BITS; -diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c ---- mpfr-3.1.0-a/src/print_raw.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/print_raw.c 2012-03-08 15:17:03.000000000 +0000 -@@ -84,7 +84,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - printf("%s ", str); - for(n-- ; n>=0 ; n--) -@@ -109,7 +109,7 @@ - int i; - mpfr_prec_t count = 0; - char c; -- mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1; -+ mp_size_t n = MPFR_PREC2LIMBS (r); - - for(n-- ; n>=0 ; n--) - { -diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c ---- mpfr-3.1.0-a/src/round_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -55,12 +55,12 @@ - - MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX); - -- nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */ -+ nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */ - - /* check if x has enough allocated space for the significand */ - /* Get the number of limbs from the precision. - (Compatible with all allocation methods) */ -- ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS; -+ ow = MPFR_LIMB_SIZE (x); - if (nw > ow) - { - /* FIXME: Variable can't be created using custom allocation, -diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c ---- mpfr-3.1.0-a/src/round_raw_generic.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/round_raw_generic.c 2012-03-08 15:17:03.000000000 +0000 -@@ -80,7 +80,7 @@ - (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg))) - return 0; - -- xsize = (xprec-1)/GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (xprec); - nw = yprec / GMP_NUMB_BITS; - rw = yprec & (GMP_NUMB_BITS - 1); - -diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c ---- mpfr-3.1.0-a/src/set.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set.c 2012-03-08 15:17:03.000000000 +0000 -@@ -48,8 +48,7 @@ - /* Same precision and b is not singular: - * just copy the mantissa, and set the exponent and the sign - * The result is exact. */ -- MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), -- (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); -+ MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b)); - MPFR_RET (0); - } - else -diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c ---- mpfr-3.1.0-a/src/set_f.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_f.c 2012-03-08 15:17:03.000000000 +0000 -@@ -43,7 +43,7 @@ - if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0) - MPFR_CHANGE_SIGN (y); - -- sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS; -+ sy = MPFR_LIMB_SIZE (y); - my = MPFR_MANT(y); - mx = PTR(x); - -diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c ---- mpfr-3.1.0-a/src/set_prec.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/set_prec.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX); - - /* Calculate the new number of limbs */ -- xsize = (p - 1) / GMP_NUMB_BITS + 1; -+ xsize = MPFR_PREC2LIMBS (p); - - /* Realloc only if the new size is greater than the old */ - xoldsize = MPFR_GET_ALLOC_SIZE (x); -diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c ---- mpfr-3.1.0-a/src/setmax.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/setmax.c 2012-03-08 15:17:03.000000000 +0000 -@@ -32,7 +32,7 @@ - mp_limb_t *xp; - - MPFR_SET_EXP (x, e); -- xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS; -+ xn = MPFR_LIMB_SIZE (x); - sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x); - xp = MPFR_MANT(x); - xp[0] = MP_LIMB_T_MAX << sh; -diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c ---- mpfr-3.1.0-a/src/sqr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sqr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -56,11 +56,11 @@ - ax = 2 * MPFR_GET_EXP (b); - bq = MPFR_PREC(b); - -- MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */ -+ MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX); - -- bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */ -- tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square, -- 2*bn or 2*bn-1 */ -+ bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */ -+ tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square, -+ 2*bn or 2*bn-1 */ - - if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD)) - return mpfr_mul (a, b, b, rnd_mode); -diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c ---- mpfr-3.1.0-a/src/stack_interface.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/stack_interface.c 2012-03-08 15:17:03.000000000 +0000 -@@ -26,7 +26,7 @@ - size_t - mpfr_custom_get_size (mpfr_prec_t prec) - { -- return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB; -+ return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB; - } - - #undef mpfr_custom_init -diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c ---- mpfr-3.1.0-a/src/strtofr.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/strtofr.c 2012-03-08 15:17:03.000000000 +0000 -@@ -467,7 +467,7 @@ - /* Set y to the value of the ~prec most significant bits of pstr->mant - (as long as we guarantee correct rounding, we don't need to get - exactly prec bits). */ -- ysize = (prec - 1) / GMP_NUMB_BITS + 1; -+ ysize = MPFR_PREC2LIMBS (prec); - /* prec bits corresponds to ysize limbs */ - ysize_bits = ysize * GMP_NUMB_BITS; - /* and to ysize_bits >= prec > MPFR_PREC (x) bits */ -diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c ---- mpfr-3.1.0-a/src/sub1sp.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/sub1sp.c 2012-03-08 15:17:03.000000000 +0000 -@@ -155,8 +155,8 @@ - MPFR_ASSERTD(MPFR_IS_PURE_FP(c)); - - /* Read prec and num of limbs */ -- p = MPFR_PREC(b); -- n = (p-1)/GMP_NUMB_BITS+1; -+ p = MPFR_PREC (b); -+ n = MPFR_PREC2LIMBS (p); - - /* Fast cmp of |b| and |c|*/ - bx = MPFR_GET_EXP (b); -diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c ---- mpfr-3.1.0-a/src/urandomb.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/urandomb.c 2012-03-08 15:17:03.000000000 +0000 -@@ -31,13 +31,20 @@ - a sufficient number of limbs */ - void - mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate, -- unsigned long int nbits) -+ mpfr_prec_t nbits) - { - mpz_t z; - -+ MPFR_ASSERTN (nbits >= 1); - /* To be sure to avoid the potential allocation of mpz_urandomb */ -- ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1; -+ ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits); - PTR(z) = mp; -+#if __MPFR_GMP(5,0,0) -+ /* Check for integer overflow (unless mp_bitcnt_t is signed, -+ but according to the GMP manual, this shouldn't happen). -+ Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */ -+ MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1); -+#endif - mpz_urandomb (z, rstate, nbits); - } - -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 2012-02-24 13:50:05.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-08 15:17:03.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p6"; -+ return "3.1.0-p7"; - } -diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c ---- mpfr-3.1.0-a/tests/tinits.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tinits.c 2012-03-08 15:17:03.000000000 +0000 -@@ -1,4 +1,4 @@ --/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears. -+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears. - - Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. - Contributed by the Arenaire and Caramel projects, INRIA. -@@ -20,18 +20,43 @@ - http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc., - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */ - -+#include <stdlib.h> -+ - #include "mpfr-test.h" - - int - main (void) - { - mpfr_t a, b, c; -+ long large_prec; - - tests_start_mpfr (); -+ - mpfr_inits (a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); - mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0); - mpfr_clears (a, b, c, (mpfr_ptr) 0); -+ -+ /* test for precision 2^31-1, see -+ https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */ -+ large_prec = 2147483647; -+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ { -+ /* We assume that the precision won't be increased internally. */ -+ if (large_prec > MPFR_PREC_MAX) -+ large_prec = MPFR_PREC_MAX; -+ mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0); -+ mpfr_set_ui (a, 17, MPFR_RNDN); -+ mpfr_set (b, a, MPFR_RNDN); -+ if (mpfr_get_ui (a, MPFR_RNDN) != 17) -+ { -+ printf ("Error in mpfr_init2 with precision 2^31-1\n"); -+ exit (1); -+ } -+ mpfr_clears (a, b, (mpfr_ptr) 0); -+ } -+ - tests_end_mpfr (); -+ - return 0; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-03-12 11:59:47.000000000 +0000 -@@ -0,0 +1 @@ -+__gmp_const -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-03-12 11:59:47.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p7 -+3.1.0-p8 -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 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-03-12 11:59:47.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-p7" -+#define MPFR_VERSION_STRING "3.1.0-p8" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -@@ -39,6 +39,18 @@ - # include <gmp.h> - #endif - -+/* GMP's internal __gmp_const macro has been removed on 2012-03-04: -+ http://gmplib.org:8000/gmp/rev/d287cfaf6732 -+ const is standard and now assumed to be available. If the __gmp_const -+ definition is no longer present in GMP, this probably means that GMP -+ assumes that const is available; thus let's define it to const. -+ Note: this is a temporary fix that can be backported to previous MPFR -+ versions. In the future, __gmp_const should be replaced by const like -+ in GMP. */ -+#ifndef __gmp_const -+# define __gmp_const const -+#endif -+ - /* Avoid some problems with macro expansion if the user defines macros - with the same name as keywords. By convention, identifiers and macro - names starting with mpfr_ are reserved by MPFR. */ -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 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-03-12 11:59:47.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p7"; -+ return "3.1.0-p8"; - } -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-04-27 01:13:15.000000000 +0000 -@@ -0,0 +1 @@ -+gamma-underflow -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-04-27 01:13:15.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p8 -+3.1.0-p9 -diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c ---- mpfr-3.1.0-a/src/gamma.c 2011-10-03 08:17:09.000000000 +0000 -+++ mpfr-3.1.0-b/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 -@@ -296,7 +296,7 @@ - /* we want an upper bound for x * [log(2-x)-1]. - since x < 0, we need a lower bound on log(2-x) */ - mpfr_ui_sub (xp, 2, x, MPFR_RNDD); -- mpfr_log2 (xp, xp, MPFR_RNDD); -+ mpfr_log (xp, xp, MPFR_RNDD); - mpfr_sub_ui (xp, xp, 1, MPFR_RNDD); - mpfr_mul (xp, xp, x, MPFR_RNDU); - -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 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-04-27 01:13:15.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-p8" -+#define MPFR_VERSION_STRING "3.1.0-p9" - - /* 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 2012-03-12 11:59:47.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-04-27 01:13:15.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p8"; -+ return "3.1.0-p9"; - } -diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c ---- mpfr-3.1.0-a/tests/tgamma.c 2011-10-03 08:17:14.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 -@@ -478,6 +478,36 @@ - mpfr_clear (x); - } - -+/* bug found by Giridhar Tammana */ -+static void -+test20120426 (void) -+{ -+ mpfr_t xa, xb; -+ int i; -+ mpfr_exp_t emin; -+ -+ mpfr_init2 (xa, 53); -+ mpfr_init2 (xb, 53); -+ mpfr_set_d (xb, -168.5, MPFR_RNDN); -+ emin = mpfr_get_emin (); -+ mpfr_set_emin (-1073); -+ i = mpfr_gamma (xa, xb, MPFR_RNDN); -+ i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */ -+ mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN); -+ if (!((i > 0) && (mpfr_cmp (xa, xb) == 0))) -+ { -+ printf ("Error in test20120426, i=%d\n", i); -+ printf ("expected "); -+ mpfr_print_binary (xb); putchar ('\n'); -+ printf ("got "); -+ mpfr_print_binary (xa); putchar ('\n'); -+ exit (1); -+ } -+ mpfr_set_emin (emin); -+ mpfr_clear (xa); -+ mpfr_clear (xb); -+} -+ - static void - exprange (void) - { -@@ -821,6 +851,7 @@ - gamma_integer (); - test20071231 (); - test20100709 (); -+ test20120426 (); - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - -diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES ---- mpfr-3.1.0-a/PATCHES 2012-05-07 18:52:45.000000000 +0000 -+++ mpfr-3.1.0-b/PATCHES 2012-05-07 18:52:45.000000000 +0000 -@@ -0,0 +1 @@ -+gamma-overunderflow -diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION ---- mpfr-3.1.0-a/VERSION 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/VERSION 2012-05-07 18:52:45.000000000 +0000 -@@ -1 +1 @@ --3.1.0-p9 -+3.1.0-p10 -diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c ---- mpfr-3.1.0-a/src/gamma.c 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/gamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -100,7 +100,8 @@ - mpfr_t xp, GammaTrial, tmp, tmp2; - mpz_t fact; - mpfr_prec_t realprec; -- int compared, inex, is_integer; -+ int compared, is_integer; -+ int inex = 0; /* 0 means: result gamma not set yet */ - MPFR_GROUP_DECL (group); - MPFR_SAVE_EXPO_DECL (expo); - MPFR_ZIV_DECL (loop); -@@ -377,6 +378,15 @@ - mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */ - err_g = MPFR_GET_EXP(GammaTrial); - mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */ -+ /* If tmp is +Inf, we compute exp(lngamma(x)). */ -+ if (mpfr_inf_p (tmp)) -+ { -+ inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode); -+ if (inex) -+ goto end; -+ else -+ goto ziv_next; -+ } - err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial); - /* let g0 the true value of Pi*(2-x), g the computed value. - We have g = g0 + h with |h| <= |(1+u^2)-1|*g. -@@ -411,11 +421,16 @@ - if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g, - MPFR_PREC(gamma), rnd_mode))) - break; -+ -+ ziv_next: - MPFR_ZIV_NEXT (loop, realprec); - } -+ -+ end: - MPFR_ZIV_FREE (loop); - -- inex = mpfr_set (gamma, GammaTrial, rnd_mode); -+ if (inex == 0) -+ inex = mpfr_set (gamma, GammaTrial, rnd_mode); - MPFR_GROUP_CLEAR (group); - mpz_clear (fact); - -diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c ---- mpfr-3.1.0-a/src/lngamma.c 2012-03-08 15:17:03.000000000 +0000 -+++ mpfr-3.1.0-b/src/lngamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -49,9 +49,72 @@ - mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */ - } - --#ifndef IS_GAMMA -+#ifdef IS_GAMMA -+ -+/* This function is called in case of intermediate overflow/underflow. -+ The s1 and s2 arguments are temporary MPFR numbers, having the -+ working precision. If the result could be determined, then the -+ flags are updated via pexpo, y is set to the result, and the -+ (non-zero) ternary value is returned. Otherwise 0 is returned -+ in order to perform the next Ziv iteration. */ - static int --unit_bit (mpfr_srcptr (x)) -+mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo, -+ mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd) -+{ -+ mpfr_t t1, t2; -+ int inex1, inex2, sign; -+ MPFR_BLOCK_DECL (flags1); -+ MPFR_BLOCK_DECL (flags2); -+ MPFR_GROUP_DECL (group); -+ -+ MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD)); -+ MPFR_ASSERTN (inex1 != 0); -+ /* s1 = RNDD(lngamma(x)), inexact */ -+ if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1))) -+ { -+ if (MPFR_SIGN (s1) > 0) -+ { -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW); -+ return mpfr_overflow (y, rnd, sign); -+ } -+ else -+ { -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW); -+ return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign); -+ } -+ } -+ -+ mpfr_set (s2, s1, MPFR_RNDN); /* exact */ -+ mpfr_nextabove (s2); /* v = RNDU(lngamma(z0)) */ -+ -+ if (sign < 0) -+ rnd = MPFR_INVERT_RND (rnd); /* since the result with be negated */ -+ MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2); -+ MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd)); -+ MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd)); -+ /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|, -+ t2 is the rounding with mode 'rnd' of an upper bound, thus if both -+ are equal, so is the wanted result. If t1 and t2 differ or the flags -+ differ, at some point of Ziv's loop they should agree. */ -+ if (mpfr_equal_p (t1, t2) && flags1 == flags2) -+ { -+ MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0)); -+ mpfr_set4 (y, t1, MPFR_RNDN, sign); /* exact */ -+ if (sign < 0) -+ inex1 = - inex1; -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1); -+ } -+ else -+ inex1 = 0; /* couldn't determine the result */ -+ MPFR_GROUP_CLEAR (group); -+ -+ return inex1; -+} -+ -+#else -+ -+static int -+unit_bit (mpfr_srcptr x) - { - mpfr_exp_t expo; - mpfr_prec_t prec; -@@ -75,6 +138,7 @@ - - return (x0 >> (prec % GMP_NUMB_BITS)) & 1; - } -+ - #endif - - /* lngamma(x) = log(gamma(x)). -@@ -99,12 +163,14 @@ - mpfr_t s, t, u, v, z; - unsigned long m, k, maxm; - mpz_t *INITIALIZED(B); /* variable B declared as initialized */ -- int inexact, compared; -+ int compared; -+ int inexact = 0; /* 0 means: result y not set yet */ - mpfr_exp_t err_s, err_t; - unsigned long Bm = 0; /* number of allocated B[] */ - unsigned long oldBm; - double d; - MPFR_SAVE_EXPO_DECL (expo); -+ MPFR_ZIV_DECL (loop); - - compared = mpfr_cmp_ui (z0, 1); - -@@ -122,7 +188,7 @@ - if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y)) - { - mpfr_t l, h, g; -- int ok, inex2; -+ int ok, inex1, inex2; - mpfr_prec_t prec = MPFR_PREC(y) + 14; - MPFR_ZIV_DECL (loop); - -@@ -157,14 +223,14 @@ - mpfr_sub (h, h, g, MPFR_RNDD); - mpfr_mul (g, z0, z0, MPFR_RNDU); - mpfr_add (h, h, g, MPFR_RNDU); -- inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd); -+ inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd); - inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd); - /* Caution: we not only need l = h, but both inexact flags should - agree. Indeed, one of the inexact flags might be zero. In that - case if we assume lngamma(z0) cannot be exact, the other flag - should be correct. We are conservative here and request that both - inexact flags agree. */ -- ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0; -+ ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0; - if (ok) - mpfr_set (y, h, rnd); /* exact */ - mpfr_clear (l); -@@ -172,8 +238,9 @@ - mpfr_clear (g); - if (ok) - { -+ MPFR_ZIV_FREE (loop); - MPFR_SAVE_EXPO_FREE (expo); -- return mpfr_check_range (y, inexact, rnd); -+ return mpfr_check_range (y, inex1, rnd); - } - /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2), - if x ~ 2^(-n), then we have a n-bit approximation, thus -@@ -205,9 +272,10 @@ - thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */ - - w = precy + MPFR_INT_CEIL_LOG2 (precy); -+ w += MPFR_INT_CEIL_LOG2 (w) + 14; -+ MPFR_ZIV_INIT (loop, w); - while (1) - { -- w += MPFR_INT_CEIL_LOG2 (w) + 14; - MPFR_ASSERTD(w >= 3); - mpfr_set_prec (s, w); - mpfr_set_prec (t, w); -@@ -288,7 +356,9 @@ - + (rnd == MPFR_RNDN))) - goto end; - } -+ MPFR_ZIV_NEXT (loop, w); - } -+ MPFR_ZIV_FREE (loop); - } - - /* now z0 > 1 */ -@@ -298,10 +368,10 @@ - /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w), - so there is a cancellation of ~log(w) in the argument reconstruction */ - w = precy + MPFR_INT_CEIL_LOG2 (precy); -- -- do -+ w += MPFR_INT_CEIL_LOG2 (w) + 13; -+ MPFR_ZIV_INIT (loop, w); -+ while (1) - { -- w += MPFR_INT_CEIL_LOG2 (w) + 13; - MPFR_ASSERTD (w >= 3); - - /* argument reduction: we compute gamma(z0 + k), where the series -@@ -441,6 +511,15 @@ - #ifdef IS_GAMMA - err_s = MPFR_GET_EXP(s); - mpfr_exp (s, s, MPFR_RNDN); -+ /* If s is +Inf, we compute exp(lngamma(z0)). */ -+ if (mpfr_inf_p (s)) -+ { -+ inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd); -+ if (inexact) -+ goto end0; -+ else -+ goto ziv_next; -+ } - /* before the exponential, we have s = s0 + h where - |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h). - For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus -@@ -480,16 +559,26 @@ - err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s); - err_s += 1 - MPFR_GET_EXP(s); - #endif -+ if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd))) -+ break; -+#ifdef IS_GAMMA -+ ziv_next: -+#endif -+ MPFR_ZIV_NEXT (loop, w); - } -- while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd))); - -+#ifdef IS_GAMMA -+ end0: -+#endif - oldBm = Bm; - while (Bm--) - mpz_clear (B[Bm]); - (*__gmp_free_func) (B, oldBm * sizeof (mpz_t)); - - end: -- inexact = mpfr_set (y, s, rnd); -+ if (inexact == 0) -+ inexact = mpfr_set (y, s, rnd); -+ MPFR_ZIV_FREE (loop); - - mpfr_clear (s); - mpfr_clear (t); -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 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/mpfr.h 2012-05-07 18:52:45.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-p9" -+#define MPFR_VERSION_STRING "3.1.0-p10" - - /* 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 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/src/version.c 2012-05-07 18:52:45.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.0-p9"; -+ return "3.1.0-p10"; - } -diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c ---- mpfr-3.1.0-a/tests/tgamma.c 2012-04-27 01:13:15.000000000 +0000 -+++ mpfr-3.1.0-b/tests/tgamma.c 2012-05-07 18:52:45.000000000 +0000 -@@ -838,6 +838,175 @@ - exit (1); - } - -+/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x)) -+ computing with a working precision p2. Assume that x is not an -+ integer <= 2. */ -+static void -+exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2) -+{ -+ mpfr_t yd, yu, zd, zu; -+ int inexd, inexu, sign; -+ int underflow = -1, overflow = -1; /* -1: we don't know */ -+ int got_underflow, got_overflow; -+ -+ if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0) -+ { -+ printf ("Warning! x is an integer <= 2 in exp_lgamma: "); -+ mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n'); -+ return; -+ } -+ mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0); -+ inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD); -+ mpfr_set (yu, yd, MPFR_RNDN); /* exact */ -+ if (inexd) -+ mpfr_nextabove (yu); -+ mpfr_clear_flags (); -+ mpfr_exp (yd, yd, MPFR_RNDD); -+ if (! mpfr_underflow_p ()) -+ underflow = 0; -+ if (mpfr_overflow_p ()) -+ overflow = 1; -+ mpfr_clear_flags (); -+ mpfr_exp (yu, yu, MPFR_RNDU); -+ if (mpfr_underflow_p ()) -+ underflow = 1; -+ if (! mpfr_overflow_p ()) -+ overflow = 0; -+ if (sign < 0) -+ { -+ mpfr_neg (yd, yd, MPFR_RNDN); /* exact */ -+ mpfr_neg (yu, yu, MPFR_RNDN); /* exact */ -+ mpfr_swap (yd, yu); -+ } -+ /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */ -+ mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0); -+ mpfr_clear_flags (); -+ inexd = mpfr_gamma (zd, x, MPFR_RNDD); /* zd <= Gamma(x) < yu */ -+ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); -+ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); -+ if (! mpfr_less_p (zd, yu) || inexd > 0 || -+ got_underflow != underflow || -+ got_overflow != overflow) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("yu = "); -+ mpfr_dump (yu); -+ printf ("zd = "); -+ mpfr_dump (zd); -+ printf ("got inexd = %d, expected <= 0\n", inexd); -+ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); -+ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); -+ exit (1); -+ } -+ mpfr_clear_flags (); -+ inexu = mpfr_gamma (zu, x, MPFR_RNDU); /* zu >= Gamma(x) > yd */ -+ got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p (); -+ got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p (); -+ if (! mpfr_greater_p (zu, yd) || inexu < 0 || -+ got_underflow != underflow || -+ got_overflow != overflow) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("yd = "); -+ mpfr_dump (yd); -+ printf ("zu = "); -+ mpfr_dump (zu); -+ printf ("got inexu = %d, expected >= 0\n", inexu); -+ printf ("got underflow = %d, expected %d\n", got_underflow, underflow); -+ printf ("got overflow = %d, expected %d\n", got_overflow, overflow); -+ exit (1); -+ } -+ if (mpfr_equal_p (zd, zu)) -+ { -+ if (inexd != 0 || inexu != 0) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n", -+ inexd, inexu); -+ exit (1); -+ } -+ MPFR_ASSERTN (got_underflow == 0); -+ MPFR_ASSERTN (got_overflow == 0); -+ } -+ else if (inexd == 0 || inexu == 0) -+ { -+ printf ("Error in exp_lgamma on x = "); -+ mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n'); -+ printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n", -+ inexd, inexu); -+ exit (1); -+ } -+ mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0); -+} -+ -+static void -+exp_lgamma_tests (void) -+{ -+ mpfr_t x; -+ mpfr_exp_t emin, emax; -+ int i; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ -+ mpfr_init2 (x, 96); -+ for (i = 3; i <= 8; i++) -+ { -+ mpfr_set_ui (x, i, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_nextbelow (x); -+ exp_lgamma (x, 53, 64); -+ mpfr_nextabove (x); -+ mpfr_nextabove (x); -+ exp_lgamma (x, 53, 64); -+ } -+ mpfr_set_str (x, "1.7", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* The following test gives a large positive result < +Inf */ -+ mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* Idem for a large negative result > -Inf */ -+ mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* The following two tests trigger an endless loop in r8186 -+ on 64-bit machines (64-bit exponent). The second one (due -+ to undetected overflow) is a direct consequence of the -+ first one, due to the call of Gamma(2-x) if x < 1. */ -+ mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* Similar tests (overflow threshold) for 32-bit machines. */ -+ mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); -+ mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); -+ /* The following test is an overflow on 32-bit and 64-bit machines. -+ Revision r8189 fails on 64-bit machines as the flag is unset. */ -+ mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN); -+ exp_lgamma (x, 53, 64); -+ /* On the following tests, with r8196, one gets an underflow on -+ 32-bit machines, while a normal result is expected (see FIXME -+ in gamma.c:382). */ -+ mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); /* failure on 32-bit machines */ -+ mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN); -+ exp_lgamma (x, 12, 64); /* failure on 64-bit machines */ -+ mpfr_clear (x); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -852,6 +1021,7 @@ - test20071231 (); - test20100709 (); - test20120426 (); -+ exp_lgamma_tests (); - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD deleted file mode 100644 index 1cd89e22a..000000000 --- a/testing/nilfs-utils/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 157773 2012-04-29 09:45:01Z allan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> - -pkgname=nilfs-utils -pkgver=2.1.1 -pkgrel=2 -pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" -arch=('i686' 'x86_64') -url="http://www.nilfs.org/" -license=('GPL2' 'LGPL2.1') -backup=('etc/nilfs_cleanerd.conf') -depends=('util-linux') -options=(!libtool) -source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('caa7d8b7121311bd978120e2f0c45d81') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --enable-libmount - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install LDCONFIG=/bin/true -} diff --git a/testing/nss_ldap/PKGBUILD b/testing/nss_ldap/PKGBUILD deleted file mode 100644 index 120501e13..000000000 --- a/testing/nss_ldap/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 157987 2012-04-30 16:15:04Z tomegun $ -# Maintainer: -# Contributor: Comete <la_comete@tiscali.fr> - -pkgname=nss_ldap -pkgver=265 -pkgrel=4 -pkgdesc="The nss_ldap module provides the means for Linux and Solaris workstations to resolve the entities defined in RFC 2307 from LDAP directories." -arch=('i686' 'x86_64') -url="http://www.padl.com/OSS/nss_ldap.html" -license=('LGPL') -depends=('libldap' 'krb5') -backup=("etc/nss_ldap.conf") -source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('c1cb02d1a85538cf16bca6f6a562abe4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --with-ldap-conf-file=/etc/nss_ldap.conf \ - --with-ldap=openldap \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-schema-mapping \ - --enable-rfc2307bis \ - --enable-configurable-krb5-ccname-gssapi - env PATH=`pwd`:"$PATH" make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # buildsystem is trying to be clever and hardcodes symlinks in /usr$(libdir) - rm -rf "${pkgdir}/usr/usr" -} diff --git a/testing/ntfs-3g_ntfsprogs/PKGBUILD b/testing/ntfs-3g_ntfsprogs/PKGBUILD deleted file mode 100644 index d1084ddee..000000000 --- a/testing/ntfs-3g_ntfsprogs/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 158659 2012-05-05 16:20:23Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: Thomas Bchler <thomas.archlinux.org> - -pkgbase=ntfs-3g_ntfsprogs -pkgname=('ntfs-3g' 'ntfsprogs') -pkgver=2012.1.15 -pkgrel=3 -url="http://www.tuxera.com" -arch=('i686' 'x86_64') -license=('GPL2') -depends=('glibc' 'fuse') -makedepends=('pkgconfig') -options=('!libtool') -source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz) -sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb') - -build() { - cd "$srcdir/$pkgbase-$pkgver" - ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \ - --with-fuse=external --disable-static \ - --enable-posix-acls --mandir=/usr/share/man - make -} - -package_ntfs-3g() { - pkgdesc="Stable read and write NTFS driver" - - for DIR in src libntfs-3g include; do - cd "$srcdir/$pkgbase-$pkgver/$DIR" - make DESTDIR="$pkgdir" install - done - - mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ - mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/ - rm -rf "$pkgdir"/{lib,{s,}bin} - - cd "$pkgdir"/usr/bin - ln -s ntfs-3g mount.ntfs - ln -s ntfs-3g mount.ntfs-3g - ln -s lowntfs-3g mount.lowntfs-3g -} - -package_ntfsprogs() { - pkgdesc="NTFS filesystem utilities" - depends=('util-linux' 'ntfs-3g') - - cd "$srcdir/$pkgbase-$pkgver/ntfsprogs" - make DESTDIR="$pkgdir" install - - mv "$pkgdir"/sbin/* "$pkgdir"/usr/bin/ - rm -rf "$pkgdir"/sbin -} diff --git a/testing/opengtl/PKGBUILD b/testing/opengtl/PKGBUILD deleted file mode 100644 index 549d6419c..000000000 --- a/testing/opengtl/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 159380 2012-05-22 20:41:20Z foutrelis $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andries Radu <admiral0@live.it> - -pkgname=opengtl -pkgver=0.9.16 -pkgrel=2 -pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" -url="http://www.opengtl.org" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gcc-libs' 'llvm') -makedepends=('cmake' 'libpng') -optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048') - -build() { - cd "${srcdir}" - # Fix build with LLVM 3.1 - sed -i 's/LLVM_VERSION STREQUAL "3.0"/LLVM_VERSION STREQUAL "3.1"/' \ - OpenGTL-${pkgver}/CMakeLists.txt - sed -i 's/ConstantArray::get/ConstantDataArray::getString/' \ - OpenGTL-${pkgver}/OpenGTL/GTLCore/AST/Expression.cpp - mkdir build - cd build - cmake ../OpenGTL-${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/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD deleted file mode 100644 index b34de46b4..000000000 --- a/testing/openmpi/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# $Id: PKGBUILD 159205 2012-05-18 00:00:13Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -pkgname=openmpi -pkgver=1.6 -pkgrel=2 -pkgdesc="High performance message passing library (MPI)" -arch=('i686' 'x86_64') -url="http://www.open-mpi.org" -license=('custom') -depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc') -makedepends=('inetutils') -options=(!libtool) -source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2 - openmpi-hostfile.patch) -sha1sums=('8b81eea712bb8f8120468003b5f29baecedf2367' - 'a76da03418a106d57cfd020d0f8d887d7ec9225b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Make sure we use the system ltdl librariry rather than the ones in the tarball - rm -r opal/libltdl - - # Search for openmpi-default-hostfile in /etc/openmpi - patch -Np1 -i ../openmpi-hostfile.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc/${pkgname} \ - --mandir=/usr/share/man \ - --enable-mpi-f90 \ - --libdir=/usr/lib/${pkgname} \ - --with-threads=posix \ - --enable-smp-locks \ - --with-valgrind \ - --enable-memchecker \ - --enable-debug \ - --enable-pretty-print-stacktrace \ - --without-slurm \ - --with-hwloc=/usr \ - --with-libltdl=/usr \ - FC=/usr/bin/gfortran \ - LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # FS#28583 - install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig - for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do - ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/ - done - - # Openmpi's otfinfo conflicts with the one from texlive - mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - - # Openmpi's otfdump conflicts with the one from libotf - mv "${pkgdir}"/usr/bin/otfdump{,ompi} - - # Remove dangling symlink - rm "${pkgdir}"/usr/share/man/man1/orteCC.1 - - install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d - echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf - - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch deleted file mode 100644 index dc9dcfeae..000000000 --- a/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch +++ /dev/null @@ -1,43 +0,0 @@ -Description: If running under Debian fakeroot then its important - that this hook is disabled; a new stat check was introduced in - 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. -Author: James Page <james.page@ubuntu.com> -Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 - -Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c -=================================================================== ---- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 -+++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 -@@ -738,15 +738,6 @@ - check_result_t r1, r2, lp, lpp; - bool want_rcache = false, found_driver = false; - -- /* First, check if ummunotify is present on the system. If it is, -- then we don't need to do the following ptmalloc2 hacks. -- open/mmap on the device may fail during init, but if /dev/ummunotify -- exists, we assume that the user/administrator *wants* to use -- ummunotify. */ -- if (stat("/dev/ummunotify", &st) == 0) { -- return; -- } -- - /* Yes, checking for an MPI MCA parameter here is an abstraction - violation. Cope. Yes, even checking for *any* MCA parameter - here (without going through the MCA param API) is an -@@ -769,6 +760,15 @@ - return; - } - -+ /* Next, check if ummunotify is present on the system. If it is, -+ then we don't need to do the following ptmalloc2 hacks. -+ open/mmap on the device may fail during init, but if /dev/ummunotify -+ exists, we assume that the user/administrator *wants* to use -+ ummunotify. */ -+ if (stat("/dev/ummunotify", &st) == 0) { -+ return; -+ } -+ - /* Look for sentinel files (directories) to see if various network - drivers are loaded (yes, I know, further abstraction - violations...). - diff --git a/testing/openmpi/openmpi-hostfile.patch b/testing/openmpi/openmpi-hostfile.patch deleted file mode 100644 index f6377674b..000000000 --- a/testing/openmpi/openmpi-hostfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c ---- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600 -+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600 -@@ -225,7 +225,7 @@ int orte_register_params(void) - false, false, 1000, &orte_timeout_usec_per_proc); - - /* default hostfile */ -- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix); -+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir); - mca_base_param_reg_string_name("orte", "default_hostfile", - "Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)", - false, false, orte_default_hostfile, &orte_default_hostfile); diff --git a/testing/openssl/PKGBUILD b/testing/openssl/PKGBUILD deleted file mode 100644 index ee4f13ee8..000000000 --- a/testing/openssl/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 158807 2012-05-10 16:33:56Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=openssl -_ver=1.0.1c -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -#pkgver=$_ver -pkgrel=1 -pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' -arch=('i686' 'x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -depends=('perl') -optdepends=('ca-certificates') -options=('!makeflags') -backup=('etc/ssl/openssl.cnf') -source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" - "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" - 'fix-manpages.patch' - 'no-rpath.patch' - 'ca-dir.patch') -md5sums=('ae412727c8c15b67880aef7bd2999b2e' - 'a3d90bc42253def61cd1c4237f1ce5f7' - '5bbc0655bda2af95bc8eb568963ce8ba' - 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') - -build() { - cd $srcdir/$pkgname-$_ver - - if [ "${CARCH}" == 'x86_64' ]; then - openssltarget='linux-x86_64' - optflags='enable-ec_nistp_64_gcc_128' - elif [ "${CARCH}" == 'i686' ]; then - openssltarget='linux-elf' - optflags='' - fi - - # avoid conflicts with other man pages - # see http://www.linuxfromscratch.org/patches/downloads/openssl/ - patch -p1 -i $srcdir/fix-manpages.patch - # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch - # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT - ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ - shared zlib enable-md2 ${optflags} \ - "${openssltarget}" \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ - -DOPENSSL_NO_TLS1_2_CLIENT - - make depend - make -} - -check() { - cd $srcdir/$pkgname-$_ver - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - patch -p0 -R -i $srcdir/ca-dir.patch - make test - patch -p0 -i $srcdir/ca-dir.patch -} - -package() { - cd $srcdir/$pkgname-$_ver - make INSTALL_PREFIX=$pkgdir MANDIR=/usr/share/man install - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/testing/openssl/ca-dir.patch b/testing/openssl/ca-dir.patch deleted file mode 100644 index 41d1386d3..000000000 --- a/testing/openssl/ca-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/testing/openssl/fix-manpages.patch b/testing/openssl/fix-manpages.patch deleted file mode 100644 index 0a300f3b9..000000000 --- a/testing/openssl/fix-manpages.patch +++ /dev/null @@ -1,1920 +0,0 @@ -Submitted By: Robert Connolly <robert at linuxfromscratch dot org> -Date: 2005-11-13 -Initial Package Version: 0.9.8a -Upstream Status: Submitted upstream -Origin: Anderson Lizardo -Description: This patch fixes conflicts between man pages - installed by OpenSSL and those found on other - packages (particulary Shadow, Perl, and - Man-pages). It also fixes syntax errors on some - POD files that generates slightly broken man - pages. Rediffed for 1.0.0a by Ken Moffat - -diff -Naur openssl-1.0.0a.orig//crypto/rand/md_rand.c openssl-1.0.0a/crypto/rand/md_rand.c ---- openssl-1.0.0a.orig//crypto/rand/md_rand.c 2009-01-03 09:25:32.000000000 +0000 -+++ openssl-1.0.0a/crypto/rand/md_rand.c 2010-09-01 19:36:31.604126440 +0100 -@@ -196,7 +196,7 @@ - int do_not_lock; - - /* -- * (Based on the rand(3) manpage) -+ * (Based on the openssl_rand(3) manpage) - * - * The input is chopped up into units of 20 bytes (or less for - * the last block). Each of these blocks is run through the hash -@@ -361,7 +361,7 @@ - num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2); - - /* -- * (Based on the rand(3) manpage:) -+ * (Based on the openssl_rand(3) manpage) - * - * For each group of 10 bytes (or less), we do the following: - * -diff -Naur openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod openssl-1.0.0a/doc/apps/openssl-passwd.pod ---- openssl-1.0.0a.orig//doc/apps/openssl-passwd.pod 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.0a/doc/apps/openssl-passwd.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -0,0 +1,82 @@ -+=pod -+ -+=head1 NAME -+ -+openssl-passwd - compute password hashes -+ -+=head1 SYNOPSIS -+ -+B<openssl passwd> -+[B<-crypt>] -+[B<-1>] -+[B<-apr1>] -+[B<-salt> I<string>] -+[B<-in> I<file>] -+[B<-stdin>] -+[B<-noverify>] -+[B<-quiet>] -+[B<-table>] -+{I<password>} -+ -+=head1 DESCRIPTION -+ -+The B<passwd> command computes the hash of a password typed at -+run-time or the hash of each password in a list. The password list is -+taken from the named file for option B<-in file>, from stdin for -+option B<-stdin>, or from the command line, or from the terminal otherwise. -+The Unix standard algorithm B<crypt> and the MD5-based BSD password -+algorithm B<1> and its Apache variant B<apr1> are available. -+ -+=head1 OPTIONS -+ -+=over 4 -+ -+=item B<-crypt> -+ -+Use the B<crypt> algorithm (default). -+ -+=item B<-1> -+ -+Use the MD5 based BSD password algorithm B<1>. -+ -+=item B<-apr1> -+ -+Use the B<apr1> algorithm (Apache variant of the BSD algorithm). -+ -+=item B<-salt> I<string> -+ -+Use the specified salt. -+When reading a password from the terminal, this implies B<-noverify>. -+ -+=item B<-in> I<file> -+ -+Read passwords from I<file>. -+ -+=item B<-stdin> -+ -+Read passwords from B<stdin>. -+ -+=item B<-noverify> -+ -+Don't verify when reading a password from the terminal. -+ -+=item B<-quiet> -+ -+Don't output warnings when passwords given at the command line are truncated. -+ -+=item B<-table> -+ -+In the output list, prepend the cleartext password and a TAB character -+to each password hash. -+ -+=back -+ -+=head1 EXAMPLES -+ -+B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>. -+ -+B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>. -+ -+B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. -+ -+=cut -diff -Naur openssl-1.0.0a.orig//doc/apps/openssl.pod openssl-1.0.0a/doc/apps/openssl.pod ---- openssl-1.0.0a.orig//doc/apps/openssl.pod 2010-01-21 18:46:28.000000000 +0000 -+++ openssl-1.0.0a/doc/apps/openssl.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -163,7 +163,7 @@ - - Online Certificate Status Protocol utility. - --=item L<B<passwd>|passwd(1)> -+=item L<B<passwd>|openssl-passwd(1)> - - Generation of hashed passwords. - -@@ -401,7 +401,7 @@ - L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>, - L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>, - L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>, --L<passwd(1)|passwd(1)>, -+L<openssl-passwd(1)|openssl-passwd(1)>, - L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>, - L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>, - L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>, -diff -Naur openssl-1.0.0a.orig//doc/apps/passwd.pod openssl-1.0.0a/doc/apps/passwd.pod ---- openssl-1.0.0a.orig//doc/apps/passwd.pod 2002-10-04 13:59:00.000000000 +0100 -+++ openssl-1.0.0a/doc/apps/passwd.pod 1970-01-01 01:00:00.000000000 +0100 -@@ -1,82 +0,0 @@ --=pod -- --=head1 NAME -- --passwd - compute password hashes -- --=head1 SYNOPSIS -- --B<openssl passwd> --[B<-crypt>] --[B<-1>] --[B<-apr1>] --[B<-salt> I<string>] --[B<-in> I<file>] --[B<-stdin>] --[B<-noverify>] --[B<-quiet>] --[B<-table>] --{I<password>} -- --=head1 DESCRIPTION -- --The B<passwd> command computes the hash of a password typed at --run-time or the hash of each password in a list. The password list is --taken from the named file for option B<-in file>, from stdin for --option B<-stdin>, or from the command line, or from the terminal otherwise. --The Unix standard algorithm B<crypt> and the MD5-based BSD password --algorithm B<1> and its Apache variant B<apr1> are available. -- --=head1 OPTIONS -- --=over 4 -- --=item B<-crypt> -- --Use the B<crypt> algorithm (default). -- --=item B<-1> -- --Use the MD5 based BSD password algorithm B<1>. -- --=item B<-apr1> -- --Use the B<apr1> algorithm (Apache variant of the BSD algorithm). -- --=item B<-salt> I<string> -- --Use the specified salt. --When reading a password from the terminal, this implies B<-noverify>. -- --=item B<-in> I<file> -- --Read passwords from I<file>. -- --=item B<-stdin> -- --Read passwords from B<stdin>. -- --=item B<-noverify> -- --Don't verify when reading a password from the terminal. -- --=item B<-quiet> -- --Don't output warnings when passwords given at the command line are truncated. -- --=item B<-table> -- --In the output list, prepend the cleartext password and a TAB character --to each password hash. -- --=back -- --=head1 EXAMPLES -- --B<openssl passwd -crypt -salt xx password> prints B<xxj31ZMTZzkVA>. -- --B<openssl passwd -1 -salt xxxxxxxx password> prints B<$1$xxxxxxxx$UYCIxa628.9qXjpQCjM4a.>. -- --B<openssl passwd -apr1 -salt xxxxxxxx password> prints B<$apr1$xxxxxxxx$dxHfLAsjHkDRmG83UXe8K0>. -- --=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod openssl-1.0.0a/doc/crypto/BN_generate_prime.pod ---- openssl-1.0.0a.orig//doc/crypto/BN_generate_prime.pod 2003-01-13 13:18:22.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/BN_generate_prime.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -90,7 +90,7 @@ - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)> -+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/bn.pod openssl-1.0.0a/doc/crypto/bn.pod ---- openssl-1.0.0a.orig//doc/crypto/bn.pod 2008-07-03 20:59:24.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/bn.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -167,7 +167,7 @@ - =head1 SEE ALSO - - L<bn_internal(3)|bn_internal(3)>, --L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<BN_new(3)|BN_new(3)>, L<BN_CTX_new(3)|BN_CTX_new(3)>, - L<BN_copy(3)|BN_copy(3)>, L<BN_swap(3)|BN_swap(3)>, L<BN_num_bytes(3)|BN_num_bytes(3)>, - L<BN_add(3)|BN_add(3)>, L<BN_add_word(3)|BN_add_word(3)>, -diff -Naur openssl-1.0.0a.orig//doc/crypto/BN_rand.pod openssl-1.0.0a/doc/crypto/BN_rand.pod ---- openssl-1.0.0a.orig//doc/crypto/BN_rand.pod 2002-09-25 14:33:26.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/BN_rand.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -45,7 +45,7 @@ - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<bn(3)|bn(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<RAND_add(3)|RAND_add(3)>, L<RAND_bytes(3)|RAND_bytes(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod openssl-1.0.0a/doc/crypto/CONF_modules_free.pod ---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_free.pod 2006-12-21 21:13:27.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/CONF_modules_free.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -37,7 +37,7 @@ - =head1 SEE ALSO - - L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, --L<CONF_modules_load_file(3), CONF_modules_load_file(3)> -+L<CONF_modules_load_file(3)|CONF_modules_load_file(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod ---- openssl-1.0.0a.orig//doc/crypto/CONF_modules_load_file.pod 2004-03-02 13:31:32.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/CONF_modules_load_file.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -51,7 +51,7 @@ - =head1 SEE ALSO - - L<conf(5)|conf(5)>, L<OPENSSL_config(3)|OPENSSL_config(3)>, --L<CONF_free(3), CONF_free(3)>, L<err(3),err(3)> -+L<CONF_free(3)|CONF_free(3)>, L<openssl_err(3)|openssl_err(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/crypto.pod openssl-1.0.0a/doc/crypto/crypto.pod ---- openssl-1.0.0a.orig//doc/crypto/crypto.pod 2002-10-06 13:59:25.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/crypto.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -46,7 +46,7 @@ - - =item AUXILIARY FUNCTIONS - --L<err(3)|err(3)>, L<threads(3)|threads(3)>, L<rand(3)|rand(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<openssl_threads(3)|openssl_threads(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<OPENSSL_VERSION_NUMBER(3)|OPENSSL_VERSION_NUMBER(3)> - - =item INPUT/OUTPUT, DATA ENCODING -diff -Naur openssl-1.0.0a.orig//doc/crypto/des.pod openssl-1.0.0a/doc/crypto/des.pod ---- openssl-1.0.0a.orig//doc/crypto/des.pod 2003-10-01 16:02:45.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/des.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -115,7 +115,7 @@ - the key; it is used to speed the encryption process. - - DES_random_key() generates a random key. The PRNG must be seeded --prior to using this function (see L<rand(3)|rand(3)>). If the PRNG -+prior to using this function (see L<openssl_rand(3)|openssl_rand(3)>). If the PRNG - could not generate a secure key, 0 is returned. - - Before a DES key can be used, it must be converted into the -@@ -317,7 +317,7 @@ - - =head1 SEE ALSO - --crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<rand(3)|rand(3)> -+crypt(3), L<des_modes(7)|des_modes(7)>, L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod openssl-1.0.0a/doc/crypto/DH_generate_key.pod ---- openssl-1.0.0a.orig//doc/crypto/DH_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DH_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -40,7 +40,7 @@ - - =head1 SEE ALSO - --L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<DH_size(3)|DH_size(3)> -+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<DH_size(3)|DH_size(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod ---- openssl-1.0.0a.orig//doc/crypto/DH_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DH_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -59,7 +59,7 @@ - - =head1 SEE ALSO - --L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dh(3)|dh(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DH_free(3)|DH_free(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/dh.pod openssl-1.0.0a/doc/crypto/dh.pod ---- openssl-1.0.0a.orig//doc/crypto/dh.pod 2002-08-05 17:27:01.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/dh.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -67,8 +67,8 @@ - - =head1 SEE ALSO - --L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<err(3)|err(3)>, --L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, -+L<dhparam(1)|dhparam(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<openssl_err(3)|openssl_err(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<engine(3)|engine(3)>, - L<DH_set_method(3)|DH_set_method(3)>, L<DH_new(3)|DH_new(3)>, - L<DH_get_ex_new_index(3)|DH_get_ex_new_index(3)>, - L<DH_generate_parameters(3)|DH_generate_parameters(3)>, -diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod openssl-1.0.0a/doc/crypto/DSA_do_sign.pod ---- openssl-1.0.0a.orig//doc/crypto/DSA_do_sign.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DSA_do_sign.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -36,7 +36,7 @@ - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_SIG_new(3)|DSA_SIG_new(3)>, - L<DSA_sign(3)|DSA_sign(3)> - -diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod openssl-1.0.0a/doc/crypto/DSA_generate_key.pod ---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DSA_generate_key.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -24,7 +24,7 @@ - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_generate_parameters(3)|DSA_generate_parameters(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod ---- openssl-1.0.0a.orig//doc/crypto/DSA_generate_parameters.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DSA_generate_parameters.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -90,7 +90,7 @@ - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_free(3)|DSA_free(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/dsa.pod openssl-1.0.0a/doc/crypto/dsa.pod ---- openssl-1.0.0a.orig//doc/crypto/dsa.pod 2002-08-05 17:27:01.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/dsa.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -100,7 +100,7 @@ - - =head1 SEE ALSO - --L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<err(3)|err(3)>, L<rand(3)|rand(3)>, -+L<bn(3)|bn(3)>, L<dh(3)|dh(3)>, L<openssl_err(3)|openssl_err(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<rsa(3)|rsa(3)>, L<sha(3)|sha(3)>, L<engine(3)|engine(3)>, - L<DSA_new(3)|DSA_new(3)>, - L<DSA_size(3)|DSA_size(3)>, -diff -Naur openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod openssl-1.0.0a/doc/crypto/DSA_sign.pod ---- openssl-1.0.0a.orig//doc/crypto/DSA_sign.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/DSA_sign.pod 2010-09-01 19:36:31.608126088 +0100 -@@ -55,7 +55,7 @@ - - =head1 SEE ALSO - --L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, -+L<dsa(3)|dsa(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<DSA_do_sign(3)|DSA_do_sign(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/engine.pod openssl-1.0.0a/doc/crypto/engine.pod ---- openssl-1.0.0a.orig//doc/crypto/engine.pod 2007-11-19 09:18:03.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/engine.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -594,6 +594,6 @@ - - =head1 SEE ALSO - --L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<rand(3)|rand(3)> -+L<rsa(3)|rsa(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod openssl-1.0.0a/doc/crypto/ERR_clear_error.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_clear_error.pod 2000-02-01 01:36:58.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_clear_error.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -20,7 +20,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod openssl-1.0.0a/doc/crypto/ERR_error_string.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_error_string.pod 2004-11-14 15:11:37.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_error_string.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -60,7 +60,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, - L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, - L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> - L<ERR_print_errors(3)|ERR_print_errors(3)> -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod openssl-1.0.0a/doc/crypto/ERR_get_error.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_get_error.pod 2002-11-29 14:21:54.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_get_error.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -61,7 +61,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, - L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_GET_LIB.pod 2000-02-01 01:36:58.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_GET_LIB.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -41,7 +41,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_get_error(3)|ERR_get_error(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_load_crypto_strings.pod 2000-02-24 11:55:08.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_load_crypto_strings.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -35,7 +35,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod openssl-1.0.0a/doc/crypto/ERR_load_strings.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_load_strings.pod 2000-02-24 11:55:08.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_load_strings.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -43,7 +43,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/err.pod openssl-1.0.0a/doc/crypto/err.pod ---- openssl-1.0.0a.orig//doc/crypto/err.pod 2002-07-10 20:35:46.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/err.pod 1970-01-01 01:00:00.000000000 +0100 -@@ -1,187 +0,0 @@ --=pod -- --=head1 NAME -- --err - error codes -- --=head1 SYNOPSIS -- -- #include <openssl/err.h> -- -- unsigned long ERR_get_error(void); -- unsigned long ERR_peek_error(void); -- unsigned long ERR_get_error_line(const char **file, int *line); -- unsigned long ERR_peek_error_line(const char **file, int *line); -- unsigned long ERR_get_error_line_data(const char **file, int *line, -- const char **data, int *flags); -- unsigned long ERR_peek_error_line_data(const char **file, int *line, -- const char **data, int *flags); -- -- int ERR_GET_LIB(unsigned long e); -- int ERR_GET_FUNC(unsigned long e); -- int ERR_GET_REASON(unsigned long e); -- -- void ERR_clear_error(void); -- -- char *ERR_error_string(unsigned long e, char *buf); -- const char *ERR_lib_error_string(unsigned long e); -- const char *ERR_func_error_string(unsigned long e); -- const char *ERR_reason_error_string(unsigned long e); -- -- void ERR_print_errors(BIO *bp); -- void ERR_print_errors_fp(FILE *fp); -- -- void ERR_load_crypto_strings(void); -- void ERR_free_strings(void); -- -- void ERR_remove_state(unsigned long pid); -- -- void ERR_put_error(int lib, int func, int reason, const char *file, -- int line); -- void ERR_add_error_data(int num, ...); -- -- void ERR_load_strings(int lib,ERR_STRING_DATA str[]); -- unsigned long ERR_PACK(int lib, int func, int reason); -- int ERR_get_next_error_library(void); -- --=head1 DESCRIPTION -- --When a call to the OpenSSL library fails, this is usually signalled --by the return value, and an error code is stored in an error queue --associated with the current thread. The B<err> library provides --functions to obtain these error codes and textual error messages. -- --The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to --access error codes. -- --Error codes contain information about where the error occurred, and --what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to --extract this information. A method to obtain human-readable error --messages is described in L<ERR_error_string(3)|ERR_error_string(3)>. -- --L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the --error queue. -- --Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to --avoid memory leaks when threads are terminated. -- --=head1 ADDING NEW ERROR CODES TO OPENSSL -- --See L<ERR_put_error(3)> if you want to record error codes in the --OpenSSL error system from within your application. -- --The remainder of this section is of interest only if you want to add --new error codes to OpenSSL or add error codes from external libraries. -- --=head2 Reporting errors -- --Each sub-library has a specific macro XXXerr() that is used to report --errors. Its first argument is a function code B<XXX_F_...>, the second --argument is a reason code B<XXX_R_...>. Function codes are derived --from the function names; reason codes consist of textual error --descriptions. For example, the function ssl23_read() reports a --"handshake failure" as follows: -- -- SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE); -- --Function and reason codes should consist of upper case characters, --numbers and underscores only. The error file generation script translates --function codes into function names by looking in the header files --for an appropriate function name, if none is found it just uses --the capitalized form such as "SSL23_READ" in the above example. -- --The trailing section of a reason code (after the "_R_") is translated --into lower case and underscores changed to spaces. -- --When you are using new function or reason codes, run B<make errors>. --The necessary B<#define>s will then automatically be added to the --sub-library's header file. -- --Although a library will normally report errors using its own specific --XXXerr macro, another library's macro can be used. This is normally --only done when a library wants to include ASN1 code which must use --the ASN1err() macro. -- --=head2 Adding new libraries -- --When adding a new sub-library to OpenSSL, assign it a library number --B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its --name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add --C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function --(in B<crypto/err/err_all.c>). Finally, add an entry -- -- L XXX xxx.h xxx_err.c -- --to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile. --Running B<make errors> will then generate a file B<xxx_err.c>, and --add all error codes used in the library to B<xxx.h>. -- --Additionally the library include file must have a certain form. --Typically it will initially look like this: -- -- #ifndef HEADER_XXX_H -- #define HEADER_XXX_H -- -- #ifdef __cplusplus -- extern "C" { -- #endif -- -- /* Include files */ -- -- #include <openssl/bio.h> -- #include <openssl/x509.h> -- -- /* Macros, structures and function prototypes */ -- -- -- /* BEGIN ERROR CODES */ -- --The B<BEGIN ERROR CODES> sequence is used by the error code --generation script as the point to place new error codes, any text --after this point will be overwritten when B<make errors> is run. --The closing #endif etc will be automatically added by the script. -- --The generated C error code file B<xxx_err.c> will load the header --files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the --header file must load any additional header files containing any --definitions it uses. -- --=head1 USING ERROR CODES IN EXTERNAL LIBRARIES -- --It is also possible to use OpenSSL's error code scheme in external --libraries. The library needs to load its own codes and call the OpenSSL --error code insertion script B<mkerr.pl> explicitly to add codes to --the header file and generate the C error code file. This will normally --be done if the external library needs to generate new ASN1 structures --but it can also be used to add more general purpose error code handling. -- --TBA more details -- --=head1 INTERNALS -- --The error queues are stored in a hash table with one B<ERR_STATE> --entry for each pid. ERR_get_state() returns the current thread's --B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error --codes. When more error codes are added, the old ones are overwritten, --on the assumption that the most recent errors are most important. -- --Error strings are also stored in hash table. The hash tables can --be obtained by calling ERR_get_err_state_table(void) and --ERR_get_string_table(void) respectively. -- --=head1 SEE ALSO -- --L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>, --L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>, --L<ERR_get_error(3)|ERR_get_error(3)>, --L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>, --L<ERR_clear_error(3)|ERR_clear_error(3)>, --L<ERR_error_string(3)|ERR_error_string(3)>, --L<ERR_print_errors(3)|ERR_print_errors(3)>, --L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, --L<ERR_remove_state(3)|ERR_remove_state(3)>, --L<ERR_put_error(3)|ERR_put_error(3)>, --L<ERR_load_strings(3)|ERR_load_strings(3)>, --L<SSL_get_error(3)|SSL_get_error(3)> -- --=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod openssl-1.0.0a/doc/crypto/ERR_print_errors.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_print_errors.pod 2000-02-01 01:36:59.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_print_errors.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -38,7 +38,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, -+L<openssl_err(3)|openssl_err(3)>, L<ERR_error_string(3)|ERR_error_string(3)>, - L<ERR_get_error(3)|ERR_get_error(3)>, - L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, - L<SSL_load_error_strings(3)|SSL_load_error_strings(3)> -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod openssl-1.0.0a/doc/crypto/ERR_put_error.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_put_error.pod 2000-02-24 11:55:08.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/ERR_put_error.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -34,7 +34,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> -+L<openssl_err(3)|openssl_err(3)>, L<ERR_load_strings(3)|ERR_load_strings(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod openssl-1.0.0a/doc/crypto/ERR_remove_state.pod ---- openssl-1.0.0a.orig//doc/crypto/ERR_remove_state.pod 2000-05-19 08:54:42.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/ERR_remove_state.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -25,7 +25,7 @@ - - =head1 SEE ALSO - --L<err(3)|err(3)> -+L<openssl_err(3)|openssl_err(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod ---- openssl-1.0.0a.orig//doc/crypto/EVP_BytesToKey.pod 2004-11-25 17:47:30.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/EVP_BytesToKey.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -59,7 +59,7 @@ - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod ---- openssl-1.0.0a.orig//doc/crypto/EVP_OpenInit.pod 2000-09-23 08:16:14.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/EVP_OpenInit.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -54,7 +54,7 @@ - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, - L<EVP_SealInit(3)|EVP_SealInit(3)> - -diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod openssl-1.0.0a/doc/crypto/EVP_SealInit.pod ---- openssl-1.0.0a.orig//doc/crypto/EVP_SealInit.pod 2005-03-29 18:50:08.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/EVP_SealInit.pod 2010-09-01 19:36:31.612125737 +0100 -@@ -74,7 +74,7 @@ - - =head1 SEE ALSO - --L<evp(3)|evp(3)>, L<rand(3)|rand(3)>, -+L<evp(3)|evp(3)>, L<openssl_rand(3)|openssl_rand(3)>, - L<EVP_EncryptInit(3)|EVP_EncryptInit(3)>, - L<EVP_OpenInit(3)|EVP_OpenInit(3)> - -diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod openssl-1.0.0a/doc/crypto/EVP_SignInit.pod ---- openssl-1.0.0a.orig//doc/crypto/EVP_SignInit.pod 2006-07-12 13:31:29.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/EVP_SignInit.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -89,7 +89,7 @@ - =head1 SEE ALSO - - L<EVP_VerifyInit(3)|EVP_VerifyInit(3)>, --L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, -+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, - L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, - L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, - L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> -diff -Naur openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod ---- openssl-1.0.0a.orig//doc/crypto/EVP_VerifyInit.pod 2006-07-12 13:31:30.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/EVP_VerifyInit.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -80,7 +80,7 @@ - - L<evp(3)|evp(3)>, - L<EVP_SignInit(3)|EVP_SignInit(3)>, --L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<err(3)|err(3)>, -+L<EVP_DigestInit(3)|EVP_DigestInit(3)>, L<openssl_err(3)|openssl_err(3)>, - L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, - L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, - L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> -diff -Naur openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod openssl-1.0.0a/doc/crypto/OPENSSL_config.pod ---- openssl-1.0.0a.orig//doc/crypto/OPENSSL_config.pod 2005-06-03 00:19:56.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/OPENSSL_config.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -73,7 +73,7 @@ - =head1 SEE ALSO - - L<conf(5)|conf(5)>, L<CONF_load_modules_file(3)|CONF_load_modules_file(3)>, --L<CONF_modules_free(3),CONF_modules_free(3)> -+L<CONF_modules_free(3)|CONF_modules_free(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_err.pod openssl-1.0.0a/doc/crypto/openssl_err.pod ---- openssl-1.0.0a.orig//doc/crypto/openssl_err.pod 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/openssl_err.pod 2010-09-01 19:36:31.624124669 +0100 -@@ -0,0 +1,187 @@ -+=pod -+ -+=head1 NAME -+ -+openssl_err - error codes -+ -+=head1 SYNOPSIS -+ -+ #include <openssl/err.h> -+ -+ unsigned long ERR_get_error(void); -+ unsigned long ERR_peek_error(void); -+ unsigned long ERR_get_error_line(const char **file, int *line); -+ unsigned long ERR_peek_error_line(const char **file, int *line); -+ unsigned long ERR_get_error_line_data(const char **file, int *line, -+ const char **data, int *flags); -+ unsigned long ERR_peek_error_line_data(const char **file, int *line, -+ const char **data, int *flags); -+ -+ int ERR_GET_LIB(unsigned long e); -+ int ERR_GET_FUNC(unsigned long e); -+ int ERR_GET_REASON(unsigned long e); -+ -+ void ERR_clear_error(void); -+ -+ char *ERR_error_string(unsigned long e, char *buf); -+ const char *ERR_lib_error_string(unsigned long e); -+ const char *ERR_func_error_string(unsigned long e); -+ const char *ERR_reason_error_string(unsigned long e); -+ -+ void ERR_print_errors(BIO *bp); -+ void ERR_print_errors_fp(FILE *fp); -+ -+ void ERR_load_crypto_strings(void); -+ void ERR_free_strings(void); -+ -+ void ERR_remove_state(unsigned long pid); -+ -+ void ERR_put_error(int lib, int func, int reason, const char *file, -+ int line); -+ void ERR_add_error_data(int num, ...); -+ -+ void ERR_load_strings(int lib,ERR_STRING_DATA str[]); -+ unsigned long ERR_PACK(int lib, int func, int reason); -+ int ERR_get_next_error_library(void); -+ -+=head1 DESCRIPTION -+ -+When a call to the OpenSSL library fails, this is usually signalled -+by the return value, and an error code is stored in an error queue -+associated with the current thread. The B<err> library provides -+functions to obtain these error codes and textual error messages. -+ -+The L<ERR_get_error(3)|ERR_get_error(3)> manpage describes how to -+access error codes. -+ -+Error codes contain information about where the error occurred, and -+what went wrong. L<ERR_GET_LIB(3)|ERR_GET_LIB(3)> describes how to -+extract this information. A method to obtain human-readable error -+messages is described in L<ERR_error_string(3)|ERR_error_string(3)>. -+ -+L<ERR_clear_error(3)|ERR_clear_error(3)> can be used to clear the -+error queue. -+ -+Note that L<ERR_remove_state(3)|ERR_remove_state(3)> should be used to -+avoid memory leaks when threads are terminated. -+ -+=head1 ADDING NEW ERROR CODES TO OPENSSL -+ -+See L<ERR_put_error(3)> if you want to record error codes in the -+OpenSSL error system from within your application. -+ -+The remainder of this section is of interest only if you want to add -+new error codes to OpenSSL or add error codes from external libraries. -+ -+=head2 Reporting errors -+ -+Each sub-library has a specific macro XXXerr() that is used to report -+errors. Its first argument is a function code B<XXX_F_...>, the second -+argument is a reason code B<XXX_R_...>. Function codes are derived -+from the function names; reason codes consist of textual error -+descriptions. For example, the function ssl23_read() reports a -+"handshake failure" as follows: -+ -+ SSLerr(SSL_F_SSL23_READ, SSL_R_SSL_HANDSHAKE_FAILURE); -+ -+Function and reason codes should consist of upper case characters, -+numbers and underscores only. The error file generation script translates -+function codes into function names by looking in the header files -+for an appropriate function name, if none is found it just uses -+the capitalized form such as "SSL23_READ" in the above example. -+ -+The trailing section of a reason code (after the "_R_") is translated -+into lower case and underscores changed to spaces. -+ -+When you are using new function or reason codes, run B<make errors>. -+The necessary B<#define>s will then automatically be added to the -+sub-library's header file. -+ -+Although a library will normally report errors using its own specific -+XXXerr macro, another library's macro can be used. This is normally -+only done when a library wants to include ASN1 code which must use -+the ASN1err() macro. -+ -+=head2 Adding new libraries -+ -+When adding a new sub-library to OpenSSL, assign it a library number -+B<ERR_LIB_XXX>, define a macro XXXerr() (both in B<err.h>), add its -+name to B<ERR_str_libraries[]> (in B<crypto/err/err.c>), and add -+C<ERR_load_XXX_strings()> to the ERR_load_crypto_strings() function -+(in B<crypto/err/err_all.c>). Finally, add an entry -+ -+ L XXX xxx.h xxx_err.c -+ -+to B<crypto/err/openssl.ec>, and add B<xxx_err.c> to the Makefile. -+Running B<make errors> will then generate a file B<xxx_err.c>, and -+add all error codes used in the library to B<xxx.h>. -+ -+Additionally the library include file must have a certain form. -+Typically it will initially look like this: -+ -+ #ifndef HEADER_XXX_H -+ #define HEADER_XXX_H -+ -+ #ifdef __cplusplus -+ extern "C" { -+ #endif -+ -+ /* Include files */ -+ -+ #include <openssl/bio.h> -+ #include <openssl/x509.h> -+ -+ /* Macros, structures and function prototypes */ -+ -+ -+ /* BEGIN ERROR CODES */ -+ -+The B<BEGIN ERROR CODES> sequence is used by the error code -+generation script as the point to place new error codes, any text -+after this point will be overwritten when B<make errors> is run. -+The closing #endif etc will be automatically added by the script. -+ -+The generated C error code file B<xxx_err.c> will load the header -+files B<stdio.h>, B<openssl/err.h> and B<openssl/xxx.h> so the -+header file must load any additional header files containing any -+definitions it uses. -+ -+=head1 USING ERROR CODES IN EXTERNAL LIBRARIES -+ -+It is also possible to use OpenSSL's error code scheme in external -+libraries. The library needs to load its own codes and call the OpenSSL -+error code insertion script B<mkerr.pl> explicitly to add codes to -+the header file and generate the C error code file. This will normally -+be done if the external library needs to generate new ASN1 structures -+but it can also be used to add more general purpose error code handling. -+ -+TBA more details -+ -+=head1 INTERNALS -+ -+The error queues are stored in a hash table with one B<ERR_STATE> -+entry for each pid. ERR_get_state() returns the current thread's -+B<ERR_STATE>. An B<ERR_STATE> can hold up to B<ERR_NUM_ERRORS> error -+codes. When more error codes are added, the old ones are overwritten, -+on the assumption that the most recent errors are most important. -+ -+Error strings are also stored in hash table. The hash tables can -+be obtained by calling ERR_get_err_state_table(void) and -+ERR_get_string_table(void) respectively. -+ -+=head1 SEE ALSO -+ -+L<CRYPTO_set_id_callback(3)|CRYPTO_set_id_callback(3)>, -+L<CRYPTO_set_locking_callback(3)|CRYPTO_set_locking_callback(3)>, -+L<ERR_get_error(3)|ERR_get_error(3)>, -+L<ERR_GET_LIB(3)|ERR_GET_LIB(3)>, -+L<ERR_clear_error(3)|ERR_clear_error(3)>, -+L<ERR_error_string(3)|ERR_error_string(3)>, -+L<ERR_print_errors(3)|ERR_print_errors(3)>, -+L<ERR_load_crypto_strings(3)|ERR_load_crypto_strings(3)>, -+L<ERR_remove_state(3)|ERR_remove_state(3)>, -+L<ERR_put_error(3)|ERR_put_error(3)>, -+L<ERR_load_strings(3)|ERR_load_strings(3)>, -+L<SSL_get_error(3)|SSL_get_error(3)> -+ -+=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod openssl-1.0.0a/doc/crypto/openssl_rand.pod ---- openssl-1.0.0a.orig//doc/crypto/openssl_rand.pod 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/openssl_rand.pod 2010-09-01 19:36:31.624124669 +0100 -@@ -0,0 +1,175 @@ -+=pod -+ -+=head1 NAME -+ -+openssl_rand - pseudo-random number generator -+ -+=head1 SYNOPSIS -+ -+ #include <openssl/rand.h> -+ -+ int RAND_set_rand_engine(ENGINE *engine); -+ -+ int RAND_bytes(unsigned char *buf, int num); -+ int RAND_pseudo_bytes(unsigned char *buf, int num); -+ -+ void RAND_seed(const void *buf, int num); -+ void RAND_add(const void *buf, int num, int entropy); -+ int RAND_status(void); -+ -+ int RAND_load_file(const char *file, long max_bytes); -+ int RAND_write_file(const char *file); -+ const char *RAND_file_name(char *file, size_t num); -+ -+ int RAND_egd(const char *path); -+ -+ void RAND_set_rand_method(const RAND_METHOD *meth); -+ const RAND_METHOD *RAND_get_rand_method(void); -+ RAND_METHOD *RAND_SSLeay(void); -+ -+ void RAND_cleanup(void); -+ -+ /* For Win32 only */ -+ void RAND_screen(void); -+ int RAND_event(UINT, WPARAM, LPARAM); -+ -+=head1 DESCRIPTION -+ -+Since the introduction of the ENGINE API, the recommended way of controlling -+default implementations is by using the ENGINE API functions. The default -+B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by -+RAND_get_rand_method(), is only used if no ENGINE has been set as the default -+"rand" implementation. Hence, these two functions are no longer the recommened -+way to control defaults. -+ -+If an alternative B<RAND_METHOD> implementation is being used (either set -+directly or as provided by an ENGINE module), then it is entirely responsible -+for the generation and management of a cryptographically secure PRNG stream. The -+mechanisms described below relate solely to the software PRNG implementation -+built in to OpenSSL and used by default. -+ -+These functions implement a cryptographically secure pseudo-random -+number generator (PRNG). It is used by other library functions for -+example to generate random keys, and applications can use it when they -+need randomness. -+ -+A cryptographic PRNG must be seeded with unpredictable data such as -+mouse movements or keys pressed at random by the user. This is -+described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file -+(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the -+seeding process whenever the application is started. -+ -+L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the -+PRNG. -+ -+=head1 INTERNALS -+ -+The RAND_SSLeay() method implements a PRNG based on a cryptographic -+hash function. -+ -+The following description of its design is based on the SSLeay -+documentation: -+ -+First up I will state the things I believe I need for a good RNG. -+ -+=over 4 -+ -+=item 1 -+ -+A good hashing algorithm to mix things up and to convert the RNG 'state' -+to random numbers. -+ -+=item 2 -+ -+An initial source of random 'state'. -+ -+=item 3 -+ -+The state should be very large. If the RNG is being used to generate -+4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum). -+If your RNG state only has 128 bits, you are obviously limiting the -+search space to 128 bits, not 2048. I'm probably getting a little -+carried away on this last point but it does indicate that it may not be -+a bad idea to keep quite a lot of RNG state. It should be easier to -+break a cipher than guess the RNG seed data. -+ -+=item 4 -+ -+Any RNG seed data should influence all subsequent random numbers -+generated. This implies that any random seed data entered will have -+an influence on all subsequent random numbers generated. -+ -+=item 5 -+ -+When using data to seed the RNG state, the data used should not be -+extractable from the RNG state. I believe this should be a -+requirement because one possible source of 'secret' semi random -+data would be a private key or a password. This data must -+not be disclosed by either subsequent random numbers or a -+'core' dump left by a program crash. -+ -+=item 6 -+ -+Given the same initial 'state', 2 systems should deviate in their RNG state -+(and hence the random numbers generated) over time if at all possible. -+ -+=item 7 -+ -+Given the random number output stream, it should not be possible to determine -+the RNG state or the next random number. -+ -+=back -+ -+The algorithm is as follows. -+ -+There is global state made up of a 1023 byte buffer (the 'state'), a -+working hash value ('md'), and a counter ('count'). -+ -+Whenever seed data is added, it is inserted into the 'state' as -+follows. -+ -+The input is chopped up into units of 20 bytes (or less for -+the last block). Each of these blocks is run through the hash -+function as follows: The data passed to the hash function -+is the current 'md', the same number of bytes from the 'state' -+(the location determined by in incremented looping index) as -+the current 'block', the new key data 'block', and 'count' -+(which is incremented after each use). -+The result of this is kept in 'md' and also xored into the -+'state' at the same locations that were used as input into the -+hash function. I -+believe this system addresses points 1 (hash function; currently -+SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash -+function and xor). -+ -+When bytes are extracted from the RNG, the following process is used. -+For each group of 10 bytes (or less), we do the following: -+ -+Input into the hash function the local 'md' (which is initialized from -+the global 'md' before any bytes are generated), the bytes that are to -+be overwritten by the random bytes, and bytes from the 'state' -+(incrementing looping index). From this digest output (which is kept -+in 'md'), the top (up to) 10 bytes are returned to the caller and the -+bottom 10 bytes are xored into the 'state'. -+ -+Finally, after we have finished 'num' random bytes for the caller, -+'count' (which is incremented) and the local and global 'md' are fed -+into the hash function and the results are kept in the global 'md'. -+ -+I believe the above addressed points 1 (use of SHA-1), 6 (by hashing -+into the 'state' the 'old' data from the caller that is about to be -+overwritten) and 7 (by not using the 10 bytes given to the caller to -+update the 'state', but they are used to update 'md'). -+ -+So of the points raised, only 2 is not addressed (but see -+L<RAND_add(3)|RAND_add(3)>). -+ -+=head1 SEE ALSO -+ -+L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, -+L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>, -+L<RAND_bytes(3)|RAND_bytes(3)>, -+L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, -+L<RAND_cleanup(3)|RAND_cleanup(3)> -+ -+=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod openssl-1.0.0a/doc/crypto/openssl_threads.pod ---- openssl-1.0.0a.orig//doc/crypto/openssl_threads.pod 1970-01-01 01:00:00.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/openssl_threads.pod 2010-09-01 19:36:31.624124669 +0100 -@@ -0,0 +1,175 @@ -+=pod -+ -+=head1 NAME -+ -+CRYPTO_set_locking_callback, CRYPTO_set_id_callback, CRYPTO_num_locks, -+CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, -+CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, -+CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support -+ -+=head1 SYNOPSIS -+ -+ #include <openssl/crypto.h> -+ -+ void CRYPTO_set_locking_callback(void (*locking_function)(int mode, -+ int n, const char *file, int line)); -+ -+ void CRYPTO_set_id_callback(unsigned long (*id_function)(void)); -+ -+ int CRYPTO_num_locks(void); -+ -+ -+ /* struct CRYPTO_dynlock_value needs to be defined by the user */ -+ struct CRYPTO_dynlock_value; -+ -+ void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value * -+ (*dyn_create_function)(char *file, int line)); -+ void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function) -+ (int mode, struct CRYPTO_dynlock_value *l, -+ const char *file, int line)); -+ void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function) -+ (struct CRYPTO_dynlock_value *l, const char *file, int line)); -+ -+ int CRYPTO_get_new_dynlockid(void); -+ -+ void CRYPTO_destroy_dynlockid(int i); -+ -+ void CRYPTO_lock(int mode, int n, const char *file, int line); -+ -+ #define CRYPTO_w_lock(type) \ -+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) -+ #define CRYPTO_w_unlock(type) \ -+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) -+ #define CRYPTO_r_lock(type) \ -+ CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) -+ #define CRYPTO_r_unlock(type) \ -+ CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) -+ #define CRYPTO_add(addr,amount,type) \ -+ CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) -+ -+=head1 DESCRIPTION -+ -+OpenSSL can safely be used in multi-threaded applications provided -+that at least two callback functions are set. -+ -+locking_function(int mode, int n, const char *file, int line) is -+needed to perform locking on shared data structures. -+(Note that OpenSSL uses a number of global data structures that -+will be implicitly shared whenever multiple threads use OpenSSL.) -+Multi-threaded applications will crash at random if it is not set. -+ -+locking_function() must be able to handle up to CRYPTO_num_locks() -+different mutex locks. It sets the B<n>-th lock if B<mode> & -+B<CRYPTO_LOCK>, and releases it otherwise. -+ -+B<file> and B<line> are the file number of the function setting the -+lock. They can be useful for debugging. -+ -+id_function(void) is a function that returns a thread ID, for example -+pthread_self() if it returns an integer (see NOTES below). It isn't -+needed on Windows nor on platforms where getpid() returns a different -+ID for each thread (see NOTES below). -+ -+Additionally, OpenSSL supports dynamic locks, and sometimes, some parts -+of OpenSSL need it for better performance. To enable this, the following -+is required: -+ -+=over 4 -+ -+=item * -+Three additional callback function, dyn_create_function, dyn_lock_function -+and dyn_destroy_function. -+ -+=item * -+A structure defined with the data that each lock needs to handle. -+ -+=back -+ -+struct CRYPTO_dynlock_value has to be defined to contain whatever structure -+is needed to handle locks. -+ -+dyn_create_function(const char *file, int line) is needed to create a -+lock. Multi-threaded applications might crash at random if it is not set. -+ -+dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line) -+is needed to perform locking off dynamic lock numbered n. Multi-threaded -+applications might crash at random if it is not set. -+ -+dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is -+needed to destroy the lock l. Multi-threaded applications might crash at -+random if it is not set. -+ -+CRYPTO_get_new_dynlockid() is used to create locks. It will call -+dyn_create_function for the actual creation. -+ -+CRYPTO_destroy_dynlockid() is used to destroy locks. It will call -+dyn_destroy_function for the actual destruction. -+ -+CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield -+describing what should be done with the lock. n is the number of the -+lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined -+from the following values. These values are pairwise exclusive, with -+undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE -+should not be used together): -+ -+ CRYPTO_LOCK 0x01 -+ CRYPTO_UNLOCK 0x02 -+ CRYPTO_READ 0x04 -+ CRYPTO_WRITE 0x08 -+ -+=head1 RETURN VALUES -+ -+CRYPTO_num_locks() returns the required number of locks. -+ -+CRYPTO_get_new_dynlockid() returns the index to the newly created lock. -+ -+The other functions return no values. -+ -+=head1 NOTES -+ -+You can find out if OpenSSL was configured with thread support: -+ -+ #define OPENSSL_THREAD_DEFINES -+ #include <openssl/opensslconf.h> -+ #if defined(OPENSSL_THREADS) -+ // thread support enabled -+ #else -+ // no thread support -+ #endif -+ -+Also, dynamic locks are currently not used internally by OpenSSL, but -+may do so in the future. -+ -+Defining id_function(void) has it's own issues. Generally speaking, -+pthread_self() should be used, even on platforms where getpid() gives -+different answers in each thread, since that may depend on the machine -+the program is run on, not the machine where the program is being -+compiled. For instance, Red Hat 8 Linux and earlier used -+LinuxThreads, whose getpid() returns a different value for each -+thread. Red Hat 9 Linux and later use NPTL, which is -+Posix-conformant, and has a getpid() that returns the same value for -+all threads in a process. A program compiled on Red Hat 8 and run on -+Red Hat 9 will therefore see getpid() returning the same value for -+all threads. -+ -+There is still the issue of platforms where pthread_self() returns -+something other than an integer. This is a bit unusual, and this -+manual has no cookbook solution for that case. -+ -+=head1 EXAMPLES -+ -+B<crypto/threads/mttest.c> shows examples of the callback functions on -+Solaris, Irix and Win32. -+ -+=head1 HISTORY -+ -+CRYPTO_set_locking_callback() and CRYPTO_set_id_callback() are -+available in all versions of SSLeay and OpenSSL. -+CRYPTO_num_locks() was added in OpenSSL 0.9.4. -+All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. -+ -+=head1 SEE ALSO -+ -+L<crypto(3)|crypto(3)> -+ -+=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_add.pod openssl-1.0.0a/doc/crypto/RAND_add.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_add.pod 2000-03-22 15:30:03.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RAND_add.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -65,7 +65,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_egd(3)|RAND_egd(3)>, - L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod openssl-1.0.0a/doc/crypto/RAND_bytes.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_bytes.pod 2007-09-24 12:01:18.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/RAND_bytes.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -38,7 +38,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<ERR_get_error(3)|ERR_get_error(3)>, - L<RAND_add(3)|RAND_add(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod openssl-1.0.0a/doc/crypto/RAND_cleanup.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_cleanup.pod 2000-01-27 01:25:06.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RAND_cleanup.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -20,7 +20,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)> -+L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod openssl-1.0.0a/doc/crypto/RAND_egd.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_egd.pod 2008-11-10 11:26:44.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RAND_egd.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -72,7 +72,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, - L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod openssl-1.0.0a/doc/crypto/RAND_load_file.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_load_file.pod 2001-03-21 15:25:56.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RAND_load_file.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -43,7 +43,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> -+L<openssl_rand(3)|openssl_rand(3)>, L<RAND_add(3)|RAND_add(3)>, L<RAND_cleanup(3)|RAND_cleanup(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/rand.pod openssl-1.0.0a/doc/crypto/rand.pod ---- openssl-1.0.0a.orig//doc/crypto/rand.pod 2002-08-05 17:27:01.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/rand.pod 1970-01-01 01:00:00.000000000 +0100 -@@ -1,175 +0,0 @@ --=pod -- --=head1 NAME -- --rand - pseudo-random number generator -- --=head1 SYNOPSIS -- -- #include <openssl/rand.h> -- -- int RAND_set_rand_engine(ENGINE *engine); -- -- int RAND_bytes(unsigned char *buf, int num); -- int RAND_pseudo_bytes(unsigned char *buf, int num); -- -- void RAND_seed(const void *buf, int num); -- void RAND_add(const void *buf, int num, int entropy); -- int RAND_status(void); -- -- int RAND_load_file(const char *file, long max_bytes); -- int RAND_write_file(const char *file); -- const char *RAND_file_name(char *file, size_t num); -- -- int RAND_egd(const char *path); -- -- void RAND_set_rand_method(const RAND_METHOD *meth); -- const RAND_METHOD *RAND_get_rand_method(void); -- RAND_METHOD *RAND_SSLeay(void); -- -- void RAND_cleanup(void); -- -- /* For Win32 only */ -- void RAND_screen(void); -- int RAND_event(UINT, WPARAM, LPARAM); -- --=head1 DESCRIPTION -- --Since the introduction of the ENGINE API, the recommended way of controlling --default implementations is by using the ENGINE API functions. The default --B<RAND_METHOD>, as set by RAND_set_rand_method() and returned by --RAND_get_rand_method(), is only used if no ENGINE has been set as the default --"rand" implementation. Hence, these two functions are no longer the recommened --way to control defaults. -- --If an alternative B<RAND_METHOD> implementation is being used (either set --directly or as provided by an ENGINE module), then it is entirely responsible --for the generation and management of a cryptographically secure PRNG stream. The --mechanisms described below relate solely to the software PRNG implementation --built in to OpenSSL and used by default. -- --These functions implement a cryptographically secure pseudo-random --number generator (PRNG). It is used by other library functions for --example to generate random keys, and applications can use it when they --need randomness. -- --A cryptographic PRNG must be seeded with unpredictable data such as --mouse movements or keys pressed at random by the user. This is --described in L<RAND_add(3)|RAND_add(3)>. Its state can be saved in a seed file --(see L<RAND_load_file(3)|RAND_load_file(3)>) to avoid having to go through the --seeding process whenever the application is started. -- --L<RAND_bytes(3)|RAND_bytes(3)> describes how to obtain random data from the --PRNG. -- --=head1 INTERNALS -- --The RAND_SSLeay() method implements a PRNG based on a cryptographic --hash function. -- --The following description of its design is based on the SSLeay --documentation: -- --First up I will state the things I believe I need for a good RNG. -- --=over 4 -- --=item 1 -- --A good hashing algorithm to mix things up and to convert the RNG 'state' --to random numbers. -- --=item 2 -- --An initial source of random 'state'. -- --=item 3 -- --The state should be very large. If the RNG is being used to generate --4096 bit RSA keys, 2 2048 bit random strings are required (at a minimum). --If your RNG state only has 128 bits, you are obviously limiting the --search space to 128 bits, not 2048. I'm probably getting a little --carried away on this last point but it does indicate that it may not be --a bad idea to keep quite a lot of RNG state. It should be easier to --break a cipher than guess the RNG seed data. -- --=item 4 -- --Any RNG seed data should influence all subsequent random numbers --generated. This implies that any random seed data entered will have --an influence on all subsequent random numbers generated. -- --=item 5 -- --When using data to seed the RNG state, the data used should not be --extractable from the RNG state. I believe this should be a --requirement because one possible source of 'secret' semi random --data would be a private key or a password. This data must --not be disclosed by either subsequent random numbers or a --'core' dump left by a program crash. -- --=item 6 -- --Given the same initial 'state', 2 systems should deviate in their RNG state --(and hence the random numbers generated) over time if at all possible. -- --=item 7 -- --Given the random number output stream, it should not be possible to determine --the RNG state or the next random number. -- --=back -- --The algorithm is as follows. -- --There is global state made up of a 1023 byte buffer (the 'state'), a --working hash value ('md'), and a counter ('count'). -- --Whenever seed data is added, it is inserted into the 'state' as --follows. -- --The input is chopped up into units of 20 bytes (or less for --the last block). Each of these blocks is run through the hash --function as follows: The data passed to the hash function --is the current 'md', the same number of bytes from the 'state' --(the location determined by in incremented looping index) as --the current 'block', the new key data 'block', and 'count' --(which is incremented after each use). --The result of this is kept in 'md' and also xored into the --'state' at the same locations that were used as input into the --hash function. I --believe this system addresses points 1 (hash function; currently --SHA-1), 3 (the 'state'), 4 (via the 'md'), 5 (by the use of a hash --function and xor). -- --When bytes are extracted from the RNG, the following process is used. --For each group of 10 bytes (or less), we do the following: -- --Input into the hash function the local 'md' (which is initialized from --the global 'md' before any bytes are generated), the bytes that are to --be overwritten by the random bytes, and bytes from the 'state' --(incrementing looping index). From this digest output (which is kept --in 'md'), the top (up to) 10 bytes are returned to the caller and the --bottom 10 bytes are xored into the 'state'. -- --Finally, after we have finished 'num' random bytes for the caller, --'count' (which is incremented) and the local and global 'md' are fed --into the hash function and the results are kept in the global 'md'. -- --I believe the above addressed points 1 (use of SHA-1), 6 (by hashing --into the 'state' the 'old' data from the caller that is about to be --overwritten) and 7 (by not using the 10 bytes given to the caller to --update the 'state', but they are used to update 'md'). -- --So of the points raised, only 2 is not addressed (but see --L<RAND_add(3)|RAND_add(3)>). -- --=head1 SEE ALSO -- --L<BN_rand(3)|BN_rand(3)>, L<RAND_add(3)|RAND_add(3)>, --L<RAND_load_file(3)|RAND_load_file(3)>, L<RAND_egd(3)|RAND_egd(3)>, --L<RAND_bytes(3)|RAND_bytes(3)>, --L<RAND_set_rand_method(3)|RAND_set_rand_method(3)>, --L<RAND_cleanup(3)|RAND_cleanup(3)> -- --=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod ---- openssl-1.0.0a.orig//doc/crypto/RAND_set_rand_method.pod 2007-11-19 09:18:03.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RAND_set_rand_method.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -67,7 +67,7 @@ - - =head1 SEE ALSO - --L<rand(3)|rand(3)>, L<engine(3)|engine(3)> -+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod ---- openssl-1.0.0a.orig//doc/crypto/RSA_blinding_on.pod 2000-02-24 11:55:10.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RSA_blinding_on.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -34,7 +34,7 @@ - - =head1 SEE ALSO - --L<rsa(3)|rsa(3)>, L<rand(3)|rand(3)> -+L<rsa(3)|rsa(3)>, L<openssl_rand(3)|openssl_rand(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod openssl-1.0.0a/doc/crypto/RSA_generate_key.pod ---- openssl-1.0.0a.orig//doc/crypto/RSA_generate_key.pod 2002-09-25 14:33:27.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/RSA_generate_key.pod 2010-09-01 19:36:31.616125383 +0100 -@@ -59,7 +59,7 @@ - - =head1 SEE ALSO - --L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<RSA_free(3)|RSA_free(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/rsa.pod openssl-1.0.0a/doc/crypto/rsa.pod ---- openssl-1.0.0a.orig//doc/crypto/rsa.pod 2002-08-04 22:08:36.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/rsa.pod 2010-09-01 19:36:31.624124669 +0100 -@@ -108,7 +108,7 @@ - =head1 SEE ALSO - - L<rsa(1)|rsa(1)>, L<bn(3)|bn(3)>, L<dsa(3)|dsa(3)>, L<dh(3)|dh(3)>, --L<rand(3)|rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<engine(3)|engine(3)>, L<RSA_new(3)|RSA_new(3)>, - L<RSA_public_encrypt(3)|RSA_public_encrypt(3)>, - L<RSA_sign(3)|RSA_sign(3)>, L<RSA_size(3)|RSA_size(3)>, - L<RSA_generate_key(3)|RSA_generate_key(3)>, -diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod ---- openssl-1.0.0a.orig//doc/crypto/RSA_public_encrypt.pod 2004-03-23 21:01:34.000000000 +0000 -+++ openssl-1.0.0a/doc/crypto/RSA_public_encrypt.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -73,7 +73,7 @@ - - =head1 SEE ALSO - --L<ERR_get_error(3)|ERR_get_error(3)>, L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, -+L<ERR_get_error(3)|ERR_get_error(3)>, L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, - L<RSA_size(3)|RSA_size(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod ---- openssl-1.0.0a.orig//doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2002-09-25 14:33:28.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/RSA_sign_ASN1_OCTET_STRING.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -48,7 +48,7 @@ - =head1 SEE ALSO - - L<ERR_get_error(3)|ERR_get_error(3)>, L<objects(3)|objects(3)>, --L<rand(3)|rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, -+L<openssl_rand(3)|openssl_rand(3)>, L<rsa(3)|rsa(3)>, L<RSA_sign(3)|RSA_sign(3)>, - L<RSA_verify(3)|RSA_verify(3)> - - =head1 HISTORY -diff -Naur openssl-1.0.0a.orig//doc/crypto/threads.pod openssl-1.0.0a/doc/crypto/threads.pod ---- openssl-1.0.0a.orig//doc/crypto/threads.pod 2009-10-01 00:40:52.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/threads.pod 1970-01-01 01:00:00.000000000 +0100 -@@ -1,210 +0,0 @@ --=pod -- --=head1 NAME -- --CRYPTO_THREADID_set_callback, CRYPTO_THREADID_get_callback, --CRYPTO_THREADID_current, CRYPTO_THREADID_cmp, CRYPTO_THREADID_cpy, --CRYPTO_THREADID_hash, CRYPTO_set_locking_callback, CRYPTO_num_locks, --CRYPTO_set_dynlock_create_callback, CRYPTO_set_dynlock_lock_callback, --CRYPTO_set_dynlock_destroy_callback, CRYPTO_get_new_dynlockid, --CRYPTO_destroy_dynlockid, CRYPTO_lock - OpenSSL thread support -- --=head1 SYNOPSIS -- -- #include <openssl/crypto.h> -- -- /* Don't use this structure directly. */ -- typedef struct crypto_threadid_st -- { -- void *ptr; -- unsigned long val; -- } CRYPTO_THREADID; -- /* Only use CRYPTO_THREADID_set_[numeric|pointer]() within callbacks */ -- void CRYPTO_THREADID_set_numeric(CRYPTO_THREADID *id, unsigned long val); -- void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr); -- int CRYPTO_THREADID_set_callback(void (*threadid_func)(CRYPTO_THREADID *)); -- void (*CRYPTO_THREADID_get_callback(void))(CRYPTO_THREADID *); -- void CRYPTO_THREADID_current(CRYPTO_THREADID *id); -- int CRYPTO_THREADID_cmp(const CRYPTO_THREADID *a, -- const CRYPTO_THREADID *b); -- void CRYPTO_THREADID_cpy(CRYPTO_THREADID *dest, -- const CRYPTO_THREADID *src); -- unsigned long CRYPTO_THREADID_hash(const CRYPTO_THREADID *id); -- -- int CRYPTO_num_locks(void); -- -- /* struct CRYPTO_dynlock_value needs to be defined by the user */ -- struct CRYPTO_dynlock_value; -- -- void CRYPTO_set_dynlock_create_callback(struct CRYPTO_dynlock_value * -- (*dyn_create_function)(char *file, int line)); -- void CRYPTO_set_dynlock_lock_callback(void (*dyn_lock_function) -- (int mode, struct CRYPTO_dynlock_value *l, -- const char *file, int line)); -- void CRYPTO_set_dynlock_destroy_callback(void (*dyn_destroy_function) -- (struct CRYPTO_dynlock_value *l, const char *file, int line)); -- -- int CRYPTO_get_new_dynlockid(void); -- -- void CRYPTO_destroy_dynlockid(int i); -- -- void CRYPTO_lock(int mode, int n, const char *file, int line); -- -- #define CRYPTO_w_lock(type) \ -- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) -- #define CRYPTO_w_unlock(type) \ -- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE,type,__FILE__,__LINE__) -- #define CRYPTO_r_lock(type) \ -- CRYPTO_lock(CRYPTO_LOCK|CRYPTO_READ,type,__FILE__,__LINE__) -- #define CRYPTO_r_unlock(type) \ -- CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_READ,type,__FILE__,__LINE__) -- #define CRYPTO_add(addr,amount,type) \ -- CRYPTO_add_lock(addr,amount,type,__FILE__,__LINE__) -- --=head1 DESCRIPTION -- --OpenSSL can safely be used in multi-threaded applications provided --that at least two callback functions are set, locking_function and --threadid_func. -- --locking_function(int mode, int n, const char *file, int line) is --needed to perform locking on shared data structures. --(Note that OpenSSL uses a number of global data structures that --will be implicitly shared whenever multiple threads use OpenSSL.) --Multi-threaded applications will crash at random if it is not set. -- --locking_function() must be able to handle up to CRYPTO_num_locks() --different mutex locks. It sets the B<n>-th lock if B<mode> & --B<CRYPTO_LOCK>, and releases it otherwise. -- --B<file> and B<line> are the file number of the function setting the --lock. They can be useful for debugging. -- --threadid_func(CRYPTO_THREADID *id) is needed to record the currently-executing --thread's identifier into B<id>. The implementation of this callback should not --fill in B<id> directly, but should use CRYPTO_THREADID_set_numeric() if thread --IDs are numeric, or CRYPTO_THREADID_set_pointer() if they are pointer-based. --If the application does not register such a callback using --CRYPTO_THREADID_set_callback(), then a default implementation is used - on --Windows and BeOS this uses the system's default thread identifying APIs, and on --all other platforms it uses the address of B<errno>. The latter is satisfactory --for thread-safety if and only if the platform has a thread-local error number --facility. -- --Once threadid_func() is registered, or if the built-in default implementation is --to be used; -- --=over 4 -- --=item * --CRYPTO_THREADID_current() records the currently-executing thread ID into the --given B<id> object. -- --=item * --CRYPTO_THREADID_cmp() compares two thread IDs (returning zero for equality, ie. --the same semantics as memcmp()). -- --=item * --CRYPTO_THREADID_cpy() duplicates a thread ID value, -- --=item * --CRYPTO_THREADID_hash() returns a numeric value usable as a hash-table key. This --is usually the exact numeric or pointer-based thread ID used internally, however --this also handles the unusual case where pointers are larger than 'long' --variables and the platform's thread IDs are pointer-based - in this case, mixing --is done to attempt to produce a unique numeric value even though it is not as --wide as the platform's true thread IDs. -- --=back -- --Additionally, OpenSSL supports dynamic locks, and sometimes, some parts --of OpenSSL need it for better performance. To enable this, the following --is required: -- --=over 4 -- --=item * --Three additional callback function, dyn_create_function, dyn_lock_function --and dyn_destroy_function. -- --=item * --A structure defined with the data that each lock needs to handle. -- --=back -- --struct CRYPTO_dynlock_value has to be defined to contain whatever structure --is needed to handle locks. -- --dyn_create_function(const char *file, int line) is needed to create a --lock. Multi-threaded applications might crash at random if it is not set. -- --dyn_lock_function(int mode, CRYPTO_dynlock *l, const char *file, int line) --is needed to perform locking off dynamic lock numbered n. Multi-threaded --applications might crash at random if it is not set. -- --dyn_destroy_function(CRYPTO_dynlock *l, const char *file, int line) is --needed to destroy the lock l. Multi-threaded applications might crash at --random if it is not set. -- --CRYPTO_get_new_dynlockid() is used to create locks. It will call --dyn_create_function for the actual creation. -- --CRYPTO_destroy_dynlockid() is used to destroy locks. It will call --dyn_destroy_function for the actual destruction. -- --CRYPTO_lock() is used to lock and unlock the locks. mode is a bitfield --describing what should be done with the lock. n is the number of the --lock as returned from CRYPTO_get_new_dynlockid(). mode can be combined --from the following values. These values are pairwise exclusive, with --undefined behaviour if misused (for example, CRYPTO_READ and CRYPTO_WRITE --should not be used together): -- -- CRYPTO_LOCK 0x01 -- CRYPTO_UNLOCK 0x02 -- CRYPTO_READ 0x04 -- CRYPTO_WRITE 0x08 -- --=head1 RETURN VALUES -- --CRYPTO_num_locks() returns the required number of locks. -- --CRYPTO_get_new_dynlockid() returns the index to the newly created lock. -- --The other functions return no values. -- --=head1 NOTES -- --You can find out if OpenSSL was configured with thread support: -- -- #define OPENSSL_THREAD_DEFINES -- #include <openssl/opensslconf.h> -- #if defined(OPENSSL_THREADS) -- // thread support enabled -- #else -- // no thread support -- #endif -- --Also, dynamic locks are currently not used internally by OpenSSL, but --may do so in the future. -- --=head1 EXAMPLES -- --B<crypto/threads/mttest.c> shows examples of the callback functions on --Solaris, Irix and Win32. -- --=head1 HISTORY -- --CRYPTO_set_locking_callback() is --available in all versions of SSLeay and OpenSSL. --CRYPTO_num_locks() was added in OpenSSL 0.9.4. --All functions dealing with dynamic locks were added in OpenSSL 0.9.5b-dev. --B<CRYPTO_THREADID> and associated functions were introduced in OpenSSL 1.0.0 --to replace (actually, deprecate) the previous CRYPTO_set_id_callback(), --CRYPTO_get_id_callback(), and CRYPTO_thread_id() functions which assumed --thread IDs to always be represented by 'unsigned long'. -- --=head1 SEE ALSO -- --L<crypto(3)|crypto(3)> -- --=cut -diff -Naur openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod ---- openssl-1.0.0a.orig//doc/crypto/X509_NAME_ENTRY_get_object.pod 2006-05-14 12:27:59.000000000 +0100 -+++ openssl-1.0.0a/doc/crypto/X509_NAME_ENTRY_get_object.pod 2010-09-01 19:36:31.620125025 +0100 -@@ -65,7 +65,7 @@ - =head1 SEE ALSO - - L<ERR_get_error(3)|ERR_get_error(3)>, L<d2i_X509_NAME(3)|d2i_X509_NAME(3)>, --L<OBJ_nid2obj(3),OBJ_nid2obj(3)> -+L<OBJ_nid2obj(3)|OBJ_nid2obj(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod openssl-1.0.0a/doc/ssl/SSL_get_error.pod ---- openssl-1.0.0a.orig//doc/ssl/SSL_get_error.pod 2005-03-30 12:50:14.000000000 +0100 -+++ openssl-1.0.0a/doc/ssl/SSL_get_error.pod 2010-09-01 19:36:40.259360162 +0100 -@@ -105,7 +105,7 @@ - - =head1 SEE ALSO - --L<ssl(3)|ssl(3)>, L<err(3)|err(3)> -+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)> - - =head1 HISTORY - -diff -Naur openssl-1.0.0a.orig//doc/ssl/SSL_want.pod openssl-1.0.0a/doc/ssl/SSL_want.pod ---- openssl-1.0.0a.orig//doc/ssl/SSL_want.pod 2005-03-30 12:50:14.000000000 +0100 -+++ openssl-1.0.0a/doc/ssl/SSL_want.pod 2010-09-01 19:36:40.259360162 +0100 -@@ -72,6 +72,6 @@ - - =head1 SEE ALSO - --L<ssl(3)|ssl(3)>, L<err(3)|err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> -+L<ssl(3)|ssl(3)>, L<openssl_err(3)|openssl_err(3)>, L<SSL_get_error(3)|SSL_get_error(3)> - - =cut -diff -Naur openssl-1.0.0a.orig//FAQ openssl-1.0.0a/FAQ ---- openssl-1.0.0a.orig//FAQ 2010-06-01 14:31:36.000000000 +0100 -+++ openssl-1.0.0a/FAQ 2010-09-01 19:39:19.677244857 +0100 -@@ -724,7 +724,7 @@ - CRYPTO_set_id_callback(), for all versions of OpenSSL up to and - including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() - and associated APIs are deprecated by CRYPTO_THREADID_set_callback() --and friends. This is described in the threads(3) manpage. -+and friends. This is described in the openssl_threads(3) manpage. - - * I've compiled a program under Windows and it crashes: why? - diff --git a/testing/openssl/no-rpath.patch b/testing/openssl/no-rpath.patch deleted file mode 100644 index ebd95e23d..000000000 --- a/testing/openssl/no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD deleted file mode 100644 index 8e8ca8491..000000000 --- a/testing/pam/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 157512 2012-04-28 21:41:09Z dreisner $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=pam -pkgver=1.1.5 -pkgrel=3 -pkgdesc="PAM (Pluggable Authentication Modules) library" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://www.kernel.org/pub/linux/libs/pam/" -depends=('glibc' 'db' 'cracklib' 'libtirpc') -makedepends=('flex' 'w3m' '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=(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=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') - -build() { - cd $srcdir/Linux-PAM-$pkgver - ./configure --libdir=/usr/lib - make - - cd $srcdir/pam_unix2-2.6 - ./configure --libdir=/usr/lib - make -} - -package() { - cd $srcdir/Linux-PAM-$pkgver - make DESTDIR=$pkgdir install - install -D -m644 ../other $pkgdir/etc/pam.d/other - - # build pam_unix2 module - # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 - cd $srcdir/pam_unix2-2.6 - make DESTDIR=$pkgdir install - - # add the realtime permissions for audio users - sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf - cat >>$pkgdir/etc/security/limits.conf <<_EOT -* - rtprio 0 -* - nice 0 -@audio - rtprio 65 -@audio - nice -10 -@audio - memlock 40000 -_EOT - - # fix some missing symlinks from old pam for compatibility - cd $pkgdir/usr/lib/security - ln -s pam_unix.so pam_unix_acct.so - ln -s pam_unix.so pam_unix_auth.so - ln -s pam_unix.so pam_unix_passwd.so - ln -s pam_unix.so pam_unix_session.so - - # set unix_chkpwd uid - chmod +s $pkgdir/sbin/unix_chkpwd -} -md5sums=('927ee5585bdec5256c75117e9348aa47' - 'e2788389a6c59224110a45fcff30e02b' - '6e6c8719e5989d976a14610f340bd33a') diff --git a/testing/pam/other b/testing/pam/other deleted file mode 100644 index 08498b423..000000000 --- a/testing/pam/other +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so diff --git a/testing/pam/pam.install b/testing/pam/pam.install deleted file mode 100644 index 9d4588084..000000000 --- a/testing/pam/pam.install +++ /dev/null @@ -1,12 +0,0 @@ -# arg 1: the new package version -post_install() { - # need to run this immediately -- pacman only runs it at the end of - # all package installs - /sbin/ldconfig -r . -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/testing/pam_ldap/PKGBUILD b/testing/pam_ldap/PKGBUILD deleted file mode 100644 index c74c181cb..000000000 --- a/testing/pam_ldap/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 157514 2012-04-28 21:41:11Z dreisner $ -# Maintainer: -# Contributor: Comete <la_comete@tiscali.fr> - -pkgname=pam_ldap -pkgver=186 -pkgrel=3 -pkgdesc="LDAP authentication module for the PAM framework" -arch=('i686' 'x86_64') -url="http://www.padl.com/OSS/pam_ldap.html" -license=('LGPL') -depends=('libldap' 'pam') -backup=('etc/pam_ldap.conf') -options=('!makeflags') -source=("http://www.padl.com/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('58c8689921c5c4578363438acd8503c2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --libdir=/lib \ - --with-ldap-conf-file=/etc/pam_ldap.conf \ - --mandir=/usr/share/man - PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - mv "${pkgdir}/etc/ldap.conf" "${pkgdir}/etc/pam_ldap.conf" - - # move /lib to /usr/lib - mv "${pkgdir}/lib/security" "${pkgdir}/usr/lib" - rmdir "${pkgdir}/lib" -} diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD deleted file mode 100644 index 8d8913280..000000000 --- a/testing/pciutils/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 159352 2012-05-22 11:56:06Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=pciutils -pkgver=3.1.9 -pkgrel=2 -pkgdesc="PCI bus configuration space access library and tools" -arch=(i686 x86_64) -license=('GPL2') -groups=('base') -url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') -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=('e958f5ffb93b12972964381c38f27eb3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all - cp lib/libpci.a "${srcdir}/" - make clean - make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib - install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" - # this is now supplied by the hwids package - rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}} -} diff --git a/testing/php-apc/PKGBUILD b/testing/php-apc/PKGBUILD deleted file mode 100644 index 217b3d3c6..000000000 --- a/testing/php-apc/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 157759 2012-04-29 06:41:39Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=php-apc -pkgver=3.1.10 -pkgrel=2 -arch=('i686' 'x86_64') -pkgdesc='A free, open, and robust framework for caching and optimizing PHP intermediate code' -url='http://pecl.php.net/package/APC' -depends=('php') -license=('PHP') -source=("http://pecl.php.net/get/APC-${pkgver}.tgz") -backup=('etc/php/conf.d/apc.ini') -md5sums=('f4a6b91903d6ba9dce89fc87bb6f26c9') - -build() { - cd $srcdir/APC-$pkgver - phpize - ./configure --prefix=/usr - make -} - -# check() { -# cd $srcdir/APC-$pkgver -# make test -# } - -package() { - cd $srcdir/APC-$pkgver - make INSTALL_ROOT=$pkgdir install - echo ';extension=apc.so' > apc.ini - install -D -m644 apc.ini $pkgdir/etc/php/conf.d/apc.ini - install -D -m644 apc.php $pkgdir/usr/share/php-apc/apc.php - install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apc/install.txt -} diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD deleted file mode 100644 index 138a2fb2d..000000000 --- a/testing/poppler/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 159331 2012-05-21 16:28:02Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgbase=poppler -pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.0 -pkgrel=1 -arch=(i686 x86_64) -license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -options=('!libtool' '!emptydirs') -url="http://poppler.freedesktop.org/" -_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a -source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz - http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('5bca54b9561bf5b14d9344efce2cd4f3' - '9dc64c254a31e570507bdd4ad4ba629a') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -i -e '/AC_PATH_XTRA/d' configure.ac - - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-cairo-output \ - --enable-xpdf-headers \ - --enable-libjpeg --enable-zlib \ - --enable-poppler-qt4 \ - --enable-poppler-glib - make -} - -check() { - cd "${srcdir}" - ln -sf test-${_testtag} test - cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check -} - -package_poppler() { - pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') - conflicts=("poppler-qt3<${pkgver}") - - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^glib_subdir =.*/glib_subdir =/' \ - -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc -} - -package_poppler-glib() { - pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'glib2') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/glib" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* - rm -f "${pkgdir}/usr/bin/poppler-glib-demo" -} - -package_poppler-qt() { - pkgdesc="Poppler Qt bindings" - depends=("poppler=${pkgver}" 'qt') - - cd "${srcdir}/${pkgbase}-${pkgver}/poppler" - make DESTDIR="${pkgdir}" install-libLTLIBRARIES - cd "${srcdir}/${pkgbase}-${pkgver}/qt4" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/" - rm -f "${pkgdir}"/usr/lib/libpoppler.* -} diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD deleted file mode 100644 index 324784932..000000000 --- a/testing/procps-ng/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 157364 2012-04-28 03:50:32Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=procps-ng -pkgver=3.3.2 -pkgrel=1 -pkgdesc="Utilities for monitoring your system and processes on your system" -arch=('i686' 'x86_64') -url="http://gitorious.org/procps" -license=('GPL' 'LGPL') -groups=('base') -depends=('ncurses') -conflicts=('procps') -provides=('procps') -replaces=('procps') -backup=('etc/sysctl.conf') -options=('!libtool') -source=(http://gitorious.org/procps/procps/archive-tarball/v${pkgver} - sysctl_man.patch includes_restrict.patch gnu-kbsd-version.patch - complain_unmounted_proc.patch sig_printf_literal.patch - makefile_watch_ncurses.patch) -sha1sums=('889692f891e790ea035315ec321cce92d00a8db2' - '39d6562b83389ec4893de88ec88222f7169fa732' - 'd588825497fef0b057491377421fd8f68730d181' - '9eb2bb32a13656b5d671f9cffed3094399a26048' - 'bf57f5a1f54a0f4a6d9e99d66b8e447225c3371d' - '25be10b456d56b8bdf6260276c60738a7d76a34d' - '9fc24e48f902c19315e2557e4deea5592bbfad7e') - -build() { - cd "${srcdir}/procps-procps" - ./autogen.sh - patch -p1 < ../sysctl_man.patch - patch -p1 < ../includes_restrict.patch - patch -p1 < ../gnu-kbsd-version.patch - patch -p1 < ../complain_unmounted_proc.patch - patch -p1 < ../sig_printf_literal.patch - patch -p1 < ../makefile_watch_ncurses.patch - ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib - make -} - -package() { - cd "${srcdir}/procps-procps" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/procps-ng/complain_unmounted_proc.patch b/testing/procps-ng/complain_unmounted_proc.patch deleted file mode 100644 index ed932dbba..000000000 --- a/testing/procps-ng/complain_unmounted_proc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: <hesso@hesso.pool.math.tu-berlin.de> -Description: Complain when /proc/version cannot be found instead of -exiting silently. ---- a/proc/version.c -+++ b/proc/version.c -@@ -33,8 +33,10 @@ - char buf[256]; - int version_string_depth; - -- if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ -+ if ( (fp=fopen("/proc/version","r")) == NULL) { -+ fprintf(stderr, "Cannot find /proc/version - is /proc mounted?\n"); - exit(1); -+ } - if (fgets(buf, 256, fp) == NULL) { - fprintf(stderr, "Cannot read kernel version from /proc/version\n"); - fclose(fp); diff --git a/testing/procps-ng/gnu-kbsd-version.patch b/testing/procps-ng/gnu-kbsd-version.patch deleted file mode 100644 index f310a4c93..000000000 --- a/testing/procps-ng/gnu-kbsd-version.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: <csmall@debian.org> -Description: Rework version parsing so its ok with other OSes ---- a/proc/version.c -+++ b/proc/version.c -@@ -28,20 +28,26 @@ - int linux_version_code; - - void init_Linux_version(void) { -- static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ -+ FILE *fp; -+ char buf[256]; - int version_string_depth; - -- if (uname(&uts) == -1) /* failure implies impending death */ -- exit(1); -- -- version_string_depth = sscanf(uts.release, "%d.%d.%d", &x, &y, &z); -+ if ( (fp=fopen("/proc/version","r")) == NULL) /* failure implies impending death */ -+ exit(1); -+ if (fgets(buf, 256, fp) == NULL) { -+ fprintf(stderr, "Cannot read kernel version from /proc/version\n"); -+ fclose(fp); -+ exit(1); -+ } -+ fclose(fp); -+ version_string_depth = sscanf(buf, "Linux version %d.%d.%d", &x, &y, &z); - - if ((version_string_depth < 2) || /* Non-standard for all known kernels */ - ((version_string_depth < 3) && (x < 3))) /* Non-standard for 2.x.x kernels */ - fprintf(stderr, /* *very* unlikely to happen by accident */ - "Non-standard uts for running kernel:\n" -- "release %s=%d.%d.%d gives version code %d\n", -- uts.release, x, y, z, LINUX_VERSION(x,y,z)); -+ "%s=%d.%d.%d gives version code %d\n", -+ buf, x, y, z, LINUX_VERSION(x,y,z)); - linux_version_code = LINUX_VERSION(x, y, z); - } diff --git a/testing/procps-ng/includes_restrict.patch b/testing/procps-ng/includes_restrict.patch deleted file mode 100644 index 417e93223..000000000 --- a/testing/procps-ng/includes_restrict.patch +++ /dev/null @@ -1,144 +0,0 @@ -Author: Craig Small <csmall@debian.org> -Description: Change restrict to __restrict - procps automake defines restrict which means the binaries for procps - binaries compile. However external programs may not of defined - restrict. includes from libc6 use __restrict and if is good enough for - them, its good enough for us. - ---- a/proc/devname.h -+++ b/proc/devname.h -@@ -10,9 +10,9 @@ - #define ABBREV_TTY 2 /* remove tty */ - #define ABBREV_PTS 4 /* remove pts/ */ - --extern unsigned dev_to_tty(char *restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); -+extern unsigned dev_to_tty(char *__restrict ret, unsigned chop, dev_t dev_t_dev, int pid, unsigned int flags); - --extern int tty_to_dev(const char *restrict const name); -+extern int tty_to_dev(const char *__restrict const name); - - EXTERN_C_END - #endif ---- a/proc/escape.h -+++ b/proc/escape.h -@@ -14,10 +14,10 @@ - #define ESC_BRACKETS 0x2 // if using cmd, put '[' and ']' around it - #define ESC_DEFUNCT 0x4 // mark zombies with " <defunct>" - --extern int escape_strlist(char *restrict dst, char *restrict const *restrict src, size_t n, int *cells); --extern int escape_str(char *restrict dst, const char *restrict src, int bufsize, int *maxcells); --extern int escape_command(char *restrict const outbuf, const proc_t *restrict const pp, int bytes, int *cells, unsigned flags); --extern int escaped_copy(char *restrict dst, const char *restrict src, int bufsize, int *maxroom); -+extern int escape_strlist(char *__restrict dst, char *__restrict const *__restrict src, size_t n, int *cells); -+extern int escape_str(char *__restrict dst, const char *__restrict src, int bufsize, int *maxcells); -+extern int escape_command(char *__restrict const outbuf, const proc_t *__restrict const pp, int bytes, int *cells, unsigned flags); -+extern int escaped_copy(char *__restrict dst, const char *__restrict src, int bufsize, int *maxroom); - - EXTERN_C_END - #endif ---- a/proc/procps.h -+++ b/proc/procps.h -@@ -103,6 +103,6 @@ - #endif - - --typedef void (*message_fn)(const char *restrict, ...) __attribute__((format(printf,1,2))); -+typedef void (*message_fn)(const char *__restrict, ...) __attribute__((format(printf,1,2))); - - #endif ---- a/proc/readproc.h -+++ b/proc/readproc.h -@@ -173,10 +173,10 @@ - // char deBug1[64]; - pid_t taskdir_user; // for threads - int did_fake; // used when taskdir is missing -- int(*finder)(struct PROCTAB *restrict const, proc_t *restrict const); -- proc_t*(*reader)(struct PROCTAB *restrict const, proc_t *restrict const); -- int(*taskfinder)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); -- proc_t*(*taskreader)(struct PROCTAB *restrict const, const proc_t *restrict const, proc_t *restrict const, char *restrict const); -+ int(*finder)(struct PROCTAB *__restrict const, proc_t *__restrict const); -+ proc_t*(*reader)(struct PROCTAB *__restrict const, proc_t *__restrict const); -+ int(*taskfinder)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); -+ proc_t*(*taskreader)(struct PROCTAB *__restrict const, const proc_t *__restrict const, proc_t *__restrict const, char *__restrict const); - pid_t* pids; // pids of the procs - uid_t* uids; // uids of procs - int nuid; // cannot really sentinel-terminate unsigned short[] -@@ -200,8 +200,8 @@ - int ntask; // * readproctab2 - } proc_data_t; // * when PROC_LOOSE_TASKS set - --extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); --extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *restrict const PT); -+extern proc_data_t *readproctab2(int(*want_proc)(proc_t *buf), int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); -+extern proc_data_t *readproctab3(int(*want_task)(proc_t *buf), PROCTAB *__restrict const PT); - - // Convenient wrapper around openproc and readproc to slurp in the whole process - // table subset satisfying the constraints of flags and the optional PID list. -@@ -222,12 +222,12 @@ - // only before first use. Thereafter, the library will manage such - // a passed proc_t, freeing any additional acquired memory associated - // with the previous process or thread. --extern proc_t* readproc(PROCTAB *restrict const PT, proc_t *restrict p); --extern proc_t* readtask(PROCTAB *restrict const PT, const proc_t *restrict const p, proc_t *restrict t); --extern proc_t* readeither(PROCTAB *restrict const PT, proc_t *restrict x); -+extern proc_t* readproc(PROCTAB *__restrict const PT, proc_t *__restrict p); -+extern proc_t* readtask(PROCTAB *__restrict const PT, const proc_t *__restrict const p, proc_t *__restrict t); -+extern proc_t* readeither(PROCTAB *__restrict const PT, proc_t *__restrict x); - - // warning: interface may change --extern int read_cmdline(char *restrict const dst, unsigned sz, unsigned pid); -+extern int read_cmdline(char *__restrict const dst, unsigned sz, unsigned pid); - - extern void look_up_our_self(proc_t *p); - ---- a/proc/sig.h -+++ b/proc/sig.h -@@ -16,13 +16,13 @@ - EXTERN_C_BEGIN - - /* return -1 on failure */ --extern int signal_name_to_number(const char *restrict name); -+extern int signal_name_to_number(const char *__restrict name); - - extern const char *signal_number_to_name(int signo); - --extern int print_given_signals(int argc, const char *restrict const *restrict argv, int max_line); -+extern int print_given_signals(int argc, const char *__restrict const *__restrict argv, int max_line); - --extern char *strtosig(const char *restrict s); -+extern char *strtosig(const char *__restrict s); - - extern void pretty_print_signals(void); - ---- a/proc/sysinfo.h -+++ b/proc/sysinfo.h -@@ -57,11 +57,11 @@ - - #define BUFFSIZE (64*1024) - typedef unsigned long long jiff; --extern void getstat(jiff *restrict cuse, jiff *restrict cice, jiff *restrict csys, jiff *restrict cide, jiff *restrict ciow, jiff *restrict cxxx, jiff *restrict cyyy, jiff *restrict czzz, -- unsigned long *restrict pin, unsigned long *restrict pout, unsigned long *restrict s_in, unsigned long *restrict sout, -- unsigned *restrict intr, unsigned *restrict ctxt, -- unsigned int *restrict running, unsigned int *restrict blocked, -- unsigned int *restrict btime, unsigned int *restrict processes); -+extern void getstat(jiff *__restrict cuse, jiff *__restrict cice, jiff *__restrict csys, jiff *__restrict cide, jiff *__restrict ciow, jiff *__restrict cxxx, jiff *__restrict cyyy, jiff *__restrict czzz, -+ unsigned long *__restrict pin, unsigned long *__restrict pout, unsigned long *__restrict s_in, unsigned long *__restrict sout, -+ unsigned *__restrict intr, unsigned *__restrict ctxt, -+ unsigned int *__restrict running, unsigned int *__restrict blocked, -+ unsigned int *__restrict btime, unsigned int *__restrict processes); - - extern void meminfo(void); - ---- a/proc/wchan.h -+++ b/proc/wchan.h -@@ -6,8 +6,8 @@ - EXTERN_C_BEGIN - - extern const char * lookup_wchan(unsigned KLONG address, unsigned pid); --extern int open_psdb(const char *restrict override); --extern int open_psdb_message(const char *restrict override, message_fn message); -+extern int open_psdb(const char *__restrict override); -+extern int open_psdb_message(const char *__restrict override, message_fn message); - - EXTERN_C_END - diff --git a/testing/procps-ng/makefile_watch_ncurses.patch b/testing/procps-ng/makefile_watch_ncurses.patch deleted file mode 100644 index 08d70bdc7..000000000 --- a/testing/procps-ng/makefile_watch_ncurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -383,7 +383,7 @@ - @WITH_NCURSES_TRUE@slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c - @WITH_NCURSES_TRUE@slabtop_LDADD = @NCURSES_LIBS@ - @WITH_NCURSES_TRUE@watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c --@WITH_NCURSES_TRUE@watch_LDADD = @NCURSES_LIBS@ -+@WITH_NCURSES_TRUE@watch_LDADD = @WATCH_NCURSES_LIBS@ - kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c - skill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c - snice_SOURCES = skill.c $(top_srcdir)/lib/strutils.c diff --git a/testing/procps-ng/sig_printf_literal.patch b/testing/procps-ng/sig_printf_literal.patch deleted file mode 100644 index 2140abf0d..000000000 --- a/testing/procps-ng/sig_printf_literal.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/proc/sig.c -+++ b/proc/sig.c -@@ -257,7 +257,7 @@ - while(++i <= number_of_signals){ - int n; - n = printf("%2d %s", i, signal_number_to_name(i)); -- if(n>0 && i%7) printf(" \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); -+ if(n>0 && i%7) printf("%s", " \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + n); - else printf("\n"); - } - if((i-1)%7) printf("\n"); diff --git a/testing/procps-ng/sysctl_man.patch b/testing/procps-ng/sysctl_man.patch deleted file mode 100644 index d6023edfb..000000000 --- a/testing/procps-ng/sysctl_man.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/sysctl.8 -+++ b/sysctl.8 -@@ -55,7 +55,7 @@ - \fB\-w\fR, \fB\-\-write\fR - Use this option when you want to change a sysctl setting. - .TP --\fB\-p\fR, \fB\-\-load\fR[=\fIFILE\fR] -+\fB\-p\fR[\fIFILE\fR], \fB\-\-load\fR[=\fIFILE\fR] - Load in sysctl settings from the file specified or /etc/sysctl.conf if none - given. Specifying \- as filename means reading data from standard input. - .TP -@@ -117,7 +117,7 @@ - .br - /sbin/sysctl \-w kernel.domainname="example.com" - .br --/sbin/sysctl \-p /etc/sysctl.conf -+/sbin/sysctl \-p/etc/sysctl.conf - .br - /sbin/sysctl \-a \-\-pattern forward - .br diff --git a/testing/qemu-kvm/65-kvm.rules b/testing/qemu-kvm/65-kvm.rules deleted file mode 100644 index c2f7317aa..000000000 --- a/testing/qemu-kvm/65-kvm.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="kvm", GROUP="kvm", MODE="0660" diff --git a/testing/qemu-kvm/PKGBUILD b/testing/qemu-kvm/PKGBUILD deleted file mode 100644 index e0183c52f..000000000 --- a/testing/qemu-kvm/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 158037 2012-05-01 16:34:50Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu-kvm -pkgver=1.0.1 -pkgrel=2 -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) -license=('GPL2' 'LGPL2.1') -url="http://www.linux-kvm.org" -depends=('libjpeg' 'libpng' 'libsasl' 'curl' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'libpulse') -makedepends=('git' 'iasl' 'texi2html' 'perl' 'python2') -backup=('etc/qemu/target-x86_64.conf') -install=qemu-kvm.install -conflicts=('qemu') -provides=('qemu') -replaces=('kvm') -source=(http://downloads.sourceforge.net/kvm/${pkgname}-${pkgver}.tar.gz - 65-kvm.rules) -options=(!strip) - -build() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - # fix esound building - ./configure --prefix=/usr \ - --python=/usr/bin/python2 \ - --sysconfdir=/etc \ - --audio-drv-list=alsa,sdl,oss,pa \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make - - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cd "${srcdir}/" - git clone git://git.seabios.org/seabios.git - cd seabios - #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - sed -i -e 's/python/python2/g' Makefile - make clean - make -} - -package() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" - - # symbolic link for backwards compatibility - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu-kvm" - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/qemu" - # symbolic link for to qemu binary for emulator apps - ln -s qemu-system-x86_64 "${pkgdir}/usr/bin/kvm" - # fix man page - mv "${pkgdir}/usr/share/man/man1/qemu.1" \ - "${pkgdir}/usr/share/man/man1/qemu-kvm.1" - # install udev rules - install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" - # strip scripts directory - find "${pkgdir}/usr/bin" -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=('f23711fb9f3c70f802829b109ba9aa27' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu-kvm/qemu-kvm.install b/testing/qemu-kvm/qemu-kvm.install deleted file mode 100644 index 5161df93a..000000000 --- a/testing/qemu-kvm/qemu-kvm.install +++ /dev/null @@ -1,15 +0,0 @@ -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 "" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - groupdel kvm -} 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 e93300578..000000000 --- a/testing/qemu/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 158035 2012-05-01 16:34:16Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -pkgname=qemu -pkgver=1.0.1 -pkgrel=2 -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=('iasl' 'git' 'texi2html' 'perl' 'python2') -depends=('libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse') -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,pa \ - --python=/usr/bin/python2 \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs - make - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cd "${srcdir}/" - git clone git://git.seabios.org/seabios.git - cd seabios - #find 'tools/' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - make clean - make PYTHON=python2 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - # Use latest seabios version - # https://bugs.archlinux.org/task/27616 - cp "${srcdir}/seabios/out/bios.bin" "${pkgdir}/usr/share/qemu/bios.bin" - - install -D -m644 "${srcdir}/65-kvm.rules" \ - "${pkgdir}/usr/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=('5efd1091f01e3bc31bfdec27b8edeb00' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/testing/qemu/qemu.install b/testing/qemu/qemu.install deleted file mode 100644 index fd92c60eb..000000000 --- a/testing/qemu/qemu.install +++ /dev/null @@ -1,23 +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 "" - 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/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD deleted file mode 100644 index c3a223adb..000000000 --- a/testing/rasqal/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 159230 2012-05-18 13:15:02Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: AndyRTR <andyrtr@archlinux.org> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=rasqal -epoch=1 -pkgver=0.9.29 -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" -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('raptor' 'mpfr') -options=('!libtool') -source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --disable-static \ - --enable-release - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make -k check || true # still fails some checks -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} -md5sums=('49e4b75a0c67465edf55dd20606715fa') diff --git a/testing/samba/PKGBUILD b/testing/samba/PKGBUILD deleted file mode 100644 index 9ea9cccd7..000000000 --- a/testing/samba/PKGBUILD +++ /dev/null @@ -1,166 +0,0 @@ -# $Id: PKGBUILD 158041 2012-05-01 17:24:23Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -pkgbase=samba -pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.5 -# 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.5 -pkgrel=1 -arch=(i686 x86_64) -url="http://www.samba.org" -license=('GPL3') -makedepends=('db' 'popt' 'libcups' 'acl' 'libldap' 'libcap' 'krb5' 'pam' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb') -source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - samba samba.logrotate - swat.xinetd - samba.pam - samba.conf.d - smbd.service - nmbd.service - winbindd.service - smbd.conf) -### UNINSTALL dmapi package before building!!! - -build() { - cd ${srcdir}/${pkgbase}-${_realver}/source3 - ./configure --prefix=/usr \ - --libdir=/usr/lib/ \ - --localstatedir=/var \ - --with-configdir=/etc/samba \ - --with-lockdir=/var/cache/samba \ - --with-piddir=/var/run/samba \ - --with-fhs \ - --with-pam \ - --with-pam_smbpass \ - --with-pammodulesdir=/usr/lib/security \ - --with-dnsupdate \ - --with-automount \ - --with-quotas \ - --with-ads \ - --with-acl-support \ - --with-libsmbclient \ - --with-syslog \ - --enable-external-libtalloc \ - --disable-dnssd \ - --disable-avahi \ - --with-shared-modules=idmap_ad,idmap_adex,idmap_rid,idmap_hash,idmap_tdb2 \ - --enable-external-libtdb - make -} - -package_libwbclient () { -pkgdesc="Samba winbind client library" -depends=('glibc') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/lib - for i in libwbclient*; do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done -} - -package_smbclient () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('readline' 'popt' 'libldap' 'cifs-utils' 'libcap' 'krb5' 'db' 'e2fsprogs' 'tdb' 'talloc' 'libwbclient') - cd ${srcdir}/${pkgbase}-${_realver}/source3 - mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib - install -m755 bin/{smbclient,rpcclient,smbspool,smbtree,smbcacls,smbcquotas,smbget,net,nmblookup} ${pkgdir}/usr/bin/ - for i in libnetapi* libsmbclient*;do - cp -a bin/${i}*.so* ${pkgdir}/usr/lib/ - done - install -m755 script/smbtar ${pkgdir}/usr/bin/ - mkdir -p ${pkgdir}/usr/lib/cups/backend - ln -sf /usr/bin/smbspool ${pkgdir}/usr/lib/cups/backend/smb - mkdir -p ${pkgdir}/usr/include - install -m644 include/libsmbclient.h ${pkgdir}/usr/include/ - install -m644 lib/netapi/netapi.h ${pkgdir}/usr/include/ - mkdir -p ${pkgdir}/usr/share/man/man{1,7} - for man in rpcclient smbcacls smbclient smbcquotas smbget \ - smbtree smbtar nmblookup; do - install -m644 ../docs/manpages/${man}.1 ${pkgdir}/usr/share/man/man1/ - done - install -m644 ../docs/manpages/libsmbclient.7 ${pkgdir}/usr/share/man/man7/ -} - -package_samba () { -pkgdesc="Tools to access a server's filespace and printers via SMB" -backup=(etc/logrotate.d/samba - etc/pam.d/samba - etc/samba/smb.conf - etc/xinetd.d/swat - etc/conf.d/samba) -depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'krb5' 'pam' 'gamin' 'gnutls' 'e2fsprogs' 'tdb' 'talloc') - cd ${srcdir}/samba-${_realver}/source3 - mkdir -p ${pkgdir}/etc/samba/private - chmod 700 ${pkgdir}/etc/samba/private - make DESTDIR=${pkgdir} install - chmod 644 ${pkgdir}/usr/include/*.h - rm -rf ${pkgdir}/usr/var - rm -rf ${pkgdir}/var/run/samba - (cd script; cp installbin.sh i; cat i | sed 's/\/sbin\///' > installbin.sh) - install -D -m755 ../../samba ${pkgdir}/etc/rc.d/samba - install -D -m644 ../../samba.conf.d ${pkgdir}/etc/conf.d/samba - mkdir -p ${pkgdir}/etc/samba - cat ../examples/smb.conf.default | \ - sed 's|log file = .*$|log file = /var/log/samba/log.%m|g' >${pkgdir}/etc/samba/smb.conf.default - install -D -m644 ../../samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ../../swat.xinetd ${pkgdir}/etc/xinetd.d/swat - install -D -m644 ../../samba.pam ${pkgdir}/etc/pam.d/samba - # spool directory - install -d -m1777 ${pkgdir}/var/spool/samba - sed -i 's|/usr/spool/samba|/var/spool/samba|g' ${pkgdir}/etc/samba/smb.conf.default - # fix logrotate - sed -i -e 's|log.%m|%m.log|g' ${pkgdir}/etc/samba/smb.conf.default - # nsswitch libraries - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so - ln -s libnss_wins.so ${pkgdir}/usr/lib/libnss_wins.so.2 - install -D -m755 ${srcdir}/samba-${_realver}/nsswitch/libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so - ln -s libnss_winbind.so ${pkgdir}/usr/lib/libnss_winbind.so.2 - # winbind krb5 locator - mkdir -p ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -d -m 0755 ${pkgdir}/usr/lib/krb5/plugins/libkrb5 - install -m 755 bin/winbind_krb5_locator.so ${pkgdir}/usr/lib/krb5/plugins/libkrb5/winbind_krb5_locator.so - # remove conflict files of smbclient - for man in libsmbclient smbspool \ - mount.cifs net cifs.upcall; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - for i in libnetapi* libwbclient* libsmbclient* winbind_krb5*;do - rm -f ${pkgdir}/usr/lib/$i - done - for bin in net \ - nmblookup rpcclient smbcacls smbclient \ - smbcquotas smbget smbspool smbtar smbtree; do - rm -f ${pkgdir}/usr/bin/$bin - done - rm -f ${pkgdir}/usr/sbin/cifs.upcall - rm -f ${pkgdir}/usr/include/netapi.h - for man in rpcclient smbcacls smbclient smbcquotas \ - smbtree smbtar nmblookup smbget; do - rm -f ${pkgdir}/usr/share/man/man1/${man}.1 - done - for man in tdbbackup tdbdump tdbtool; do - rm -f ${pkgdir}/usr/share/man/man8/${man}.8 - done - rm -f ${pkgdir}/usr/share/man/man7/libsmbclient.7 - rm -f ${pkgdir}/usr/include/libsmbclient.h - # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema - # install systemd files - for i in smbd nmbd winbindd; do - install -D -m644 ${srcdir}/$i.service ${pkgdir}/usr/lib/systemd/system/$i.service - done - install -D -m644 ${srcdir}/smbd.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf -} -md5sums=('2f0c14547333c1b48fd4728b031e7040' - 'dfc6f9018c556b9783c7140de183727f' - '5697da77590ec092cc8a883bae06093c' - 'a4bbfa39fee95bba2e7ad6b535fae7e6' - '96f82c38f3f540b53f3e5144900acf17' - 'f2f2e348acd1ccb566e95fa8a561b828' - '389cc4fa3b459360feaa1b3d93274693' - 'ea6a1251be979cb30c6098a28b270d2d' - '455f106ce7a4f983975b3a686eaa85e5' - '6956c4f9989bec8f313de7d9343b6ba1') diff --git a/testing/samba/nmbd.service b/testing/samba/nmbd.service deleted file mode 100644 index 6e22ef2fb..000000000 --- a/testing/samba/nmbd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Samba NetBIOS name server - -[Service] -ExecStart=/usr/sbin/nmbd -F - -[Install] -WantedBy=multi-user.target diff --git a/testing/samba/samba b/testing/samba/samba deleted file mode 100755 index 2a04bfec4..000000000 --- a/testing/samba/samba +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/samba ] && . /etc/conf.d/samba - -[ -z "$SAMBA_DAEMONS" ] && SAMBA_DAEMONS=(smbd nmbd) - -case "$1" in - start) - rc=0 - stat_busy "Starting Samba Server" - if [ ! -x /var/run/samba ] ; then - install -m755 -d /var/run/samba - fi - if [ ! -x /var/log/samba ] ; then - install -m755 -d /var/log/samba - fi - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] && /usr/sbin/$d -D - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon samba - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping Samba Server" - for d in ${SAMBA_DAEMONS[@]}; do - PID=`pidof -o %PPID /usr/sbin/$d` - [ -z "$PID" ] || kill $PID &> /dev/null - rc=$(($rc+$?)) - done - if [ $rc -gt 0 ]; then - stat_fail - else - rm /var/run/samba/smbd.pid &>/dev/null - rm /var/run/samba/nmbd.pid &>/dev/null - rm /var/run/samba/winbindd.pid &>/dev/null - rm_daemon samba - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/samba/samba.conf.d b/testing/samba/samba.conf.d deleted file mode 100644 index 8721f956a..000000000 --- a/testing/samba/samba.conf.d +++ /dev/null @@ -1,7 +0,0 @@ -# -# Configuration for the samba init script -# - -# space separated list of daemons to launch -SAMBA_DAEMONS=(smbd nmbd) -#SAMBA_DAEMONS=(smbd nmbd winbindd) diff --git a/testing/samba/samba.logrotate b/testing/samba/samba.logrotate deleted file mode 100644 index 581f4c33b..000000000 --- a/testing/samba/samba.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/samba/log.smbd /var/log/samba/log.nmbd /var/log/samba/*.log { - notifempty - missingok - sharedscripts - copytruncate - postrotate - /bin/kill -HUP `cat /var/run/samba/*.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/samba/samba.pam b/testing/samba/samba.pam deleted file mode 100644 index 53724d1f8..000000000 --- a/testing/samba/samba.pam +++ /dev/null @@ -1,3 +0,0 @@ -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so diff --git a/testing/samba/smbd.conf b/testing/samba/smbd.conf deleted file mode 100644 index b745bb85b..000000000 --- a/testing/samba/smbd.conf +++ /dev/null @@ -1 +0,0 @@ -D /var/run/samba 0755 root root - diff --git a/testing/samba/smbd.service b/testing/samba/smbd.service deleted file mode 100644 index beb9bfad7..000000000 --- a/testing/samba/smbd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Samba SMB/CIFS server - -[Service] -ExecStart=/usr/sbin/smbd -F -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/samba/swat.xinetd b/testing/samba/swat.xinetd deleted file mode 100644 index 2e62a82b2..000000000 --- a/testing/samba/swat.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service swat -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/swat - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/testing/samba/winbindd.service b/testing/samba/winbindd.service deleted file mode 100644 index 509c89628..000000000 --- a/testing/samba/winbindd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Samba Winbind daemon - -[Service] -ExecStart=/usr/sbin/winbindd -F -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index aba029e27..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 159228 2012-05-18 13:03:43Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.5p1 -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc="Give certain users the ability to run some commands as root" -arch=('i686' 'x86_64') -url="http://www.sudo.ws/sudo/" -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{,.sig} - sudo.pam) -md5sums=('3b843e60e0bb226a24dd784345cbbba8' - '0f789f30462c2658afe9bd16602d76b1' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -check() { - cd "$srcdir/$pkgname-$_ver" - make check -} - -package() { - cd "$srcdir/$pkgname-$_ver" - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo" - - install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE" -} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam deleted file mode 100644 index 4e586cd22..000000000 --- a/testing/sudo/sudo.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so diff --git a/testing/sysfsutils/PKGBUILD b/testing/sysfsutils/PKGBUILD deleted file mode 100644 index e70eb3c6e..000000000 --- a/testing/sysfsutils/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 157736 2012-04-29 05:13:38Z dreisner $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=sysfsutils -pkgver=2.1.0 -pkgrel=8 -pkgdesc="System Utilities Based on Sysfs" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://linux-diag.sourceforge.net/Sysfsutils.html" -groups=('base') -depends=('glibc') -source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz) -md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc') -options=(!libtool) - -build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -check() { - cd "$pkgname-$pkgver" - make check -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/lib/libsysfs.a" -} diff --git a/testing/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/testing/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch deleted file mode 100644 index f8f6d1fa5..000000000 --- a/testing/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Mon, 2 Apr 2012 08:20:34 -0400 -Subject: [PATCH] check for proper return from dirent_ensure_type - -Fixes 'systemctl list-unit-files', which previously returned only: - - Failed to issue method call: No such file or directory ---- - src/install.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/install.c b/src/install.c -index 174d79b..9256116 100644 ---- a/src/install.c -+++ b/src/install.c -@@ -1853,7 +1853,7 @@ int unit_file_get_list( - - r = dirent_ensure_type(d, de); - if (r < 0) { -- if (errno == ENOENT) -+ if (r == -ENOENT) - continue; - - goto finish; --- -1.7.9.5 - diff --git a/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch deleted file mode 100644 index fa133ca3c..000000000 --- a/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Thu, 22 Mar 2012 02:06:40 +0100 -Subject: [PATCH] logind: close FIFO before ending sessions cleanly - -For clean session endings ask logind explicitly to get rid of the FIFO -before closing it so that the FIFO logic doesn't result in su/sudo to be -terminated immediately. ---- - src/login/logind-dbus.c | 30 ++++++++++++++++++++ - src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 98 insertions(+), 3 deletions(-) - -diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c -index d8f4d89..ea6b89f 100644 ---- a/src/login/logind-dbus.c -+++ b/src/login/logind-dbus.c -@@ -80,6 +80,9 @@ - " <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n" \ - " <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n" \ - " </method>\n" \ -+ " <method name=\"ReleaseSession\">\n" \ -+ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ -+ " </method>\n" \ - " <method name=\"ActivateSession\">\n" \ - " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \ - " </method>\n" \ -@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler( - if (r < 0) - return bus_send_error_reply(connection, message, &error, r); - -+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) { -+ const char *name; -+ Session *session; -+ -+ if (!dbus_message_get_args( -+ message, -+ &error, -+ DBUS_TYPE_STRING, &name, -+ DBUS_TYPE_INVALID)) -+ return bus_send_error_reply(connection, message, &error, -EINVAL); -+ -+ session = hashmap_get(m->sessions, name); -+ if (!session) -+ return bus_send_error_reply(connection, message, &error, -ENOENT); -+ -+ /* We use the FIFO to detect stray sessions where the -+ process invoking PAM dies abnormally. We need to make -+ sure that that process is not killed if at the clean -+ end of the session it closes the FIFO. Hence, with -+ this call explicitly turn off the FIFO logic, so that -+ the PAM code can finish clean up on its own */ -+ session_remove_fifo(session); -+ -+ reply = dbus_message_new_method_return(message); -+ if (!reply) -+ goto oom; -+ - } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) { - const char *name; - Session *session; -diff --git a/src/login/pam-module.c b/src/login/pam-module.c -index 8544413..4106d2b 100644 ---- a/src/login/pam-module.c -+++ b/src/login/pam-module.c -@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session( - "/org/freedesktop/login1", - "org.freedesktop.login1.Manager", - "CreateSession"); -- - if (!m) { - pam_syslog(handle, LOG_ERR, "Could not allocate create session message."); - r = PAM_BUF_ERR; -@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session( - int argc, const char **argv) { - - const void *p = NULL; -+ const char *id; -+ DBusConnection *bus = NULL; -+ DBusMessage *m = NULL, *reply = NULL; -+ DBusError error; -+ int r; - -- pam_get_data(handle, "systemd.session-fd", &p); -+ assert(handle); -+ -+ dbus_error_init(&error); -+ -+ id = pam_getenv(handle, "XDG_SESSION_ID"); -+ if (id) { -+ -+ /* Before we go and close the FIFO we need to tell -+ * logind that this is a clean session shutdown, so -+ * that it doesn't just go and slaughter us -+ * immediately after closing the fd */ -+ -+ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); -+ if (!bus) { -+ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ -+ m = dbus_message_new_method_call( -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ "ReleaseSession"); -+ if (!m) { -+ pam_syslog(handle, LOG_ERR, "Could not allocate release session message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } -+ -+ if (!dbus_message_append_args(m, -+ DBUS_TYPE_STRING, &id, -+ DBUS_TYPE_INVALID)) { -+ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message."); -+ r = PAM_BUF_ERR; -+ goto finish; -+ } - -+ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); -+ if (!reply) { -+ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error)); -+ r = PAM_SESSION_ERR; -+ goto finish; -+ } -+ } -+ -+ r = PAM_SUCCESS; -+ -+finish: -+ pam_get_data(handle, "systemd.session-fd", &p); - if (p) - close_nointr(PTR_TO_INT(p) - 1); - -- return PAM_SUCCESS; -+ dbus_error_free(&error); -+ -+ if (bus) { -+ dbus_connection_close(bus); -+ dbus_connection_unref(bus); -+ } -+ -+ if (m) -+ dbus_message_unref(m); -+ -+ if (reply) -+ dbus_message_unref(reply); -+ -+ return r; - } --- -1.7.9.5 - diff --git a/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch deleted file mode 100644 index 7ac9251b3..000000000 --- a/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt <mschmidt@redhat.com> -Date: Fri, 2 Mar 2012 10:39:10 +0100 -Subject: [PATCH] util: never follow symlinks in rm_rf_children() - -The function checks if the entry is a directory before recursing, but -there is a window between the check and the open, during which the -directory could be replaced with a symlink. - -CVE-2012-1174 -https://bugzilla.redhat.com/show_bug.cgi?id=803358 ---- - src/util.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/util.c b/src/util.c -index 20cbc2b..dfc1dc6 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { - if (is_dir) { - int subdir_fd; - -- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { -+ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); -+ if (subdir_fd < 0) { - if (ret == 0 && errno != ENOENT) - ret = -errno; - continue; --- -1.7.9.4 - diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD deleted file mode 100644 index 3b08e11a8..000000000 --- a/testing/systemd/PKGBUILD +++ /dev/null @@ -1,127 +0,0 @@ -# $Id: PKGBUILD 158121 2012-05-03 02:49:53Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgbase=systemd -pkgname=('systemd' 'libsystemd') -pkgver=44 -pkgrel=7 -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') -makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' - 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') -options=('!libtool') -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release" - 0001-util-never-follow-symlinks-in-rm_rf_children.patch - 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch - 0001-check-for-proper-return-from-dirent_ensure_type.patch) -md5sums=('11f44ff74c87850064e4351518bcff17' - '752636def0db3c03f121f8b4f44a63cd' - 'b5863d6d4b47e2b5bda8eb57bde0d327' - 'd37833358ef6c23fad622ea4a0941d1f' - '11f930fd0a3966abc794bf9127a7dde0') - -build() { - cd "$pkgname-$pkgver" - - # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375) - patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" - - # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd) - patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" - - # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) - patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch" - - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-pamlibdir=/usr/lib/security \ - --localstatedir=/var \ - --with-distro=arch \ - --enable-split-usr \ - --disable-ima - - make -} - -package_systemd() { - pkgdesc="system and service manager" - depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') - optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') - backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) - install="$pkgname.install" - - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - - printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" - chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # symlink to /bin/systemd for compat and sanity - install -dm755 "$pkgdir/bin" - ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" - - # use python2 for systemd-analyze - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # didn't build this... - rm -f "$pkgdir/usr/share/man/man1/systemadm.1" - - # fix .so links in manpage stubs - find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ - -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + - - # rename man pages to avoid conflicts with sysvinit and initscripts - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - cd "$pkgdir/usr/share/man" - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done - - # move bash-completion and symlink for loginctl - install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ - "$pkgdir/usr/share/bash-completion/completions/systemctl" - ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" - rm -rf "$pkgdir/etc/bash_completion.d" - - # fix systemctl where - find "$pkgdir" -type f -name '*.service' -exec \ - sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} + - - ### split off libsystemd (libs, includes, pkgconfig, man3) - install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} - - cd "$srcdir"/libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('libcap' 'xz') - - mv "$srcdir/libsystemd"/* "$pkgdir" -} - -# vim: ft=sh syn=sh et diff --git a/testing/systemd/os-release b/testing/systemd/os-release deleted file mode 100644 index 5e24a6031..000000000 --- a/testing/systemd/os-release +++ /dev/null @@ -1,5 +0,0 @@ -NAME="Arch Linux" -ID=arch -PRETTY_NAME="Arch Linux" -ANSI_COLOR="1;36" - diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install deleted file mode 100644 index 0c3e9abee..000000000 --- a/testing/systemd/systemd.install +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! getent group lock >/dev/null; then - groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroup/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi -} - -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/testing/taglib/PKGBUILD b/testing/taglib/PKGBUILD deleted file mode 100644 index 635fcb962..000000000 --- a/testing/taglib/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 158815 2012-05-11 00:55:49Z tomegun $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -pkgname=taglib -pkgver=1.7.2 -pkgrel=1 -pkgdesc="A Library for reading and editing the meta-data of several popular audio formats" -arch=('i686' 'x86_64') -url="http://developer.kde.org/~wheeler/taglib.html" -license=('LGPL' 'MPL') -depends=('sh' 'zlib' 'gcc-libs') -makedepends=('cmake' 'pkg-config') -options=('!libtool') -source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz" - 'ape-idev2.patch') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/ape-idev2.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MP4=ON \ - -DWITH_ASF=ON - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} -md5sums=('b0a9e797d3833fb933c7c3176de3d720' - 'c7c165d99acf01456351ba39ff7056cb') diff --git a/testing/taglib/ape-idev2.patch b/testing/taglib/ape-idev2.patch deleted file mode 100644 index 9c58da420..000000000 --- a/testing/taglib/ape-idev2.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp ---- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100 -+++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000 -@@ -137,7 +137,7 @@ - long ID3v2OriginalSize = 0; - bool hasID3v2 = false; - if(ID3v2Location >= 0) { -- ID3v2::Tag tag(d->file, ID3v2Location, 0); -+ ID3v2::Tag tag(d->file, ID3v2Location); - ID3v2OriginalSize = tag.header()->completeTagSize(); - if(tag.header()->tagSize() > 0) - hasID3v2 = true; diff --git a/testing/thinkfinger/PKGBUILD b/testing/thinkfinger/PKGBUILD deleted file mode 100644 index 7aae89b5d..000000000 --- a/testing/thinkfinger/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 157520 2012-04-28 21:41:20Z dreisner $ -# Maintainer: Tom Gundersen <teg@jklm.no> -# Contributor: François Charette <francois.archlinux.org> -# Contributor: Damir Perisa <damir.archlinux.org> -# Contributor: Björn Martensen <bjoern.martensen@gmail.com> - -pkgname=thinkfinger -pkgver=0.3 -pkgrel=6 -pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads" -url="http://thinkfinger.sourceforge.net/" -arch=('i686' 'x86_64') -license=("GPL") -depends=('pam' 'libusb-compat') -install=thinkfinger.install -options=('!libtool' 'emptydirs') -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'thinkfinger-uinput-hack.patch' - 'gcc46.patch') -md5sums=('588565233bcbea5ff0a7f5314361c380' - '71dc334282d19e6db4f6254542ba563c' - '93c80f342329a5bd40f5f324fe670225') - -build() { - cd $srcdir/$pkgname-$pkgver - - # Patch from Ubuntu: see http://bugs.archlinux.org/task/12580 - patch -p0 -i "${srcdir}"/thinkfinger-uinput-hack.patch - - patch -p1 -i "${srcdir}"/gcc46.patch - - ./configure --prefix=/usr \ - --with-birdir=/etc/pam_thinkfinger - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - # create dir to store fingerprints - install -d $pkgdir/etc/pam_thinkfinger - - make DESTDIR=$pkgdir install -} diff --git a/testing/thinkfinger/gcc46.patch b/testing/thinkfinger/gcc46.patch deleted file mode 100644 index 24e4b534f..000000000 --- a/testing/thinkfinger/gcc46.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/pam/Makefile.am -+++ b/pam/Makefile.am -@@ -8,7 +8,7 @@ pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h p - else - pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c - endif --pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed -+pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed - pam_thinkfinger_so_CFLAGS = $(CFLAGS) - pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS) - ---- a/pam/Makefile.in -+++ b/pam/Makefile.in -@@ -201,7 +201,7 @@ pamdir = $(SECUREDIR) - INCLUDES = -I$(top_srcdir)/libthinkfinger - @HAVE_OLD_PAM_FALSE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c - @HAVE_OLD_PAM_TRUE@pam_thinkfinger_so_SOURCES = pam_thinkfinger-compat.c pam_thinkfinger-compat.h pam_thinkfinger-uinput.c pam_thinkfinger-uinput.h pam_thinkfinger.c --pam_thinkfinger_so_LDFLAGS = -shared --strip-all -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed -+pam_thinkfinger_so_LDFLAGS = -shared -Wl,-soname,pam_thinkfinger.so -Wl,--as-needed - pam_thinkfinger_so_CFLAGS = $(CFLAGS) - pam_thinkfinger_so_LDADD = $(top_builddir)/libthinkfinger/libthinkfinger.la $(PAM_LIBS) $(PTHREAD_LIBS) - all: all-am diff --git a/testing/thinkfinger/thinkfinger-uinput-hack.patch b/testing/thinkfinger/thinkfinger-uinput-hack.patch deleted file mode 100644 index 0ac153464..000000000 --- a/testing/thinkfinger/thinkfinger-uinput-hack.patch +++ /dev/null @@ -1,13 +0,0 @@ -#Source: http://launchpadlibrarian.net/18515541/thinkfinger-uinput-hack.patch (26-12-2008) -Index: pam/pam_thinkfinger-uinput.c -=================================================================== ---- pam/pam_thinkfinger-uinput.c (revision 118) -+++ pam/pam_thinkfinger-uinput.c (working copy) -@@ -95,6 +95,7 @@ - /* our single key keyboard */ - i = ioctl (*fd, UI_SET_EVBIT, EV_KEY) < 0; - i |= ioctl (*fd, UI_SET_KEYBIT, KEY_ENTER) < 0; -+ i |= ioctl (*fd, UI_SET_KEYBIT, KEY_A) < 0; - - if (write (*fd, &device, device_size) != device_size) { - retval = errno; diff --git a/testing/thinkfinger/thinkfinger.install b/testing/thinkfinger/thinkfinger.install deleted file mode 100644 index bb1f6dde0..000000000 --- a/testing/thinkfinger/thinkfinger.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "==> To use thinkfinger, add 'uinput' to the MODULES=() in /etc/rc.conf." - echo " More Infos: http://wiki.archlinux.org/index.php/Thinkfinger" -} diff --git a/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch deleted file mode 100644 index 7873dc337..000000000 --- a/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 12250c0acf747d4ed538927ad7604356b93fb444 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Sat, 3 Mar 2012 12:28:15 +0100 -Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev - -This means we don't need a flagday in order to move udev to use -/usr/lib/udev/rules.d ---- - src/libudev.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/libudev.c b/src/libudev.c -index d954dae..4da6309 100644 ---- a/src/libudev.c -+++ b/src/libudev.c -@@ -43,8 +43,8 @@ struct udev { - void *userdata; - char *sys_path; - char *dev_path; -- char *rules_path[4]; -- unsigned long long rules_path_ts[4]; -+ char *rules_path[5]; -+ unsigned long long rules_path_ts[5]; - int rules_path_count; - char *run_path; - struct udev_list properties_list; -@@ -255,9 +255,14 @@ UDEV_EXPORT struct udev *udev_new(void) - goto err; - - if (udev->rules_path[0] == NULL) { -- /* /usr/lib/udev -- system rules */ -- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d"); -+ /* /lib/udev -- compat for system rules */ -+ udev->rules_path[0] = strdup("/lib/udev/rules.d"); - if (!udev->rules_path[0]) -+ goto err; -+ -+ /* /usr/lib/udev -- system rules */ -+ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d"); -+ if (!udev->rules_path[1]) - goto err; - - /* /run/udev -- runtime rules */ -@@ -265,11 +270,11 @@ UDEV_EXPORT struct udev *udev_new(void) - goto err; - - /* /etc/udev -- local administration rules */ -- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); -- if (!udev->rules_path[1]) -+ udev->rules_path[3] = strdup(SYSCONFDIR "/udev/rules.d"); -+ if (!udev->rules_path[3]) - goto err; - -- udev->rules_path_count = 3; -+ udev->rules_path_count = 4; - } - - dbg(udev, "context %p created\n", udev); -@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void) - dbg(udev, "dev_path='%s'\n", udev->dev_path); - dbg(udev, "sys_path='%s'\n", udev->sys_path); - dbg(udev, "run_path='%s'\n", udev->run_path); -- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]); -+ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], -+ udev->rules_path[2], udev->rules_path[3]); - free(config_file); - return udev; - err: -@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev) - free(udev->rules_path[0]); - free(udev->rules_path[1]); - free(udev->rules_path[2]); -+ free(udev->rules_path[3]); - free(udev->run_path); - dbg(udev, "context %p released\n", udev); - free(udev); --- -1.7.10 - diff --git a/testing/udev/0002-reinstate-TIMEOUT-handling.patch b/testing/udev/0002-reinstate-TIMEOUT-handling.patch deleted file mode 100644 index edbbf1d32..000000000 --- a/testing/udev/0002-reinstate-TIMEOUT-handling.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 629d840316280cffcc724fac41047374a7685490 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Thu, 15 Mar 2012 02:12:43 +0100 -Subject: [PATCH 2/2] reinstate TIMEOUT= handling - -Without treating events with timeouts specially some drivers would cause a -30 seconds stall on boot: . - -I also received reports of some drivers not working at all, even after the -timeout. - -We will remove this patch when more drivers have been fixed in the kernel (3.4?). - -This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and -57c6f8ae5f52a6e8ffc66a54966346f733dded39. ---- - TODO | 2 ++ - src/libudev-device.c | 19 +++++++++++++++++++ - src/libudev-private.h | 1 + - src/udevd.c | 13 ++++++++++--- - 4 files changed, 32 insertions(+), 3 deletions(-) - -diff --git a/TODO b/TODO -index 8b8b9c8..3d26e89 100644 ---- a/TODO -+++ b/TODO -@@ -7,6 +7,8 @@ - - - move /usr/lib/udev/devices/ to tmpfiles - -+ - remove TIMEOUT= handling -+ - - trigger --subsystem-match=usb/usb_device - - - kill rules_generator -diff --git a/src/libudev-device.c b/src/libudev-device.c -index 10f28b8..639c367 100644 ---- a/src/libudev-device.c -+++ b/src/libudev-device.c -@@ -68,6 +68,7 @@ struct udev_device { - struct udev_list tags_list; - unsigned long long int seqnum; - unsigned long long int usec_initialized; -+ int timeout; - int devlink_priority; - int refcount; - dev_t devnum; -@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) - return 0; - } - -+int udev_device_get_timeout(struct udev_device *udev_device) -+{ -+ return udev_device->timeout; -+} -+ -+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) -+{ -+ char num[32]; -+ -+ udev_device->timeout = timeout; -+ snprintf(num, sizeof(num), "%u", timeout); -+ udev_device_add_property(udev_device, "TIMEOUT", num); -+ return 0; -+} -+ - const char *udev_device_get_devpath_old(struct udev_device *udev_device) - { - return udev_device->devpath_old; -@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, - udev_device_set_devpath_old(udev_device, &property[12]); - } else if (strncmp(property, "SEQNUM=", 7) == 0) { - udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); -+ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { -+ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "IFINDEX=", 8) == 0) { - udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); - } else if (strncmp(property, "DEVMODE=", 8) == 0) { -@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) - udev_list_init(udev, &udev_device->sysattr_value_list, true); - udev_list_init(udev, &udev_device->sysattr_list, false); - udev_list_init(udev, &udev_device->tags_list, true); -+ udev_device->timeout = -1; - udev_device->watch_handle = -1; - /* copy global properties */ - udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) -diff --git a/src/libudev-private.h b/src/libudev-private.h -index 5f5c64a..ec63b67 100644 ---- a/src/libudev-private.h -+++ b/src/libudev-private.h -@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); - void udev_device_set_is_initialized(struct udev_device *udev_device); - int udev_device_add_tag(struct udev_device *udev_device, const char *tag); - void udev_device_cleanup_tags_list(struct udev_device *udev_device); -+int udev_device_get_timeout(struct udev_device *udev_device); - unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); - void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); - int udev_device_get_devlink_priority(struct udev_device *udev_device); -diff --git a/src/udevd.c b/src/udevd.c -index 1702217..88e9272 100644 ---- a/src/udevd.c -+++ b/src/udevd.c -@@ -401,7 +401,7 @@ out: - } - } - --static void event_run(struct event *event) -+static void event_run(struct event *event, bool force) - { - struct udev_list_node *loop; - -@@ -427,7 +427,7 @@ static void event_run(struct event *event) - return; - } - -- if (children >= children_max) { -+ if (!force && children >= children_max) { - if (children_max > 1) - info(event->udev, "maximum number (%i) of children reached\n", children); - return; -@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) - - event->state = EVENT_QUEUED; - udev_list_node_append(&event->node, &event_list); -+ -+ /* run all events with a timeout set immediately */ -+ if (udev_device_get_timeout(dev) > 0) { -+ event_run(event, true); -+ return 0; -+ } -+ - return 0; - } - -@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) - continue; - } - -- event_run(event); -+ event_run(event, false); - } - } - --- -1.7.10 - diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index f6bc9930a..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,76 +0,0 @@ -# $Id: PKGBUILD 159357 2012-05-22 12:47:02Z 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> - -pkgname=udev -pkgver=182 -pkgrel=4 -pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl') -install=udev.install -arch=(i686 x86_64) -license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - 0001-split-usr-always-read-config-files-from-lib-udev.patch - 0002-reinstate-TIMEOUT-handling.patch - initcpio-hooks-udev - initcpio-install-udev) -url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" -backup=(etc/udev/udev.conf) -groups=('base') -options=(!makeflags !libtool) -md5sums=('023877e6cc0d907994b8c648beab542b' - '0fa3eac115ad0140af1582d941b15f2c' - '94b816896bf23275c0598fc8e07270c3' - 'e433c11d38cf4f877b41d06e2753ebe0' - 'e6faf4c3fe456f10d8efd2487d5e3cb7') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch - patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ - --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids - - make -} - -check() { - make -C "$pkgname-$pkgver" check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=${pkgdir} install - - # install the mkinitpcio hook - install -D -m644 ../initcpio-hooks-udev ${pkgdir}/usr/lib/initcpio/hooks/udev - install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev - - # udevd moved, symlink to make life easy for restarting udevd manually - ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd - - # the path to udevadm is hardcoded in some places - install -d ${pkgdir}/sbin - ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm - - # fix wrong path to /bin/sh - sed -i -e 's#/usr/bin/sh#/bin/sh#g' $pkgdir/usr/lib/udev/keyboard-force-release.sh - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/usr/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 -} diff --git a/testing/udev/initcpio-hooks-udev b/testing/udev/initcpio-hooks-udev deleted file mode 100644 index 313a88130..000000000 --- a/testing/udev/initcpio-hooks-udev +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/ash - -run_earlyhook() { - /usr/lib/udev/udevd --daemon --resolve-names=never - udevd_running=1 -} - -run_hook() { - msg ":: Triggering uevents..." - udevadm trigger --action=add --type=subsystems - udevadm trigger --action=add --type=devices - udevadm settle -} - -run_cleanuphook() { - udevadm control --exit - udevadm info --cleanup-db -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev deleted file mode 100644 index e33664459..000000000 --- a/testing/udev/initcpio-install-udev +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -build() { - add_file "/etc/udev/udev.conf" - add_binary /usr/lib/udev/udevd - add_binary /usr/bin/udevadm - - for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do - add_file "/usr/lib/udev/rules.d/$rules" - done - for tool in ata_id scsi_id; do - add_file "/usr/lib/udev/$tool" - done - - add_runscript -} - -help() { - cat <<HELPEOF -This hook will use udev to create your root device node and detect the needed -modules for your root device. It is also required for firmware loading in -initramfs. It is recommended to use this hook. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index 557efe9e1..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,59 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 181-3)" -lt 0 ]; then - echo "udev changes:" - if [ "$(vercmp $2 168)" -lt 0 ]; then - echo " * Kernel 2.6.32 or newer is now required." - echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." - echo " * Arch specific cd symlinks are now no longer created." - echo " * cd and net persistent rules will no longer be autogenerated," - echo " see <https://wiki.archlinux.org/index.php/Udev> for details." - echo " * Errors are now logged (possibly to the console) by default." - 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 " * 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." - fi - if [ "$(vercmp $2 172)" -lt 0 ]; then - 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 " * kbd and rtc devices are no longer world readable." - 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." - fi - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo " 'scanner' and 'video' groups. Beware of any changes." - echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - 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 " * We no longer create the static nodes on install needed for an initrd-less" - echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" - echo " installs." - fi - if [ "$(vercmp $2 175)" -lt 0 ]; then - echo " * devtmpfs support is now a hard requirement. Users of the official Arch" - echo " kernels have this enabled." - fi - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo " * udev-compat has been removed, and should be uninstalled." - echo " * Framebuffers are no longer blacklisted by default." - echo " * binaries moved from /sbin to /usr/bin" - fi - echo " * if your kernel does not provide /dev/loop-control, you need to manually" - echo " load the 'loop' module before using losetup" - fi -} diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD deleted file mode 100644 index b0f74f8e2..000000000 --- a/testing/usbmuxd/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 158000 2012-04-30 22:27:24Z tomegun $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=usbmuxd -pkgver=1.0.7 -pkgrel=3 -pkgdesc="USB Multiplex Daemon" -url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" -arch=('i686' 'x86_64') -license=('GPL2' 'GPL3' 'LGPL2.1') -depends=('libusb>=1.0.8') -makedepends=('cmake') -install=usbmuxd.install -source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - usbmuxd-udevuser.patch) -md5sums=('6f431541f3177fa06aa6df9ceecb2da0' - '8526f24f4ad16cd6b2a7321c0b59592c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - - # fix udev dir being hardcoded - mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" - rmdir "${pkgdir}/lib" -} diff --git a/testing/usbmuxd/usbmuxd-udevuser.patch b/testing/usbmuxd/usbmuxd-udevuser.patch deleted file mode 100644 index 51c8f3d3a..000000000 --- a/testing/usbmuxd/usbmuxd-udevuser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in usbmuxd-1.0.7/udev/85-usbmuxd.rules.in ---- usbmuxd-1.0.7.orig/udev/85-usbmuxd.rules.in 2011-08-04 15:28:32.751579507 +0000 -+++ usbmuxd-1.0.7/udev/85-usbmuxd.rules.in 2011-08-04 15:36:20.139265124 +0000 -@@ -1,7 +1,7 @@ - # usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) - - # Forces iDevices to the last USB configuration and runs usbmuxd --ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" -+ACTION=="add", SUBSYSTEM=="usb", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -u -U usbmux" - - # Exit usbmuxd when the last device is removed - ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="@CMAKE_INSTALL_PREFIX@/sbin/usbmuxd -x" diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install deleted file mode 100644 index 1a4859674..000000000 --- a/testing/usbmuxd/usbmuxd.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - groupadd -g 140 usbmux &>/dev/null - useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null - passwd -l usbmux &>/dev/null -} - -post_upgrade() { - getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null - getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null -} - -post_remove() { - if getent passwd usbmux >/dev/null 2>&1; then - userdel usbmux - fi - if getent group usbmux >/dev/null 2>&1; then - groupdel usbmux - fi -} diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD deleted file mode 100644 index afa220518..000000000 --- a/testing/usbutils/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 159355 2012-05-22 11:56:10Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Tom Gundersen <teg@jklm.no> -# Contributor: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> -pkgname=usbutils -pkgver=005 -pkgrel=2 -pkgdesc="USB Device Utilities" -arch=(i686 x86_64) -license=('GPL') -groups=('base') -depends=('libusb' 'hwids') -optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') -url="http://linux-usb.sourceforge.net/" -# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - fix-python2.patch) - -build() { - cd $srcdir/$pkgname-$pkgver - # patch lsusb.py to use correct usb.ids file and python2 interpreter - patch -Np1 -i $srcdir/fix-python2.patch - ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - # this is now in the hwids package - rm -rf $pkgdir/usr/{share/hwdata,sbin} -} -md5sums=('6a21f7b6c02b76df5e8a7c208d746654' - '45766196895b4cc50b53cd56e1bbf3d1') diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch deleted file mode 100644 index 7e2875e99..000000000 --- a/testing/usbutils/fix-python2.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- usbutils-002/lsusb.py 2010-12-16 01:07:09.000000000 +0100 -+++ usbutils-002/lsusb.py 2011-04-09 22:43:59.043828595 +0200 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # lsusb.py - # Displays your USB devices in reasonable form. - # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3. -@@ -16,7 +16,7 @@ - warnsort = False - - prefix = "/sys/bus/usb/devices/" --usbids = "/usr/share/usb.ids" -+usbids = "/usr/share/hwdata/usb.ids" - - esc = chr(27) - norm = esc + "[0;0m" diff --git a/testing/v4l-utils/PKGBUILD b/testing/v4l-utils/PKGBUILD deleted file mode 100644 index ea035ac40..000000000 --- a/testing/v4l-utils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 158069 2012-05-02 11:35:18Z tomegun $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=v4l-utils -pkgver=0.8.8 -pkgrel=1 -pkgdesc="Userspace tools and conversion library for Video 4 Linux" -arch=('i686' 'x86_64') -url="http://freshmeat.net/projects/libv4l" -provides=("libv4l=$pkgver") -replaces=('libv4l') -conflicts=('libv4l') -license=('LGPL') -makedepends=('qt') -optdepends=('qt') -depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo') -source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2 - http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc) - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules - - make PREFIX="/usr" -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make install PREFIX="/usr" DESTDIR="${pkgdir}/" - rm -f "${pkgdir}/usr/bin/ivtv-ctl" - mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" - rm -rf "${pkgdir}/lib" -} -md5sums=('40fdda3f4055ed818012d7a7b5ef5be5' - 'cceb1325f35789c95f875b705b3eb373') diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules deleted file mode 100644 index f6aa20835..000000000 --- a/testing/xf86-input-wacom/70-wacom.rules +++ /dev/null @@ -1,12 +0,0 @@ -ACTION!="add|change", GOTO="wacom_end" - -# Match all serial wacom tablets with a serial ID starting with WACf -# Notes: We assign NAME though we shouldn't, but currently the server requires it -# We assign the lot to subsystem pnp too because server reads NAME from -# the parent device. Once all that's fixed, as simple SUBSYSTEM="tty" -# will do and the ENV{NAME} can be removed. -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" -SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}" - -LABEL="wacom_end" - diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD deleted file mode 100644 index 8d2e52511..000000000 --- a/testing/xf86-input-wacom/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 156119 2012-04-14 08:45:51Z andyrtr $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: M Rawash <mrawash@gmail.com> - -pkgname=xf86-input-wacom -pkgver=0.14.0 -pkgrel=2 -pkgdesc="X.Org Wacom tablet driver" -arch=('i686' 'x86_64') -url="http://linuxwacom.sourceforge.net/" -license=('GPL') -backup=('etc/X11/xorg.conf.d/50-wacom.conf') -depends=('libxi' 'libxrandr' 'libxinerama') -makedepends=('xorg-server-devel>=1.12.0' 'libxext') -conflicts=('xorg-server<1.12.0') -options=(!libtool) -source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - 70-wacom.rules) -md5sums=('23d19a2b50a86b848df17297c745144f' - '10db4f8272286690255c1bcc18bfdd92') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/lib/udev/rules.d" - install -m644 "${srcdir}/70-wacom.rules" "${pkgdir}/usr/lib/udev/rules.d/" -} diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD deleted file mode 100644 index 4c6c87ee5..000000000 --- a/testing/xfsprogs/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 158040 2012-05-01 17:23:55Z tomegun $ -# -pkgname=xfsprogs -pkgver=3.1.8 -pkgrel=2 -pkgdesc="XFS filesystem utilities" -arch=('i686' 'x86_64') -license=('LGPL') -url="http://oss.sgi.com/projects/xfs/" -groups=('base') -depends=('util-linux') -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=('f70b2e7200d4c29f0af1cf70e7be1db6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export OPTIMIZER="-march=${CARCH/_/-} -O1" - export DEBUG=-DNDEBUG - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DIST_ROOT="${pkgdir}" install install-dev - chown -R root $pkgdir - chgrp -R root $pkgdir - # add hack as we cannot set rootlibdir - mv "${pkgdir}"/lib/libhandle.so* "${pkgdir}/usr/lib/" - rm -rf "${pkgdir}/lib" -} diff --git a/testing/xinetd/PKGBUILD b/testing/xinetd/PKGBUILD deleted file mode 100644 index 43c3e6fc2..000000000 --- a/testing/xinetd/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 158805 2012-05-10 14:07:20Z tpowa $ -# Maintainer: -# Contributor: Judd <jvinet@zeroflux.org> - -pkgname=xinetd -pkgver=2.3.15 -pkgrel=1 -pkgdesc="A secure replacement for inetd" -arch=('i686' 'x86_64') -url="http://www.xinetd.org/" -license=('custom') -optdepends=('perl: for xconv.pl script') -backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') -source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz - xinetd.conf - xinetd - servers - services - xinetd.service) -md5sums=('77358478fd58efa6366accae99b8b04c' - 'f109f699a07bc8cfb5791060f5e87f9e' - 'ea37a2794f202e6b953d9b6956dad16a' - '21f47b4aa20921cfaddddd9f9a407f81' - '9fa2061dc7dd738c8424251deb86f81e' - '4473d8b2b6c984626d9f73a0b89711ee') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i "s#${prefix}/man#${prefix}/share/man#" configure - ./configure --prefix=/usr --without-libwrap - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - - install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd - install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf - install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers - install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services - - # install systemd files - install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service - # install license - install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT -} diff --git a/testing/xinetd/servers b/testing/xinetd/servers deleted file mode 100644 index f064c8d7a..000000000 --- a/testing/xinetd/servers +++ /dev/null @@ -1,10 +0,0 @@ -service servers -{ - type = INTERNAL UNLISTED - port = 9099 - socket_type = stream - protocol = tcp - wait = no - disable = yes - only_from = 127.0.0.1 -} diff --git a/testing/xinetd/services b/testing/xinetd/services deleted file mode 100644 index 4ea304c4f..000000000 --- a/testing/xinetd/services +++ /dev/null @@ -1,10 +0,0 @@ -service services -{ - type = INTERNAL UNLISTED - port = 9098 - socket_type = stream - protocol = tcp - wait = no - disable = yes - only_from = 127.0.0.1 -} diff --git a/testing/xinetd/xinetd b/testing/xinetd/xinetd deleted file mode 100755 index 4b8fa369a..000000000 --- a/testing/xinetd/xinetd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/xinetd` -case "$1" in - start) - stat_busy "Starting xinetd" - [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/xinetd.pid - add_daemon xinetd - stat_done - fi - ;; - stop) - stat_busy "Stopping xinetd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/xinetd.pid - rm_daemon xinetd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/xinetd/xinetd.conf b/testing/xinetd/xinetd.conf deleted file mode 100644 index b15d9f649..000000000 --- a/testing/xinetd/xinetd.conf +++ /dev/null @@ -1,14 +0,0 @@ -# -# /etc/xinetd.conf -# - -defaults -{ - instances = 60 - log_type = SYSLOG authpriv - log_on_success = HOST PID - log_on_failure = HOST - cps = 25 30 -} - -includedir /etc/xinetd.d diff --git a/testing/xinetd/xinetd.service b/testing/xinetd/xinetd.service deleted file mode 100644 index ac80139e2..000000000 --- a/testing/xinetd/xinetd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=A secure replacement for inetd -After=network.service - -[Service] -ExecStart=/usr/sbin/xinetd -dontfork -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/testing/xpdf/PKGBUILD b/testing/xpdf/PKGBUILD deleted file mode 100644 index 5009c613d..000000000 --- a/testing/xpdf/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 159335 2012-05-21 16:28:07Z jgc $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=xpdf -#pkgver=3.03_pl1 -pkgver=3.03 -pkgrel=2 -pkgdesc='Viewer for Portable Document Format (PDF) files' -url='http://www.foolabs.com/xpdf/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('lesstif' 'gsfonts' 'libxt') -optdepends=('poppler: tools that used to be included in xpdf' - 'desktop-file-utils: for desktop environments') -# "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch" -source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz" - 'char.patch' - 'desktop') -sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248' - '5c471944685a6b24a2b0c0e000562d1a3263aeeb' - '3b6fe01636253676ffa0efe1b237a75af4721f6d') - -install=install -backup=('etc/xpdfrc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - -# patch -p1 -i "../${pkgname}-${_srcver}pl1.patch" - patch -p1 -i ../char.patch - - sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc - sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --enable-multithreaded \ - --enable-wordlist \ - --with-freetype2-library=/usr/lib \ - --with-freetype2-includes=/usr/include/freetype2 \ - --x-includes=/usr/include \ - --with-Xm-library=/usr/lib \ - --with-Xm-includes=/usr/include \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver%_*}" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop" - install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm" - - # stuff provided by poppler - for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do - rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1" - done -} diff --git a/testing/xpdf/char.patch b/testing/xpdf/char.patch deleted file mode 100644 index 8e49393a6..000000000 --- a/testing/xpdf/char.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc ---- old/xpdf/XPDFViewer.cc 2011-08-15 14:08:53.000000000 -0700 -+++ new/xpdf/XPDFViewer.cc 2011-08-17 11:05:55.739431215 -0700 -@@ -1803,7 +1803,7 @@ - menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n); - for (i = 0; i < nZoomMenuItems; ++i) { - n = 0; -- s = XmStringCreateLocalized(zoomMenuInfo[i].label); -+ s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label); - XtSetArg(args[n], XmNlabelString, s); ++n; - XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n; - sprintf(buf, "zoom%d", i); diff --git a/testing/xpdf/desktop b/testing/xpdf/desktop deleted file mode 100644 index 06830ecda..000000000 --- a/testing/xpdf/desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Xpdf -Comment=Views Adobe PDF (acrobat) files -Exec=xpdf -Terminal=false -Type=Application -Icon=xpdf -Categories=Office; -MimeType=application/pdf; diff --git a/testing/xpdf/install b/testing/xpdf/install deleted file mode 100644 index c6cf149dd..000000000 --- a/testing/xpdf/install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - [[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/zlib/PKGBUILD b/testing/zlib/PKGBUILD deleted file mode 100644 index 8cb139591..000000000 --- a/testing/zlib/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 158127 2012-05-03 08:36:59Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgname=zlib -pkgver=1.2.7 -pkgrel=1 -pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' -arch=('i686' 'x86_64') -license=('custom') -url="http://www.zlib.net/" -depends=('glibc') -source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('60df6a37c56e7c1366cca812414f7b85') - -build() { - cd ${srcdir}/zlib-$pkgver - ./configure --prefix=/usr - make - - grep -A 24 '^ Copyright' zlib.h > LICENSE -} - -check() { - cd ${srcdir}/zlib-$pkgver - make test -} - -package() { - cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE -} |