diff options
Diffstat (limited to 'testing')
54 files changed, 0 insertions, 3740 deletions
diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone deleted file mode 100644 index 509c311f6..000000000 --- a/testing/bind/127.0.0.zone +++ /dev/null @@ -1,11 +0,0 @@ -$ORIGIN 0.0.127.in-addr.arpa. - -@ 1D IN SOA localhost. root.localhost. ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS localhost. -1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD deleted file mode 100644 index 8df2eb03d..000000000 --- a/testing/bind/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Contributor: Mario Vazquez <mario_vazq@hotmail.com> - -pkgname=bind - -# Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols' -arch=('i686' 'x86_64') -url='http://www.isc.org/software/bind/' -license=('custom:ISC') -provides=('dns-server') -backup=('etc/logrotate.d/named' - 'etc/conf.d/named' - 'etc/named.conf') -depends=('openssl' 'krb5' 'libxml2') -options=('!makeflags' '!libtool') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz" - 'root.hint::ftp://ftp.rs.internic.net/domain/db.cache' - 'so_bsdcompat.patch' - 'notools.patch' - 'named' - 'named.conf' - 'named.conf.d' - 'named.logrotate' - 'localhost.zone' - '127.0.0.zone') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ee52947062c1582858187716b776afa3613608fb' - 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' - '17444f9d759a4bde7688bdaa304dac57a138e4c1' - '46232e9db243c6c05e170a1781d7a7f413be5d03' - '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' - '7848edbfb9a848843f57c11c02b0289eefd42d00' - '9ffb5c3f72390a517aeae557e32349d5d278cb63' - '76a0d4cd1b913db177a5a375bebc47e5956866ec' - '53be0f1437ebe595240d8dbdd819939582b97fb9') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - patch -p1 -i ../so_bsdcompat.patch - patch -p1 -i ../notools.patch - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-linux-caps \ - --with-openssl \ - --with-gssapi \ - --with-libxml2 \ - --with-libtool \ - --with-dlz-dlopen \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${_pkgver}" - - make DESTDIR="${pkgdir}" install - - rmdir "${pkgdir}/var/run" - install -d "${pkgdir}"/usr/share/doc/bind - install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ - install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -D -m755 ../named "${pkgdir}"/etc/rc.d/named - install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named - install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named - install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf - - install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named - install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ - install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ -} diff --git a/testing/bind/install b/testing/bind/install deleted file mode 100644 index e3a1397cb..000000000 --- a/testing/bind/install +++ /dev/null @@ -1,21 +0,0 @@ -post_install() { - getent group named >/dev/null || groupadd -g 40 named - getent passwd named >/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named - passwd -l named &>/dev/null - - touch var/log/named.log - chown named:named var/log/named.log - - # create an rndc.key if it doesn't already exist - if [ ! -s etc/rndc.key ]; then - usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key - chown root:named etc/rndc.key - chmod 640 etc/rndc.key - fi -} - -pre_remove() { - getent passwd named &>/dev/null && userdel named >/dev/null - getent group named &>/dev/null && groupdel named >/dev/null - return 0 -} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone deleted file mode 100644 index e3ff9641c..000000000 --- a/testing/bind/localhost.zone +++ /dev/null @@ -1,10 +0,0 @@ -$ORIGIN localhost. -@ 1D IN SOA @ root ( - 42 ; serial (yyyymmdd##) - 3H ; refresh - 15M ; retry - 1W ; expiry - 1D ) ; minimum ttl - - 1D IN NS @ - 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named deleted file mode 100755 index 7907f9983..000000000 --- a/testing/bind/named +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/named - -[[ -d /var/run/named ]] || mkdir -p /var/run/named -chown named:named /var/run/named - -PIDFILE=/var/run/named/named.pid -PID=$(cat $PIDFILE 2>/dev/null) -readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } - -case "$1" in - start) - stat_busy "Starting BIND" - [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon named - stat_done - fi - ;; - stop) - stat_busy "Stopping BIND" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon named - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - reload) - stat_busy "Reloading BIND" - [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - fi - ;; - *) - echo "usage: $0 {start|stop|reload|restart}" -esac -exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf deleted file mode 100644 index 38fb12cbe..000000000 --- a/testing/bind/named.conf +++ /dev/null @@ -1,64 +0,0 @@ -// -// /etc/named.conf -// - -options { - directory "/var/named"; - pid-file "/var/run/named/named.pid"; - auth-nxdomain yes; - datasize default; -// Uncomment these to enable IPv6 connections support -// IPv4 will still work: -// listen-on-v6 { any; }; -// Add this for no IPv4: -// listen-on { none; }; - - // Default security settings. - allow-recursion { 127.0.0.1; }; - allow-transfer { none; }; - allow-update { none; }; - version none; - hostname none; - server-id none; -}; - -zone "localhost" IN { - type master; - file "localhost.zone"; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "127.0.0.zone"; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "example.org" IN { -// type slave; -// file "example.zone"; -// masters { -// 192.168.1.100; -// }; -// allow-query { any; }; -// allow-transfer { any; }; -//}; - -logging { - channel xfer-log { - file "/var/log/named.log"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; -}; - diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d deleted file mode 100644 index aecbd2307..000000000 --- a/testing/bind/named.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to BIND -# -NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate deleted file mode 100644 index ef1a2d032..000000000 --- a/testing/bind/named.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/named.log { - missingok - postrotate - /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true - endscript -} diff --git a/testing/bind/notools.patch b/testing/bind/notools.patch deleted file mode 100644 index 0ad083a01..000000000 --- a/testing/bind/notools.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur old/bin/Makefile.in new/bin/Makefile.in ---- old/bin/Makefile.in 2011-05-27 10:12:59.392416094 +0200 -+++ new/bin/Makefile.in 2011-05-27 10:13:12.372521984 +0200 -@@ -19,7 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -+SUBDIRS = named rndc dnssec tests tools \ - check confgen @PKCS11_TOOLS@ - TARGETS = - diff --git a/testing/bind/so_bsdcompat.patch b/testing/bind/so_bsdcompat.patch deleted file mode 100644 index 4d7031fcc..000000000 --- a/testing/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/testing/bison/ChangeLog b/testing/bison/ChangeLog deleted file mode 100644 index 5bb22be1d..000000000 --- a/testing/bison/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2010-03-25 Eric Belanger <eric@archlinux.org> - - * bison 2.4.2-1 - * Upstream update - * Removed texinfo dependency in install scriptlet - * Updated license - * Added sh depends - -2008-12-11 Eric Belanger <eric@archlinux.org> - - * bison 2.4.1-1 - * Upstream update - -2008-11-08 Eric Belanger <eric@archlinux.org> - - * bison 2.4-1 - * Upstream update - * Added info file support - * Added ChangeLog diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD deleted file mode 100644 index ebf2c0fc5..000000000 --- a/testing/bison/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 124065 2011-05-16 12:02:28Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> - -pkgname=bison -pkgver=2.5 -pkgrel=1 -pkgdesc="The GNU general-purpose parser generator" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/bison/bison.html" -depends=('glibc' 'm4' 'sh') -groups=('base-devel') -install=bison.install -source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.bz2) -md5sums=('9dba20116b13fc61a0846b0058fbe004') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --datadir=/usr/share - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/bison/bison.install b/testing/bison/bison.install deleted file mode 100644 index 0081a194f..000000000 --- a/testing/bison/bison.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file=bison.info.gz - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file $infodir/dir 2> /dev/null -} diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD deleted file mode 100644 index 15d191ead..000000000 --- a/testing/cryptsetup/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=cryptsetup -pkgver=1.3.1 -pkgrel=1 -pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" -arch=(i686 x86_64) -license=('GPL') -url="http://code.google.com/p/cryptsetup/" -groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') -conflicts=('mkinitcpio<0.5.99') -options=('!libtool' '!emptydirs') -source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 - encrypt_hook - encrypt_install) -sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' - '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' - '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') - -build() { - cd $srcdir/$pkgname-${pkgver} - ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib - make -} - -package() { - cd $srcdir/$pkgname-${pkgver} - make DESTDIR=$pkgdir install - # install hook - install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt - install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt - # Fix pkgconfig location - install -d -m755 $pkgdir/usr/lib - mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ -} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook deleted file mode 100644 index e84bc6ed7..000000000 --- a/testing/cryptsetup/encrypt_hook +++ /dev/null @@ -1,131 +0,0 @@ -# vim: set ft=sh: -# TODO this one needs some work to work with lots of different -# encryption schemes -run_hook () -{ - /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" - - # Get keyfile if specified - ckeyfile="/crypto_keyfile.bin" - if [ "x${cryptkey}" != "x" ]; then - ckdev="$(echo "${cryptkey}" | cut -d: -f1)" - ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" - ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" - if poll_device "${ckdev}" ${rootdelay}; then - case ${ckarg1} in - *[!0-9]*) - # Use a file on the device - # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path - mkdir /ckey - mount -r -t ${ckarg1} ${ckdev} /ckey - dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 - umount /ckey - ;; - *) - # Read raw data from the block device - # ckarg1 is numeric: ckarg1=offset, ckarg2=length - dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 - ;; - esac - fi - [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." - fi - - if [ -n "${cryptdevice}" ]; then - DEPRECATED_CRYPT=0 - cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" - cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" - else - DEPRECATED_CRYPT=1 - cryptdev="${root}" - cryptname="root" - fi - - warn_deprecated() { - echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" - echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." - } - - if poll_device "${cryptdev}" ${rootdelay}; then - if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - dopassphrase=1 - # If keyfile exists, try to use that - if [ -f ${ckeyfile} ]; then - if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then - dopassphrase=0 - else - echo "Invalid keyfile. Reverting to passphrase." - fi - fi - # Ask for a passphrase - if [ ${dopassphrase} -gt 0 ]; then - echo "" - echo "A password is required to access the ${cryptname} volume:" - - #loop until we get a real password - while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do - sleep 2; - done - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - elif [ -n "${crypto}" ]; then - [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated - msg "Non-LUKS encrypted device found..." - if [ $# -ne 5 ]; then - err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" - err "Non-LUKS decryption not attempted..." - return 1 - fi - exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" - tmp=$(echo "${crypto}" | cut -d: -f1) - [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f2) - [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f3) - [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f4) - [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" - tmp=$(echo "${crypto}" | cut -d: -f5) - [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" - if [ -f ${ckeyfile} ]; then - exe="${exe} --key-file ${ckeyfile}" - else - exe="${exe} --verify-passphrase" - echo "" - echo "A password is required to access the ${cryptname} volume:" - fi - eval "${exe} ${CSQUIET}" - - if [ $? -ne 0 ]; then - err "Non-LUKS device decryption failed. verify format: " - err " crypto=hash:cipher:keysize:offset:skip" - exit 1 - fi - if [ -e "/dev/mapper/${cryptname}" ]; then - if [ ${DEPRECATED_CRYPT} -eq 1 ]; then - export root="/dev/mapper/root" - fi - else - err "Password succeeded, but ${cryptname} creation failed, aborting..." - exit 1 - fi - else - err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." - fi - fi - rm -f ${ckeyfile} - fi -} diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install deleted file mode 100644 index 25a2ae45c..000000000 --- a/testing/cryptsetup/encrypt_install +++ /dev/null @@ -1,27 +0,0 @@ -# vim: set ft=sh: - -install () -{ - if [ -z "${CRYPTO_MODULES}" ]; then - MODULES=" dm-crypt $(all_modules "/crypto/") " - else - MODULES=" dm-crypt ${CRYPTO_MODULES} " - fi - FILES="" - SCRIPT="encrypt" - add_dir "/dev/mapper" - [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" - [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" -} - -help () -{ -cat<<HELPEOF - This hook allows for an encrypted root device. -HELPEOF -} diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD deleted file mode 100644 index 12829b5d1..000000000 --- a/testing/dnsutils/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 125626 2011-05-27 10:41:33Z 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.8.0.P2 -_pkgver=9.8.0-P2 -pkgrel=1 - -pkgdesc='Various DNS utilities - dig host nslookup nsupdate' -arch=('i686' 'x86_64') -url='https://www.isc.org/software/bind' -license=('custom:ISC') -depends=('openssl' 'idnkit') -replaces=('bind-tools' 'host') -options=('!makeflags') -source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" - 'tools-only.patch') -sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b' - 'ac88c89e25c26d73095a3dd85e1ca1070d184ded') - -build() { - cd "${srcdir}/bind-${_pkgver}" - - patch -p1 -i ../tools-only.patch - export STD_CDEFINES='-DDIG_SIGCHASE' - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-openssl=yes \ - --with-idn=yes \ - --disable-linux-caps \ - - make -} - -package() { - cd "${srcdir}/bind-${_pkgver}/bin" - - make DESTDIR="${pkgdir}" install - - install -Dm644 ../COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/dnsutils/tools-only.patch b/testing/dnsutils/tools-only.patch deleted file mode 100644 index b46b71f60..000000000 --- a/testing/dnsutils/tools-only.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur bind-9.7.1-P2.orig/bin/Makefile.in bind-9.7.1-P2/bin/Makefile.in ---- bind-9.7.1-P2.orig/bin/Makefile.in 2009-10-05 08:07:08.000000000 -0400 -+++ bind-9.7.1-P2/bin/Makefile.in 2010-07-22 15:55:00.000000000 -0400 -@@ -19,8 +19,7 @@ - VPATH = @srcdir@ - top_srcdir = @top_srcdir@ - --SUBDIRS = named rndc dig dnssec tests tools nsupdate \ -- check confgen @PKCS11_TOOLS@ -+SUBDIRS = dig nsupdate - TARGETS = - - @BIND9_MAKE_RULES@ -diff -Naur bind-9.7.1-P2.orig/lib/Makefile.in bind-9.7.1-P2/lib/Makefile.in ---- bind-9.7.1-P2.orig/lib/Makefile.in 2007-06-19 19:47:13.000000000 -0400 -+++ bind-9.7.1-P2/lib/Makefile.in 2010-07-22 15:56:29.000000000 -0400 -@@ -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/glew/PKGBUILD b/testing/glew/PKGBUILD deleted file mode 100644 index 6270e8c8f..000000000 --- a/testing/glew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: SleepyDog - -pkgname=glew -pkgver=1.6.0 -pkgrel=1 -pkgdesc="The OpenGL Extension Wrangler Library" -arch=('i686' 'x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('libxmu' 'libxi' 'mesa') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|lib64|lib|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install.all - install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a - chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver} -} diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD deleted file mode 100644 index d09e302dd..000000000 --- a/testing/hugin/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Dominik Ryba <domryba@post.pl> - -pkgname=hugin -pkgver=2010.4.0 -pkgrel=4 -pkgdesc="A frontend to the panorama-tools" -arch=('i686' 'x86_64') -url="http://hugin.sourceforge.net/" -license=('LGPL') -depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr' - 'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool') -makedepends=('zip' 'cmake' 'boost') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 hugin-gcc46.patch) -md5sums=('bfd716655461987312b2f2f00c90dcc5' - '4393c7b31da60f230c85e63a6a2e43a0') -sha1sums=('47f25c0a8b97c27108e567bcd22203c87f268d07' - '52798a155a037f853f41402f797e8a4cb6bb3e07') - -build() { - cd "${srcdir}" - (cd ${pkgname}-${pkgver}; patch -p1 -i ../hugin-gcc46.patch) - mkdir build && cd build - - cmake "${srcdir}/${pkgname}-${pkgver}" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \ - -DENABLE_LAPACK=yes - - make -} - -package(){ - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/hugin/hugin-gcc46.patch b/testing/hugin/hugin-gcc46.patch deleted file mode 100644 index 98a70ad50..000000000 --- a/testing/hugin/hugin-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ - -diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx ---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 -+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - - - - - diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install deleted file mode 100644 index 362749233..000000000 --- a/testing/hugin/hugin.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome - update-desktop-database -q - update-mime-database usr/share/mime > /dev/null -} diff --git a/testing/koffice/PKGBUILD b/testing/koffice/PKGBUILD deleted file mode 100644 index 1884dd92c..000000000 --- a/testing/koffice/PKGBUILD +++ /dev/null @@ -1,301 +0,0 @@ -# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > - -pkgbase=koffice -pkgname=( - 'koffice-filters' - 'koffice-interfaces' - 'koffice-libs' - 'koffice-plugins' - 'koffice-pics' - 'koffice-servicetypes' - 'koffice-templates' - 'koffice-tools' - 'koffice-karbon' - 'koffice-karbon-doc' -# 'koffice-kchart' -# 'koffice-kchart-doc' - 'koffice-kexi' - 'koffice-kexi-doc' - 'koffice-kformula' - 'koffice-kformula-doc' - 'koffice-kounavail' - 'koffice-kplato' -# 'koffice-kplato-doc' - 'koffice-kpresenter' - 'koffice-kpresenter-doc' - 'koffice-krita' -# 'koffice-krita-doc' # no krita-doc anymore upstream - 'koffice-kspread' - 'koffice-kspread-doc' - 'koffice-kword' -# 'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources) - 'koffice-handbook' - 'koffice-thesaurus-doc' -# 'koffice-kdgantt' # still an empty package -) -pkgver=2.3.3 -pkgrel=4 -arch=('i686' 'x86_64') -url='http://koffice.kde.org' -license=('GPL' 'LGPL' 'FDL') -makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' - 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'kdegraphics-libs') -groups=('koffice') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" - 'kde4-koffice-libwpg02.patch' 'gcc46.patch') -sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099' - '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612' - 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -##### 1st package common files, depends, optdepends of the koffice applications ##### - -package_koffice-filters(){ - pkgdesc="Filters for the KDE office suite" - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'kdegraphics-libs: support for raw images') - install=filters.install - cd "${srcdir}/build/filters" - make DESTDIR="${pkgdir}" install -} - -package_koffice-interfaces(){ - pkgdesc="Interfaces for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/interfaces" - make DESTDIR="${pkgdir}" install -} - -package_koffice-libs(){ - pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') - cd "${srcdir}/build/libs" - make DESTDIR="${pkgdir}" install -} - -package_koffice-plugins(){ - pkgdesc="Plugins for the KDE office suite" - depends=('koffice-libs') - replaces=('koffice-kchart') - conflicts=('koffice-kchart') - cd "${srcdir}/build/plugins" - make DESTDIR="${pkgdir}" install -} - -package_koffice-pics(){ - pkgdesc="Icons for the KDE office suite" - install=koffice.install - cd "${srcdir}/build/pics" - make DESTDIR="${pkgdir}" install -} - -package_koffice-servicetypes(){ - pkgdesc="Servicetypes for the KDE office suite" - cd "${srcdir}/build/servicetypes" - make DESTDIR="${pkgdir}" install -} - -package_koffice-templates(){ - pkgdesc="Templates for the KDE office suite" - cd "${srcdir}/build/templates" - make DESTDIR="${pkgdir}" install -} - -package_koffice-tools(){ - pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs') - cd "${srcdir}/build/tools" - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_koffice-karbon(){ - pkgdesc="Vector drawing application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-karbon-doc(){ - pkgdesc="Documentation for karbon" - cd "${srcdir}/build/doc/karbon" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi(){ - pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') - cd "${srcdir}/build/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kexi-doc(){ - pkgdesc="Documentation for kexi" - cd "${srcdir}/build/doc/kexi" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula(){ - pkgdesc="Formula editor for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kformula" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kformula-doc() { - pkgdesc="Documentation for koffice-kformula" - cd "${srcdir}/build/doc/kformula" - make DESTDIR="${pkgdir}" install -} - - -package_koffice-kounavail(){ - pkgdesc="Kounavail for the KDE office suite" - depends=('kdelibs' 'koffice-libs') - cd "${srcdir}/build/kounavail" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kplato(){ - pkgdesc="Project management application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ - 'koffice-plugins' 'koffice-kword') - install=koffice.install - cd "${srcdir}/build/kplato" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-kplato-doc(){ -# pkgdesc="Documentation for kplato" -# cd ${srcdir}/build/doc/kplato -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-kpresenter(){ - pkgdesc="Presentation tool for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kpresenter-doc(){ - pkgdesc="Documentation for kpresenter" - cd "${srcdir}/build/doc/kpresenter" - make DESTDIR="${pkgdir}" install -} - -package_koffice-krita(){ - pkgdesc="Graphics editor for KDE" - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr' 'opengtl') - optdepends=('koffice-filters: import/export filters') - install=krita.install - cd "${srcdir}/build/krita" - make DESTDIR="${pkgdir}" install -} - -#package_koffice-krita-doc(){ -# pkgdesc="Documentation for krita" -# cd ${srcdir}/build/doc/krita -# make DESTDIR="${pkgdir}" install -#} - - -package_koffice-kspread(){ - pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kspread-doc(){ - pkgdesc="Documentation for kspread" - cd "${srcdir}/build/doc/kspread" - make DESTDIR="${pkgdir}" install -} - -package_koffice-kword(){ - pkgdesc="Wordprocessor for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ - 'koffice-kounavail' 'koffice-plugins') - optdepends=('koffice-filters: import/export filters') - install=koffice.install - cd "${srcdir}/build/kword" - make DESTDIR="${pkgdir}" install - - # some sed lines to have python2 in extension scripts - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py" - sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py" -} - -#package_koffice-kword-doc(){ -# pkgdesc="Documentation for kword" -# cd ${srcdir}/build/doc/kword -# make DESTDIR="${pkgdir}" install -#} - -##### package apps done ##### - -#package_koffice-kchart(){ -# pkgdesc="Charting tool for KDE" -# depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates') -# optdepends=('koffice-filters: import/export filters') -# install=koffice.install -# cd "${srcdir}/build/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kchart-doc(){ -# pkgdesc="Documentation for kchart" -# cd "${srcdir}/build/doc/kchart" -# make DESTDIR="${pkgdir}" install -#} - -#package_koffice-kdgantt(){ -# pkgdesc="Gantt for KDE" -# cd "${srcdir}/build/kdgantt" -# make DESTDIR="${pkgdir}" install -#} - -package_koffice-handbook() { - pkgdesc="Documentation for koffice" - cd "${srcdir}/build/doc/koffice" - make DESTDIR="${pkgdir}" install -} - -package_koffice-thesaurus-doc(){ - pkgdesc="Documentation for koffice-thesaurus" - cd "${srcdir}/build/doc/thesaurus" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/koffice/filters.install b/testing/koffice/filters.install deleted file mode 100644 index 7c8a8bd2b..000000000 --- a/testing/koffice/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/koffice/gcc46.patch b/testing/koffice/gcc46.patch deleted file mode 100644 index dcf8a4f85..000000000 --- a/testing/koffice/gcc46.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc ---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 2011-02-17 06:13:40.000000000 -0600 -+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc 2011-02-19 21:15:56.597142885 -0600 -@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp - return IT_FLOAT16; - case Imf::FLOAT: - return IT_FLOAT32; -+ default: -+ // shouldn't reach here -+ return IT_UNSUPPORTED; - } - } - -@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace( - case IT_UNKNOWN: - case IT_UNSUPPORTED: - return 0; -+ default: -+ // shouldn't reach here -+ return 0; - } - } - diff --git a/testing/koffice/kde4-koffice-libwpg02.patch b/testing/koffice/kde4-koffice-libwpg02.patch deleted file mode 100644 index e2a55a216..000000000 --- a/testing/koffice/kde4-koffice-libwpg02.patch +++ /dev/null @@ -1,1323 +0,0 @@ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt ---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt 2011-01-18 07:40:25.000000000 +0100 -@@ -1,16 +1,11 @@ - -- - include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/) - --set(wpgimport_PART_SRCS --WPGImport.cpp --OdgExporter.cxx --FileOutputHandler.cxx --GraphicsElement.cxx) -+set(wpgimport_PART_SRCS WPGImport.cpp) - - kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS}) - --target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES}) -+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES}) - - install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,95 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "FileOutputHandler.hxx" -- --FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) : -- mbIsTagOpened(false), -- mContentStream(contentStream) --{ --} -- --void FileOutputHandler::startDocument() --{ --} -- --void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << "<" << psName; -- -- for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++) -- { -- mContentStream << " " << (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\""; -- } -- mbIsTagOpened = true; -- msOpenedTagName = psName; --} -- --void FileOutputHandler::endElement(const char *psName) --{ -- if (mbIsTagOpened) -- { -- if( msOpenedTagName == psName ) -- { -- mContentStream << "/>"; -- mbIsTagOpened = false; -- } -- else // should not happen, but handle it -- { -- mContentStream << ">"; -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } -- } -- else -- { -- mContentStream << "</" << psName << ">"; -- mbIsTagOpened = false; -- } --} -- --void FileOutputHandler::characters(const std::string &sCharacters) --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } -- mContentStream << sCharacters.c_str(); --} -- --void FileOutputHandler::endDocument() --{ -- if (mbIsTagOpened) -- { -- mContentStream << ">"; -- mbIsTagOpened = false; -- } --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,49 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef FILEOUTPUTHANDLER_H --#define FILEOUTPUTHANDLER_H -- --#include <iostream> --#include <sstream> --#include <string> --#include "GraphicsHandler.hxx" -- --class FileOutputHandler : public GraphicsHandler --{ -- public: -- explicit FileOutputHandler(std::ostringstream &contentStream); -- virtual void startDocument(); -- virtual void endDocument(); -- virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList); -- virtual void endElement(const char *psName); -- virtual void characters(const std::string &sCharacters); -- -- private: -- bool mbIsTagOpened; -- std::string msOpenedTagName; -- std::ostringstream &mContentStream; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,66 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <string.h> -- --#define ASCII_SPACE 0x0020 -- --void TagGraphicsElement::print() const --{ --} -- --void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->startElement(getTagName().c_str(), maAttrList); --} -- --void OpenTagGraphicsElement::print() const --{ -- TagGraphicsElement::print(); --} -- --void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue) --{ -- std::pair<std::string, std::string> tmpAttribute; -- tmpAttribute.first = szAttributeName; -- tmpAttribute.second = sAttributeValue; -- maAttrList.push_back(tmpAttribute); --} -- --void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- -- pHandler->endElement(getTagName().c_str()); --} -- --void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const --{ -- pHandler->characters(msData); --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,84 +0,0 @@ --/* GraphicsElement: The items we are collecting to be put into the Writer -- * document: paragraph and spans of text, as well as section breaks. -- * -- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca) -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpd.sourceforge.net -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef _GRAPHICSELEMENT_H --#define _GRAPHICSELEMENT_H --#include <string> --#include <map> --#include <vector> -- --#include "GraphicsHandler.hxx" -- --class GraphicsElement --{ --public: -- virtual ~GraphicsElement() {} -- virtual void write(GraphicsHandler *pHandler) const = 0; -- virtual void print() const {} --}; -- --class TagGraphicsElement : public GraphicsElement --{ --public: -- explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {} -- const std::string &getTagName() const { return msTagName; } -- virtual void print() const; --private: -- const std::string msTagName; --}; -- --class OpenTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- ~OpenTagGraphicsElement() {} -- void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue); -- virtual void write(GraphicsHandler *pHandler) const; -- virtual void print () const; --private: -- std::vector<std::pair<std::string, std::string> > maAttrList; --}; -- --class CloseTagGraphicsElement : public TagGraphicsElement --{ --public: -- explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {} -- virtual void write(GraphicsHandler *pHandler) const; --}; -- --class CharDataGraphicsElement : public GraphicsElement --{ --public: -- CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {} -- virtual void write(GraphicsHandler *pHandler) const; --private: -- std::string msData; --}; -- -- --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,43 +0,0 @@ --/* -- * Copyright (C) 2004 William Lachance (wlach@interlog.com) -- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com) -- * -- * 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 Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * Contributor(s): Martin Gallwey (gallwey@sun.com) -- * -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ --#ifndef _GRAPHICSHANDLER_H --#define _GRAPHICSHANDLER_H --#include <string> --#include <map> --#include <vector> -- --class GraphicsHandler --{ --public: -- virtual ~GraphicsHandler() {} -- virtual void startDocument() = 0; -- virtual void endDocument() = 0; -- virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0; -- virtual void endElement(const char *psName) = 0; -- virtual void characters(const std::string &sCharacters) = 0; --}; --#endif -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,662 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#include "OdgExporter.hxx" --#include "GraphicsElement.hxx" --#include "GraphicsHandler.hxx" --#include <locale.h> -- --static std::string doubleToString(const double value) --{ -- std::ostringstream tempStream; -- tempStream << value; -- std::string decimalPoint(localeconv()->decimal_point); -- if ((decimalPoint.size() == 0) || (decimalPoint == ".")) -- return tempStream.str(); -- std::string stringValue(tempStream.str()); -- if (!stringValue.empty()) -- { -- std::string::size_type pos; -- while ((pos = stringValue.find(decimalPoint)) != std::string::npos) -- stringValue.replace(pos,decimalPoint.size(),"."); -- } -- return stringValue; --} -- -- --OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML): -- mpHandler(pHandler), -- m_fillRule(AlternatingFill), -- m_gradientIndex(1), -- m_dashIndex(1), -- m_styleIndex(1), -- m_width(0.0f), -- m_height(0.0f), -- m_isFlatXML(isFlatXML) --{ --} -- --OdgExporter::~OdgExporter() --{ -- for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- delete (*iterStroke); -- -- for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- delete (*iterGradient); -- -- for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- delete (*iterAutomaticStyles); -- -- for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- delete (*bodyIter); --} -- --void OdgExporter::startGraphics(double width, double height) --{ -- m_gradientIndex = 1; -- m_dashIndex = 1; -- m_styleIndex = 1; -- m_width = width; -- m_height = height; -- -- -- mpHandler->startDocument(); -- OpenTagGraphicsElement tmpOfficeDocumentContent("office:document"); -- tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/"); -- tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0"); -- tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office"); -- tmpOfficeDocumentContent.addAttribute("office:version", "1.0"); -- if (m_isFlatXML) -- tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing"); -- tmpOfficeDocumentContent.write(mpHandler); -- -- OpenTagGraphicsElement("office:settings").write(mpHandler); -- -- OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set"); -- configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings"); -- configItemSetOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement configItemOpenElement1("config:config-item"); -- configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop"); -- configItemOpenElement1.addAttribute("config:type", "int"); -- configItemOpenElement1.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement2("config:config-item"); -- configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft"); -- configItemOpenElement2.addAttribute("config:type", "int"); -- configItemOpenElement2.write(mpHandler); -- mpHandler->characters("0"); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement3("config:config-item"); -- configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth"); -- configItemOpenElement3.addAttribute("config:type", "int"); -- configItemOpenElement3.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * width); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- OpenTagGraphicsElement configItemOpenElement4("config:config-item"); -- configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight"); -- configItemOpenElement4.addAttribute("config:type", "int"); -- configItemOpenElement4.write(mpHandler); -- m_value.str(""); -- m_value << (unsigned)(2540 * height); -- mpHandler->characters(m_value.str()); -- mpHandler->endElement("config:config-item"); -- -- mpHandler->endElement("config:config-item-set"); -- -- mpHandler->endElement("office:settings"); -- --} -- --void OdgExporter::endGraphics() --{ -- OpenTagGraphicsElement("office:styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin(); -- iterStroke != mStrokeDashElements.end(); iterStroke++) -- (*iterStroke)->write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin(); -- iterGradient != mGradientElements.end(); iterGradient++) -- (*iterGradient)->write(mpHandler); -- -- mpHandler->endElement("office:styles"); -- -- OpenTagGraphicsElement("office:automatic-styles").write(mpHandler); -- -- for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin(); -- iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++) -- (*iterAutomaticStyles)->write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout"); -- tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0"); -- tmpStylePageLayoutOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in"); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in"); -- m_value.str(""); -- m_value << doubleToString(m_width) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(m_height) << "in"; -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str()); -- m_value.str(""); -- tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait"); -- tmpStylePageLayoutPropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:page-layout-properties"); -- -- mpHandler->endElement("style:page-layout"); -- -- OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style"); -- tmpStyleStyleOpenElement.addAttribute("style:name", "dp1"); -- tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page"); -- tmpStyleStyleOpenElement.write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties"); -- // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border"); -- tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none"); -- tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:drawing-page-properties"); -- -- mpHandler->endElement("style:style"); -- -- mpHandler->endElement("office:automatic-styles"); -- -- OpenTagGraphicsElement("office:master-styles").write(mpHandler); -- -- OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page"); -- tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default"); -- tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0"); -- tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpStyleMasterPageOpenElement.write(mpHandler); -- -- mpHandler->endElement("style:master-page"); -- -- mpHandler->endElement("office:master-styles"); -- -- OpenTagGraphicsElement("office:body").write(mpHandler); -- -- OpenTagGraphicsElement("office:drawing").write(mpHandler); -- -- OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page"); -- tmpDrawPageOpenElement.addAttribute("draw:name", "page1"); -- tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1"); -- tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default"); -- tmpDrawPageOpenElement.write(mpHandler); -- -- for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin(); -- bodyIter != mBodyElements.end(); bodyIter++) -- { -- (*bodyIter)->write(mpHandler); -- } -- -- mpHandler->endElement("draw:page"); -- mpHandler->endElement("office:drawing"); -- mpHandler->endElement("office:body"); -- mpHandler->endElement("office:document"); -- -- mpHandler->endDocument(); --} -- --void OdgExporter::setPen(const libwpg::WPGPen& pen) --{ -- m_pen = pen; --} -- --void OdgExporter::setBrush(const libwpg::WPGBrush& brush) --{ -- m_brush = brush; --} -- --void OdgExporter::setFillRule(FillRule rule) --{ -- m_fillRule = rule; --} -- --void OdgExporter::startLayer(unsigned int) --{ --} -- --void OdgExporter::endLayer(unsigned int) --{ --} -- --void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double ) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawRectElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.x2-rect.x1) << "in"; -- pDrawRectElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rect.y2-rect.y1) << "in"; -- pDrawRectElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(rx) << "in"; -- // FIXME: what to do when rx != ry ? -- pDrawRectElement->addAttribute("draw:corner-radius", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect"))); --} -- --void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry) --{ -- writeStyle(); -- OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawEllipseElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.x - rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(center.y - ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * rx) << "in"; -- pDrawEllipseElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(2 * ry) << "in"; -- pDrawEllipseElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse"))); --} -- --void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices) --{ -- if(vertices.count() < 2) -- return; -- -- if(vertices.count() == 2) -- { -- const libwpg::WPGPoint& p1 = vertices[0]; -- const libwpg::WPGPoint& p2 = vertices[1]; -- -- writeStyle(); -- OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawLineElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawLineElement->addAttribute("draw:text-style-name", "P1"); -- pDrawLineElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p1.x) << "in"; -- pDrawLineElement->addAttribute("svg:x1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p1.y) << "in"; -- pDrawLineElement->addAttribute("svg:y1", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.x) << "in"; -- pDrawLineElement->addAttribute("svg:x2", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p2.y) << "in"; -- pDrawLineElement->addAttribute("svg:y2", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line"))); -- } -- else -- { -- // draw as path -- libwpg::WPGPath path; -- path.moveTo(vertices[0]); -- for(unsigned long ii = 1; ii < vertices.count(); ii++) -- path.lineTo(vertices[ii]); -- path.closed = true; -- drawPath(path); -- } --} -- --void OdgExporter::drawPath(const libwpg::WPGPath& path) --{ -- if(path.count() == 0) -- return; -- -- // try to find the bounding box -- // this is simple convex hull technique, the bounding box might not be -- // accurate but that should be enough for this purpose -- libwpg::WPGPoint p = path.element(0).point; -- libwpg::WPGPoint q = path.element(0).point; -- for(unsigned k = 0; k < path.count(); k++) -- { -- libwpg::WPGPathElement element = path.element(k); -- p.x = (p.x > element.point.x) ? element.point.x : p.x; -- p.y = (p.y > element.point.y) ? element.point.y : p.y; -- q.x = (q.x < element.point.x) ? element.point.x : q.x; -- q.y = (q.y < element.point.y) ? element.point.y : q.y; -- if(element.type == libwpg::WPGPathElement::CurveToElement) -- { -- p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x; -- p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y; -- q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x; -- q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y; -- p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x; -- p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y; -- q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x; -- q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y; -- } -- } -- double vw = q.x - p.x; -- double vh = q.y - p.y; -- -- writeStyle(); -- -- OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path"); -- m_value.str(""); -- m_value << "gr" << m_styleIndex-1; -- pDrawPathElement->addAttribute("draw:style-name", m_value.str()); -- m_value.str(""); -- pDrawPathElement->addAttribute("draw:text-style-name", "P1"); -- pDrawPathElement->addAttribute("draw:layer", "layout"); -- m_value << doubleToString(p.x) << "in"; -- pDrawPathElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(p.y) << "in"; -- pDrawPathElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vw) << "in"; -- pDrawPathElement->addAttribute("svg:width", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(vh) << "in"; -- pDrawPathElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540); -- pDrawPathElement->addAttribute("svg:viewBox", m_value.str()); -- m_value.str(""); -- -- for(unsigned i = 0; i < path.count(); i++) -- { -- libwpg::WPGPathElement element = path.element(i); -- libwpg::WPGPoint point = element.point; -- switch(element.type) -- { -- // 2540 is 2.54*1000, 2.54 in = 1 in -- case libwpg::WPGPathElement::MoveToElement: -- m_value << "M" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::LineToElement: -- m_value << "L" << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- case libwpg::WPGPathElement::CurveToElement: -- m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " "; -- m_value << (int)((element.extra1.y-p.y)*2540) << " "; -- m_value << (int)((element.extra2.x-p.x)*2540) << " "; -- m_value << (int)((element.extra2.y-p.y)*2540) << " "; -- m_value << (int)((point.x-p.x)*2540) << " "; -- m_value << (int)((point.y-p.y)*2540); -- break; -- -- default: -- break; -- } -- } -- if(path.closed) -- m_value << " Z"; -- pDrawPathElement->addAttribute("svg:d", m_value.str()); -- m_value.str(""); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement)); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path"))); --} -- -- --void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap) --{ -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(bitmap.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary; -- bitmap.generateBase64DIB(base64Binary); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- --void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData) --{ -- if (binaryData.mimeType.length() <= 0) -- return; -- OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame"); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.x1) << "in"; -- pDrawFrameElement->addAttribute("svg:x", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.y1) << "in"; -- pDrawFrameElement->addAttribute("svg:y", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.height()) << "in"; -- pDrawFrameElement->addAttribute("svg:height", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(binaryData.rect.width()) << "in"; -- pDrawFrameElement->addAttribute("svg:width", m_value.str()); -- mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement)); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data"))); -- -- libwpg::WPGString base64Binary = binaryData.getBase64Data(); -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr()))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image"))); -- -- mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame"))); --} -- -- --static std::string colorToHex(const libwpg::WPGColor& color) --{ -- char hexdigits[] = "0123456789abcdef"; -- char buffer[] = "123456"; -- buffer[0] = hexdigits[(color.red >> 4) & 15]; -- buffer[1] = hexdigits[color.red & 15]; -- buffer[2] = hexdigits[(color.green >> 4) & 15]; -- buffer[3] = hexdigits[color.green & 15]; -- buffer[4] = hexdigits[(color.blue >> 4) & 15]; -- buffer[5] = hexdigits[color.blue & 15]; -- return std::string(buffer); --} -- --void OdgExporter::writeStyle() --{ -- m_value.str(""); -- m_name.str(""); -- -- if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) ) -- { -- // ODG only supports dashes with the same length of spaces inbetween -- // here we take the first space and assume everything else the same -- // note that dash length is written in percentage -- double distance = m_pen.dashArray.at(1); -- OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash"); -- tmpDrawStrokeDashElement->addAttribute("draw:style", "rect"); -- m_value << "Dash_" << m_dashIndex++; -- tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- m_value << doubleToString(distance*100) << "%"; -- tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str()); -- m_value.str(""); -- for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++) -- { -- m_name << "draw:dots" << i+1; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1"); -- m_name.str(""); -- m_name << "draw:dots" << i+1 << "-length"; -- m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%"; -- tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str()); -- m_name.str(""); -- m_value.str(""); -- } -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement)); -- mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash"))); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient"); -- tmpDrawGradientElement->addAttribute("draw:style", "linear"); -- m_value << "Gradient_" << m_gradientIndex++; -- tmpDrawGradientElement->addAttribute("draw:name", m_value.str()); -- m_value.str(""); -- -- // ODG angle unit is 0.1 degree -- double angle = -m_brush.gradient.angle(); -- while(angle < 0) -- angle += 360; -- while(angle > 360) -- angle -= 360; -- -- m_value << (unsigned)(angle*10); -- tmpDrawGradientElement->addAttribute("draw:angle", m_value.str()); -- m_value.str(""); -- -- libwpg::WPGColor startColor = m_brush.gradient.stopColor(0); -- libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1); -- m_value << "#" << colorToHex(startColor); -- tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(stopColor); -- tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str()); -- m_value.str(""); -- tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%"); -- tmpDrawGradientElement->addAttribute("draw:border", "0%"); -- mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement)); -- mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient"))); -- } -- -- OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style"); -- m_value << "gr" << m_styleIndex; -- tmpStyleStyleElement->addAttribute("style:name", m_value.str()); -- m_value.str(""); -- tmpStyleStyleElement->addAttribute("style:family", "graphic"); -- tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard"); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement)); -- -- OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties"); -- -- if(m_pen.width > 0.0) -- { -- m_value << doubleToString(m_pen.width) << "in"; -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str()); -- m_value.str(""); -- m_value << "#" << colorToHex(m_pen.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str()); -- m_value.str(""); -- -- if(!m_pen.solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash"); -- m_value << "Dash_" << m_dashIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str()); -- m_value.str(""); -- } -- } -- else -- tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::NoBrush) -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none"); -- -- if(m_brush.style == libwpg::WPGBrush::Solid) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid"); -- m_value << "#" << colorToHex(m_brush.foreColor); -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str()); -- m_value.str(""); -- } -- -- if(m_brush.style == libwpg::WPGBrush::Gradient) -- { -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient"); -- m_value << "Gradient_" << m_gradientIndex-1; -- tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str()); -- m_value.str(""); -- } -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement)); -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties"))); -- -- mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style"))); -- m_styleIndex++; --} -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx ---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx 1970-01-01 01:00:00.000000000 +0100 -@@ -1,116 +0,0 @@ --/* libwpg -- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org) -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) any later version. -- * -- * This library 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 -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02111-1301 USA -- * -- * For further information visit http://libwpg.sourceforge.net -- */ -- --/* "This product is not manufactured, approved, or supported by -- * Corel Corporation or Corel Corporation Limited." -- */ -- --#ifndef __ODGEXPORTER_H__ --#define __ODGEXPORTER_H__ -- --#include <iostream> --#include <sstream> --#include <string> -- --#include <libwpg/libwpg.h> --#include "GraphicsElement.hxx" -- --class OdgExporter : public libwpg::WPGPaintInterface { --public: -- explicit OdgExporter(GraphicsHandler *pHandler, -- const bool isFlatXML = false); -- ~OdgExporter(); -- --#if LIBWPG_VERSION_MINOR<2 -- void startGraphics(double imageWidth, double imageHeight); -- void endGraphics(); -- void startLayer(unsigned int id); -- void endLayer(unsigned int id); -- -- void setPen(const libwpg::WPGPen& pen); -- void setBrush(const libwpg::WPGBrush& brush); -- void setFillRule(FillRule rule); -- -- void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry); -- void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry); -- void drawPolygon(const libwpg::WPGPointArray& vertices); -- void drawPath(const libwpg::WPGPath& path); -- void drawBitmap(const libwpg::WPGBitmap& bitmap); -- void drawImageObject(const libwpg::WPGBinaryData& binaryData); -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- libwpg::WPGPen m_pen; -- libwpg::WPGBrush m_brush; -- FillRule m_fillRule; -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#else -- virtual void startGraphics(const ::WPXPropertyList &propList); -- virtual void endGraphics(); -- virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient); -- virtual void startLayer(const ::WPXPropertyList &propList); -- virtual void endLayer(); -- virtual void drawRectangle(const ::WPXPropertyList& propList); -- virtual void drawEllipse(const ::WPXPropertyList& propList); -- virtual void drawPolygon(const ::WPXPropertyListVector &vertices); -- virtual void drawPath(const ::WPXPropertyListVector &path); -- virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData); -- virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList); -- virtual void endEmbeddedGraphics(); -- virtual void drawPolyline(const ::WPXPropertyListVector &vertices); -- virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path); -- virtual void endTextObject(); -- virtual void startTextLine(const ::WPXPropertyList &propList); -- virtual void endTextLine(); -- virtual void startTextSpan(const ::WPXPropertyList &propList); -- virtual void endTextSpan(); -- virtual void insertText(const ::WPXString &str); -- -- --private: -- std::vector <GraphicsElement *> mBodyElements; -- std::vector <GraphicsElement *> mAutomaticStylesElements; -- std::vector <GraphicsElement *> mStrokeDashElements; -- std::vector <GraphicsElement *> mGradientElements; -- GraphicsHandler *mpHandler; -- -- int m_gradientIndex; -- int m_dashIndex; -- int m_styleIndex; -- void writeStyle(); -- std::ostringstream m_value, m_name; -- double m_width, m_height; -- const bool m_isFlatXML; --#endif --}; -- --#endif // __ODGEXPORTER_H__ -diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp ---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp 2011-01-15 21:05:35.000000000 +0100 -+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp 2011-01-02 17:46:15.000000000 +0100 -@@ -20,28 +20,26 @@ - #include <WPGImport.h> - #include <WPGImport.moc> - --#include <QBuffer> --#include <QByteArray> --#include <QString> -- --#include <kdebug.h> - #include <KoFilterChain.h> - #include <KoGlobal.h> - #include <KoUnit.h> -+#include <KoXmlWriter.h> -+ - #include <kpluginfactory.h> -+#include <KDebug> - --#include <KoXmlWriter.h> -+ -+#include <QtCore/QString> -+#include <QtCore/QFile> - - #include <libwpg/libwpg.h> - #if LIBWPG_VERSION_MINOR<2 - #include <libwpg/WPGStreamImplementation.h> - #else - #include <libwpd-stream/libwpd-stream.h> -+#include <libwpd/libwpd.h> - #endif - --#include "FileOutputHandler.hxx" --#include "OdgExporter.hxx" -- - #include <iostream> - - K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();) -@@ -56,35 +54,13 @@ - { - } - --static QByteArray createManifest() --{ -- KoXmlWriter* manifestWriter; -- QByteArray manifestData; -- QBuffer manifestBuffer(&manifestData); -- -- manifestBuffer.open(QIODevice::WriteOnly); -- manifestWriter = new KoXmlWriter(&manifestBuffer); -- -- manifestWriter->startDocument("manifest:manifest"); -- manifestWriter->startElement("manifest:manifest"); -- manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0"); -- manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics"); -- //manifestWriter->addManifestEntry( "styles.xml", "text/xml" ); -- manifestWriter->addManifestEntry("content.xml", "text/xml"); -- manifestWriter->endElement(); -- manifestWriter->endDocument(); -- delete manifestWriter; -- -- return manifestData; --} -- - - KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to) - { - if (from != "application/x-wpg") - return KoFilter::NotImplemented; - -- if (to != "application/vnd.oasis.opendocument.graphics") -+ if (to != "image/svg+xml") - return KoFilter::NotImplemented; - - #if LIBWPG_VERSION_MINOR<2 -@@ -96,6 +72,7 @@ - input = olestream; - } - } -+ libwpg::WPGString output; - #else - WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit()); - if (input->isOLEStream()) { -@@ -105,59 +82,31 @@ - input = olestream; - } - } -+ ::WPXString output; - #endif - - if (!libwpg::WPGraphics::isSupported(input)) { -- std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl; -+ kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!"; - delete input; - return KoFilter::NotImplemented; - } - -- // do the conversion -- std::ostringstream tmpStringStream; -- FileOutputHandler tmpHandler(tmpStringStream); -- OdgExporter exporter(&tmpHandler); -- libwpg::WPGraphics::parse(input, &exporter); -- delete input; -- -- -- // create output store -- KoStore* storeout; -- storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write, -- "application/vnd.oasis.opendocument.graphics", KoStore::Zip); -- -- if (!storeout) { -- kWarning() << "Couldn't open the requested file."; -- return KoFilter::FileNotFound; -- } -- --#if 0 -- if (!storeout->open("styles.xml")) { -- kWarning() << "Couldn't open the file 'styles.xml'."; -- return KoFilter::CreationError; -+ if (!libwpg::WPGraphics::generateSVG(input, output)) { -+ kWarning() << "ERROR: SVG Generation failed!"; -+ delete input; -+ return KoFilter::ParsingError; - } -- //storeout->write( createStyles() ); -- storeout->close(); --#endif - -- if (!storeout->open("content.xml")) { -- kWarning() << "Couldn't open the file 'content.xml'."; -- return KoFilter::CreationError; -- } -- storeout->write(tmpStringStream.str().c_str()); -- storeout->close(); -+ delete input; - -- // store document manifest -- storeout->enterDirectory("META-INF"); -- if (!storeout->open("manifest.xml")) { -- kWarning() << "Couldn't open the file 'META-INF/manifest.xml'."; -- return KoFilter::CreationError; -+ QFile outputFile(m_chain->outputFile()); -+ if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) { -+ kWarning() << "ERROR: Could not open output file" << m_chain->outputFile(); -+ return KoFilter::InternalError; - } -- storeout->write(createManifest()); -- storeout->close(); - -- // we are done! -- delete storeout; -+ outputFile.write(output.cstr()); -+ outputFile.close(); - - return KoFilter::OK; - } - diff --git a/testing/koffice/koffice.install b/testing/koffice/koffice.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/koffice/koffice.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/koffice/krita.install b/testing/koffice/krita.install deleted file mode 100644 index ce5c32e1b..000000000 --- a/testing/koffice/krita.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
\ No newline at end of file diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD deleted file mode 100644 index c26ddfb00..000000000 --- a/testing/less/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 125524 2011-05-26 14:15:10Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=less -pkgver=443 -pkgrel=2 -pkgdesc="A terminal based program for viewing text files" -license=('GPL3') -arch=('i686' 'x86_64') -url="http://www.greenwoodsoftware.com/less" -groups=('base') -depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('47db098fb3cdaf847b3c4be05ee954fc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix="${pkgdir}"/usr install - install -dm755 "${pkgdir}"/bin - mv "${pkgdir}"/usr/bin/${pkgname} "${pkgdir}"/bin -} diff --git a/testing/less/zless b/testing/less/zless deleted file mode 100644 index 93d560bc5..000000000 --- a/testing/less/zless +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${PAGER=less} -export PAGER - -PATH="/usr/bin:$PATH" -export PATH - -exec zmore ${1+"$@"} diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD deleted file mode 100644 index 4c3853010..000000000 --- a/testing/libreoffice/PKGBUILD +++ /dev/null @@ -1,701 +0,0 @@ -# $Id: PKGBUILD 125824 2011-05-30 09:43:02Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice' 'libreoffice-sdk' - #'libreoffice-extension-barcode' # - 'libreoffice-extension-diagram' - 'libreoffice-extension-google-docs' - 'libreoffice-extension-hunart' - #'libreoffice-extension-lightproof' # no source integration - #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity - 'libreoffice-extension-nlpsolver' - 'libreoffice-extension-ct2n' - 'libreoffice-extension-numbertext' - 'libreoffice-extension-oooblogger' - 'libreoffice-extension-pdfimport' - 'libreoffice-extension-presenter-screen' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' - 'libreoffice-extension-scripting-beanshell' - 'libreoffice-extension-scripting-javascript' - 'libreoffice-extension-scripting-python' - 'libreoffice-extension-typo' - 'libreoffice-extension-validator' - 'libreoffice-extension-watch-window' - 'libreoffice-extension-wiki-publisher') -_LOver=3.4.0.2 -pkgver=3.4.0 -pkgrel=1 -arch=('i686' 'x86_64') -#_LO_tree="3.4" -_OFFICEUPD="340" -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. - 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' - 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' - 'mesa' 'gstreamer0.10-base' 'java-runtime' - #'saxon' - currently broken - # the depends from libreoffice main pkg - "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script - 'ttf-dejavu') # to satisfy regression tests - # translate-toolkit - todo move them to extra to allow --with-system-foo builds -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors -#_mirror="http://download.documentfoundation.org/libreoffice/src" -_mirror="http://dev-builds.libreoffice.org/pre-releases/src/" -_additional_source_url="http://hg.services.openoffice.org/binaries" -source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_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}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - http://download.go-oo.org/src/7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2 - http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll - http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 - http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - buildfix_i116795.diff - buildfix_boost.diff - buildfix_ct2n.diff - vbahelper.visibility.patch - buildfix_bison25.diff) -noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll - b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 - 7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.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 - 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 - 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt - 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt - 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt - bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt - 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt - b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt - b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt - 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt - dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt - b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt - 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 - f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) -md5sums=('7427ddd5ae63b6ee7aa868201dfbccaa' - 'a78a8e08731213da02c65060cedc5589' - '596da255e2728faccc8f2361171270ec' - '8ed9803a34d13da1764e7523d550d6b0' - '9be46d7c4bf3a60ee8dd0a5ef3638f82' - 'b60db802866ab71c485de42e6382d1bb' - '09e374cf3bd8f07a043883393012d69b' - 'af9f25aa04dc4ef7b797f7bcc743877c' - 'ad29de786d76d67759f9d2dd574b29be' - 'ff13a8ac0ea324122b75773fd80a9245' - '6eb8f53e01da7a945ee4cd42b7297732' - '90df27d4cbf490668ce4f03ff7dba521' - 'c0ea197183564c49306a1c79ca571e51' - '91e69ed3c0be542fa7f69ca3da2d7808' - 'a81c787b2e5469c2acc9f335b2c9e52f' - 'ee1c78af6553657614b1a43adf4750ac' - 'c970d6212618fc9b34526907eb030ce6' - '6d25488c81af09d87015bf487243042f' - '9a39234a49516b7035309e28dd4f0784' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - 'fdb27bfe2dbe2e7b57ae194d9bf36bab' - 'ada24d37d8d638b3d8a9985e80bc2978' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' - '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '18f577b374d60b3c760a3a3350407632' - '7a0dcb3fe1e8c7229ab4fb868b7325e6' - '185d60944ea767075d27247c3162b3bc' - 'b4cae0700aa1c2aef7eb7f345365e6f1' - '451ccf439a36a568653b024534669971' - '90401bca927835b6fbae4a707ed187c8' - 'f02578f5218f217a9f20e9c30e119c6a' - '7e7efc5d4a03126bb9ae3ae9aa2c4e87' - '41c9b65ad60af4b3255bbecdfef11736' - '451ccf439a36a568653b024534669971' - 'bbdd5639ada63e3130761daaecae1a10' - '23bd75552206dfcd8fd4e29137dcac84' - 'b8cbca7b3363e6ca2d02bc0ba2b63904' - 'b632bdd25649cc4067bcb410bae23d2b' - '9d60b6cfa3ef1926848710bbcd11115b' - 'dbaafd21de055e582d92d7d32fe9da13' - 'b7b2d0e04e142f26dd96119c80757d1f' - '0520d63c946e272ed3bdfc863fbdc42e' - 'bc228237108cab7745897a9f466b6d39' - 'eee273f501ff45dc5f1365e78c6d57c0' - '43b145db28e6c0d73578ae6fd35e510d' - '4fa96e04b41a6e86774e74a972024b3e') - -build() { - - unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS - [ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh - [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh - [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - - # move all LibO sources into one build directory - mkdir ${srcdir}/build && cd ${srcdir}/build - for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations - mv ${srcdir}/$i/* . - done - - # move external sources into place - mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - - cd ${srcdir}/build - - # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix_i116795.diff - patch -Np1 -i ${srcdir}/buildfix_boost.diff - patch -Np1 -i ${srcdir}/buildfix_ct2n.diff - patch -Np0 -i ${srcdir}/vbahelper.visibility.patch - patch -Np0 -i ${srcdir}/buildfix_bison25.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 - - # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options - -# if [ "$CARCH" = "x86_64" ]; then -# EXTRAOPTS="--without-stlport" -# else -# EXTRAOPTS="--with-stlport" # --without-system-boost" -# # # avoid problems with ixion for now -# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1 -# fi - -# autoconf -v -f - - # non-SMP test build -# export MAKEFLAGS="-j1" - ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \ - --with-unix-wrapper="libreoffice" \ - --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ - --disable-verbose \ - --enable-cairo\ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --disable-graphite\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-ldap \ - --enable-lockdown\ - --enable-opengl \ - --enable-odk\ - --enable-opengl\ - --enable-ext-barcode \ - --enable-ext-diagram \ - --enable-ext-google-docs \ - --enable-ext-hunart \ - --disable-ext-lightproof \ - --disable-ext-mysql-connector \ - --with-system-mysql \ - --enable-ext-nlpsolver \ - --enable-ext-ct2n \ - --enable-ext-numbertext \ - --enable-ext-oooblogger \ - --enable-ext-pdfimport \ - --enable-ext-presenter-console \ - --enable-ext-presenter-minimizer \ - --enable-ext-report-builder \ - --enable-ext-scripting-beanshell \ - --enable-ext-scripting-javascript \ - --enable-ext-scripting-python \ - --enable-ext-typo \ - --enable-ext-validator \ - --enable-ext-watch-window \ - --enable-ext-wiki-publisher \ - --without-fonts\ - --without-afms\ - --without-ppds\ - --without-system-libwps\ - --without-system-mdds\ - --without-myspell-dicts \ - --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-cppunit\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-saxon\ - --with-system-libtextcat \ - --with-external-libtextcat-data \ - --with-openldap\ - --with-ant-home="/usr/share/java/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mozilla\ - --with-system-mythes\ - --with-system-xrender-headers\ - --with-system-headers\ - --with-alloc=system\ - --with-system-lucene\ - --with-lucene-core-jar=/usr/share/java/lucene-core.jar\ - --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\ - $EXTRAOPTS || return 1 - -#--with-system-graphite --enable-graohite ? -#--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 - unset MAKEFLAGS - ./bootstrap - make -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice() { - - pkgdesc="a productivity suite that is compatible with other major office suites" - install=${pkgbase}.install - depends=("curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' - 'redland' 'libgraphite' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script - #'java-runtime' - #'saxon' - optdepends=('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' - 'kdelibs: for kde integration' - 'libmythes: for use in thesaurus' - 'hsqldb-java: default database format for OpenOffice.org' - 'beanshell: interactive java -- good for prototyping /macros' - 'vigra: C++ computer vision library, usable in Basebmp' - 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images' - 'libldap: to get profiles via ldap' - 'lucene: full-text search engine library for Java needed in the help section' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'mesa: for the OGLTrans extension' - '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) - provides=('go-openoffice') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' ) - - cd ${srcdir}/build - make DESTDIR=${pkgdir} install - - # fix missing desktop integration - install -dm755 ${pkgdir}/usr/bin - pushd ${pkgdir}/usr/bin - ln -vs /usr/lib/libreoffice/program/soffice ./libreoffice - ln -vs /usr/lib/libreoffice/program/soffice ./soffice - ln -vs /usr/lib/libreoffice/program/sbase ./lobase - ln -vs /usr/lib/libreoffice/program/scalc ./localc - ln -vs /usr/lib/libreoffice/program/sdraw ./lodraw - ln -vs /usr/lib/libreoffice/program/simpress ./loimpress - ln -vs /usr/lib/libreoffice/program/smath ./lomath - ln -vs /usr/lib/libreoffice/program/swriter ./lowriter - ln -vs /usr/lib/libreoffice/program/unopkg ./unopkg - popd - - # move sysui desktop files into place we want to use - javafilter and qstarter, but not unneeded printeradmin - install -dm755 ${pkgdir}/usr/share/{applications,icons,mime/packages,pixmaps} - rm ${pkgdir}/usr/lib/libreoffice/share/xdg/printeradmin.desktop - for i in base calc draw impress javafilter math qstart startcenter writer; do - cp ${pkgdir}/usr/lib/libreoffice/share/xdg/$i.desktop ${pkgdir}/usr/share/applications/libreoffice-$i.desktop - done - # remove version in menu entry and make it visible - sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop - sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop - sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop - # remove unneeded .desktop files - rm -rf ${pkgdir}/usr/lib/libreoffice/share/xdg - - # add missing icon files - cp -R ${srcdir}/build/sysui/desktop/icons/{hi,lo}color ${pkgdir}/usr/share/icons/ - pushd ${pkgdir}/usr/share/pixmaps - for i in base calc draw impress main math printeradmin startcenter writer; do - ln -vs /usr/share/icons/hicolor/48x48/apps/$i.png . - done - popd - sed -i -e 's/Icon=libreoffice-/Icon=/' ${pkgdir}/usr/share/applications/*.desktop - - # add missing mimetype file - install -m644 ${srcdir}/build/sysui/unxlng*/misc/libreoffice/openoffice.org.xml ${pkgdir}/usr/share/mime/packages/libreoffice.xml - - # 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/basis3.4/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/basis3.4/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; - - # split out extensions - mv ${pkgdir}/usr/lib/libreoffice/share/extensions ${srcdir}/extensions-install - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - install -m644 ${srcdir}/extensions-install/package.txt ${pkgdir}/usr/lib/libreoffice/share/extensions/ - - # move SDK to separated package - mkdir -p ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/sdk - mv ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk ${srcdir}/sdk-install/usr/lib/libreoffice/basis3.4/ - - # cleanup gid_Module files - mkdir ${srcdir}/splitlist - mv -f ${pkgdir}/gid_Module* ${srcdir}/splitlist/ -} - -package_libreoffice-sdk() { - - pkgdesc="Software development kit for LibreOffice" - depends=('libreoffice' 'gcc-libs' 'sh') - - cd ${srcdir}/sdk-install - cp -r * ${pkgdir} - - cd ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk - mv setsdkenv_unix setsdkenv_unix.sh && chmod 755 setsdkenv_unix.sh - rm -f ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in - #fix permissions - find examples -type f -exec chmod -x {} \; -} - -package_libreoffice-extension-barcode() { - - pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw " - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode - chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode -} - -package_libreoffice-extension-diagram() { - - pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram -} - -package_libreoffice-extension-google-docs() { - - pkgdesc="Google Documents extension for LibreOffice" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs -} - -package_libreoffice-extension-hunart() { - - pkgdesc="Hungarian cross-reference toolbar extension" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart -} - -#package_libreoffice-extension-lightproof() { - -# pkgdesc="Lightproof extension for LibreOffice" - #arch=('any') -# depends=('libreoffice') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof -#} - -#package_libreoffice-extension-mysql-connector() { - -# pkgdesc="MySQL Connector extension for LibreOffice" - #arch=('any') -# depends=('libreoffice') -# groups=('libreoffice-extensions') - -# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions -# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector -#} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} - -package_libreoffice-extension-ct2n() { - - pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates." - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n -} - -package_libreoffice-extension-numbertext() { - - pkgdesc="NUMBERTEXT/MONEYTEXT extensions" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext -} - -package_libreoffice-extension-oooblogger() { - - pkgdesc="An extensions for blogging" - #arch=('any') - depends=('libreoffice' 'coreutils') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger -} - -package_libreoffice-extension-pdfimport() { - - pkgdesc="This extension allows you to import and modify PDF documents" - depends=('libreoffice' 'poppler') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/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') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/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' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/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') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - -package_libreoffice-extension-scripting-beanshell() { - - pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell" - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell -} - -package_libreoffice-extension-scripting-javascript() { - - pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript" - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript -} - -package_libreoffice-extension-scripting-python() { - - pkgdesc="LibreOffice extension - Enables support for scripts in Python" - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python -} - -package_libreoffice-extension-typo() { - - pkgdesc="Typography toolbar extension" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo - chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo -} - -package_libreoffice-extension-validator() { - - pkgdesc="Validator extension for LibreOffice" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-watch-window() { - - pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen." - #arch=('any') - depends=('libreoffice') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window -} diff --git a/testing/libreoffice/buildfix_64bit_system_libjpeg.diff b/testing/libreoffice/buildfix_64bit_system_libjpeg.diff deleted file mode 100644 index 1f4eb110f..000000000 --- a/testing/libreoffice/buildfix_64bit_system_libjpeg.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- solenv/inc/libs.mk 2009-07-02 09:44:33.084467312 +0000 -+++ solenv/inc/libs.mk.new 2009-07-02 10:44:03.420819776 +0000 -@@ -211,7 +211,7 @@ - .IF "$(OS)" == "FREEBSD" - JPEG3RDLIB=/usr/local/lib/libjpeg.so - .ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64" --JPEG3RDLIB=/usr/lib64/libjpeg.so -+JPEG3RDLIB=/usr/lib/libjpeg.so - .ELSE - JPEG3RDLIB=/usr/lib/libjpeg.so - .ENDIF diff --git a/testing/libreoffice/buildfix_bison25.diff b/testing/libreoffice/buildfix_bison25.diff deleted file mode 100644 index 869b6c81e..000000000 --- a/testing/libreoffice/buildfix_bison25.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- connectivity/source/parse/sqlbison.y 2011-05-20 13:21:02.000000000 -0600 -+++ connectivity/source/parse/sqlbison.y 2011-05-20 13:22:11.000000000 -0600 -@@ -4338,7 +4338,7 @@ - } - - // ------------------------------------------------------------------------- --void OSQLParser::error(sal_Char *fmt) -+void OSQLParser::error(const sal_Char *fmt) - { - if(!m_sErrorMessage.getLength()) - { ---- connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:58.000000000 -0600 -+++ connectivity/inc/connectivity/sqlparse.hxx 2011-05-20 13:23:46.000000000 -0600 -@@ -233,7 +233,7 @@ - // returns the type for a parameter in a given function name - static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos); - -- void error(sal_Char *fmt); -+ void error(const sal_Char *fmt); - int SQLlex(); - #ifdef YYBISON - void setParseTree(OSQLParseNode * pNewParseTree); - diff --git a/testing/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff deleted file mode 100644 index d8608d0d4..000000000 --- a/testing/libreoffice/buildfix_boost.diff +++ /dev/null @@ -1,40 +0,0 @@ -From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 05 Apr 2011 14:07:02 +0000 -Subject: silence some more of that annoying gcc#47679 - ---- -diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch -index 1c804aa..9b33a5f 100644 ---- a/boost/boost.gcc47679.patch -+++ b/boost/boost.gcc47679.patch -@@ -36,3 +36,26 @@ - template <int MaxDigits> - inline bool allow_more_digits(std::size_t i) - { -+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100 -+@@ -31,6 +31,8 @@ -+ -+ #include "boost/optional/optional_fwd.hpp" -+ -++#include <string.h> -++ -+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200) -+ // VC6.0 has the following bug: -+ // When a templated assignment operator exist, an implicit conversion -+@@ -114,6 +116,11 @@ -+ -+ public: -+ -++ aligned_storage() -++ { -++ memset(&dummy_, 0, sizeof(dummy_)); -++ } -++ -+ void const* address() const { return &dummy_.data[0]; } -+ void * address() { return &dummy_.data[0]; } -+ } ; --- -cgit v0.8.3-6-g21f6 - diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff deleted file mode 100644 index 979587f79..000000000 --- a/testing/libreoffice/buildfix_ct2n.diff +++ /dev/null @@ -1,17 +0,0 @@ -From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001 -From: Caolán McNamara <caolanm@redhat.com> -Date: Tue, 12 Apr 2011 19:35:51 +0000 -Subject: duplicate NULLs - ---- -diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst -index 91f44b7..714d926 100644 ---- a/ct2n/prj/build.lst -+++ b/ct2n/prj/build.lst -@@ -1,3 +1,3 @@ --ct2n ct2n : solenv NULL NULL -+ct2n ct2n : solenv NULL - ct2n ct2n usr1 - all ct2n_mkout NULL - ct2n ct2n nmake - all ct2n_ct2n NULL --- -cgit v0.8.3-6-g21f6 diff --git a/testing/libreoffice/buildfix_i116795.diff b/testing/libreoffice/buildfix_i116795.diff deleted file mode 100644 index 8601bc164..000000000 --- a/testing/libreoffice/buildfix_i116795.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -r 4ab9e11cb892 connectivity/qa/makefile.mk ---- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100 -+++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100 -@@ -35,9 +35,16 @@ - - #----- compile .java files ----------------------------------------- - --JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar - JAVAFILES := $(shell @$(FIND) complex -name "*.java") - -+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -+ -+.IF "$(SYSTEM_HSQLDB)" == "YES" -+EXTRAJARFILES = $(HSQLDB_JAR) -+.ELSE -+JARFILES += hsqldb.jar -+.ENDIF -+ - #----- make a jar from compiled files ------------------------------ - - JARCLASSDIRS = $(PACKAGE) - diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install deleted file mode 100644 index 27f3173ae..000000000 --- a/testing/libreoffice/libreoffice.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 - -echo " * see http://wiki.archlinux.org/index.php/Openoffice" -echo " * you may want to pacman -Ss libreoffice-extensions" -echo " to see what 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 -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -update-desktop-database -q -update-mime-database usr/share/mime > /dev/null 2>&1 -} - -post_remove() { -update-desktop-database -q -gtk-update-icon-cache -f -q /usr/share/icons/hicolor -update-mime-database usr/share/mime > /dev/null 2>&1 -} diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch deleted file mode 100644 index 5739100d0..000000000 --- a/testing/libreoffice/vbahelper.visibility.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000 -+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000 -@@ -238,7 +238,7 @@ - - // including a HelperInterface implementation - template< typename Ifc1 > --class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > -+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 > - { - typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase; - protected: ---- sc/Library_vbaobj.mk -+++ sc/Library_vbaobj.mk -@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbaquerytable \ - sc/source/ui/vba/vbarange \ - sc/source/ui/vba/vbasheetobject \ -- sc/source/ui/vba/vbasheetobjects \ - sc/source/ui/vba/vbastyle \ - sc/source/ui/vba/vbastyles \ - sc/source/ui/vba/vbatextboxshape \ -@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ - sc/source/ui/vba/vbawsfunction \ - )) - -+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ -+ sc/source/ui/vba/vbasheetobjects \ -+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ -+)) -+ - ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) - $(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules deleted file mode 100644 index d2c167324..000000000 --- a/testing/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/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff deleted file mode 100644 index e75499e8e..000000000 --- a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff +++ /dev/null @@ -1,17 +0,0 @@ -Do not issue an error message when unable to remove .cache on read-only fs. -=================================================================== -RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v -retrieving revision 1.49 -retrieving revision 1.50 -diff -u -r1.49 -r1.50 ---- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 -+++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 -@@ -108,7 +108,7 @@ - log_very_verbose("Obtaining device list from " - "udev. Removing obolete %s.", - pf->file); -- if (unlink(pf->file) < 0) -+ if (unlink(pf->file) < 0 && errno != EROFS) - log_sys_error("unlink", pf->file); - } - return 1; diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD deleted file mode 100644 index 39e3b4561..000000000 --- a/testing/lvm2/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') -pkgver=2.02.85 -_pkgverlvm=${pkgver} -pkgrel=2 -arch=('i686' 'x86_64') -url="http://sourceware.org/lvm2/" -license=('GPL2' 'LGPL2.1') -groups=('base') -conflicts=('mkinitcpio<0.5.99') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz - lvm2_install - lvm2_hook - Be-quiet-on-removing-cache-on-read-only-fs.diff - 11-dm-initramfs.rules) -md5sums=('91785ca438e5ce679dd3a386b183d552' - '9fbe01c6e3fca4634b4a38ecdc2f562f' - 'cf05f2c7281e24269ea9dcc6b4e106ba' - '6db89da27928d2415a8e26cd0a842712' - '69e40679cd8b3658bfc619e48baae125') -sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' - '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' - '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' - '6d7dd04be291d7537235704c816a701fd5beacc0' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') - -build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh - patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff - unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --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.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_device-mapper - # extra udev rule for device-mapper in initramfs - install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/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.5.99') - backup=('etc/lvm/lvm.conf') - options=('!makeflags') - - cd "${srcdir}/LVM2.${_pkgverlvm}" - make DESTDIR="${pkgdir}" install_lvm2 - # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. - # /etc directories - install -d "${pkgdir}"/etc/lvm/{archive,backup} - # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" -} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook deleted file mode 100644 index 86d2ea582..000000000 --- a/testing/lvm2/lvm2_hook +++ /dev/null @@ -1,24 +0,0 @@ -# vim:set ft=sh: -run_hook () -{ - /sbin/modprobe -q dm-mod >/dev/null 2>&1 - if [ -e "/sys/class/misc/device-mapper" ]; then - if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') - fi - - # If the lvmwait= parameter has been specified on the command line - # wait for the device(s) before trying to activate the volume group(s) - if [ -n "${lvmwait}" ]; then - for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do - poll_device ${pvdev} ${rootdelay} - done - fi - - [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" - - msg "Activating logical volumes..." - [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit - eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET - fi -} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install deleted file mode 100644 index 0df69f81b..000000000 --- a/testing/lvm2/lvm2_install +++ /dev/null @@ -1,30 +0,0 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" dm-mod dm-snapshot dm-mirror" - BINARIES="" - FILES="" - SCRIPT="lvm2" - - add_dir "/dev/mapper" - add_binary "/sbin/lvm" - add_binary "/sbin/dmsetup" - add_file "/lib/udev/rules.d/10-dm.rules" - add_file "/lib/udev/rules.d/13-dm-disk.rules" - add_file "/lib/udev/rules.d/95-dm-notify.rules" - add_file "/lib/udev/rules.d/11-dm-lvm.rules" - add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" -} - -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 -} diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD deleted file mode 100644 index bba3253fc..000000000 --- a/testing/make/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 110342 2011-02-18 22:21:30Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=make -pkgver=3.82 -pkgrel=3 -pkgdesc="GNU make utility to maintain groups of programs" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/make" -license=('GPL3') -groups=('base-devel') -depends=('glibc' 'sh') -install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - bug30612.patch - bug30723.patch - make-3.82-sort-blank.patch) -md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c8f496b22191f9fb9420ab14c1a19a47' - '662e6450e19a5acdaa5c9fcb8ad78dea' - '7d01a99f389d8f08dec93ed479071ee4') - - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # http://savannah.gnu.org/bugs/?30612 - patch -Np1 -i $srcdir/bug30612.patch - - # http://savannah.gnu.org/bugs/?30723 - patch -Np1 -i $srcdir/bug30723.patch - - # https://bugs.archlinux.org/task/22733 (fix from Fedora) - patch -Np1 -i $srcdir/make-3.82-sort-blank.patch - - ./configure --prefix=/usr - make - make check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/testing/make/bug30612.patch b/testing/make/bug30612.patch deleted file mode 100644 index fb843bcd9..000000000 --- a/testing/make/bug30612.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 -@@ -1,3 +1,4 @@ -+ - /* Argument parsing and main program of GNU Make. - Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, -@@ -1138,7 +1139,7 @@ - a macro and some compilers (MSVC) don't like conditionals in macros. */ - { - const char *features = "target-specific order-only second-expansion" -- " else-if shortest-stem undefine" -+ " else-if shortest-stem undefine oneshell" - #ifndef NO_ARCHIVES - " archives" - #endif -diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c ---- make-3.82-orig/read.c 2010-07-13 11:20:42.000000000 +1000 -+++ make-3.82-fix30612//read.c 2010-09-23 23:30:58.018855839 +1000 -@@ -3028,7 +3028,7 @@ - { - /* This looks like the first element in an open archive group. - A valid group MUST have ')' as the last character. */ -- const char *e = p + nlen; -+ const char *e = p; - do - { - e = next_token (e); -@@ -3084,19 +3084,19 @@ - Go to the next item in the string. */ - if (flags & PARSEFS_NOGLOB) - { -- NEWELT (concat (2, prefix, tp)); -+ NEWELT (concat (2, prefix, tmpbuf)); - continue; - } - - /* If we get here we know we're doing glob expansion. - TP is a string in tmpbuf. NLEN is no longer used. - We may need to do more work: after this NAME will be set. */ -- name = tp; -+ name = tmpbuf; - - /* Expand tilde if applicable. */ -- if (tp[0] == '~') -+ if (tmpbuf[0] == '~') - { -- tildep = tilde_expand (tp); -+ tildep = tilde_expand (tmpbuf); - if (tildep != 0) - name = tildep; - } -@@ -3152,7 +3152,11 @@ - else - { - /* We got a chain of items. Attach them. */ -- (*newp)->next = found; -+ if (*newp) -+ (*newp)->next = found; -+ else -+ *newp = found; -+ - - /* Find and set the new end. Massage names if necessary. */ - while (1) diff --git a/testing/make/bug30723.patch b/testing/make/bug30723.patch deleted file mode 100644 index 84e7ebe7a..000000000 --- a/testing/make/bug30723.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c ---- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 -+++ make-3.82-fix30723//main.c 2010-09-23 23:34:10.932188592 +1000 -@@ -2093,7 +2093,7 @@ - const char *pv = define_makeflags (1, 1); - char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1); - sprintf (p, "MAKEFLAGS=%s", pv); -- putenv (p); -+ putenv (allocated_variable_expand (p)); - } - - if (ISDB (DB_BASIC)) diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch deleted file mode 100644 index 2e73f5b7c..000000000 --- a/testing/make/make-3.82-sort-blank.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urp make-3.82/function.c make-3.82-pm/function.c ---- make-3.82/function.c 2010-07-13 03:20:39.000000000 +0200 -+++ make-3.82-pm/function.c 2010-10-27 01:43:27.000000000 +0200 -@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c - { - char c = *(t++); - -- if (! isspace ((unsigned char)c)) -+ if (! isblank ((unsigned char)c)) - continue; - - ++wordi; - -- while (isspace ((unsigned char)*t)) -+ while (isblank ((unsigned char)*t)) - ++t; - } diff --git a/testing/make/make.install b/testing/make/make.install deleted file mode 100644 index 6cf8b0dc4..000000000 --- a/testing/make/make.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(make.info make.info-1 make.info-2) - -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/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD deleted file mode 100644 index 4ecfab9c9..000000000 --- a/testing/module-init-tools/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 126053 2011-06-01 05:32:56Z andyrtr $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=module-init-tools -pkgver=3.13 -pkgrel=1 -pkgdesc="utilities needed by Linux systems for managing loadable kernel modules" -arch=('i686' 'x86_64') -url="http://kerneltools.org" -license=('GPL') -depends=('glibc') -backup=('etc/modprobe.d/modprobe.conf') -source=(http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-$pkgver.tar.bz2 - modprobe.conf) -md5sums=('dc575e7df00d9f745bf23b32f927b7a6' - '316f1bda4c21af02b30252eb014a0a55') - -build() { - cd $srcdir/$pkgname-$pkgver - - # do not regenerate man pages - touch *.{5,8} - - ./configure --prefix=/usr --exec-prefix=/ --enable-zlib - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - # Install our custom (read: empty) modprobe.conf - install -Dm644 $srcdir/modprobe.conf $pkgdir/etc/modprobe.d/modprobe.conf - - # fix man page (FS#17559) - sed -i "s#mod#man5/mod#" $pkgdir/usr/share/man/man5/modprobe.d.5 -} diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf deleted file mode 100644 index 83865a3af..000000000 --- a/testing/module-init-tools/modprobe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# -# /etc/modprobe.d/modprobe.conf (for v2.6 kernels) -# diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD deleted file mode 100644 index 95ed134c6..000000000 --- a/testing/pkg-config/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 124806 2011-05-24 14:39:31Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Committer: Judd Vinet <jvinet@zeroflux.org> - -pkgname=pkg-config -pkgver=0.26 -pkgrel=1 -pkgdesc="A system for managing library compile/link flags" -arch=('i686' 'x86_64') -url="http://pkgconfig.freedesktop.org/wiki/" -license=('GPL') -groups=('base-devel') -depends=('glibc' 'popt' 'glib2') -provides=("pkgconfig=${pkgver}") -conflicts=('pkgconfig') -replaces=('pkgconfig') -source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('47525c26a9ba7ba14bf85e01509a7234') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - # Use system popt - ./configure --prefix=/usr --with-installed-popt - - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install -} diff --git a/testing/pkg-config/autoconf-2.66.patch b/testing/pkg-config/autoconf-2.66.patch deleted file mode 100644 index 14cabdf9f..000000000 --- a/testing/pkg-config/autoconf-2.66.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur pkg-config-0.25-old//pkg.m4 pkg-config-0.25/pkg.m4 ---- pkg-config-0.25-old//pkg.m4 2009-12-07 06:39:02.000000000 +1000 -+++ pkg-config-0.25/pkg.m4 2010-07-15 14:44:37.466942978 +1000 -@@ -135,7 +135,7 @@ - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --_PKG_TEXT])dnl -+_PKG_TEXT])[]dnl - ]) - elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD deleted file mode 100644 index fee69d2c1..000000000 --- a/testing/sudo/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 124889 2011-05-24 21:47:33Z eric $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=sudo -_ver=1.8.1p2 -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 - sudo.pam) -md5sums=('e8330f0e63b0ecb2e12b5c76922818cc' - '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') - -build() { - cd "$srcdir/$pkgname-$_ver" - - ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ - --with-env-editor --with-all-insults --with-logfac=auth - make -} - -package() { - cd "$srcdir/$pkgname-$_ver" - install -dm755 "$pkgdir/var/lib" - - 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 |