summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/bacula/PKGBUILD6
-rw-r--r--community/cdfs/PKGBUILD10
-rw-r--r--community/darktable/PKGBUILD8
-rw-r--r--community/libuser/PKGBUILD32
-rw-r--r--community/libvirt/PKGBUILD9
-rw-r--r--community/libvirt/openbsd-netcat-default.patch36
-rw-r--r--community/mygui/PKGBUILD4
-rw-r--r--community/open-vm-tools-modules/PKGBUILD17
-rw-r--r--community/quilt/PKGBUILD21
-rw-r--r--community/root/PKGBUILD6
-rw-r--r--community/sage-mathematics/PKGBUILD6
-rw-r--r--community/spring/PKGBUILD25
-rw-r--r--community/subtle/PKGBUILD4
-rw-r--r--community/systemd/PKGBUILD8
-rw-r--r--community/virtualbox-modules/60-vboxguest.rules2
-rw-r--r--community/virtualbox-modules/LocalConfig.kmk19
-rw-r--r--community/virtualbox-modules/PKGBUILD101
-rw-r--r--community/virtualbox-modules/virtualbox-archlinux-modules.install17
-rw-r--r--community/virtualbox-modules/virtualbox-modules.install19
-rw-r--r--community/virtualbox/PKGBUILD89
-rwxr-xr-xcommunity/virtualbox/vbox-service.rc4
-rwxr-xr-xcommunity/virtualbox/vboxbuild2
-rw-r--r--community/virtualbox/vboxdrv-reference.patch56
-rw-r--r--community/virtualbox/virtualbox-source.install12
-rw-r--r--community/virtualbox/virtualbox.install31
-rw-r--r--core/btrfs-progs-unstable/PKGBUILD4
-rw-r--r--core/bzip2/PKGBUILD10
-rw-r--r--core/cracklib/PKGBUILD9
-rw-r--r--core/e2fsprogs/PKGBUILD4
-rw-r--r--core/gpm/PKGBUILD14
-rw-r--r--core/groff/PKGBUILD11
-rw-r--r--core/iproute2/PKGBUILD4
-rw-r--r--core/iputils/PKGBUILD4
-rw-r--r--core/net-tools/PKGBUILD4
-rw-r--r--core/procinfo-ng/PKGBUILD12
-rw-r--r--core/udev/PKGBUILD14
-rw-r--r--core/wireless_tools/PKGBUILD4
-rw-r--r--extra/audacious/PKGBUILD6
-rw-r--r--extra/bin86/PKGBUILD33
-rw-r--r--extra/bin86/bin86-0.16.17-x86_64-1.patch44
-rw-r--r--extra/git/PKGBUILD12
-rw-r--r--extra/gnutls/PKGBUILD6
-rw-r--r--extra/irqbalance/PKGBUILD28
-rw-r--r--extra/lirc/PKGBUILD15
-rw-r--r--extra/lirc/lirc.install4
-rw-r--r--extra/numactl/PKGBUILD24
-rw-r--r--extra/ruby/PKGBUILD25
-rw-r--r--extra/telepathy-gabble/PKGBUILD6
-rw-r--r--extra/telepathy-glib/PKGBUILD7
-rw-r--r--extra/telepathy-mission-control/PKGBUILD10
-rw-r--r--extra/telepathy-mission-control/telepathy-mission-control.install11
-rw-r--r--extra/vim/PKGBUILD16
-rw-r--r--extra/xulrunner/PKGBUILD42
-rw-r--r--extra/xulrunner/mozconfig37
-rw-r--r--staging/koffice/PKGBUILD306
-rw-r--r--staging/koffice/filters.install11
-rw-r--r--staging/koffice/gcc46.patch23
-rw-r--r--staging/koffice/kde4-koffice-libwpg02.patch1323
-rw-r--r--staging/koffice/koffice.install12
-rw-r--r--staging/koffice/krita.install13
-rw-r--r--staging/koffice/qt48fix.patch10
-rw-r--r--staging/tumbler/PKGBUILD37
-rw-r--r--staging/tumbler/fix-video-image.patch34
-rw-r--r--testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch33
-rw-r--r--testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch61
-rw-r--r--testing/dhcpcd/PKGBUILD17
-rw-r--r--testing/ffmpeg/PKGBUILD10
-rw-r--r--~brendan/guile/PKGBUILD27
-rw-r--r--~brendan/guile/guile.install23
-rw-r--r--~brendan/libunistring/PKGBUILD27
-rw-r--r--~brendan/libunistring/libunistring.install22
71 files changed, 2609 insertions, 344 deletions
diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
index f775387d1..a109c889c 100644
--- a/community/bacula/PKGBUILD
+++ b/community/bacula/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Matias Hernandez <msdark@archlinux.cl>
pkgname=bacula
-pkgver=5.0.3
-pkgrel=6
+pkgver=5.2.1
+pkgrel=1
pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)"
arch=(mips64el)
url="http://www.${pkgname}.org"
@@ -26,7 +26,7 @@ source=(http://downloads.sourceforge.net/project/bacula/bacula/${pkgver}/${pkgna
${pkgname}-sd.rc.d
${pkgname}-fd.rc.d
${pkgname}-dir.rc.d)
-md5sums=('9de254ae39cab0587fdb2f5d8d90b03b'
+md5sums=('793da9f89fc5e024b6b95eb16a3120e5'
'e7be4c9fb3c7ce334f9ee24d71652d3e'
'a9a070a862e9cf39ae4bc374409c721d'
'55619ae3094c698541a3bfedc87bdb48')
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD
index 8b79de1f5..e231f2f09 100644
--- a/community/cdfs/PKGBUILD
+++ b/community/cdfs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53785 2011-08-08 08:18:16Z spupykin $
+# $Id: PKGBUILD 58212 2011-11-08 22:41:05Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
pkgname=cdfs
pkgver=2.6.27
-pkgrel=16
+pkgrel=17
pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
arch=(i686 x86_64 'mips64el')
url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -19,10 +19,10 @@ md5sums=('ac64c014a90e3c488394832ea29605b3'
build() {
_kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
+ _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
cd $srcdir/$pkgname-$pkgver
patch -p1 <$srcdir/cdfs-3.0.0.patch
- make
- mkdir -p $pkgdir/lib/modules/`uname -r`/extra
- cp cdfs.ko $pkgdir/lib/modules/`uname -r`/extra
+ make KDIR=/lib/modules/${_kernverfull}/build
+ install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
}
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index e2f16517a..dfae03e72 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 56335 2011-10-05 19:07:45Z andrea $
+# $Id: PKGBUILD 58181 2011-11-08 11:48:47Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christian Himpel <chressie at gmail dot com>
# Contributor: Johannes Hanika <hanatos at gmail dot com>
pkgname=darktable
-pkgver=0.9.2
+pkgver=0.9.3
_pkgver=0.9
-pkgrel=2
+pkgrel=1
pkgdesc="Utility to organize and develop raw images"
arch=('i686' 'x86_64' 'mips64el')
url=http://darktable.sf.net/
@@ -18,7 +18,7 @@ optdepends=( 'librsvg')
install=darktable.install
options=(!libtool)
source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
-md5sums=('08377e80ad77c7b11f742f26fddb80f1')
+md5sums=('49253a3a2990a4bf8e0b0a19295f19bd')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
new file mode 100644
index 000000000..dcf5d2bbf
--- /dev/null
+++ b/community/libuser/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 58190 2011-11-08 15:26:34Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Thomas Dziedzic < gostrc at gmail >
+
+pkgname=libuser
+pkgver=0.57.1
+pkgrel=2
+pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
+arch=('i686' 'x86_64')
+license=('LGPL')
+url='https://fedorahosted.org/libuser/'
+depends=('python2' 'glib2' 'popt')
+options=('!libtool')
+source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz")
+md5sums=('be82c6941264d0b4bd04f95fb342ec7d')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ export PYTHON=python2
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-gtk-doc-html \
+ --disable-rpath
+ sed -i 's/SUBDIRS = po docs/SUBDIRS = po/' Makefile
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 8e1348240..13090b7bd 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55818 2011-09-22 13:29:51Z spupykin $
+# $Id: PKGBUILD 58183 2011-11-08 12:06:30Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
-pkgver=0.9.6
+pkgver=0.9.7
pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64' 'mips64el')
@@ -24,6 +24,7 @@ options=('emptydirs' '!libtool')
backup=('etc/conf.d/libvirtd'
'etc/conf.d/libvirtd-guests'
'etc/libvirt/libvirtd.conf'
+ 'etc/libvirt/libvirt.conf'
'etc/libvirt/qemu.conf'
'etc/sasl2/libvirt.conf')
install="libvirt.install"
@@ -35,12 +36,12 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
openbsd-netcat-default.patch
unixperms.patch
yajl-2.x.patch)
-md5sums=('b74df374b524d00a22a6c89cfc23099f'
+md5sums=('4308b3f4d23f5b0c5196260a9a22a38b'
'c43244c40a0437038c82089618e7beaa'
'3ed0e24f5b5e25bf553f5427d64915e6'
'6f36bf189ef0e5847038787d13535420'
'bc2971dacdbac967fc3474e50affc345'
- '4a2659d0e06a7af742f71a0a36c7cea3'
+ 'b0be50eb9dfe4d133decf23b60880f7d'
'db95aecdf2ccf3693fef5821cdcb7eba'
'5745bb8d0b254abb7a3528c66e03b0f9')
diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch
index c884d2171..a01b4f14e 100644
--- a/community/libvirt/openbsd-netcat-default.patch
+++ b/community/libvirt/openbsd-netcat-default.patch
@@ -1,7 +1,7 @@
-diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qemu_migration.c
---- libvirt-0.9.5/src/qemu/qemu_migration.c 2011-09-16 16:37:07.000000000 +0400
-+++ libvirt-0.9.5.my/src/qemu/qemu_migration.c 2011-09-20 20:44:39.000000000 +0400
-@@ -1497,7 +1497,7 @@
+diff -wbBur libvirt-0.9.7/src/qemu/qemu_migration.c libvirt-0.9.7.my/src/qemu/qemu_migration.c
+--- libvirt-0.9.7/src/qemu/qemu_migration.c 2011-10-31 07:46:04.000000000 +0400
++++ libvirt-0.9.7.my/src/qemu/qemu_migration.c 2011-11-08 15:46:10.000000000 +0400
+@@ -1589,7 +1589,7 @@
spec->dest.unix_socket.file);
} else {
const char *args[] = {
@@ -10,10 +10,10 @@ diff -wbBur libvirt-0.9.5/src/qemu/qemu_migration.c libvirt-0.9.5.my/src/qemu/qe
};
ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
}
-diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote/remote_driver.c
---- libvirt-0.9.5/src/remote/remote_driver.c 2011-09-20 07:00:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/remote/remote_driver.c 2011-09-20 20:44:43.000000000 +0400
-@@ -596,7 +596,7 @@
+diff -wbBur libvirt-0.9.7/src/remote/remote_driver.c libvirt-0.9.7.my/src/remote/remote_driver.c
+--- libvirt-0.9.7/src/remote/remote_driver.c 2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/remote/remote_driver.c 2011-11-08 15:46:10.000000000 +0400
+@@ -614,7 +614,7 @@
username,
!tty,
!verify,
@@ -22,15 +22,15 @@ diff -wbBur libvirt-0.9.5/src/remote/remote_driver.c libvirt-0.9.5.my/src/remote
keyfile,
sockname)))
goto failed;
-diff -wbBur libvirt-0.9.5/src/rpc/virnetsocket.c libvirt-0.9.5.my/src/rpc/virnetsocket.c
---- libvirt-0.9.5/src/rpc/virnetsocket.c 2011-09-14 06:11:44.000000000 +0400
-+++ libvirt-0.9.5.my/src/rpc/virnetsocket.c 2011-09-20 20:44:33.000000000 +0400
-@@ -633,7 +633,7 @@
- if (noVerify)
+diff -wbBur libvirt-0.9.7/src/rpc/virnetsocket.c libvirt-0.9.7.my/src/rpc/virnetsocket.c
+--- libvirt-0.9.7/src/rpc/virnetsocket.c 2011-11-08 07:53:30.000000000 +0400
++++ libvirt-0.9.7.my/src/rpc/virnetsocket.c 2011-11-08 15:46:31.000000000 +0400
+@@ -642,7 +642,7 @@
virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
- virCommandAddArgList(cmd, nodename,
-- netcat ? netcat : "nc",
-+ netcat ? netcat : "nc.openbsd",
- "-U", path, NULL);
- return virNetSocketNewConnectCommand(cmd, retsock);
+ if (!netcat)
+- netcat = "nc";
++ netcat = "nc.openbsd";
+
+ virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
+
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 7dc26edb8..d15a5b7e9 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 53640 2011-08-07 04:39:00Z svenstaro $
+# $Id: PKGBUILD 58226 2011-11-09 02:09:13Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Andrew Belitsky <belitsky.a@gmail.com>
pkgbase=mygui
pkgname=('mygui' 'mygui-docs')
pkgver=3.2.0rc1
-pkgrel=8
+pkgrel=9
pkgdesc="A multilayer and overlappable GUI System for OGRE"
arch=('i686' 'x86_64' 'mips64el')
url="http://mygui.info/"
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 752b13b19..9d348180a 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 56484 2011-10-07 10:16:01Z spupykin $
+# $Id: PKGBUILD 58214 2011-11-08 22:41:11Z ibiru $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
pkgname=open-vm-tools-modules
pkgver=2011.09.23
_pkgsubver=491607
-pkgrel=1
+pkgrel=2
pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools"
arch=('i686' 'x86_64' 'mips64el')
url="http://open-vm-tools.sourceforge.net/"
@@ -17,22 +17,25 @@ source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${
md5sums=('599342eee8d531b35ca1cc948b61868f')
build() {
+ _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
+ KERNEL_RELEASE=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
+
cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
-# sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure
- [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x
+ [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr \
+ --without-x --with-kernel-release=$KERNEL_RELEASE
(cd modules && make modules)
}
package() {
_kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
- KERNEL_VERSION=`uname -r`
+ KERNEL_VERSION=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version`
msg "Kernel = $KERNEL_VERSION"
cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
- mkdir -p $pkgdir/lib/modules/$KERNEL_VERSION/misc/
+ mkdir -p $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
for MOD in `find -type f -name '*.ko'`; do
- install -D -m644 $MOD $pkgdir/lib/modules/$KERNEL_VERSION/misc/
+ install -D -m644 $MOD $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/
done
sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install
}
diff --git a/community/quilt/PKGBUILD b/community/quilt/PKGBUILD
new file mode 100644
index 000000000..a09e3fc73
--- /dev/null
+++ b/community/quilt/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Peter Richard Lewis <plewis@aur.archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
+
+pkgname=quilt
+pkgver=0.48
+pkgrel=2
+pkgdesc="Manage a series of patches by keeping track of the changes each patch makes."
+arch=('i686' 'x86_64')
+url="http://savannah.nongnu.org/projects/quilt"
+license=('GPL')
+depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
+source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f77adda60039ffa753f3c584a286f12b')
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+ make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+}
diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
index 71195520d..239728d51 100644
--- a/community/root/PKGBUILD
+++ b/community/root/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Sebastian Voecking <voeck@web.de>
pkgname=root
-pkgver=5.30.03
-pkgrel=3
+pkgver=5.30.04
+pkgrel=1
pkgdesc='C++ data analysis framework and interpreter from CERN.'
arch=('i686' 'x86_64' 'mips64el')
url='http://root.cern.ch'
@@ -16,7 +16,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
'root.sh'
'rootd'
'root.xml')
-md5sums=('da46aac87047acc41a67b24c05fc465f'
+md5sums=('800103f8d5ea5f81c06fda95e057a648'
'0e883ad44f99da9bc7c23bc102800b62'
'efd06bfa230cc2194b38e0c8939e72af'
'e2cf69b204192b5889ceb5b4dedc66f7')
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index c71dbff1b..aa3a6c96b 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -4,7 +4,7 @@
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sage-mathematics
-pkgver=4.7.1
+pkgver=4.7.2
pkgrel=1
pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
url='http://www.sagemath.org'
@@ -20,7 +20,7 @@ options=('!makeflags')
install="${pkgname}.install"
source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
'SAGE-notebook.desktop')
-md5sums=('4d82c6719d14a1c2d403024d989faac7'
+md5sums=('b3073997e6c7ec00a269f84ff2e54973'
'dc391f12b7d17dd37326343ec0e99bbd')
build() {
@@ -66,12 +66,14 @@ build() {
make
}
+<< COMMENT
check() {
cd sage-${pkgver}
# uncomment if we want to run all the tests (warning: very long)
#make ptestlong
}
+COMMENT
package() {
cd sage-${pkgver}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 940681ffd..93d546244 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 55901 2011-09-24 16:49:52Z stephane $
+# $Id: PKGBUILD 58224 2011-11-09 01:31:15Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=spring
-pkgver=0.82.7.1
-pkgrel=7
+pkgver=0.83.0
+_pkgver=83.0
+pkgrel=1
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64' 'mips64el')
url="http://springrts.com/"
@@ -14,22 +15,14 @@ depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis')
makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2')
optdepends=('python2: python-based bots'
'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${pkgver}_src.tar.lzma
- gcc46.patch
- awk-java.patch)
-md5sums=('378cf0b18a5dd5b840964e5945778503'
- 'e9586b611db1ed04fe4f0c5982fda7d2'
- 'cd94edf21e49ff6ff7d256442ed9aa3c')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('05f1c625f2dd81b0d7f30269435ab2f7')
build() {
- bsdtar -xf ${pkgname}_${pkgver}_src.tar.lzma
+ bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
- cd spring_$pkgver
+ cd spring_${_pkgver}
- sed -i '1i\
- #include <list>' rts/lib/lobby/Connection.h
- patch -Np1 < $srcdir/gcc46.patch
- patch -Np1 < $srcdir/awk-java.patch
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DDATADIR=share/spring
@@ -37,7 +30,7 @@ build() {
}
package() {
- cd spring_$pkgver
+ cd spring_${_pkgver}
make DESTDIR=$pkgdir install
diff --git a/community/subtle/PKGBUILD b/community/subtle/PKGBUILD
index 60d53fe11..53211f509 100644
--- a/community/subtle/PKGBUILD
+++ b/community/subtle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 54488 2011-08-18 18:11:38Z angvp $
+# $Id: PKGBUILD 58177 2011-11-08 07:15:39Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: unexist <unexist@dorfelite.net>
# Past Contributors: Abakus <java5@arcor.de>, TDY <tdy@gmx.com>, Xilon <xilonmu@gmail.com>
pkgname=subtle
pkgver=0.10.3008
-pkgrel=1
+pkgrel=2
pkgdesc="A grid-based manual tiling window manager with a strong focus on easy but customizable look and feel"
arch=("i686" "x86_64" 'mips64el')
url="http://subtle.subforge.org"
diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD
index 33ea277bb..eb7d8b9fc 100644
--- a/community/systemd/PKGBUILD
+++ b/community/systemd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 56766 2011-10-12 01:06:12Z dreisner $
+# $Id: PKGBUILD 58198 2011-11-08 16:54:47Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=systemd
pkgver=37
-pkgrel=1
+pkgrel=2
pkgdesc="Session and Startup manager"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -53,13 +53,13 @@ build() {
--libdir=/usr/lib \
--localstatedir=/var \
--with-rootdir= \
- --with-rootlibdir=/lib \
- --disable-audit
+ --with-rootlibdir=/lib
make
# fix .so links in manpages
sed -i 's|\.so halt\.8|.so systemd.halt.8|' man/{halt,poweroff}.8
+ sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
}
package() {
diff --git a/community/virtualbox-modules/60-vboxguest.rules b/community/virtualbox-modules/60-vboxguest.rules
new file mode 100644
index 000000000..6285f7249
--- /dev/null
+++ b/community/virtualbox-modules/60-vboxguest.rules
@@ -0,0 +1,2 @@
+ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
+ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/community/virtualbox-modules/LocalConfig.kmk b/community/virtualbox-modules/LocalConfig.kmk
new file mode 100644
index 000000000..af79f90cd
--- /dev/null
+++ b/community/virtualbox-modules/LocalConfig.kmk
@@ -0,0 +1,19 @@
+VBOX_WITH_ADDITION_DRIVERS =
+VBOX_WITH_INSTALLER = 1
+VBOX_WITH_LINUX_ADDITIONS = 1
+VBOX_WITH_X11_ADDITIONS =
+VBOX_WITH_TESTCASES =
+VBOX_WITH_TESTSUITE =
+VBOX_WITH_ORIGIN :=
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/virtualbox
+VBOX_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_WITH_VNC := 1
+VBOX_BLD_PYTHON = python2
+VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
new file mode 100644
index 000000000..85e9ab987
--- /dev/null
+++ b/community/virtualbox-modules/PKGBUILD
@@ -0,0 +1,101 @@
+# $Id: PKGBUILD 58216 2011-11-08 22:41:23Z ibiru $
+#Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgbase=virtualbox-modules
+pkgname=('virtualbox-modules' 'virtualbox-archlinux-modules')
+pkgver=4.1.6
+pkgrel=2
+arch=('i686' 'x86_64')
+url='http://virtualbox.org'
+license=('GPL')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
+[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
+source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
+ LocalConfig.kmk 60-vboxguest.rules)
+md5sums=('89b979d1b817242c7cdcb489898f166a'
+ '4c88bd122677a35f68abd76eb01b378b'
+ 'ed1341881437455d9735875ddf455fbe')
+
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
+
+export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_INCL=/usr/src/linux-${_kernver}/include/
+
+build() {
+ cd "$srcdir/VirtualBox-${pkgver}_OSE"
+
+ cp "$srcdir/LocalConfig.kmk" .
+
+ ./configure \
+ --with-linux=/usr/src/linux-${_kernver} \
+ --disable-java \
+ --disable-docs \
+ --disable-xpcom \
+ --disable-python \
+ --disable-sdl-ttf \
+ --disable-alsa \
+ --disable-pulse \
+ --disable-dbus \
+ --disable-opengl \
+ --build-headless \
+ --nofatal
+ source ./env.sh
+ kmk all
+
+ make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+ make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+}
+
+package_virtualbox-archlinux-modules(){
+ pkgdesc="Additions only for Arch Linux guests (kernel modules)"
+ license=('GPL')
+ install=virtualbox-archlinux-modules.install
+ depends=('linux>=3.1' 'linux<3.2')
+ replaces=('virtualbox-guest-modules')
+ conflicts=('virtualbox-guest-modules')
+
+ source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+ cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
+
+ for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do
+ install -D -m644 ${module} \
+ "$pkgdir/lib/modules/${_extramodules}/${module}"
+ done
+
+ install -D -m 0644 "$srcdir/60-vboxguest.rules" \
+ "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-archlinux-modules.install"
+}
+
+package_virtualbox-modules(){
+ pkgdesc="Kernel modules for VirtualBox"
+ license=('GPL')
+ install=virtualbox-modules.install
+ depends=('linux>=3.1' 'linux<3.2')
+
+ source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+
+
+ cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src"
+
+ install -D -m644 vboxdrv.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxdrv.ko"
+
+ install -D -m644 vboxnetadp.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxnetadp.ko"
+
+ install -D -m644 vboxnetflt.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxnetflt.ko"
+
+ install -D -m644 vboxpci.ko \
+ "$pkgdir/lib/modules/${_extramodules}/vboxpci.ko"
+
+ find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install"
+}
diff --git a/community/virtualbox-modules/virtualbox-archlinux-modules.install b/community/virtualbox-modules/virtualbox-archlinux-modules.install
new file mode 100644
index 000000000..39a0e4063
--- /dev/null
+++ b/community/virtualbox-modules/virtualbox-archlinux-modules.install
@@ -0,0 +1,17 @@
+post_install() {
+cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/community/virtualbox-modules/virtualbox-modules.install b/community/virtualbox-modules/virtualbox-modules.install
new file mode 100644
index 000000000..ec29d3a87
--- /dev/null
+++ b/community/virtualbox-modules/virtualbox-modules.install
@@ -0,0 +1,19 @@
+post_install() {
+/bin/cat << EOF
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+EOF
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_upgrade() {
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+ echo 'In order to use the new version, reload all virtualbox modules manually.'
+}
+
+post_remove() {
+ EXTRAMODULES='extramodules-3.1-ARCH'
+ depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 57ceb8c7f..fe7e517c9 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 56770 2011-10-12 05:24:02Z ibiru $
+# $Id: PKGBUILD 58218 2011-11-08 22:41:47Z ibiru $
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox
-pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk')
-pkgver=4.1.4
+pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-sdk' 'virtualbox-source')
+pkgver=4.1.6
pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://virtualbox.org'
license=('GPL' 'custom')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
-'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2'
-'xorg-server-devel' 'xf86driproto' 'libxcomposite')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt=4.7.4-3' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst'
+'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'linux-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' 'gsoap' 'vde2')
+#'xorg-server-devel' 'xf86driproto' 'libxcomposite')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf
- virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
- 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
+ 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
-_kernver=3.0-LIBRE
+
+_extramodules=extramodules-3.1-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
build() {
cd "$srcdir/VirtualBox-${pkgver}_OSE"
- patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch"
- patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch"
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
@@ -31,23 +30,23 @@ build() {
./configure --disable-docs \
--enable-webservice \
--enable-vde \
+ --enable-vnc \
+ --nofatal \
--with-linux=/usr/src/linux-${_kernver}
source ./env.sh
kmk all
-
- export KERN_DIR=/usr/src/linux-${_kernver}
- make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
- make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo"
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
}
package_virtualbox() {
pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'linux-libre-headers' 'gcc' 'make')
+ depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
- 'virtualbox-sdk: developer kit')
+ 'virtualbox-sdk: developer kit'
+ 'virtualbox-source: host kernel source modules for non-stock kernels')
+ backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox-ose')
conflicts=('virtualbox-ose')
install=virtualbox.install
@@ -109,6 +108,20 @@ package_virtualbox() {
"$pkgdir/usr/share/licenses/virtualbox/LICENSE"
install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
"$pkgdir/lib/udev/rules.d/10-vboxdrv.rules"
+}
+
+package_virtualbox-source() {
+ pkgdesc="VirtualBox kernel modules source"
+ depends=(gcc make)
+ provides=(virtualbox-modules)
+ optdepends=('linux-headers'
+ 'kernel26-lts-headers')
+ install=virtualbox-source.install
+
+ source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
+ mkdir -p $pkgdir/usr/lib/virtualbox
+
+ cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
#sources for modules
cp -r src ${pkgdir}/usr/lib/virtualbox
@@ -117,7 +130,7 @@ package_virtualbox() {
}
package_virtualbox-sdk() {
- pkgdesc=" VirtualBox Software Developer Kit (SDK)"
+ pkgdesc="VirtualBox Software Developer Kit (SDK)"
depends=('python2')
mkdir -p "$pkgdir/usr/lib/virtualbox"
@@ -165,42 +178,12 @@ package_virtualbox-archlinux-additions(){
# install sample config
install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
}
-
-package_virtualbox-archlinux-modules(){
- pkgdesc="Additions only for Arch Linux guests (kernel modules)"
- license=('GPL')
- install=virtualbox-archlinux-modules.install
- depends=('linux-libre>=3.0' 'linux-libre<3.1')
- replaces=('virtualbox-guest-modules')
- conflicts=('virtualbox-guest-modules')
-
- source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src"
-
- install -D -m644 vboxguest.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko"
-
- install -D -m644 vboxsf.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko"
-
- install -D -m644 vboxvideo.ko \
- "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko"
-
- install -D -m 0644 "$srcdir/60-vboxguest.rules" \
- "$pkgdir/lib/udev/rules.d/60-vboxguest.rules"
-
- sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install"
-}
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'bc048d1e58d84ece4a186199ee48d4c8'
- '44efb3c4be214daa453a317d527f1f30'
- '32a232b43852b9a08cb11a7bcd64b347'
+md5sums=('89b979d1b817242c7cdcb489898f166a'
+ 'af534f713993eb077df26ff9a44fb080'
'5f85710e0b8606de967716ded7b2d351'
- 'ed1341881437455d9735875ddf455fbe'
- 'cc3f278bc273011aa95277500a76f677'
+ '6ab2455c391d8cc005e2f4461ae26a3b'
'78ffa67ff131680f1d2b6f06d4325c5b'
- 'dda3811f7d94ac55f12b4de707a7c2c2'
+ 'a82d698e7868315cdf876cfb02fd2268'
'97e193f050574dd272a38e5ee5ebe62b'
'3c08ad30b89add47d3f45121200a5360'
- '778d865e56e31cc592fbfa257fdcfce7')
+ 'e7416331d0bc331f3b5aae3e5d104642')
diff --git a/community/virtualbox/vbox-service.rc b/community/virtualbox/vbox-service.rc
index c1af2134d..6f1b8d892 100755
--- a/community/virtualbox/vbox-service.rc
+++ b/community/virtualbox/vbox-service.rc
@@ -11,13 +11,13 @@ case "$1" in
start)
stat_busy "Starting $name service"
[[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon $name; stat_done; } \
+ && { add_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
stop)
stat_busy "Stopping $name service"
[[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
+ && { rm_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
restart)
diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild
index 1058744c5..cfc3c0a66 100755
--- a/community/virtualbox/vboxbuild
+++ b/community/virtualbox/vboxbuild
@@ -29,7 +29,7 @@ if (( ${#MODLIST[*]} )); then
modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail
fi
-for kdir in /lib/modules/*; do
+for kdir in /lib/modules/[2-3]*; do
if [[ ! -d $kdir/kernel ]]; then
# found a stale kernel
mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch
index c310dbc8d..710e2e511 100644
--- a/community/virtualbox/vboxdrv-reference.patch
+++ b/community/virtualbox/vboxdrv-reference.patch
@@ -1,45 +1,57 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000
+@@ -75,10 +75,9 @@
"The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
"there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
"module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
-- "package first. This package keeps track of Linux kernel changes and "
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+ "as root. This package keeps track of Linux kernel changes and"
- "recompiles the vboxdrv kernel module if necessary."
+- "as root. If it is available in your distribution, you should install the "
+- "DKMS package first. This package keeps track of Linux kernel changes and "
+- "recompiles the vboxdrv kernel module if necessary."
++ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
++ "as root. If you don't use our stock kernel, install virtualbox-source and"
++ "execute /usr/bin/vboxbuild ."
);
-@@ -92,7 +91,7 @@
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+@@ -90,11 +89,8 @@
+
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
- "VirtualBox. The installation of VirtualBox was apparently not "
- "successful. Executing<br/><br/>"
+- "VirtualBox. The installation of VirtualBox was apparently not "
+- "successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+- "may correct this. Make sure that you do not mix the "
+- "OSE version and the PUEL version of VirtualBox."
++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
- "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
);
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
+
+ QString g_QStrHintOtherNoDriver = QApplication::tr(
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000
+@@ -32,17 +32,18 @@
+ cat << EOF
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+- load. Please recompile the kernel module and install it by
++ load. Please reinstall the kernel module virtualbox-modules or
++ if you don't use our stock kernel compile the modules with
- sudo /etc/init.d/vboxdrv setup
+ sudo /usr/bin/vboxbuild
You will not be able to start VMs until this problem is fixed.
EOF
-@@ -42,7 +42,7 @@
+ elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
+-WARNING: The character device /dev/vboxdrv does not exist. Try
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- sudo /etc/init.d/vboxdrv restart
-+ sudo /usr/bin/vboxbuild
++ sudo modprobe vboxdrv
and if that is not successful, try to re-install the package.
diff --git a/community/virtualbox/virtualbox-source.install b/community/virtualbox/virtualbox-source.install
new file mode 100644
index 000000000..24d90b1c2
--- /dev/null
+++ b/community/virtualbox/virtualbox-source.install
@@ -0,0 +1,12 @@
+post_install() {
+/bin/cat << EOF
+===> To compile the modules do /usr/bin/vboxbuild
+EOF
+
+}
+
+post_upgrade() {
+/bin/cat << EOF
+===> To recompile the modules do /usr/bin/vboxbuild
+EOF
+}
diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install
index 0eac014f2..c794b857d 100644
--- a/community/virtualbox/virtualbox.install
+++ b/community/virtualbox/virtualbox.install
@@ -14,35 +14,18 @@ utils() {
post_install() {
getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- /bin/cat << EOF
-
-===> In order to run VirtualBox, you have to be in the 'vboxusers' group.
-===>
-===> If you want to be able to install guest additions, you have to install
-===> 'virtualbox-additions' package.
-===>
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-===>
-===> For networking you must load vboxnetflt or vboxnetadp.
-===>
-===> For PCI passthrough support load vboxpci module.
-===>
-===> To load it automatically, add vboxdrv module
-===> to the MODULES array in /etc/rc.conf.
-
-*** To compile the modules do /usr/bin/vboxbuild ***
-
-EOF
- utils
+ utils
}
post_upgrade() {
getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
- /bin/cat << EOF
-*** To recompile the modules do /usr/bin/vboxbuild ***
+ utils
+ if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
+/bin/cat << EOF
+===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
+===> Use virtualbox-source package if you don't use our stock linux package.
EOF
- utils
+ fi
}
post_remove() {
diff --git a/core/btrfs-progs-unstable/PKGBUILD b/core/btrfs-progs-unstable/PKGBUILD
index 151a74ef0..54abc43eb 100644
--- a/core/btrfs-progs-unstable/PKGBUILD
+++ b/core/btrfs-progs-unstable/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 107578 2011-01-26 20:59:54Z tpowa $
+# $Id: PKGBUILD 142300 2011-11-08 06:06:06Z tomegun $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=btrfs-progs-unstable
pkgver=0.19.20101006
-pkgrel=1
+pkgrel=2
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64 'mips64el')
depends=('glibc' 'e2fsprogs')
diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
index fe80a4831..0b31f911e 100644
--- a/core/bzip2/PKGBUILD
+++ b/core/bzip2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 138504 2011-09-25 17:23:16Z dan $
-# Maintainer:
+# $Id: PKGBUILD 142378 2011-11-08 22:04:46Z ronald $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=bzip2
pkgver=1.0.6
-pkgrel=2
+pkgrel=3
pkgdesc="A high-quality data compression program"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
@@ -13,8 +13,8 @@ groups=('base')
depends=('glibc')
source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz
bzip2-1.0.4-bzip2recover.patch)
-md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b'
- '8a8bca02bdeaf2fd8913aeb549577e7e')
+sha1sums=('3f89f861209ce81a6bab1fd1998c0ef311712002'
+ '85ce76fdb67f52f152bba368c1de81132dcdbdb5')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD
index fbf548e76..b15505408 100644
--- a/core/cracklib/PKGBUILD
+++ b/core/cracklib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106685 2011-01-17 20:46:24Z tpowa $
+# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
pkgname=cracklib
pkgver=2.8.18
-pkgrel=1
+pkgrel=2
pkgdesc="Password Checking Library"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -20,6 +20,11 @@ build() {
make
}
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index f1683011e..1a3a9a8a6 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104009 2010-12-25 10:42:37Z allan $
+# $Id: PKGBUILD 142380 2011-11-08 22:04:59Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=e2fsprogs
pkgver=1.41.14
-pkgrel=1
+pkgrel=2
pkgdesc="Ext2/3/4 filesystem utilities"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'MIT')
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index aa147eaff..70aa978f1 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100083 2010-11-20 08:19:49Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 142351 2011-11-08 18:37:43Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gpm
pkgver=1.20.6
-pkgrel=6
+pkgrel=7
pkgdesc="A mouse server for the console and xterm"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.nico.schottelius.org/software/gpm/"
@@ -14,10 +14,10 @@ options=('!makeflags')
install=gpm.install
source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.bz2 \
gpm gpm.conf.d gpm.sh)
-md5sums=('6b534da16dc1b28ba828dea89e520f6f' '945ecde0836687e05c13ea837092ea6c'\
- 'f436a1277571f2ae8bfa9bf2ef32f7a5' 'e391fe4599ce102615f9cd449c380d41')
-sha1sums=('f3bb9272878b7934968381c8b25edab359114150' '19e1feb1493373512a77801699df012d186336ea'\
- '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9')
+sha1sums=('f3bb9272878b7934968381c8b25edab359114150'
+ '19e1feb1493373512a77801699df012d186336ea'
+ '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
+ '88fe5ff10916c68a87abc8418a56eb0073f69fa9')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 9cd958e8c..f9661d3f4 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 104541 2011-01-03 22:33:16Z tpowa $
+# $Id: PKGBUILD 142313 2011-11-08 10:57:28Z tpowa $
# Maintainer: judd <jvinet@zeroflux.org>
pkgname=groff
pkgver=1.21
-pkgrel=1
+pkgrel=2
pkgdesc="GNU troff text-formatting system"
arch=(i686 x86_64 'mips64el')
url="http://www.gnu.org/software/groff/groff.html"
@@ -13,7 +13,7 @@ optdepends=('netpbm: for use together with man -H command interaction in browser
'psutils: for use together with man -H command interaction in browsers')
source=(ftp://ftp.gnu.org/gnu/groff/groff-$pkgver.tar.gz
site.tmac)
-options=('!makeflags')
+options=(!makeflags !docs)
install=groff.install
md5sums=('8b8cd29385b97616a0f0d96d0951c5bf'
'a1fedafd7863b37968d32ad9ae1d8c13')
@@ -25,6 +25,11 @@ build() {
make
}
+check() {
+ cd $srcdir/$pkgname-$pkgver
+ make check
+}
+
package() {
cd $srcdir/$pkgname-$pkgver
make prefix=$pkgdir/usr install
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 2eabc228d..9731624f8 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 131999 2011-07-18 20:47:01Z ronald $
+# $Id: PKGBUILD 142382 2011-11-08 22:05:14Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
pkgver=2.6.39
-pkgrel=1
+pkgrel=2
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index 7c9351502..9894e02f8 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 107536 2011-01-26 17:38:04Z stephane $
+# $Id: PKGBUILD 142315 2011-11-08 10:57:52Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=iputils
pkgver=20101006
_traceroutever=1.4a12
-pkgrel=1
+pkgrel=2
pkgdesc="IP Configuration Utilities (and Ping)"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 5c761e2a2..5b450319c 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139639 2011-10-04 00:28:38Z eric $
+# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=net-tools
pkgver=1.60.20110819cvs
-pkgrel=1
+pkgrel=3
pkgdesc="Configuration tools for Linux networking"
arch=(i686 x86_64 'mips64el')
license=('GPL2')
diff --git a/core/procinfo-ng/PKGBUILD b/core/procinfo-ng/PKGBUILD
index 65e348f20..45fa85e68 100644
--- a/core/procinfo-ng/PKGBUILD
+++ b/core/procinfo-ng/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102696 2010-12-09 23:17:33Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 142353 2011-11-08 18:37:45Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
pkgname=procinfo-ng
pkgver=2.0.304
-pkgrel=2
+pkgrel=3
pkgdesc="Displays useful information from /proc"
arch=('i686' 'x86_64' 'mips64el')
url="http://procinfo-ng.sourceforge.net/"
@@ -13,10 +13,10 @@ depends=('ncurses' 'perl')
provides=('procinfo')
conflicts=('procinfo')
replaces=('procinfo')
-source=(http://downloads.sourceforge.net/project/procinfo-ng/procinfo-ng/2.0.304/${pkgname}-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/project/procinfo-ng/procinfo-ng/${pkgver}/${pkgname}-${pkgver}.tar.bz2
ftp://ftp.archlinux.org/other/procinfo-ng/procinfo-18.tar.gz)
-md5sums=('ed018fe37becc36ceb1ebe3ed909c4d2' '27658d0a69040aca05a65b9888599d50')
-sha1sums=('da2176a505bcdf65c4eadcf5a2e056fb7a3f84af' '8bc75669cbd27775c3a837209425c5ce76238ebc')
+sha1sums=('da2176a505bcdf65c4eadcf5a2e056fb7a3f84af'
+ '8bc75669cbd27775c3a837209425c5ce76238ebc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 15ab470d2..44a8705ca 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 141114 2011-10-24 09:59:24Z dreisner $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
+# $Id: PKGBUILD 142408 2011-11-09 04:55:56Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# Contributor: Thomas Bächler <thomas@archlinux.org>
pkgbase="udev"
pkgname=('udev' 'udev-compat')
-pkgver=174
+pkgver=175
pkgrel=1
arch=(i686 x86_64 mips64el)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -15,7 +15,7 @@ groups=('base')
options=(!makeflags !libtool)
makedepends=('gobject-introspection' 'gperf')
#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
-source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
+source=(http://people.freedesktop.org/~kay/udev/$pkgbase-$pkgver.tar.bz2
81-arch.rules)
build() {
@@ -102,5 +102,5 @@ package_udev-compat() {
# /dev/ppp
mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
}
-md5sums=('3b84706046a33d7a7e00491a1136804d'
+md5sums=('2fc9c1efcbde98e3d73ffee7a77aea47'
'3da2bb9891592f9438a07bd641465531')
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index 922f4dc7b..960565cad 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100106 2010-11-20 11:19:34Z pierre $
+# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributer: Jason Chu <jchu@xentac.net>
pkgname=wireless_tools
pkgver=29
-pkgrel=4
+pkgrel=5
pkgdesc="Wireless Tools"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 8af53c3d5..73b0cd341 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 141068 2011-10-23 03:27:31Z bisson $
+# $Id: PKGBUILD 142398 2011-11-09 01:26:09Z bisson $
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=audacious
-pkgver=3.0.4
+pkgver=3.1
pkgrel=1
pkgdesc='Lightweight, GTK-based advanced audio player focused on audio quality'
url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'libmcs' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
optdepends=('p7zip-libre: zipped skins support')
source=("http://distfiles.atheme.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('d4bb828e4ead275bded85cf8b0aa258c347106cb')
+sha1sums=('53d89b3e2faf5ca13dca55875dc04efc753328f2')
provides=('audacious-player')
replaces=('audacious-player')
diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD
new file mode 100644
index 000000000..a5dbd1c25
--- /dev/null
+++ b/extra/bin86/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+
+pkgname=bin86
+pkgver=0.16.18
+pkgrel=3
+pkgdesc="A complete 8086 assembler and loader"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.debath.co.uk/"
+depends=('glibc')
+source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz"
+ bin86-0.16.17-x86_64-1.patch)
+md5sums=('914068fb649b93642d1cf21857b75699'
+ '92bdce7b0655cd2e9f83c83fc56d128e')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ if [[ $CARCH = x86_64 ]]; then
+ patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
+ fi
+
+ make PREFIX=/usr
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
+ make "PREFIX=$pkgdir/usr" "MANDIR=$pkgdir/usr/share/man/man1" install
+}
diff --git a/extra/bin86/bin86-0.16.17-x86_64-1.patch b/extra/bin86/bin86-0.16.17-x86_64-1.patch
new file mode 100644
index 000000000..152413ee7
--- /dev/null
+++ b/extra/bin86/bin86-0.16.17-x86_64-1.patch
@@ -0,0 +1,44 @@
+Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
+Date: 2005-06-28
+Initial Package Version: 0.16.14
+Upstream Status: Submitted Upstream
+Origin: from ROCK Linux
+Description: Allows bin86 to compile on x86_64, which permits lilo to
+ be used in a 64-bit system. I'm dubious about ROCK's attempts to
+ automatically add dual-licensing to all their patches, but bin86 is
+ already GPL'd. I've heard from the maintainer that this will be
+ included in the next upload.
+
+
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+#
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+#
+# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
+# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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.
+#
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
+--- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100
++++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
+@@ -12,6 +12,9 @@
+ #if defined(i386) || defined(__BCC__) || defined(MSDOS)
+ typedef long Long;
+ #define __OUT_OK 1
++#elif defined(__x86_64__)
++typedef int Long;
++#define __OUT_OK 1
+ #else
+ typedef char Long[4];
+ #endif
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 108ed61d8..82955938d 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 141726 2011-11-02 15:25:43Z dan $
+# $Id: PKGBUILD 142406 2011-11-09 04:33:51Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.7.7.2
+pkgver=1.7.7.3
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -80,11 +80,11 @@ package() {
install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
}
-md5sums=('400d85fd17bdb7f8923dbf3b3a2ca671'
- '24e2d2b6c3f97102f7b79e05c165fd22'
+md5sums=('da2b3c226d8e99d8f66e708129f57a0a'
+ 'f801b4c7b2c9dea7c0ff969f4acaa12c'
'8e2648910fd5dd4f1c41d3c7fa9e9156'
'2e42bf97779a1c6411d89043334c9e78')
-sha256sums=('b309c172b63636bb746ded2771536cb5b2efdfa011511d81783e87950c665260'
- '8a80657b6095b10d0f9db9707de6d02c38e364a5ccf25ee94edb4daa4c27c755'
+sha256sums=('dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100'
+ '62bec01d704d3495fcf66a3b97a8fb7c337a06202784fa7a7fa510360e79671f'
'2e0a50bdaf8f387a499895e1c204bff78244eaa72b78187c8a84ef40c0b82598'
'e8bfe29d8393d2b87517c4dd56ea834b213aa00bf3d7fcde4ead3457cadbbc68')
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index a78b96d08..ebb9bf7df 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 141300 2011-10-28 13:49:24Z andyrtr $
+# $Id: PKGBUILD 142365 2011-11-08 21:23:02Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnutls
-pkgver=3.0.5
+pkgver=3.0.7
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool' '!zipman')
depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit')
[ "$CARCH" = "mips64el" ] || makedepends=('valgrind')
source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz)
-md5sums=('c2d4e6344974545c228a1df2147bf334')
+md5sums=('840c96c75817c0f800a47805e275db7e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index 953d1533b..26f7397c1 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -2,34 +2,24 @@
# Contributor: Martin Striz <ms@poruba.net>
pkgname=irqbalance
-pkgver=0.56
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
pkgdesc="IRQ balancing daemon for SMP systems"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.irqbalance.org/"
+url="http://code.google.com/p/irqbalance"
license=('GPL')
-depends=(glib2)
+depends=(glib2 numactl libcap-ng)
makedepends=(pkgconfig)
backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tbz2
+source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
irqbalance.conf.d
- irqbalance.rc.d
- current-trunk.patch
- Fix-detection-of-CPUs-in-sysfs.patch
- Special-interrupt-counts-line-NMI-may-start-with-a-s.patch)
-md5sums=('cd0c4d3b2bb84778a04fc594ad83949a'
+ irqbalance.rc.d)
+md5sums=('58e1c9c164b12d797b500634a73938b4'
'336c1ee99818f9ecda1687e34c69fd6b'
- 'fb82fc5d267d39110baf720d81282a7c'
- '64df09f54cf80d9ce5ff2751a882032d'
- '00dcb394dac884c116657ade4fe623ee'
- 'e774aff57054ce3c8b5adc7c3e5a74c2')
+ 'fb82fc5d267d39110baf720d81282a7c')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -Np0 < ../current-trunk.patch
- patch -Np1 < ../Fix-detection-of-CPUs-in-sysfs.patch
- patch -Np1 < ../Special-interrupt-counts-line-NMI-may-start-with-a-s.patch
- ./autogen.sh
./configure --prefix=/usr
make
}
@@ -37,8 +27,6 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
make install DESTDIR="$pkgdir"
- #install -D -m755 irqbalance $pkgdir/usr/sbin/irqbalance
- #install -D -m644 irqbalance.1 $pkgdir/usr/share/man/man1/irqbalance.1
install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance
install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance
}
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD
index 0a10e033f..502905d48 100644
--- a/extra/lirc/PKGBUILD
+++ b/extra/lirc/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $
+# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $
# Maintainer: Paul Mattal <paul@archlinux.org>
pkgbase=lirc
pkgname=('lirc' 'lirc-utils')
pkgver=0.9.0
-pkgrel=6
+pkgrel=8
epoch=1
-_kernver=3.0-LIBRE
+_extramodules=extramodules-3.1-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lirc.org/"
license=('GPL')
-makedepends=('help2man' 'linux-libre-headers>=3.0' 'linux-libre-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python')
+makedepends=('help2man' 'linux-libre-headers>=3.1' 'linux-libre-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
@@ -60,15 +61,15 @@ build() {
package_lirc() {
pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel"
- depends=('lirc-utils' 'linux-libre>=3.0' 'linux-libre<3.1')
+ depends=('lirc-utils' 'linux-libre>=3.1' 'linux-libre<3.2')
replaces=('lirc+pctv')
install=lirc.install
cd "${srcdir}/lirc-${pkgver}/drivers"
- make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install
# set the kernel we've built for inside the install script
- sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install"
+ sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install"
# gzip -9 modules
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
}
diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install
index 0d42e8a5c..1e7c4f4a1 100644
--- a/extra/lirc/lirc.install
+++ b/extra/lirc/lirc.install
@@ -1,9 +1,9 @@
-KERNEL_VERSION=3.0-ARCH
+EXTRAMODULES=extramodules-3.1-ARCH
post_install() {
# updating module dependencies
echo ">>> Updating module dependencies. Please wait ..."
- depmod $KERNEL_VERSION > /dev/null 2>&1
+ depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1
}
post_upgrade() {
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
new file mode 100644
index 000000000..0565cdc08
--- /dev/null
+++ b/extra/numactl/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Dan McGee <dan@archlinux.org>
+# Contributor: Florian Zeitz <florob at babelmonkeys dot de>
+
+pkgname=numactl
+pkgver=2.0.7
+pkgrel=2
+pkgdesc="Simple NUMA policy support"
+arch=('i686' 'x86_64')
+url="http://oss.sgi.com/projects/libnuma/"
+license=('LGPL2.1' 'GPL2')
+depends=('perl')
+source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz)
+sha1sums=('dfdf539da65d1e880f04202071c139c4d2ba2da9')
+
+build() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-${pkgver/_/-}"
+ make prefix="$pkgdir/usr" libdir="$pkgdir/usr/lib" install
+ rmdir $pkgdir/usr/share/man/man2
+}
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 9ed0088fc..29c8f035a 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131846 2011-07-16 03:10:20Z eric $
+# $Id: PKGBUILD 142306 2011-11-08 07:15:40Z angvp $
# Maintainer:
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
@@ -6,34 +6,36 @@
pkgbase=ruby
pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.2_p290
+pkgver=1.9.3_p0
pkgrel=1
pkgdesc="An object-oriented language for quick and easy programming"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.ruby-lang.org/en/"
-license=('custom')
-makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz')
+license=('BSD' 'custom')
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
[ "$CARCH" = "mips64el" ] && \
-makedepends=('openssl' 'tk' 'libffi' 'doxygen')
-options=('!emptydirs')
-source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
+makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'libyaml')
+options=('!emptydirs' '!makeflags')
+source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
+sha1sums=('f63c116411b981ef54c2caeefb9ccc4d71a5d2cf')
build() {
cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
- ./configure --prefix=/usr --sysconfdir=/etc \
+ DOXYGEN=/usr/bin/doxygen PKG_CONFIG=/usr/bin/pkg-config ./configure --prefix=/usr --sysconfdir=/etc \
--enable-shared --enable-pthread --disable-rpath
make
}
package_ruby() {
- depends=('openssl' 'libffi')
+ depends=('openssl' 'libffi' 'libyaml')
provides=('rubygems' 'rake')
conflicts=('rake')
optdepends=('tk: for Ruby/TK')
cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install-nodoc
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
}
package_ruby-docs() {
@@ -41,6 +43,7 @@ package_ruby-docs() {
cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
make DESTDIR="${pkgdir}" install-doc install-capi
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -D -m644 BSDL "${pkgdir}/usr/share/licenses/${pkgname}/BSDL"
}
md5sums=('096758c3e853b839dc980b183227b182')
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index f78aa084d..1f1d56a16 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 139439 2011-10-01 19:01:33Z ibiru $
+# $Id: PKGBUILD 142337 2011-11-08 15:59:23Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Daniel Balieiro <daniel@balieiro.com>
# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
pkgname=telepathy-gabble
-pkgver=0.12.7
+pkgver=0.14.0
pkgrel=1
pkgdesc="A Jabber/XMPP connection manager for Telepathy"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('libxslt' 'python2')
options=('!libtool')
source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
install=telepathy-gabble.install
-md5sums=('3518db585403a6cf93ba253200acc5e7')
+md5sums=('73afa5533833d176b9b82b96351efe63')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 476f33695..7dbe378d8 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 141174 2011-10-25 11:30:46Z ibiru $
+# $Id: PKGBUILD 142317 2011-11-08 12:30:16Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
pkgname=telepathy-glib
-pkgver=0.16.1
+pkgver=0.16.2
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64' 'mips64el')
url="http://telepathy.freedesktop.org"
-groups=('telepathy')
license=('LGPL2.1')
options=('!libtool' '!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('22dd16bdf4f987c602c719a1efc3d268')
+md5sums=('c05e48da72f013cec86ca8a05da71ffd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index 348ed04ad..dfc000ed5 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 140177 2011-10-08 12:03:11Z ibiru $
+# $Id: PKGBUILD 142335 2011-11-08 15:59:21Z ibiru $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Ju Liu <liuju86 at gmail dot com>
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
# Contributor: Andreas Zwinkau <beza1e1@web.de>
pkgname=telepathy-mission-control
-pkgver=5.9.3
+pkgver=5.10.1
pkgrel=1
pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
arch=('i686' 'x86_64' 'mips64el')
@@ -12,15 +12,17 @@ url="http://telepathy.freedesktop.org/wiki/Mission Control"
license=('LGPL2.1')
depends=('telepathy-glib' 'libgnome-keyring')
makedepends=('libxslt' 'python2')
+install=telepathy-mission-control.install
options=('!libtool')
source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('15fc8e560bc67a86393a3138d7ac38e3')
+md5sums=('50594028ebb2dba0181fec99e6f56ff5')
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--libexecdir=/usr/lib/telepathy \
- --enable-gnome-keyring
+ --enable-gnome-keyring \
+ --disable-schemas-compile
make
}
diff --git a/extra/telepathy-mission-control/telepathy-mission-control.install b/extra/telepathy-mission-control/telepathy-mission-control.install
new file mode 100644
index 000000000..c25dff2d3
--- /dev/null
+++ b/extra/telepathy-mission-control/telepathy-mission-control.install
@@ -0,0 +1,11 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index 5a989a09e..cd83d4046 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140768 2011-10-18 23:20:38Z eric $
+# $Id: PKGBUILD 142404 2011-11-09 04:16:54Z eric $
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Maintainer: tobias [ tobias at archlinux org ]
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,19 +6,19 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.3
-_patchlevel=338
-__hgrev=f530aef0d959
+_patchlevel=353
+__hgrev=379a6398d462
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom:vim')
url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2')
+makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz
pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872
vimrc archlinux.vim gvim.desktop)
-md5sums=('fc83d6580fd8441793fccfd26487aadb'
+md5sums=('3a7fb107699b741a7a1a86ff5ec3b83e'
'6e7adfbd5d26c1d161030ec203a7f243'
'e57777374891063b9ca48a1fe392ac05'
'10353a61aadc3f276692d0e17db1478e'
@@ -73,7 +73,7 @@ build() {
--with-features=big --enable-gpm --enable-acl --with-x=no \
--disable-gui --enable-multibyte --enable-cscope \
--disable-netbeans --enable-perlinterp --disable-pythoninterp \
- --disable-rubyinterp
+ --disable-rubyinterp --disable-luainterp
make
@@ -84,7 +84,7 @@ build() {
--with-features=big --enable-gpm --enable-acl --with-x=yes \
--enable-gui=gtk2 --enable-multibyte --enable-cscope \
--enable-netbeans --enable-perlinterp --enable-pythoninterp \
- --enable-python3interp --enable-rubyinterp
+ --enable-python3interp --enable-rubyinterp --enable-luainterp
make
}
@@ -119,7 +119,7 @@ package_vim() {
package_gvim() {
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
- 'desktop-file-utils' 'gtk2')
+ 'desktop-file-utils' 'gtk2' 'lua')
provides=("vim=${pkgver}-${pkgrel}")
conflicts=('vim')
install=gvim.install
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index b39be4f56..53196d886 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,51 +1,51 @@
-# $Id: PKGBUILD 138761 2011-09-27 20:42:01Z ibiru $
+# $Id: PKGBUILD 142354 2011-11-08 18:38:40Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xulrunner
-pkgver=7.0
-_ffoxver=7.0
-pkgrel=1
-pkgver=2.0
-pkgrel=2 # hold ver
+pkgver=8.0
+_ffoxver=8.0
+pkgrel=2
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
+depends=('gtk2' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=(http://ftp.gnu.org/gnu/gnuzilla/${_ffoxver}/icecat-${_ffoxver}.tar.xz
mozconfig
mips.patch
mozilla-pkgconfig.patch)
-options=('!emptydirs' '!buildflags')
+options=('!emptydirs')
replaces=('xulrunner-oss')
+md5sums=('9395a5be13da119bd8d53c3225e5d17c'
+ '8dfb78c5bd0581c8cf4753813132bf0b'
+ '639ea80e823543dd415b90c0ee804186')
build() {
- cd "${srcdir}/icecat-${_ffoxver}/"
- cp "${srcdir}/mozconfig" .mozconfig
-
- #fix libdir/sdkdir - fedora
+ cd "$srcdir/mozilla-release"
+ cp "$srcdir/mozconfig" .mozconfig
[[ "$CARCH" == "mips64el" ]] && {
echo "ac_add_options --disable-ipc" >> .mozconfig
patch -Np0 -i "${srcdir}/mips.patch"
}
- patch -Np1 -i "${srcdir}/mozilla-pkgconfig.patch"
- export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
+ #fix libdir/sdkdir - fedora
+ patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
+
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner"
make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
}
package() {
- cd "${srcdir}/icecat-${_ffoxver}/"
- make -j1 -f client.mk DESTDIR="${pkgdir}" install
+ cd "$srcdir/mozilla-release"
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
# add xulrunner library path to ld.so.conf
- install -d ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/xulrunner.conf
+ install -d $pkgdir/etc/ld.so.conf.d
+ echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
- #wtf mozilla!
chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
+ sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
}
diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig
index 96e8a6bd9..82a6ae512 100644
--- a/extra/xulrunner/mozconfig
+++ b/extra/xulrunner/mozconfig
@@ -2,6 +2,8 @@
ac_add_options --prefix=/usr
ac_add_options --libdir=/usr/lib
+
+# System libraries
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
@@ -9,47 +11,28 @@ ac_add_options --with-system-zlib
ac_add_options --with-system-bz2
ac_add_options --with-system-png
ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
ac_add_options --enable-system-hunspell
ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
ac_add_options --with-pthreads
-ac_add_options --enable-default-toolkit=cairo-gtk2
+# Features
ac_add_options --enable-safe-browsing
-ac_add_options --enable-extensions=default
ac_add_options --enable-startup-notification
-ac_add_options --enable-pango
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-smil
-ac_add_options --enable-canvas3d
-ac_add_options --enable-places
-ac_add_options --enable-shared-js
-ac_add_options --enable-url-classifier
-
-ac_add_options --enable-optimize
-ac_add_options --enable-strip
-ac_add_options --enable-install-strip
-ac_add_options --enable-jemalloc
-ac_add_options --enable-xterm-updates
-ac_add_options --enable-printing
-ac_add_options --enable-xinerama
+ac_add_options --enable-gio
-ac_add_options --disable-javaxpcom
+ac_add_options --disable-gnomevfs
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
-ac_add_options --disable-xprint
ac_add_options --disable-mochitest
-ac_add_options --disable-debug
ac_add_options --disable-installer
-ac_add_options --disable-pedantic
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
+# Optimization
+ac_add_options --enable-optimize
-export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1
diff --git a/staging/koffice/PKGBUILD b/staging/koffice/PKGBUILD
new file mode 100644
index 000000000..8a01a346e
--- /dev/null
+++ b/staging/koffice/PKGBUILD
@@ -0,0 +1,306 @@
+# $Id: PKGBUILD 142363 2011-11-08 21:20:27Z ronald $
+# 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=10
+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' 'libkdcraw' 'oxygen-icons' 'wv2')
+groups=('koffice')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+ 'kde4-koffice-libwpg02.patch' 'gcc46.patch' 'qt48fix.patch')
+sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
+ '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
+ 'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739'
+ 'a20d7412ceeefdf7987b1c5179a740c7ee188e314ffb94cc226967ee194bc2aa')
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+ patch -p1 -i "${srcdir}"/gcc46.patch
+ patch -p1 -i "${srcdir}"/qt48fix.patch
+
+ cd "${srcdir}"
+ mkdir build
+ 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"
+ depends=('shared-mime-info')
+ optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
+ 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
+ 'libkdcraw: support for raw images' 'poppler: support for pdf'
+ 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters'
+ 'koffice-kplato: Kplato filters')
+ install=filters.install
+ cd "${srcdir}/build/filters"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_koffice-interfaces(){
+ pkgdesc="Interfaces for the KDE office suite"
+ depends=('koffice-libs')
+ cd "${srcdir}/build/interfaces"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_koffice-libs(){
+ pkgdesc="Libs for the KDE office suite"
+ depends=('kdepimlibs' '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"
+ depends=('desktop-file-utils' 'xdg-utils')
+ 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' 'oxygen-icons')
+ 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=('koffice-libs' 'koffice-templates' 'oxygen-icons')
+ 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=('koffice-kspread' 'oxygen-icons')
+ install=koffice.install
+ 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=('koffice-libs')
+ install=koffice.install
+ 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=('koffice-libs')
+ cd "${srcdir}/build/kounavail"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_koffice-kplato(){
+ pkgdesc="Project management application for KDE"
+ depends=('koffice-kword' 'oxygen-icons')
+ 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=('koffice-libs' 'koffice-templates' 'oxygen-icons')
+ 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=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \
+ 'koffice-plugins' 'poppler-qt' 'opengtl')
+ optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images')
+ 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=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons')
+ 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=('koffice-templates' 'koffice-pics' 'oxygen-icons' \
+ 'koffice-kounavail' 'koffice-plugins' 'wv2')
+ 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/staging/koffice/filters.install b/staging/koffice/filters.install
new file mode 100644
index 000000000..7c8a8bd2b
--- /dev/null
+++ b/staging/koffice/filters.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/staging/koffice/gcc46.patch b/staging/koffice/gcc46.patch
new file mode 100644
index 000000000..dcf8a4f85
--- /dev/null
+++ b/staging/koffice/gcc46.patch
@@ -0,0 +1,23 @@
+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/staging/koffice/kde4-koffice-libwpg02.patch b/staging/koffice/kde4-koffice-libwpg02.patch
new file mode 100644
index 000000000..e2a55a216
--- /dev/null
+++ b/staging/koffice/kde4-koffice-libwpg02.patch
@@ -0,0 +1,1323 @@
+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/staging/koffice/koffice.install b/staging/koffice/koffice.install
new file mode 100644
index 000000000..6c87527e2
--- /dev/null
+++ b/staging/koffice/koffice.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/staging/koffice/krita.install b/staging/koffice/krita.install
new file mode 100644
index 000000000..5d458de55
--- /dev/null
+++ b/staging/koffice/krita.install
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/staging/koffice/qt48fix.patch b/staging/koffice/qt48fix.patch
new file mode 100644
index 000000000..de72926d5
--- /dev/null
+++ b/staging/koffice/qt48fix.patch
@@ -0,0 +1,10 @@
+--- koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-02-17 13:10:38.000000000 +0100
++++ koffice-2.3.3/plugins/chartshape/kdchart/src/KDChartBackgroundAttributes.cpp 2011-09-08 15:03:31.932039128 +0200
+@@ -150,7 +150,6 @@ QDebug operator<<(QDebug dbg, const KDCh
+ << "visible="<<ba.isVisible()
+ << "brush="<<ba.brush()
+ << "pixmapmode="<<ba.pixmapMode()
+- << "pixmap="<<ba.pixmap()
+ << ")";
+ return dbg;
+ }
diff --git a/staging/tumbler/PKGBUILD b/staging/tumbler/PKGBUILD
new file mode 100644
index 000000000..f4be09220
--- /dev/null
+++ b/staging/tumbler/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 142309 2011-11-08 07:29:50Z eric $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Jan Jezek <honzin.jezek@gmail.com>
+
+pkgname=tumbler
+pkgver=0.1.22
+pkgrel=4
+pkgdesc="D-Bus service for applications to request thumbnails"
+url="http://git.xfce.org/xfce/tumbler/"
+license=('GPL2' 'LGPL')
+arch=('i686' 'x86_64')
+groups=('xfce4')
+depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2')
+makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10')
+optdepends=('ffmpegthumbnailer: for video thumbnails'
+ 'gstreamer0.10: for video thumbnails')
+options=('!libtool')
+source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+ fix-video-image.patch)
+md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9'
+ 'be9b0f1c3a4b0be102774c84d5ac29e6')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../fix-video-image.patch
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/xfce4 \
+ --disable-static \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/tumbler/fix-video-image.patch b/staging/tumbler/fix-video-image.patch
new file mode 100644
index 000000000..11c9d867b
--- /dev/null
+++ b/staging/tumbler/fix-video-image.patch
@@ -0,0 +1,34 @@
+From aab140d868c1ebedbb04bbd65deddf94dc21787b Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis@xfce.org>
+Date: Mon, 26 Sep 2011 17:28:51 +0000
+Subject: Fix generation of video images by starting the pipeline (bug #7996).
+
+Patch provided by Sam Thursfield<ssssam@gmail.com>.
+---
+diff --git a/NEWS b/NEWS
+index 0ff1c1c..48e3896 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,7 @@
++0.1.xx
++======
++- Fix generation of video images by starting the pipeline (bug #7996).
++
+ 0.1.22
+ ======
+ - Add coding style documentation.
+diff --git a/plugins/gst-thumbnailer/gst-helper.c b/plugins/gst-thumbnailer/gst-helper.c
+index b8a29ab..dead043 100644
+--- a/plugins/gst-thumbnailer/gst-helper.c
++++ b/plugins/gst-thumbnailer/gst-helper.c
+@@ -154,6 +154,8 @@ gst_helper_convert_buffer_to_pixbuf (GstBuffer *buffer,
+
+ bus = gst_element_get_bus (GST_ELEMENT (pipeline));
+
++ gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
++
+ i = 0;
+ msg = NULL;
+ while (msg == NULL && i < 5)
+--
+cgit
diff --git a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
new file mode 100644
index 000000000..4420d0b63
--- /dev/null
+++ b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
@@ -0,0 +1,33 @@
+From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
+From: Dan McGee <dan@archlinux.org>
+Date: Sun, 19 Jun 2011 16:04:25 -0500
+Subject: [PATCH] Set hostname via /proc if file is available
+
+On Linux, the hostname can be set via this file if available, precluding
+the need for a `hostname` binary.
+
+Signed-off-by: Dan McGee <dan@archlinux.org>
+---
+ dhcpcd-hooks/30-hostname | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
+index 65d1a13..af94262 100644
+--- a/dhcpcd-hooks/30-hostname
++++ b/dhcpcd-hooks/30-hostname
+@@ -21,7 +21,11 @@ need_hostname()
+ try_hostname()
+ {
+ if valid_domainname "$1"; then
+- hostname "$1"
++ if [ -w /proc/sys/kernel/hostname ]; then
++ echo "$1" > /proc/sys/kernel/hostname
++ else
++ hostname "$1"
++ fi
+ else
+ syslog err "Invalid hostname: $1"
+ fi
+--
+1.7.5.4
+
diff --git a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
new file mode 100644
index 000000000..7e78ecd0d
--- /dev/null
+++ b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
@@ -0,0 +1,61 @@
+From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <d@falconindy.com>
+Date: Tue, 21 Jun 2011 09:32:47 -0400
+Subject: [PATCH] set MTU via sysfs if file is available
+
+On Linux, a network interface's MTU can be set by writing to
+/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
+
+Signed-off-by: Dave Reisner <d@falconindy.com>
+---
+ dhcpcd-hooks/10-mtu | 4 ++--
+ dhcpcd-run-hooks.in | 11 +++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
+index 639697c..8763930 100644
+--- a/dhcpcd-hooks/10-mtu
++++ b/dhcpcd-hooks/10-mtu
+@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
+ elif [ -n "$new_interface_mtu" ] && $if_up; then
+ # The smalled MTU dhcpcd can work with is 576
+ if [ "$new_interface_mtu" -ge 576 ]; then
+- if ifconfig "$interface" mtu "$new_interface_mtu"; then
++ if set_mtu "$interface" "$new_interface_mtu"; then
+ syslog info "$interface: MTU set to $new_interface_mtu"
+ # Save the MTU so we can restore it later
+ if [ ! -e "$mtu_dir/$interface" ]; then
+@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
+ # No MTU in this state, so restore the prior MTU
+ mtu=$(cat "$mtu_dir/$interface")
+ syslog info "$interface: MTU restored to $mtu"
+- ifconfig "$interface" mtu "$mtu"
++ set_mtu "$interface" "$mtu"
+ rm "$mtu_dir/$interface"
+ fi
+ fi
+diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
+index 0e60338..843f3ca 100644
+--- a/dhcpcd-run-hooks.in
++++ b/dhcpcd-run-hooks.in
+@@ -215,6 +215,17 @@ service_condcommand()
+ service_exists $1 && service_status $1 && service_cmd $1 $2
+ }
+
++# Set MTU for an interface
++set_mtu() {
++ local interface=$1 mtu=$2
++
++ if [ -e /sys/class/net/$interface/mtu ]; then
++ echo "$mtu" > /sys/class/net/$interface/mtu
++ else
++ ifconfig "$interface" mtu "$mtu"
++ fi
++}
++
+ # We source each script into this one so that scripts run earlier can
+ # remove variables from the environment so later scripts don't see them.
+ # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
+--
+1.7.5.4
+
diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD
index 422486a8e..11da0f20b 100644
--- a/testing/dhcpcd/PKGBUILD
+++ b/testing/dhcpcd/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 142023 2011-11-04 06:51:06Z ronald $
+# $Id: PKGBUILD 142367 2011-11-08 21:52:38Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
pkgver=5.2.12
-pkgrel=3
+pkgrel=4
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/dhcpcd/"
arch=('i686' 'x86_64')
license=('BSD')
groups=('base')
-depends=('glibc' 'sh' 'inetutils' 'iproute2')
+depends=('glibc' 'sh')
backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
- 'dhcpcd.conf.d' 'remove_ifconfig.patch')
+ 'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \
+ '0001-set-MTU-via-sysfs-if-file-is-available.patch')
sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5'
'b67b9ce6a2faaca75fea356966a16be2283b7db0'
- 'de3e14a24b479b2832c6671ba12586444bd86ebe')
+ 'ee85adac972a8172a9d9b3a1bdd46e0430301582'
+ 'afbed18dc5544f7d0b81e2266b322ca12becf9a4')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- # remove ifconfig call but use ip (iproute2) instead
- patch -Np0 -i ${srcdir}/remove_ifconfig.patch
+ # remove net-tools dep
+ patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch
+ patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch
# configure variables
./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
index 97d25fe08..7a777824e 100644
--- a/testing/ffmpeg/PKGBUILD
+++ b/testing/ffmpeg/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 142121 2011-11-05 11:37:18Z ibiru $
+# $Id: PKGBUILD 142324 2011-11-08 15:16:14Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=20111105
+pkgver=20111108
pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
arch=('i686' 'x86_64')
url="http://ffmpeg.org/"
license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
+depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump' 'speex' 'gsm')
makedepends=('yasm' 'git')
#git clone git://git.videolan.org/ffmpeg.git
source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('d1889c07a929cd0efaf7f486ff2f55e0')
+md5sums=('bad7e47f6974cee62d98ce9de710076c')
build() {
cd "$srcdir/$pkgname"
@@ -27,6 +27,8 @@ build() {
--enable-libx264 \
--enable-libvpx \
--enable-libtheora \
+ --enable-libgsm \
+ --enable-libspeex \
--enable-postproc \
--enable-shared \
--enable-x11grab \
diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD
new file mode 100644
index 000000000..c6297290a
--- /dev/null
+++ b/~brendan/guile/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Brendan Tildesley <brendan.tildesley@gmail.com>
+pkgname=guile
+pkgver=2.0.3
+pkgrel=1
+pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - portable Scheme implementation written in C."
+url="http://www.gnu.org/software/guile/"
+license=('GPL3' 'LGPL3')
+arch=(i686 x86_64 mips64el)
+depends=('gmp>=4.1' 'libtool' 'gettext' 'libunistring' 'gc' 'libffi')
+builddepends=('pkgconfig')
+install=guile.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+sha1sums=('4fde55bbd612adda267420d86d8b395d49031809')
+# I think .xz is only provided for latest release, so change to .gz if it vanishes
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr \
+ --disable-static \
+ --disable-error-on-warning
+ make LDFLAGS+="-lpthread"
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+} \ No newline at end of file
diff --git a/~brendan/guile/guile.install b/~brendan/guile/guile.install
new file mode 100644
index 000000000..ed113ab8f
--- /dev/null
+++ b/~brendan/guile/guile.install
@@ -0,0 +1,23 @@
+infodir=usr/share/info
+filelist=(guile.info
+ r5rs.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~brendan/libunistring/PKGBUILD b/~brendan/libunistring/PKGBUILD
new file mode 100644
index 000000000..634195741
--- /dev/null
+++ b/~brendan/libunistring/PKGBUILD
@@ -0,0 +1,27 @@
+# Former Arch maintainer: Emmanuel 'guinness' Boudreault
+# Current Arch maintainer: Patrick McCarty <pnorcks at gmail dot com>
+# Parabola maintainer: Brendan Tildesley <brendan.tildesley@gmail.com>
+
+pkgname=libunistring
+pkgver=0.9.3
+pkgrel=1
+pkgdesc="GNU library for manipulating Unicode strings and C strings."
+url="http://www.gnu.org/software/libunistring/"
+arch=('i686' 'x86_64')
+license=('GPL3' 'LGPL3')
+depends=('glibc')
+install=${pkgname}.install
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('db8eca3b64163abadf8c40e5cecc261f')
+sha256sums=('610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr || return 1
+ make || return 1
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install || return 1
+} \ No newline at end of file
diff --git a/~brendan/libunistring/libunistring.install b/~brendan/libunistring/libunistring.install
new file mode 100644
index 000000000..58dd2ef8e
--- /dev/null
+++ b/~brendan/libunistring/libunistring.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(libunistring.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et: