summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-03-14 00:05:24 -0700
committerroot <root@rshg054.dnsready.net>2013-03-14 00:05:24 -0700
commit3ff20dedff636571ad0faa4736af5b23e4623ffe (patch)
treeab4a70fe4e4a9113ff3483d8635eb46f8994c12a
parent3efd178c050d911cfdff7e8d2ed4886b98b08b98 (diff)
Thu Mar 14 00:05:23 PDT 2013
-rw-r--r--community/fcitx/PKGBUILD19
-rw-r--r--community/gpsdrive/PKGBUILD4
-rw-r--r--community/gsmartcontrol/PKGBUILD33
-rw-r--r--community/gsmartcontrol/gsmartcontrol.install5
-rw-r--r--community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy4
-rw-r--r--community/haveged/PKGBUILD16
-rw-r--r--community/i3-wm/PKGBUILD14
-rw-r--r--community/libvirt/PKGBUILD8
-rwxr-xr-xcommunity/lightdm-gtk2-greeter/PKGBUILD40
-rwxr-xr-xcommunity/lightdm-gtk2-greeter/onscreen-keyboard.patch306
-rwxr-xr-xcommunity/lightdm-gtk3-greeter/PKGBUILD40
-rwxr-xr-xcommunity/lightdm-gtk3-greeter/onscreen-keyboard.patch306
-rwxr-xr-xcommunity/lightdm-kde-greeter/PKGBUILD44
-rwxr-xr-xcommunity/lightdm-kde-greeter/lightdm-kde-greeter.conf2
-rwxr-xr-xcommunity/lightdm/PKGBUILD111
-rwxr-xr-xcommunity/lightdm/lightdm-1.5.1-systemd_login1_power.patch211
-rwxr-xr-xcommunity/lightdm/lightdm-autologin.pam11
-rwxr-xr-xcommunity/lightdm/lightdm-default-config.patch35
-rwxr-xr-xcommunity/lightdm/lightdm-lock-screen-before-switch.patch55
-rwxr-xr-xcommunity/lightdm/lightdm.install15
-rwxr-xr-xcommunity/lightdm/lightdm.pam7
-rwxr-xr-xcommunity/lightdm/lightdm.rules15
-rwxr-xr-xcommunity/lightdm/lightdm.service14
-rwxr-xr-xcommunity/lightdm/lightdm.tmpfiles2
-rwxr-xr-xcommunity/lightdm/xsession73
-rw-r--r--community/lua-zlib/PKGBUILD34
-rw-r--r--community/nodejs/PKGBUILD6
-rw-r--r--community/pigz/PKGBUILD37
-rw-r--r--community/pigz/pigz-2.3-make.patch25
-rw-r--r--community/qupzilla/PKGBUILD24
-rwxr-xr-xcommunity/xnoise/PKGBUILD9
-rw-r--r--extra/autogen/PKGBUILD8
-rw-r--r--extra/calligra/PKGBUILD14
-rw-r--r--extra/dbus-glib/PKGBUILD6
-rw-r--r--extra/evolution-data-server/PKGBUILD6
-rw-r--r--extra/evolution/PKGBUILD6
-rw-r--r--extra/gconf/PKGBUILD18
-rw-r--r--extra/gconf/gconf-dbus-fix-shutdown.patch34
-rw-r--r--extra/gconf/gconf-dbus-fix-use-after-free.patch99
-rw-r--r--extra/gconf/gsettings-schema-convert-dont-fail.patch28
-rw-r--r--extra/genius/PKGBUILD10
-rw-r--r--extra/gnome-nettool/PKGBUILD13
-rw-r--r--extra/gnome-nettool/ldns.patch21
-rw-r--r--extra/gnome-sharp/02_fix_pkg-config_paths.patch49
-rw-r--r--extra/gnome-sharp/04_initialize_dbus_glib_threading.patch51
-rw-r--r--extra/gnome-sharp/PKGBUILD14
-rw-r--r--extra/gnome-terminal/PKGBUILD6
-rw-r--r--extra/gnumeric/PKGBUILD20
-rw-r--r--extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch104
-rw-r--r--extra/gnumeric/revert-warnings.patch11
-rw-r--r--extra/goffice/PKGBUILD6
-rw-r--r--extra/gphoto2/PKGBUILD6
-rw-r--r--extra/libgnome-keyring/PKGBUILD5
-rw-r--r--extra/libgphoto2/PKGBUILD6
-rwxr-xr-xextra/python-numpy/PKGBUILD43
-rw-r--r--extra/slim/PKGBUILD8
-rw-r--r--extra/xchm/PKGBUILD6
-rw-r--r--libre/audex-libre/PKGBUILD49
-rw-r--r--libre/audex-libre/audex.install12
-rw-r--r--libre/audex-libre/gcc47.patch13
-rw-r--r--libre/audex-libre/google_regex.patch14
-rw-r--r--libre/audio-convert-libre/ChangeLog5
-rw-r--r--libre/audio-convert-libre/PKGBUILD30
-rw-r--r--libre/avidemux-libre/PKGBUILD123
-rw-r--r--libre/avidemux-libre/PKGBUILD.WIP83
-rw-r--r--libre/avidemux-libre/avidemux.install11
-rw-r--r--libre/ecasound-libre/PKGBUILD57
-rw-r--r--libre/gnormalize-libre/PKGBUILD54
-rw-r--r--libre/gnormalize-libre/gnormalize.desktop9
-rw-r--r--libre/gnormalize-libre/gnormalize.install14
-rw-r--r--libre/ogmrip-libre/PKGBUILD47
-rw-r--r--libre/ogmrip-libre/ogmrip.changelog27
-rw-r--r--libre/ogmrip-libre/ogmrip.install11
-rw-r--r--libre/openshot-libre/PKGBUILD28
-rw-r--r--libre/openshot-libre/openshot.install11
-rw-r--r--libre/soundkonverter-libre/PKGBUILD52
-rw-r--r--libre/soundkonverter-libre/soundkonverter.install12
-rw-r--r--libre/your-freedom/PKGBUILD2
-rw-r--r--libre/your-freedom/your-freedom.install8
79 files changed, 2456 insertions, 339 deletions
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 20f77977a..342bacbff 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85343 2013-03-01 10:30:04Z andrea $
+# $Id: PKGBUILD 86209 2013-03-13 05:41:43Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: csslayer <wengxt AT gmail com>
@@ -6,21 +6,26 @@
pkgbase=fcitx
pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
pkgver=4.2.7
-pkgrel=3
+pkgrel=4
groups=('fcitx-im')
arch=('i686' 'x86_64')
url="http://code.google.com/p/fcitx/"
license=('GPL')
makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
'iso-codes' 'gobject-introspection' 'libxkbfile')
-source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz)
+source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz
+ https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch)
build() {
#source /etc/profile.d/qt4.sh
- cd "${srcdir}"
+ cd "$srcdir/$pkgbase-$pkgver"
+ patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch"
+
+ cd "$srcdir"
mkdir -p build
cd build
+
cmake ../${pkgbase}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -30,7 +35,8 @@ build() {
-DENABLE_TEST=ON \
-DENABLE_GTK2_IM_MODULE=ON \
-DENABLE_GTK3_IM_MODULE=ON \
- -DENABLE_QT_IM_MODULE=ON
+ -DENABLE_QT_IM_MODULE=ON \
+ -DQT_QMAKE_EXECUTABLE=qmake-qt4
make
}
@@ -115,4 +121,5 @@ package_fcitx-qt4() {
make DESTDIR="${pkgdir}" install
}
-md5sums=('6e291717c24615b9dc9bfaa2949af3a7')
+md5sums=('6e291717c24615b9dc9bfaa2949af3a7'
+ '009e0cd17f078e24c03b3b46b45e41ab')
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index e6fd25a96..cd2a4dbf8 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83255 2013-01-28 16:49:42Z stephane $
+# $Id: PKGBUILD 86225 2013-03-13 15:08:23Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=gpsdrive
pkgver=2.11
_pkgver=20120928
-pkgrel=15
+pkgrel=16
pkgdesc="A car (bike, ship, plane) navigation system"
arch=("i686" "x86_64")
url="http://www.gpsdrive.de/"
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 5ed813a1d..852b0ea58 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -2,18 +2,18 @@
pkgname=gsmartcontrol
pkgver=0.8.7
-pkgrel=2
+pkgrel=3
pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
arch=('i686' 'x86_64')
url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
license=('GPL3')
-depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('polkit: to run gparted directly from menu')
+depends=('smartmontools' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme' 'polkit')
+optdepends=('polkit-gnome: to run gsmartcontrol directly from menu')
install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 org.archlinux.pkexec.gsmartcontrol.policy gsmartcontrol.desktop)
+source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2
+ org.archlinux.pkexec.gsmartcontrol.policy)
md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30'
- 'e7b9380849cdcaa4356a42559ea7954f'
- '19b20293a639e51fa2abb929a3faae01')
+ 'e403f8e06e6b8a3d1a99da5e584b2257')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -31,11 +31,20 @@ package() {
make DESTDIR=${pkgdir} install
- # Install pexec fixed desktop file
- install -Dm755 $srcdir/gsmartcontrol.desktop $pkgdir/usr/share/applications/gsmartcontrol.desktop
+ # We need rename the original binary
+ mv "${pkgdir}/usr/bin/gsmartcontrol" "${pkgdir}/usr/bin/gsmartcontrol.elf"
- # Install pexec file
- install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
- $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy
+ # Install launcher script
+ echo '#!/bin/sh' > ${pkgdir}/usr/bin/gsmartcontrol
+ echo 'pkexec --disable-internal-agent "/usr/bin/gsmartcontrol.elf" "$@"' \
+ >> ${pkgdir}/usr/bin/gsmartcontrol
+ chmod 755 ${pkgdir}/usr/bin/gsmartcontrol
+
+ # Modify desktop file
+ sed -i -e "s|^Exec=.*|Exec=/usr/bin/gsmartcontrol|" \
+ "${pkgdir}/usr/share/applications/gsmartcontrol.desktop"
- }
+ # Install policy file
+ install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
+ $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy
+}
diff --git a/community/gsmartcontrol/gsmartcontrol.install b/community/gsmartcontrol/gsmartcontrol.install
index b95cc069d..f636406f2 100644
--- a/community/gsmartcontrol/gsmartcontrol.install
+++ b/community/gsmartcontrol/gsmartcontrol.install
@@ -1,9 +1,12 @@
post_install() {
which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+ echo 'If you use a lightweight windowmanager, remember to run'
+ echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+ echo 'graphical authentication, which may be needed for pkexec to work.'
}
post_upgrade() {
- post_install $1
+ which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
}
post_remove() {
diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
index fb985df87..b71db7904 100644
--- a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
+++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
@@ -5,14 +5,14 @@
<policyconfig>
<action id="org.archlinux.pkexec.gsmartcontrol">
- <message>Authentication is required to run the gsmartcontrol</message>
+ <message>Authentication is required to run the GSmartControl</message>
<icon_name>gsmartcontrol</icon_name>
<defaults>
<allow_any>auth_admin</allow_any>
<allow_inactive>auth_admin</allow_inactive>
<allow_active>auth_admin</allow_active>
</defaults>
- <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol.elf</annotate>
<annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
</action>
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index d73c5f102..730e487fc 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84580 2013-02-20 05:11:56Z bpiotrowski $
+# $Id: PKGBUILD 86237 2013-03-13 19:59:28Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
# Contributor: kfgz <kfgz at interia dot pl>
# Contributor: pootzko <pootzko at gmail dot com>
pkgname=haveged
-pkgver=1.7
+pkgver=1.7a
pkgrel=1
pkgdesc='Entropy harvesting daemon using CPU timings'
arch=('i686' 'x86_64')
@@ -12,18 +12,12 @@ url='http://www.issihosts.com/haveged'
license=('GPL')
depends=('glibc')
source=($url/$pkgname-$pkgver.tar.gz
- service
- haveged-1.7-build.patch)
-sha256sums=('9ec85438386a46d5c3fe7b5b121cafd89c34bae68cbbfb4cecb1ff5622111013'
- '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a'
- '94c77b1d2d80eb5fb30bab4aeb560e6dfe9957654cd3ed915478d2ce67ac37b7')
+ service)
+sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051'
+ '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a')
build() {
cd $srcdir/$pkgname-$pkgver
-
- patch -Np1 -i $srcdir/haveged-1.7-build.patch
- aclocal && libtoolize --force && automake --add-missing && autoreconf
-
./configure --prefix=/usr
make
}
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 071f832f3..c25ad2edb 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 81566 2012-12-24 12:23:53Z ttoepper $
+# $Id: PKGBUILD 86213 2013-03-13 09:19:21Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3-wm
_pkgsourcename=i3
-pkgver=4.4
-pkgrel=2
+pkgver=4.5
+pkgrel=1
pkgdesc="An improved dynamic tiling window manager"
arch=('i686' 'x86_64')
url="http://i3wm.org/"
license=('BSD')
replaces=("i3" "i3bar")
groups=("i3")
-depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl' 'startup-notification' 'pango')
+depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
+ 'startup-notification' 'pango' 'perl')
makedepends=('bison' 'flex')
optdepends=('dmenu: As menu.'
'i3lock: For locking your screen.'
- 'i3status: To display systeminformation with a bar.'
- 'perl: To migrate your configuration to v4 format.')
+ 'i3status: To display systeminformation with a bar.')
options=('docs' '!strip')
source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2")
-md5sums=('fa2b8aae3d2e10c5ee480bd370366f5b')
+md5sums=('9eea2f570ec19affa3ec60b5ab411497')
build() {
cd "$srcdir/$_pkgsourcename-$pkgver"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index cbf475f88..96defe4c9 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85917 2013-03-08 23:40:42Z foutrelis $
+# $Id: PKGBUILD 86217 2013-03-13 13:30:48Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
pkgver=1.0.3
-pkgrel=3rc2
+pkgrel=4
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64')
url="http://libvirt.org/"
@@ -30,13 +30,13 @@ backup=('etc/conf.d/libvirtd'
'etc/libvirt/qemu.conf'
'etc/sasl2/libvirt.conf')
install="libvirt.install"
-source=("http://libvirt.org/sources/$pkgname-$pkgver-rc2.tar.gz"
+source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
libvirtd.rc.d
libvirtd.conf.d
libvirtd-guests.rc.d
libvirtd-guests.conf.d
libvirt.tmpfiles.d)
-md5sums=('d03a65be35c455bc09ee96df66ea2c4d'
+md5sums=('3d9f85d586c9aa3d819b626622f3fc97'
'c43244c40a0437038c82089618e7beaa'
'3ed0e24f5b5e25bf553f5427d64915e6'
'0ee5b6c58590ff392a266f20f7928d1f'
diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
new file mode 100755
index 000000000..153294933
--- /dev/null
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 86201 2013-03-13 00:23:53Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Padfoot <padfoot@exemail.com.au>
+
+pkgname=lightdm-gtk2-greeter
+pkgver=1.5.1
+pkgrel=3
+pkgdesc="GTK+ greeter for LightDM"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/lightdm-gtk-greeter"
+license=('GPL3' 'LGPL3')
+depends=('gtk2' 'lightdm')
+makedepends=('exo' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
+provides=("${pkgname/2/}")
+conflicts=("${pkgname/2/3}")
+backup=('etc/lightdm/lightdm-gtk-greeter.conf')
+source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz"
+ "onscreen-keyboard.patch")
+sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621'
+ '381c4da15ed2482800aaf3258217cd48c2313aee5da4f7ade77f7ef55659d0b9')
+
+build() {
+ cd "${srcdir}"/${pkgname/2/}-${pkgver}
+
+# Patch
+ patch -Np1 -i ../onscreen-keyboard.patch
+
+# Build
+ AUTOMAKE=automake ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname/2/}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm-gtk2-greeter/onscreen-keyboard.patch b/community/lightdm-gtk2-greeter/onscreen-keyboard.patch
new file mode 100755
index 000000000..6db01d3f6
--- /dev/null
+++ b/community/lightdm-gtk2-greeter/onscreen-keyboard.patch
@@ -0,0 +1,306 @@
+diff -aur lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf
+--- lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf 2013-02-11 00:19:17.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf 2013-02-20 19:17:39.382817993 +1100
+@@ -9,6 +9,7 @@
+ # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
+ # show-language-selector (true or false)
+ # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so)
++# keyboard = Command to launch on screen keyboard. Ensure it does not steal focus.
+ #
+ [greeter]
+ #background=
+@@ -21,3 +22,4 @@
+ #xft-rgba=
+ #show-language-selector=
+ #show-indicators=
++#keyboard=
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c 2013-02-11 00:48:21.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c 2013-02-20 20:09:30.219150045 +1100
+@@ -23,6 +23,7 @@
+ #include <cairo-xlib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdkx.h>
++#include <glib.h>
+
+ #ifdef HAVE_LIBINDICATOR
+ #include <libindicator/indicator-object.h>
+@@ -44,6 +45,7 @@
+ static GtkComboBox *user_combo;
+ static GtkComboBox *session_combo;
+ static GtkComboBox *language_combo;
++static GtkCheckMenuItem *keyboard_menuitem;
+ static gchar *default_font_name, *default_theme_name, *default_icon_theme_name;
+ static GdkPixbuf *default_background_pixbuf = NULL;
+ #if GTK_CHECK_VERSION (3, 0, 0)
+@@ -52,6 +54,10 @@
+ static GdkColor *default_background_color = NULL;
+ #endif
+ static gboolean cancelling = FALSE, prompted = FALSE;
++static gchar **a11y_keyboard_command;
++static int a11y_kbd_pid = 0;
++static GPid *a11y_keyboard_pid = &a11y_kbd_pid;
++static GError *a11y_keyboard_error;
+
+
+ #ifdef HAVE_LIBINDICATOR
+@@ -649,7 +655,10 @@
+ if (lightdm_greeter_get_is_authenticated (greeter))
+ {
+ if (prompted)
+- start_session ();
++ {
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), FALSE);
++ start_session ();
++ }
+ }
+ else
+ {
+@@ -864,6 +873,32 @@
+ }
+ }
+
++void a11y_keyboard_cb (GtkWidget *widget);
++G_MODULE_EXPORT
++void
++a11y_keyboard_cb (GtkWidget *widget)
++{
++ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
++ {
++ if (!g_spawn_async(NULL, a11y_keyboard_command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, a11y_keyboard_pid, &a11y_keyboard_error))
++ {
++ g_debug ("a11y keyboard command error : '%s'", a11y_keyboard_error->message);
++ a11y_kbd_pid = 0;
++ g_clear_error(&a11y_keyboard_error);
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), FALSE);
++ }
++ }
++ else
++ {
++ if (a11y_kbd_pid != 0)
++ {
++ kill (a11y_kbd_pid, SIGTERM);
++ g_spawn_close_pid(*a11y_keyboard_pid);
++ a11y_kbd_pid = 0;
++ }
++ }
++}
++
+ static void
+ sigterm_cb (int signum)
+ {
+@@ -1190,6 +1225,13 @@
+ g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL);
+ g_free (value);
+
++ /* Get a11y on screen keyboard command*/
++ gint argp;
++ value = g_key_file_get_value (config, "greeter", "keyboard", NULL);
++ g_debug ("a11y keyboard command is '%s'", value);
++ g_shell_parse_argv (value, &argp, &a11y_keyboard_command, NULL);
++ g_free (value);
++
+ builder = gtk_builder_new ();
+ if (!gtk_builder_add_from_string (builder, lightdm_gtk_greeter_ui,
+ lightdm_gtk_greeter_ui_length, &error))
+@@ -1212,6 +1254,7 @@
+ language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox"));
+ panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window"));
+ user_avatar = GTK_IMAGE (gtk_builder_get_object (builder, "user_avatar"));
++ keyboard_menuitem = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "keyboard_menuitem"));
+
+ gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_get_hostname ());
+
+@@ -1264,7 +1307,7 @@
+ #endif
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (menuitem), hbox);
+- image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU);
++ image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+
+@@ -1276,7 +1319,7 @@
+ #endif
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (menuitem), hbox);
+- image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU);
++ image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+
+@@ -1377,6 +1420,11 @@
+ gtk_widget_show (GTK_WIDGET (login_window));
+ gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME);
+
++ if (a11y_keyboard_command)
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), TRUE);
++ else
++ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_menuitem")));
++
+ gtk_main ();
+
+ if (default_background_pixbuf)
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade 2013-02-10 23:48:19.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade 2013-02-20 17:11:01.968469713 +1100
+@@ -215,6 +215,7 @@
+ <object class="GtkWindow" id="panel_window">
+ <property name="name">panel_window</property>
+ <property name="can_focus">False</property>
++ <property name="default_height">40</property>
+ <property name="decorated">False</property>
+ <property name="has_resize_grip">False</property>
+ <child>
+@@ -309,6 +310,16 @@
+ <signal name="toggled" handler="a11y_contrast_cb" swapped="no"/>
+ </object>
+ </child>
++ <child>
++ <object class="GtkCheckMenuItem" id="keyboard_menuitem">
++ <property name="name">keyboard_menuitem</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="use_action_appearance">False</property>
++ <property name="label" translatable="yes">On Screen Keyboard</property>
++ <signal name="toggled" handler="a11y_keyboard_cb" swapped="no"/>
++ </object>
++ </child>
+ </object>
+ </child>
+ </object>
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h 2013-02-11 01:46:04.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h 2013-02-20 17:52:56.172967000 +1100
+@@ -108,66 +108,73 @@
+ "\">3</property></packing></child></object></child><child type=\"tab\"><"
+ "placeholder/></child></object></child></object><object class=\"GtkWindo"
+ "w\" id=\"panel_window\"><property name=\"name\">panel_window</property>"
+- "<property name=\"can_focus\">False</property><property name=\"decorated"
+- "\">False</property><property name=\"has_resize_grip\">False</property><"
+- "child><object class=\"GtkMenuBar\" id=\"menubar\"><property name=\"name"
+- "\">menubar</property><property name=\"visible\">True</property><propert"
+- "y name=\"can_focus\">False</property><property name=\"pack_direction\">"
+- "rtl</property><child><object class=\"GtkMenuItem\" id=\"power_menuitem\""
+- "><property name=\"name\">power_menuitem</property><property name=\"visi"
+- "ble\">True</property><property name=\"can_focus\">False</property><prop"
+- "erty name=\"use_action_appearance\">False</property><child type=\"subme"
+- "nu\"><object class=\"GtkMenu\" id=\"power_menu\"><property name=\"name\""
+- ">power_menu</property><property name=\"visible\">True</property><proper"
+- "ty name=\"can_focus\">False</property><child><object class=\"GtkMenuIte"
+- "m\" id=\"suspend_menuitem\"><property name=\"name\">suspend_menuitem</p"
+- "roperty><property name=\"visible\">True</property><property name=\"can_"
+- "focus\">False</property><property name=\"use_action_appearance\">False<"
+- "/property><property name=\"label\" translatable=\"yes\">Suspend</proper"
+- "ty><signal name=\"activate\" handler=\"suspend_cb\" swapped=\"no\"/></o"
+- "bject></child><child><object class=\"GtkMenuItem\" id=\"hibernate_menui"
+- "tem\"><property name=\"name\">hibernate_menuitem</property><property na"
+- "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
+- "rty><property name=\"use_action_appearance\">False</property><property "
+- "name=\"label\" translatable=\"yes\">Hibernate</property><signal name=\""
+- "activate\" handler=\"hibernate_cb\" swapped=\"no\"/></object></child><c"
+- "hild><object class=\"GtkMenuItem\" id=\"restart_menuitem\"><property na"
+- "me=\"name\">restart_menuitem</property><property name=\"visible\">True<"
+- "/property><property name=\"can_focus\">False</property><property name=\""
+- "use_action_appearance\">False</property><property name=\"label\" transl"
+- "atable=\"yes\">Restart...</property><signal name=\"activate\" handler=\""
+- "restart_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt"
+- "kMenuItem\" id=\"shutdown_menuitem\"><property name=\"name\">shutdown_m"
+- "enuitem</property><property name=\"visible\">True</property><property n"
+- "ame=\"can_focus\">False</property><property name=\"use_action_appearanc"
+- "e\">False</property><property name=\"label\" translatable=\"yes\">Shutd"
+- "own...</property><signal name=\"activate\" handler=\"shutdown_cb\" swap"
+- "ped=\"no\"/></object></child></object></child></object></child><child><"
+- "object class=\"GtkMenuItem\" id=\"a11y_menuitem\"><property name=\"name"
+- "\">a11y_menuitem</property><property name=\"visible\">True</property><p"
+- "roperty name=\"can_focus\">False</property><property name=\"use_action_"
+- "appearance\">False</property><child type=\"submenu\"><object class=\"Gt"
+- "kMenu\" id=\"a11y_menu\"><property name=\"name\">a11y_menu</property><p"
+- "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa"
+- "lse</property><child><object class=\"GtkCheckMenuItem\" id=\"large_font"
+- "_menuitem\"><property name=\"name\">large_font_menuitem</property><prop"
++ "<property name=\"can_focus\">False</property><property name=\"default_h"
++ "eight\">40</property><property name=\"decorated\">False</property><prop"
++ "erty name=\"has_resize_grip\">False</property><child><object class=\"Gt"
++ "kMenuBar\" id=\"menubar\"><property name=\"name\">menubar</property><pr"
++ "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
++ "se</property><property name=\"pack_direction\">rtl</property><child><ob"
++ "ject class=\"GtkMenuItem\" id=\"power_menuitem\"><property name=\"name\""
++ ">power_menuitem</property><property name=\"visible\">True</property><pr"
++ "operty name=\"can_focus\">False</property><property name=\"use_action_a"
++ "ppearance\">False</property><child type=\"submenu\"><object class=\"Gtk"
++ "Menu\" id=\"power_menu\"><property name=\"name\">power_menu</property><"
++ "property name=\"visible\">True</property><property name=\"can_focus\">F"
++ "alse</property><child><object class=\"GtkMenuItem\" id=\"suspend_menuit"
++ "em\"><property name=\"name\">suspend_menuitem</property><property name="
++ "\"visible\">True</property><property name=\"can_focus\">False</property"
++ "><property name=\"use_action_appearance\">False</property><property nam"
++ "e=\"label\" translatable=\"yes\">Suspend</property><signal name=\"activ"
++ "ate\" handler=\"suspend_cb\" swapped=\"no\"/></object></child><child><o"
++ "bject class=\"GtkMenuItem\" id=\"hibernate_menuitem\"><property name=\""
++ "name\">hibernate_menuitem</property><property name=\"visible\">True</pr"
++ "operty><property name=\"can_focus\">False</property><property name=\"us"
++ "e_action_appearance\">False</property><property name=\"label\" translat"
++ "able=\"yes\">Hibernate</property><signal name=\"activate\" handler=\"hi"
++ "bernate_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt"
++ "kMenuItem\" id=\"restart_menuitem\"><property name=\"name\">restart_men"
++ "uitem</property><property name=\"visible\">True</property><property nam"
++ "e=\"can_focus\">False</property><property name=\"use_action_appearance\""
++ ">False</property><property name=\"label\" translatable=\"yes\">Restart."
++ "..</property><signal name=\"activate\" handler=\"restart_cb\" swapped=\""
++ "no\"/></object></child><child><object class=\"GtkMenuItem\" id=\"shutdo"
++ "wn_menuitem\"><property name=\"name\">shutdown_menuitem</property><prop"
+ "erty name=\"visible\">True</property><property name=\"can_focus\">False"
+ "</property><property name=\"use_action_appearance\">False</property><pr"
+- "operty name=\"label\" translatable=\"yes\">Large Font</property><signal"
+- " name=\"toggled\" handler=\"a11y_font_cb\" swapped=\"no\"/></object></c"
+- "hild><child><object class=\"GtkCheckMenuItem\" id=\"high_contrast_menui"
+- "tem\"><property name=\"name\">high_contrast_menuitem</property><propert"
+- "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
+- "roperty><property name=\"use_action_appearance\">False</property><prope"
+- "rty name=\"label\" translatable=\"yes\">High Contrast</property><signal"
+- " name=\"toggled\" handler=\"a11y_contrast_cb\" swapped=\"no\"/></object"
+- "></child></object></child></object></child></object></child></object><o"
+- "bject class=\"GtkListStore\" id=\"session_liststore\"><columns><column "
+- "type=\"gchararray\"/><column type=\"gchararray\"/></columns></object><o"
+- "bject class=\"GtkListStore\" id=\"user_liststore\"><columns><column typ"
+- "e=\"gchararray\"/><column type=\"gchararray\"/><column type=\"gint\"/><"
+- "/columns></object></interface>"
++ "operty name=\"label\" translatable=\"yes\">Shutdown...</property><signa"
++ "l name=\"activate\" handler=\"shutdown_cb\" swapped=\"no\"/></object></"
++ "child></object></child></object></child><child><object class=\"GtkMenuI"
++ "tem\" id=\"a11y_menuitem\"><property name=\"name\">a11y_menuitem</prope"
++ "rty><property name=\"visible\">True</property><property name=\"can_focu"
++ "s\">False</property><property name=\"use_action_appearance\">False</pro"
++ "perty><child type=\"submenu\"><object class=\"GtkMenu\" id=\"a11y_menu\""
++ "><property name=\"name\">a11y_menu</property><property name=\"visible\""
++ ">True</property><property name=\"can_focus\">False</property><child><ob"
++ "ject class=\"GtkCheckMenuItem\" id=\"large_font_menuitem\"><property na"
++ "me=\"name\">large_font_menuitem</property><property name=\"visible\">Tr"
++ "ue</property><property name=\"can_focus\">False</property><property nam"
++ "e=\"use_action_appearance\">False</property><property name=\"label\" tr"
++ "anslatable=\"yes\">Large Font</property><signal name=\"toggled\" handle"
++ "r=\"a11y_font_cb\" swapped=\"no\"/></object></child><child><object clas"
++ "s=\"GtkCheckMenuItem\" id=\"high_contrast_menuitem\"><property name=\"n"
++ "ame\">high_contrast_menuitem</property><property name=\"visible\">True<"
++ "/property><property name=\"can_focus\">False</property><property name=\""
++ "use_action_appearance\">False</property><property name=\"label\" transl"
++ "atable=\"yes\">High Contrast</property><signal name=\"toggled\" handler"
++ "=\"a11y_contrast_cb\" swapped=\"no\"/></object></child><child><object c"
++ "lass=\"GtkCheckMenuItem\" id=\"keyboard_menuitem\"><property name=\"nam"
++ "e\">keyboard_menuitem</property><property name=\"visible\">True</proper"
++ "ty><property name=\"can_focus\">False</property><property name=\"use_ac"
++ "tion_appearance\">False</property><property name=\"label\" translatable"
++ "=\"yes\">On Screen Keyboard</property><signal name=\"toggled\" handler="
++ "\"a11y_keyboard_cb\" swapped=\"no\"/></object></child></object></child>"
++ "</object></child></object></child></object><object class=\"GtkListStore"
++ "\" id=\"session_liststore\"><columns><column type=\"gchararray\"/><colu"
++ "mn type=\"gchararray\"/></columns></object><object class=\"GtkListStore"
++ "\" id=\"user_liststore\"><columns><column type=\"gchararray\"/><column "
++ "type=\"gchararray\"/><column type=\"gint\"/></columns></object></interf"
++ "ace>"
+ };
+
+-static const unsigned lightdm_gtk_greeter_ui_length = 10699u;
++static const unsigned lightdm_gtk_greeter_ui_length = 11147u;
+
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
new file mode 100755
index 000000000..951bfe25d
--- /dev/null
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 86202 2013-03-13 00:26:13Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Padfoot <padfoot@exemail.com.au>
+
+pkgname=lightdm-gtk3-greeter
+pkgver=1.5.1
+pkgrel=1
+pkgdesc="GTK+ greeter for LightDM"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/lightdm-gtk-greeter"
+license=('GPL3' 'LGPL3')
+depends=('gtk3' 'lightdm')
+makedepends=('exo' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool')
+provides=("${pkgname/3/}")
+conflicts=("${pkgname/3/2}")
+backup=('etc/lightdm/lightdm-gtk-greeter.conf')
+source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz"
+ "onscreen-keyboard.patch")
+sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621'
+ '381c4da15ed2482800aaf3258217cd48c2313aee5da4f7ade77f7ef55659d0b9')
+
+build() {
+ cd "${srcdir}"/${pkgname/3/}-${pkgver}
+
+# Patch
+ patch -Np1 -i ../onscreen-keyboard.patch
+
+# Build
+ AUTOMAKE=automake ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname/3/}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm-gtk3-greeter/onscreen-keyboard.patch b/community/lightdm-gtk3-greeter/onscreen-keyboard.patch
new file mode 100755
index 000000000..6db01d3f6
--- /dev/null
+++ b/community/lightdm-gtk3-greeter/onscreen-keyboard.patch
@@ -0,0 +1,306 @@
+diff -aur lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf
+--- lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf 2013-02-11 00:19:17.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf 2013-02-20 19:17:39.382817993 +1100
+@@ -9,6 +9,7 @@
+ # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
+ # show-language-selector (true or false)
+ # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so)
++# keyboard = Command to launch on screen keyboard. Ensure it does not steal focus.
+ #
+ [greeter]
+ #background=
+@@ -21,3 +22,4 @@
+ #xft-rgba=
+ #show-language-selector=
+ #show-indicators=
++#keyboard=
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c 2013-02-11 00:48:21.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c 2013-02-20 20:09:30.219150045 +1100
+@@ -23,6 +23,7 @@
+ #include <cairo-xlib.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <gdk/gdkx.h>
++#include <glib.h>
+
+ #ifdef HAVE_LIBINDICATOR
+ #include <libindicator/indicator-object.h>
+@@ -44,6 +45,7 @@
+ static GtkComboBox *user_combo;
+ static GtkComboBox *session_combo;
+ static GtkComboBox *language_combo;
++static GtkCheckMenuItem *keyboard_menuitem;
+ static gchar *default_font_name, *default_theme_name, *default_icon_theme_name;
+ static GdkPixbuf *default_background_pixbuf = NULL;
+ #if GTK_CHECK_VERSION (3, 0, 0)
+@@ -52,6 +54,10 @@
+ static GdkColor *default_background_color = NULL;
+ #endif
+ static gboolean cancelling = FALSE, prompted = FALSE;
++static gchar **a11y_keyboard_command;
++static int a11y_kbd_pid = 0;
++static GPid *a11y_keyboard_pid = &a11y_kbd_pid;
++static GError *a11y_keyboard_error;
+
+
+ #ifdef HAVE_LIBINDICATOR
+@@ -649,7 +655,10 @@
+ if (lightdm_greeter_get_is_authenticated (greeter))
+ {
+ if (prompted)
+- start_session ();
++ {
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), FALSE);
++ start_session ();
++ }
+ }
+ else
+ {
+@@ -864,6 +873,32 @@
+ }
+ }
+
++void a11y_keyboard_cb (GtkWidget *widget);
++G_MODULE_EXPORT
++void
++a11y_keyboard_cb (GtkWidget *widget)
++{
++ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget)))
++ {
++ if (!g_spawn_async(NULL, a11y_keyboard_command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, a11y_keyboard_pid, &a11y_keyboard_error))
++ {
++ g_debug ("a11y keyboard command error : '%s'", a11y_keyboard_error->message);
++ a11y_kbd_pid = 0;
++ g_clear_error(&a11y_keyboard_error);
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), FALSE);
++ }
++ }
++ else
++ {
++ if (a11y_kbd_pid != 0)
++ {
++ kill (a11y_kbd_pid, SIGTERM);
++ g_spawn_close_pid(*a11y_keyboard_pid);
++ a11y_kbd_pid = 0;
++ }
++ }
++}
++
+ static void
+ sigterm_cb (int signum)
+ {
+@@ -1190,6 +1225,13 @@
+ g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL);
+ g_free (value);
+
++ /* Get a11y on screen keyboard command*/
++ gint argp;
++ value = g_key_file_get_value (config, "greeter", "keyboard", NULL);
++ g_debug ("a11y keyboard command is '%s'", value);
++ g_shell_parse_argv (value, &argp, &a11y_keyboard_command, NULL);
++ g_free (value);
++
+ builder = gtk_builder_new ();
+ if (!gtk_builder_add_from_string (builder, lightdm_gtk_greeter_ui,
+ lightdm_gtk_greeter_ui_length, &error))
+@@ -1212,6 +1254,7 @@
+ language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox"));
+ panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window"));
+ user_avatar = GTK_IMAGE (gtk_builder_get_object (builder, "user_avatar"));
++ keyboard_menuitem = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "keyboard_menuitem"));
+
+ gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_get_hostname ());
+
+@@ -1264,7 +1307,7 @@
+ #endif
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (menuitem), hbox);
+- image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU);
++ image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+
+@@ -1276,7 +1319,7 @@
+ #endif
+ gtk_widget_show (hbox);
+ gtk_container_add (GTK_CONTAINER (menuitem), hbox);
+- image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU);
++ image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON);
+ gtk_widget_show (image);
+ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
+
+@@ -1377,6 +1420,11 @@
+ gtk_widget_show (GTK_WIDGET (login_window));
+ gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME);
+
++ if (a11y_keyboard_command)
++ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), TRUE);
++ else
++ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_menuitem")));
++
+ gtk_main ();
+
+ if (default_background_pixbuf)
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade 2013-02-10 23:48:19.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade 2013-02-20 17:11:01.968469713 +1100
+@@ -215,6 +215,7 @@
+ <object class="GtkWindow" id="panel_window">
+ <property name="name">panel_window</property>
+ <property name="can_focus">False</property>
++ <property name="default_height">40</property>
+ <property name="decorated">False</property>
+ <property name="has_resize_grip">False</property>
+ <child>
+@@ -309,6 +310,16 @@
+ <signal name="toggled" handler="a11y_contrast_cb" swapped="no"/>
+ </object>
+ </child>
++ <child>
++ <object class="GtkCheckMenuItem" id="keyboard_menuitem">
++ <property name="name">keyboard_menuitem</property>
++ <property name="visible">True</property>
++ <property name="can_focus">False</property>
++ <property name="use_action_appearance">False</property>
++ <property name="label" translatable="yes">On Screen Keyboard</property>
++ <signal name="toggled" handler="a11y_keyboard_cb" swapped="no"/>
++ </object>
++ </child>
+ </object>
+ </child>
+ </object>
+diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h
+--- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h 2013-02-11 01:46:04.000000000 +1100
++++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h 2013-02-20 17:52:56.172967000 +1100
+@@ -108,66 +108,73 @@
+ "\">3</property></packing></child></object></child><child type=\"tab\"><"
+ "placeholder/></child></object></child></object><object class=\"GtkWindo"
+ "w\" id=\"panel_window\"><property name=\"name\">panel_window</property>"
+- "<property name=\"can_focus\">False</property><property name=\"decorated"
+- "\">False</property><property name=\"has_resize_grip\">False</property><"
+- "child><object class=\"GtkMenuBar\" id=\"menubar\"><property name=\"name"
+- "\">menubar</property><property name=\"visible\">True</property><propert"
+- "y name=\"can_focus\">False</property><property name=\"pack_direction\">"
+- "rtl</property><child><object class=\"GtkMenuItem\" id=\"power_menuitem\""
+- "><property name=\"name\">power_menuitem</property><property name=\"visi"
+- "ble\">True</property><property name=\"can_focus\">False</property><prop"
+- "erty name=\"use_action_appearance\">False</property><child type=\"subme"
+- "nu\"><object class=\"GtkMenu\" id=\"power_menu\"><property name=\"name\""
+- ">power_menu</property><property name=\"visible\">True</property><proper"
+- "ty name=\"can_focus\">False</property><child><object class=\"GtkMenuIte"
+- "m\" id=\"suspend_menuitem\"><property name=\"name\">suspend_menuitem</p"
+- "roperty><property name=\"visible\">True</property><property name=\"can_"
+- "focus\">False</property><property name=\"use_action_appearance\">False<"
+- "/property><property name=\"label\" translatable=\"yes\">Suspend</proper"
+- "ty><signal name=\"activate\" handler=\"suspend_cb\" swapped=\"no\"/></o"
+- "bject></child><child><object class=\"GtkMenuItem\" id=\"hibernate_menui"
+- "tem\"><property name=\"name\">hibernate_menuitem</property><property na"
+- "me=\"visible\">True</property><property name=\"can_focus\">False</prope"
+- "rty><property name=\"use_action_appearance\">False</property><property "
+- "name=\"label\" translatable=\"yes\">Hibernate</property><signal name=\""
+- "activate\" handler=\"hibernate_cb\" swapped=\"no\"/></object></child><c"
+- "hild><object class=\"GtkMenuItem\" id=\"restart_menuitem\"><property na"
+- "me=\"name\">restart_menuitem</property><property name=\"visible\">True<"
+- "/property><property name=\"can_focus\">False</property><property name=\""
+- "use_action_appearance\">False</property><property name=\"label\" transl"
+- "atable=\"yes\">Restart...</property><signal name=\"activate\" handler=\""
+- "restart_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt"
+- "kMenuItem\" id=\"shutdown_menuitem\"><property name=\"name\">shutdown_m"
+- "enuitem</property><property name=\"visible\">True</property><property n"
+- "ame=\"can_focus\">False</property><property name=\"use_action_appearanc"
+- "e\">False</property><property name=\"label\" translatable=\"yes\">Shutd"
+- "own...</property><signal name=\"activate\" handler=\"shutdown_cb\" swap"
+- "ped=\"no\"/></object></child></object></child></object></child><child><"
+- "object class=\"GtkMenuItem\" id=\"a11y_menuitem\"><property name=\"name"
+- "\">a11y_menuitem</property><property name=\"visible\">True</property><p"
+- "roperty name=\"can_focus\">False</property><property name=\"use_action_"
+- "appearance\">False</property><child type=\"submenu\"><object class=\"Gt"
+- "kMenu\" id=\"a11y_menu\"><property name=\"name\">a11y_menu</property><p"
+- "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa"
+- "lse</property><child><object class=\"GtkCheckMenuItem\" id=\"large_font"
+- "_menuitem\"><property name=\"name\">large_font_menuitem</property><prop"
++ "<property name=\"can_focus\">False</property><property name=\"default_h"
++ "eight\">40</property><property name=\"decorated\">False</property><prop"
++ "erty name=\"has_resize_grip\">False</property><child><object class=\"Gt"
++ "kMenuBar\" id=\"menubar\"><property name=\"name\">menubar</property><pr"
++ "operty name=\"visible\">True</property><property name=\"can_focus\">Fal"
++ "se</property><property name=\"pack_direction\">rtl</property><child><ob"
++ "ject class=\"GtkMenuItem\" id=\"power_menuitem\"><property name=\"name\""
++ ">power_menuitem</property><property name=\"visible\">True</property><pr"
++ "operty name=\"can_focus\">False</property><property name=\"use_action_a"
++ "ppearance\">False</property><child type=\"submenu\"><object class=\"Gtk"
++ "Menu\" id=\"power_menu\"><property name=\"name\">power_menu</property><"
++ "property name=\"visible\">True</property><property name=\"can_focus\">F"
++ "alse</property><child><object class=\"GtkMenuItem\" id=\"suspend_menuit"
++ "em\"><property name=\"name\">suspend_menuitem</property><property name="
++ "\"visible\">True</property><property name=\"can_focus\">False</property"
++ "><property name=\"use_action_appearance\">False</property><property nam"
++ "e=\"label\" translatable=\"yes\">Suspend</property><signal name=\"activ"
++ "ate\" handler=\"suspend_cb\" swapped=\"no\"/></object></child><child><o"
++ "bject class=\"GtkMenuItem\" id=\"hibernate_menuitem\"><property name=\""
++ "name\">hibernate_menuitem</property><property name=\"visible\">True</pr"
++ "operty><property name=\"can_focus\">False</property><property name=\"us"
++ "e_action_appearance\">False</property><property name=\"label\" translat"
++ "able=\"yes\">Hibernate</property><signal name=\"activate\" handler=\"hi"
++ "bernate_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt"
++ "kMenuItem\" id=\"restart_menuitem\"><property name=\"name\">restart_men"
++ "uitem</property><property name=\"visible\">True</property><property nam"
++ "e=\"can_focus\">False</property><property name=\"use_action_appearance\""
++ ">False</property><property name=\"label\" translatable=\"yes\">Restart."
++ "..</property><signal name=\"activate\" handler=\"restart_cb\" swapped=\""
++ "no\"/></object></child><child><object class=\"GtkMenuItem\" id=\"shutdo"
++ "wn_menuitem\"><property name=\"name\">shutdown_menuitem</property><prop"
+ "erty name=\"visible\">True</property><property name=\"can_focus\">False"
+ "</property><property name=\"use_action_appearance\">False</property><pr"
+- "operty name=\"label\" translatable=\"yes\">Large Font</property><signal"
+- " name=\"toggled\" handler=\"a11y_font_cb\" swapped=\"no\"/></object></c"
+- "hild><child><object class=\"GtkCheckMenuItem\" id=\"high_contrast_menui"
+- "tem\"><property name=\"name\">high_contrast_menuitem</property><propert"
+- "y name=\"visible\">True</property><property name=\"can_focus\">False</p"
+- "roperty><property name=\"use_action_appearance\">False</property><prope"
+- "rty name=\"label\" translatable=\"yes\">High Contrast</property><signal"
+- " name=\"toggled\" handler=\"a11y_contrast_cb\" swapped=\"no\"/></object"
+- "></child></object></child></object></child></object></child></object><o"
+- "bject class=\"GtkListStore\" id=\"session_liststore\"><columns><column "
+- "type=\"gchararray\"/><column type=\"gchararray\"/></columns></object><o"
+- "bject class=\"GtkListStore\" id=\"user_liststore\"><columns><column typ"
+- "e=\"gchararray\"/><column type=\"gchararray\"/><column type=\"gint\"/><"
+- "/columns></object></interface>"
++ "operty name=\"label\" translatable=\"yes\">Shutdown...</property><signa"
++ "l name=\"activate\" handler=\"shutdown_cb\" swapped=\"no\"/></object></"
++ "child></object></child></object></child><child><object class=\"GtkMenuI"
++ "tem\" id=\"a11y_menuitem\"><property name=\"name\">a11y_menuitem</prope"
++ "rty><property name=\"visible\">True</property><property name=\"can_focu"
++ "s\">False</property><property name=\"use_action_appearance\">False</pro"
++ "perty><child type=\"submenu\"><object class=\"GtkMenu\" id=\"a11y_menu\""
++ "><property name=\"name\">a11y_menu</property><property name=\"visible\""
++ ">True</property><property name=\"can_focus\">False</property><child><ob"
++ "ject class=\"GtkCheckMenuItem\" id=\"large_font_menuitem\"><property na"
++ "me=\"name\">large_font_menuitem</property><property name=\"visible\">Tr"
++ "ue</property><property name=\"can_focus\">False</property><property nam"
++ "e=\"use_action_appearance\">False</property><property name=\"label\" tr"
++ "anslatable=\"yes\">Large Font</property><signal name=\"toggled\" handle"
++ "r=\"a11y_font_cb\" swapped=\"no\"/></object></child><child><object clas"
++ "s=\"GtkCheckMenuItem\" id=\"high_contrast_menuitem\"><property name=\"n"
++ "ame\">high_contrast_menuitem</property><property name=\"visible\">True<"
++ "/property><property name=\"can_focus\">False</property><property name=\""
++ "use_action_appearance\">False</property><property name=\"label\" transl"
++ "atable=\"yes\">High Contrast</property><signal name=\"toggled\" handler"
++ "=\"a11y_contrast_cb\" swapped=\"no\"/></object></child><child><object c"
++ "lass=\"GtkCheckMenuItem\" id=\"keyboard_menuitem\"><property name=\"nam"
++ "e\">keyboard_menuitem</property><property name=\"visible\">True</proper"
++ "ty><property name=\"can_focus\">False</property><property name=\"use_ac"
++ "tion_appearance\">False</property><property name=\"label\" translatable"
++ "=\"yes\">On Screen Keyboard</property><signal name=\"toggled\" handler="
++ "\"a11y_keyboard_cb\" swapped=\"no\"/></object></child></object></child>"
++ "</object></child></object></child></object><object class=\"GtkListStore"
++ "\" id=\"session_liststore\"><columns><column type=\"gchararray\"/><colu"
++ "mn type=\"gchararray\"/></columns></object><object class=\"GtkListStore"
++ "\" id=\"user_liststore\"><columns><column type=\"gchararray\"/><column "
++ "type=\"gchararray\"/><column type=\"gint\"/></columns></object></interf"
++ "ace>"
+ };
+
+-static const unsigned lightdm_gtk_greeter_ui_length = 10699u;
++static const unsigned lightdm_gtk_greeter_ui_length = 11147u;
+
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD
new file mode 100755
index 000000000..e1b9200b1
--- /dev/null
+++ b/community/lightdm-kde-greeter/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 86223 2013-03-13 14:28:38Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Mladen Pejakovic <pejakm@gmail.com>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=lightdm-kde-greeter
+pkgver=0.3.1
+pkgrel=1
+pkgdesc="KDE greeter for LightDM"
+arch=('i686' 'x86_64')
+url="https://projects.kde.org/projects/playground/base/lightdm"
+license=('GPL')
+depends=('kdelibs' 'liblightdm-qt4')
+makedepends=('cmake' 'automoc4')
+backup=('etc/lightdm/lightdm-kde-greeter.conf'
+ 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf')
+source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2"
+ 'lightdm-kde-greeter.conf')
+sha256sums=('855cffaccc6500e25016e104cd593189cad9aa88ee34f237b01964fce1bcfcf9'
+ 'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8')
+
+build() {
+ cd "${srcdir}"/lightdm-${pkgver}
+
+# Build
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/lightdm-${pkgver}/build
+
+# Install
+ make DESTDIR="${pkgdir}" install
+ install -dm 755 "${pkgdir}"/etc/lightdm
+ install -m 644 ../../lightdm-kde-greeter.conf "${pkgdir}"/etc/lightdm/lightdm-kde-greeter.conf
+}
+
+# vim ts=2 sw=2 et:
diff --git a/community/lightdm-kde-greeter/lightdm-kde-greeter.conf b/community/lightdm-kde-greeter/lightdm-kde-greeter.conf
new file mode 100755
index 000000000..09c4ad281
--- /dev/null
+++ b/community/lightdm-kde-greeter/lightdm-kde-greeter.conf
@@ -0,0 +1,2 @@
+[greeter]
+theme-name=classic
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
new file mode 100755
index 000000000..c195eea24
--- /dev/null
+++ b/community/lightdm/PKGBUILD
@@ -0,0 +1,111 @@
+# $Id: PKGBUILD 86229 2013-03-13 18:51:51Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: Morfeo <morfeo89@hotmail.it>
+
+pkgbase=lightdm
+pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
+pkgver=1.5.1
+pkgrel=6
+pkgdesc="A lightweight display manager"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/lightdm"
+license=('GPL3' 'LGPL3')
+makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base')
+options=('!emptydirs' '!libtool')
+source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
+ 'lightdm.service'
+ 'lightdm.tmpfiles'
+ 'lightdm.pam'
+ 'lightdm-autologin.pam'
+ 'lightdm.rules'
+ 'lightdm-default-config.patch'
+ 'lightdm-1.5.1-systemd_login1_power.patch'
+ 'lightdm-lock-screen-before-switch.patch'
+ 'xsession')
+sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86'
+ '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125'
+ 'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4'
+ 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
+ 'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023'
+ 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
+ '51ec7eb1c50c0ba0b96b846662707533ebc1d6558cea75cb7424afddf0d064f0'
+ '8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608'
+ '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
+ '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+
+# Patch
+ patch -Np1 -i ../lightdm-default-config.patch
+ patch -Np1 -i ../lightdm-1.5.1-systemd_login1_power.patch
+ patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
+
+# Build
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${pkgbase} --with-greeter-user=lightdm --with-greeter-session=lightdm-gtk-greeter --disable-{static,tests}
+ make
+}
+
+package_lightdm() {
+depends=('libgcrypt' 'libxklavier' 'pam')
+optdepends=('xorg-server-xephyr: LightDM test mode'
+ 'accountsservice: limit visible accounts')
+backup=('etc/apparmor.d/lightdm-guest-session'
+ 'etc/lightdm/keys.conf'
+ 'etc/lightdm/lightdm.conf'
+ 'etc/lightdm/users.conf')
+install=${pkgbase}.install
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
+ install -m 755 ../xsession "${pkgdir}"/etc/lightdm/xsession
+ rm -rf "${pkgdir}"/etc/init
+
+# PAM
+ install -m 644 ../lightdm.pam "${pkgdir}"/etc/pam.d/lightdm
+ install -m 644 ../lightdm-autologin.pam "${pkgdir}"/etc/pam.d/lightdm-autologin
+
+# PolicyKit
+ install -dm 700 "${pkgdir}"/usr/share/polkit-1/rules.d
+ install -m 644 ../lightdm.rules "${pkgdir}"/usr/share/polkit-1/rules.d/lightdm.rules
+
+# Systemd
+ install -dm 755 "${pkgdir}"/usr/lib/{systemd/system,tmpfiles.d}
+ install -m 644 ../lightdm.service "${pkgdir}"/usr/lib/systemd/system/lightdm.service
+ install -m 644 ../lightdm.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lightdm.conf
+}
+
+package_liblightdm-qt4() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt4')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+ make DESTDIR="${pkgdir}" -C liblightdm-qt install
+ make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+ find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} +
+ find "${pkgdir}" -type f -name *qt5* -exec rm {} +
+ find "${pkgdir}" -type l -name *qt5* -exec rm {} +
+}
+
+package_liblightdm-qt5() {
+pkgdesc=('LightDM Qt client library')
+depends=('lightdm' 'qt5-base')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+
+# Install
+ make DESTDIR="${pkgdir}" -C liblightdm-gobject install
+ make DESTDIR="${pkgdir}" -C liblightdm-qt install
+ make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall
+ find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} +
+ find "${pkgdir}" -type f -name *qt[!5]* -exec rm {} +
+ find "${pkgdir}" -type l -name *qt[!5]* -exec rm {} +
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch b/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch
new file mode 100755
index 000000000..0bcb24589
--- /dev/null
+++ b/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch
@@ -0,0 +1,211 @@
+diff -up lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.5.1/liblightdm-gobject/power.c
+--- lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600
++++ lightdm-1.5.1/liblightdm-gobject/power.c 2013-03-09 11:31:00.169897568 -0600
+@@ -17,6 +17,7 @@
+
+ static GDBusProxy *upower_proxy = NULL;
+ static GDBusProxy *ck_proxy = NULL;
++static GDBusProxy *login1_proxy = NULL;
+
+ static gboolean
+ upower_call_function (const gchar *function, gboolean default_result, GError **error)
+@@ -147,6 +148,59 @@ ck_call_function (const gchar *function,
+ return function_result;
+ }
+
++static gboolean
++login1_call_function (const gchar *function, GVariant *parameters, gboolean default_result, GError **error)
++{
++ GVariant *result;
++ gboolean function_result = FALSE;
++ const gchar *true_result = "yes";
++ gchar *str_result;
++
++ if (!login1_proxy)
++ {
++ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
++ G_DBUS_PROXY_FLAGS_NONE,
++ NULL,
++ "org.freedesktop.login1",
++ "/org/freedesktop/login1",
++ "org.freedesktop.login1.Manager",
++ NULL,
++ error);
++ if (!login1_proxy)
++ return FALSE;
++ }
++
++ result = g_dbus_proxy_call_sync (login1_proxy,
++ function,
++ parameters,
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ error);
++
++ if (!result)
++ return default_result;
++
++ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)")))
++ g_variant_get (result, "(s)", &function_result);
++
++ /**
++ * CanReboot, CanPowerOff returns a string "yes", "no", or "challenge", not a boolean as ConsoleKit
++ **/
++ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(s)"))) {
++ g_variant_get (result, "(b)", str_result);
++ if(g_strcmp0(str_result,true_result) == 0) {
++ function_result = TRUE;
++ }
++ else {
++ function_result = default_result;
++ }
++ }
++
++ g_variant_unref (result);
++ return function_result;
++}
++
+ /**
+ * lightdm_get_can_restart:
+ *
+@@ -157,7 +211,11 @@ ck_call_function (const gchar *function,
+ gboolean
+ lightdm_get_can_restart (void)
+ {
+- return ck_call_function ("CanRestart", FALSE, NULL);
++ gboolean function_result = FALSE;
++ function_result = login1_call_function ("CanReboot", NULL, FALSE, NULL);
++ if (!function_result)
++ function_result = ck_call_function ("CanRestart", FALSE, NULL);
++ return function_result;
+ }
+
+ /**
+@@ -171,7 +229,11 @@ lightdm_get_can_restart (void)
+ gboolean
+ lightdm_restart (GError **error)
+ {
+- return ck_call_function ("Restart", TRUE, error);
++ gboolean function_result = FALSE;
++ function_result = login1_call_function ("Reboot", g_variant_new("(b)",0), TRUE, error);
++ if (!function_result)
++ function_result = ck_call_function ("Restart", TRUE, error);
++ return function_result;
+ }
+
+ /**
+@@ -184,7 +246,11 @@ lightdm_restart (GError **error)
+ gboolean
+ lightdm_get_can_shutdown (void)
+ {
+- return ck_call_function ("CanStop", FALSE, NULL);
++ gboolean function_result = FALSE;
++ function_result = login1_call_function ("CanPowerOff", NULL, FALSE, NULL);
++ if (!function_result)
++ function_result = ck_call_function ("CanStop", FALSE, NULL);
++ return function_result;
+ }
+
+ /**
+@@ -198,5 +264,9 @@ lightdm_get_can_shutdown (void)
+ gboolean
+ lightdm_shutdown (GError **error)
+ {
+- return ck_call_function ("Stop", TRUE, error);
++ gboolean function_result = FALSE;
++ function_result = login1_call_function ("PowerOff", g_variant_new("(b)",0), TRUE, error);
++ if (!function_result)
++ function_result = ck_call_function ("Stop", TRUE, error);
++ return function_result;
+ }
+diff -up lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.1/liblightdm-qt/power.cpp
+--- lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600
++++ lightdm-1.5.1/liblightdm-qt/power.cpp 2013-03-09 11:36:47.140559838 -0600
+@@ -15,6 +15,7 @@
+ #include <QtCore/QVariant>
+ #include <QtDBus/QDBusInterface>
+ #include <QtDBus/QDBusReply>
++#include <QDebug>
+
+ #include "config.h"
+
+@@ -26,11 +27,13 @@ public:
+ PowerInterfacePrivate();
+ QScopedPointer<QDBusInterface> powerManagementInterface;
+ QScopedPointer<QDBusInterface> consoleKitInterface;
++ QScopedPointer<QDBusInterface> login1Interface;
+ };
+
+ PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
+ powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
+- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus()))
++ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
++ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
+ {
+ }
+
+@@ -80,34 +83,55 @@ void PowerInterface::hibernate()
+
+ bool PowerInterface::canShutdown()
+ {
++
++ if ( d->login1Interface->isValid() ) {
++ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
++ if (reply1.isValid()) {
++ return (reply1.value()=="yes");
++ }
++ }
++ qWarning() << d->login1Interface->lastError();
++
+ QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
+ if (reply.isValid()) {
+ return reply.value();
+ }
+- else {
+- return false;
+- }
++
++ return false;
+ }
+
+ void PowerInterface::shutdown()
+ {
+- d->consoleKitInterface->call("Stop");
++ if ( d->login1Interface->isValid() )
++ d->login1Interface->call("PowerOff",false);
++ else
++ d->consoleKitInterface->call("Stop");
+ }
+
+ bool PowerInterface::canRestart()
+ {
++ if ( d->login1Interface->isValid() ) {
++ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
++ if (reply1.isValid()) {
++ return (reply1.value()=="yes");
++ }
++ }
++ qWarning() << d->login1Interface->lastError();
++
+ QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
+ if (reply.isValid()) {
+ return reply.value();
+ }
+- else {
+- return false;
+- }
++
++ return false;
+ }
+
+ void PowerInterface::restart()
+ {
+- d->consoleKitInterface->call("Restart");
++ if ( d->login1Interface->isValid() )
++ d->login1Interface->call("Reboot",false);
++ else
++ d->consoleKitInterface->call("Restart");
+ }
+
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
diff --git a/community/lightdm/lightdm-autologin.pam b/community/lightdm/lightdm-autologin.pam
new file mode 100755
index 000000000..4cd3626cd
--- /dev/null
+++ b/community/lightdm/lightdm-autologin.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth required pam_env.so$
+auth required pam_tally.so file=/var/log/faillog onerr=succeed$
+auth required pam_shells.so$
+auth required pam_nologin.so$
+auth required pam_permit.so$
+-auth optional pam_gnome_keyring.so$
+account include system-local-login$
+password include system-local-login$
+session include system-local-login$
+-session optional pam_gnome_keyring.so auto_start
diff --git a/community/lightdm/lightdm-default-config.patch b/community/lightdm/lightdm-default-config.patch
new file mode 100755
index 000000000..8b106dd91
--- /dev/null
+++ b/community/lightdm/lightdm-default-config.patch
@@ -0,0 +1,35 @@
+diff -rupN lightdm-1.5.1.orig/data/lightdm.conf lightdm-1.5.1/data/lightdm.conf
+--- lightdm-1.5.1.orig/data/lightdm.conf 2013-03-06 03:40:10.000000000 +0100
++++ lightdm-1.5.1/data/lightdm.conf 2013-03-12 22:59:22.494743200 +0100
+@@ -24,7 +24,7 @@
+ #user-authority-in-system-dir=false
+ #guest-account-script=guest-account
+ #log-directory=/var/log/lightdm
+-#run-directory=/var/run/lightdm
++run-directory=/run/lightdm
+ #cache-directory=/var/cache/lightdm
+ #xsessions-directory=/usr/share/xsessions
+ #remote-sessions-directory=/usr/share/lightdm/remote-sessions
+@@ -77,7 +77,7 @@
+ #user-session=default
+ #allow-guest=true
+ #guest-session=UNIMPLEMENTED
+-#session-wrapper=lightdm-session
++session-wrapper=/etc/lightdm/xsession
+ #display-setup-script=
+ #greeter-setup-script=
+ #session-setup-script=
+diff -rupN lightdm-1.5.1.orig/data/users.conf lightdm-1.5.1/data/users.conf
+--- lightdm-1.5.1.orig/data/users.conf 2013-03-06 03:40:10.000000000 +0100
++++ lightdm-1.5.1/data/users.conf 2013-03-12 22:54:29.398854700 +0100
+@@ -8,7 +8,7 @@
+ # hidden-users = Users that are not shown to the user
+ # hidden-shells = Shells that indicate a user cannot login
+ #
+-[UserAccounts]
+-minimum-uid=500
++[UserList]
++minimum-uid=1000
+ hidden-users=nobody nobody4 noaccess
+-hidden-shells=/bin/false /usr/sbin/nologin
++hidden-shells=/bin/false /sbin/nologin
diff --git a/community/lightdm/lightdm-lock-screen-before-switch.patch b/community/lightdm/lightdm-lock-screen-before-switch.patch
new file mode 100755
index 000000000..b8b1d559c
--- /dev/null
+++ b/community/lightdm/lightdm-lock-screen-before-switch.patch
@@ -0,0 +1,55 @@
+# HG changeset patch
+# Parent b329fa1badaa454239690c3feb93d53324134915
+try to lock the screen before switching users
+
+diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver
+--- a/utils/gdmflexiserver
++++ b/utils/gdmflexiserver
+@@ -9,9 +9,47 @@
+ #
+ # See http://www.gnu.org/copyleft/gpl.html for the full text of the license.
+
++PATH=/usr/local/bin:/bin:/usr/bin
++export PATH
++
+ if [ -z "$XDG_SEAT_PATH" ]; then
+ # something went wrong
+ exit 1
+ fi
+
++find_command () {
++ cmd="$1"
++ oIFS="${IFS}"; IFS=:
++ set -- ${PATH}
++ IFS="${oIFS}"
++
++ for part; do
++ [ -x "${part}/${cmd}" ] && return 0
++ done
++ return 1
++}
++
++lock_screen () {
++ for lock_cmd in \
++ "xscreensaver-command -lock" \
++ "gnome-screensaver-command --lock" \
++ "dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call /ScreenSaver org.freedesktop.ScreenSaver.Lock"
++ do
++ ${lock_cmd} >/dev/null 2>&1 && return
++ done
++
++ for lock_cmd in \
++ "slock" \
++ "xlock -mode blank"
++ do
++ set -- ${lock_cmd}
++ if find_command "$1"; then
++ ${lock_cmd} >/dev/null 2>&1 &
++ return
++ fi
++ done
++}
++
++lock_screen
++
+ dbus-send --system --type=method_call --print-reply --dest=org.freedesktop.DisplayManager $XDG_SEAT_PATH org.freedesktop.DisplayManager.Seat.SwitchToGreeter
diff --git a/community/lightdm/lightdm.install b/community/lightdm/lightdm.install
new file mode 100755
index 000000000..154d93e10
--- /dev/null
+++ b/community/lightdm/lightdm.install
@@ -0,0 +1,15 @@
+post_install() {
+ getent group lightdm > /dev/null 2>&1 || groupadd -g 620 lightdm
+ getent passwd lightdm > /dev/null 2>&1 || useradd -c 'Light Display Manager' -u 620 -g lightdm -d /run/lightdm -s /sbin/nologin lightdm
+ passwd -l lightdm > /dev/null
+ systemd-tmpfiles --create /usr/lib/tmpfiles.d/lightdm.conf
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ getent passwd lightdm > /dev/null 2>&1 && userdel lightdm
+ getent group lightdm > /dev/null 2>&1 && groupdel lightdm
+}
diff --git a/community/lightdm/lightdm.pam b/community/lightdm/lightdm.pam
new file mode 100755
index 000000000..76b8869a2
--- /dev/null
+++ b/community/lightdm/lightdm.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth include system-login
+-auth optional pam_gnome_keyring.so
+account include system-login
+password include system-login
+session include system-login
+-session optional pam_gnome_keyring.so auto_start
diff --git a/community/lightdm/lightdm.rules b/community/lightdm/lightdm.rules
new file mode 100755
index 000000000..eda155bf3
--- /dev/null
+++ b/community/lightdm/lightdm.rules
@@ -0,0 +1,15 @@
+polkit.addRule(function(action, subject) {
+ if (subject.user == "lightdm") {
+ polkit.log("action=" + action);
+ polkit.log("subject=" + subject);
+ if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+ return polkit.Result.YES;
+ }
+ if (action.id.indexOf("org.freedesktop.consolekit.system.") == 0) {
+ return polkit.Result.YES;
+ }
+ if (action.id.indexOf("org.freedesktop.upower.") == 0) {
+ return polkit.Result.YES;
+ }
+ }
+});
diff --git a/community/lightdm/lightdm.service b/community/lightdm/lightdm.service
new file mode 100755
index 000000000..7eb46ceba
--- /dev/null
+++ b/community/lightdm/lightdm.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Light Display Manager
+Documentation=man:lightdm(1)
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=/usr/sbin/lightdm
+StandardOutput=syslog
+Restart=always
+IgnoreSIGPIPE=no
+BusName=org.freedesktop.DisplayManager
+
+[Install]
+Alias=display-manager.service
diff --git a/community/lightdm/lightdm.tmpfiles b/community/lightdm/lightdm.tmpfiles
new file mode 100755
index 000000000..5199f5327
--- /dev/null
+++ b/community/lightdm/lightdm.tmpfiles
@@ -0,0 +1,2 @@
+d /run/lightdm 0775 lightdm lightdm
+f /run/lightdm/.pam_environment 0644 lightdm lightdm - GDK_CORE_DEVICE_EVENTS=true
diff --git a/community/lightdm/xsession b/community/lightdm/xsession
new file mode 100755
index 000000000..589205342
--- /dev/null
+++ b/community/lightdm/xsession
@@ -0,0 +1,73 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+ if [ -f "$file" ]; then
+ echo "Loading profile from $file";
+ . "$file"
+ fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+ if [ -f "$file" ]; then
+ echo "Loading resource: $file"
+ xrdb -nocpp -merge "$file"
+ fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading keymap: $file"
+ setxkbmap `cat "$file"`
+ XKB_IN_USE=yes
+ fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+ for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+ fi
+ done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+ for script in $xinitdir/*; do
+ echo "Loading xinit script $script"
+ if [ -x "$script" -a ! -d "$script" ]; then
+ . "$script"
+ fi
+ done
+fi
+
+# Load xsession scripts
+xsessionddir="/etc/X11/xsession.d"
+if [ -d "$xsessionddir" ]; then
+ for i in `ls $xsessionddir`; do
+ script="$xsessionddir/$i"
+ echo "Loading X session script $script"
+ if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
+ . "$script"
+ fi
+ done
+fi
+if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
+ echo "Loading user X session script"
+ . "$HOME/.xsession"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@
diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD
index 0d67dc101..b2c4c5bb0 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -1,30 +1,46 @@
-# $Id: PKGBUILD 81123 2012-12-12 00:49:35Z eric $
+# $Id: PKGBUILD 86219 2013-03-13 13:38:07Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-pkgname=lua-zlib
+pkgname=(lua-zlib lua51-zlib)
+pkgbase=lua-zlib
pkgver=0.2
-pkgrel=3
+pkgrel=4
_gitver=8d07669
-_luaver=5.2
url="http://github.com/brimworks/lua-zlib"
pkgdesc='Simple streaming interface to zlib for Lua.'
arch=('i686' 'x86_64')
license=('MIT')
-depends=('lua' 'zlib')
-makedepends=('cmake')
+makedepends=('cmake' 'lua' 'lua51' 'zlib')
conflicts=('lua-lzlib')
source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver")
md5sums=('28ce556fccb2d364bc5392f63c6f89ee')
build() {
+ cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver}
+
cd $srcdir/brimworks-lua-zlib-${_gitver}
- sed -i "s#share/lua/cmod#lib/lua/${_luaver}#" CMakeLists.txt
+ sed -i "s#share/lua/cmod#lib/lua/5.2#" CMakeLists.txt
+ cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr .
+
+ cd $srcdir/brimworks-lua51-zlib-${_gitver}
+ sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr .
}
-package() {
+package_lua-zlib() {
+ depends=('zlib' 'lua')
+
cd $srcdir/brimworks-lua-zlib-${_gitver}
make DESTDIR="$pkgdir" install
- install -D -m644 "README" "$pkgdir/usr/share/licenses/lua-zlib/README"
+ install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
+}
+
+package_lua51-zlib() {
+ depends=('zlib' 'lua51')
+
+ cd $srcdir/brimworks-lua51-zlib-${_gitver}
+ make DESTDIR="$pkgdir" install
+ install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README"
}
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 5e61a05e1..d369c0d94 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85853 2013-03-07 19:25:26Z bpiotrowski $
+# $Id: PKGBUILD 86233 2013-03-13 19:40:21Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
pkgname=nodejs
-pkgver=0.8.22
+pkgver=0.10.0
pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2')
checkdepends=('curl') # curl used for check()
options=('!emptydirs')
source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('3f61152cf5cd8fc1ab5c6c18101819841b947da79e1e44b51418c0ad2e6db8e8')
+sha256sums=('1624dc37866ebfb5431e3393e6b049cf238cac8ad4d20c6d567263b1259177ab')
build() {
cd node-v${pkgver}
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index f9331664b..5ae1190d3 100644
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -1,38 +1,41 @@
-# $Id: PKGBUILD 74606 2012-07-31 12:59:28Z bpiotrowski $
+# $Id: PKGBUILD 86235 2013-03-13 19:48:34Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: Laszlo Papp <djszapi2@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=pigz
-pkgver=2.2.5
+pkgver=2.3
pkgrel=1
-pkgdesc="Parallel implementation of the gzip file compressor"
+pkgdesc='Parallel implementation of the gzip file compressor'
arch=('i686' 'x86_64')
-url="http://www.zlib.net/pigz/"
+url='http://www.zlib.net/pigz/'
license=('custom')
depends=('zlib')
-source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('188f769ccedc403893d03049ad31e969')
+source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz
+ pigz-2.3-make.patch)
+md5sums=('042e3322534f2c3d761736350cac303f'
+ 'f6291ee36e36e098d7fbf0655a89b183')
build() {
- cd "${srcdir}/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
+ patch -Np1 -i "$srcdir"/pigz-2.3-make.patch
make
}
package() {
- cd "${srcdir}/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
- install -Dm755 "${srcdir}"/${pkgname}-$pkgver/${pkgname} \
- "${pkgdir}"/usr/bin/${pkgname}
+ install -Dm755 "$srcdir"/$pkgname-$pkgver/$pkgname \
+ "$pkgdir"/usr/bin/$pkgname
- pushd "${pkgdir}"/usr/bin
+ pushd "$pkgdir"/usr/bin
ln -s pigz unpigz
popd
- install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.1 \
- "${pkgdir}"/usr/share/man/man1/${pkgname}.1
- install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.pdf \
- "${pkgdir}"/usr/share/doc/${pkgname}/${pkgname}.pdf
- install -Dm644 "${srcdir}"/${pkgname}-$pkgver/README \
- "${pkgdir}"/usr/share/licenses/${pkgname}/README
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/$pkgname.1 \
+ "$pkgdir"/usr/share/man/man1/$pkgname.1
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/$pkgname.pdf \
+ "$pkgdir"/usr/share/doc/$pkgname/$pkgname.pdf
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/README \
+ "$pkgdir"/usr/share/licenses/$pkgname/README
}
diff --git a/community/pigz/pigz-2.3-make.patch b/community/pigz/pigz-2.3-make.patch
new file mode 100644
index 000000000..f014c7b02
--- /dev/null
+++ b/community/pigz/pigz-2.3-make.patch
@@ -0,0 +1,25 @@
+From 545a9350f8026f6c9826dd4fa7ab6000d8826d78 Mon Sep 17 00:00:00 2001
+From: Tim Harder <radhermit@gmail.com>
+Date: Wed, 6 Mar 2013 15:51:27 -0800
+Subject: [PATCH] Respect LDFLAGS and explicitly link to math library
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3cc231d..48d1f26 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra
+
+
+ pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o
+- $(CC) -o pigz $^ -lpthread -lz
++ $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lz -lm
+ ln -f pigz unpigz
+
+ pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
+--
+1.8.1.5
+
diff --git a/community/qupzilla/PKGBUILD b/community/qupzilla/PKGBUILD
index 46cb818ef..645e744fc 100644
--- a/community/qupzilla/PKGBUILD
+++ b/community/qupzilla/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 83299 2013-01-29 01:36:39Z speps $
+# $Id: PKGBUILD 86204 2013-03-13 01:33:35Z speps $
# Maintainer: speps <speps at aur dot archlinux dot org>
_name=QupZilla
-_commit=fbfcc70
+_commit=93d22ec # fixes https://github.com/QupZilla/qupzilla/issues/793
pkgname=qupzilla
-pkgver=1.3.5_git20130128
+pkgver=1.4.0_git20130312
pkgrel=1
pkgdesc="Cross-platform QtWebKit browser"
arch=(i686 x86_64)
url="http://www.qupzilla.com/"
license=('GPL3')
-depends=('qtwebkit')
+depends=('qtwebkit' 'hunspell')
+optdepends=('bash-completion: bash completion support')
install="$pkgname.install"
source=("$pkgname-$pkgver.tar.gz::https://github.com/$_name/$pkgname/tarball/$_commit")
-md5sums=('ff8bd77f785335a8157aceb3cd54507a')
+md5sums=('8fa69f60a26b55d68bfac2d7ec812bf8')
build() {
cd "$srcdir/$_name-$pkgname-"*
@@ -21,13 +22,24 @@ build() {
# enable webgl support
export USE_WEBGL=true
- qmake QUPZILLA_PREFIX=/usr/
+ # manually install bash completion
+ sed -i '/bashcompletion/d' src/install.pri
+
+ qmake-qt4 QUPZILLA_PREFIX=/usr/
make
}
package() {
cd "$srcdir/$_name-$pkgname-"*
make INSTALL_ROOT="$pkgdir/" install
+
+ # bash completion
+ install -Dm644 linux/completion/bash_completion.sh \
+ "$pkgdir/usr/share/bash-completion/completions/$pkgname"
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$pkgname"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 1676dc7aa..c6918ace1 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 85878 2013-03-08 06:00:14Z fyan $
+# $Id: PKGBUILD 86215 2013-03-13 13:22:22Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: archtux <antonio dot arias99999 at gmail dot com>
pkgname=xnoise
pkgver=0.2.16
-pkgrel=2
+pkgrel=3
pkgdesc="Media player with a slick GUI, great speed and lots of features."
arch=('i686' 'x86_64')
url="http://www.xnoise-media-player.com/"
license=('GPL2')
depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo')
-optdepends=('gst-plugins-bad: Extra media codecs'
+optdepends=('gst-plugins-base: Basic media codecs'
+ 'gst-plugins-bad: Extra media codecs'
'gst-plugins-ugly: Extra media codecs'
'gst-libav: Extra media codecs')
makedepends=('gettext' 'intltool')
@@ -32,6 +33,6 @@ package() {
make DESTDIR="$pkgdir" install
# Remove obsolete files
- rm -rf $pkgdir/usr/include $pkgdir/usr/share/vala
+ rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
}
md5sums=('54a3c54bb292353075a22e49e6cc1eae')
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index dda533b5b..d0814d595 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 157991 2012-04-30 17:51:02Z dan $
+# $Id: PKGBUILD 179949 2013-03-13 11:07:49Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@soufly.nl>
# Contributor: Tor Krill
pkgname=autogen
-pkgver=5.15
+pkgver=5.17.2
pkgrel=1
pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ depends=('guile' 'libxml2')
options=('!libtool')
install=autogen.install
source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('5fba3c0e1ec0965061f27e8e79bd6da2'
- 'ed74e586ade1a61f753d391f3849c25b')
+md5sums=('567dd065d24294c5c31517e399c2fcf5'
+ 'af72d4d6f27486366e7712c41f61b8fa')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 7ee20c4bf..2ed945e90 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178833 2013-02-27 14:34:41Z andrea $
+# $Id: PKGBUILD 179991 2013-03-13 21:33:19Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -17,18 +17,18 @@ pkgname=('calligra-filters'
'calligra-handbook'
'calligra-braindump'
'calligra-flow')
-pkgver=2.6.1
-pkgrel=2
+pkgver=2.6.2
+pkgrel=1
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
- 'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
+ 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
- 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa' 'vc')
+ 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc')
groups=('calligra')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('8ba98f3ccb3c5097eb059d86b51f6139')
+md5sums=('1c2feb12677ee71eb2e428e589b33862')
build() {
mkdir build
@@ -107,7 +107,7 @@ package_calligra-karbon() {
package_calligra-kexi() {
pkgdesc="Develop desktop database applications"
depends=('calligra-libs' 'glew' 'fftw')
- optdepends=('libmysqlclient: MySQL driver'
+ optdepends=('libmariadbclient: MariaDB driver'
'freetds: Sybase & MS SQL driver'
'xbase: XBase driver'
'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 9ba5e1e92..3822b8e89 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162401 2012-06-26 20:15:42Z andyrtr $
+# $Id: PKGBUILD 179955 2013-03-13 11:59:13Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=dbus-glib
-pkgver=0.100
+pkgver=0.100.2
pkgrel=1
pkgdesc="GLib bindings for DBUS"
arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('dbus-core' 'glib2')
makedepends=('pkgconfig')
options=('!libtool' '!emptydirs')
source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d33959a9c0c6a158f5ac6d640316e89e')
+md5sums=('ad0920c7e3aad669163bb59171cf138e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index eea4b775c..bce513ea2 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 176001 2013-01-25 17:18:47Z ioni $
+# $Id: PKGBUILD 179957 2013-03-13 12:28:12Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=evolution-data-server
-pkgver=3.6.3
+pkgver=3.6.4
pkgrel=1
pkgdesc="Centralized access to appointments and contacts"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=$pkgname.install
url="http://www.gnome.org"
license=('GPL')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0')
+sha256sums=('50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 0b4ed50be..dccdcd330 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176002 2013-01-25 17:24:35Z ioni $
+# $Id: PKGBUILD 179984 2013-03-13 20:18:27Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=evolution
-pkgver=3.6.3
+pkgver=3.6.4
pkgrel=1
pkgdesc="Manage your email, contacts and schedule"
arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs')
install=evolution.install
url=http://www.gnome.org/projects/evolution/
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2c564f3e59cb26663d3e3992c881842815fb8fbc037074475f906030c8c5fd25')
+sha256sums=('7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index 31e7a370f..dfd2e82fd 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 170051 2012-10-31 09:24:25Z jgc $
+# $Id: PKGBUILD 179963 2013-03-13 14:27:34Z jgc $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=gconf
-pkgver=3.2.5
-pkgrel=3
+pkgver=3.2.6
+pkgrel=1
pkgdesc="A configuration database system"
arch=(i686 x86_64)
license=('LGPL')
@@ -13,17 +13,11 @@ options=('!libtool')
install=gconf.install
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
- gconf-dbus-fix-use-after-free.patch
- gconf-dbus-fix-shutdown.patch
- gsettings-schema-convert-dont-fail.patch
gconf-merge-schema
gconfpkg
gconf-reload.patch
01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
- '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d'
- 'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2'
- 'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19'
+sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
'567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
@@ -31,10 +25,6 @@ sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
build() {
cd "GConf-$pkgver"
- # Upstream fixes from git
- patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch"
- patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch"
- patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch"
# Patch from fedora - reloads gconf after installing schemas
patch -Np1 -i "$srcdir/gconf-reload.patch"
diff --git a/extra/gconf/gconf-dbus-fix-shutdown.patch b/extra/gconf/gconf-dbus-fix-shutdown.patch
deleted file mode 100644
index b294284b2..000000000
--- a/extra/gconf/gconf-dbus-fix-shutdown.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 39299610083e0e7f9b44e62b7f4e51e89693cf89 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Tue, 06 Mar 2012 19:39:06 +0000
-Subject: dbus: fix shutdown
-
-gconftool-2 wasn't properly shutting down gconfd, because
-it was trying to do it before connecting to the daemon.
-
-This commit makes sure that we always first try to connect to
-the daemon before asking it to shutdown.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671490
----
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 442a94b..f167fc5 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -2483,7 +2483,13 @@ gconf_shutdown_daemon (GError** err)
- {
- DBusMessage *message;
-
-- /* Don't want to spawn it if it's already down */
-+ /* If we haven't reached out to it yet,
-+ * reach out now.
-+ */
-+ if (global_conn == NULL)
-+ gconf_ping_daemon();
-+
-+ /* But we don't want to spawn it if it's already down */
- if (global_conn == NULL || !service_running)
- return;
-
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gconf-dbus-fix-use-after-free.patch b/extra/gconf/gconf-dbus-fix-use-after-free.patch
deleted file mode 100644
index d99b222cc..000000000
--- a/extra/gconf/gconf-dbus-fix-use-after-free.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 84884e9df7ce8c081a1c223c66a799b82545ff1e Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 18 Oct 2012 20:08:02 +0000
-Subject: gconf-dbus: fix use after free
-
-gconf_engine_get_fuller is accessing freed memory.
-The problem is that it's referencing strings that are owned
-by a D-Bus message, and they go away when the D-Bus message is freed.
-
-This commit addresses the problem by duplicating the strings and
-freeing them later.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=667167
----
-diff --git a/gconf/gconf-dbus-utils.c b/gconf/gconf-dbus-utils.c
-index 6fd5bfa..92f5980 100644
---- a/gconf/gconf-dbus-utils.c
-+++ b/gconf/gconf-dbus-utils.c
-@@ -569,11 +569,11 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter,
- gchar **schema_name_p)
- {
- DBusMessageIter struct_iter;
-- gchar *key;
-+ const gchar *key;
- GConfValue *value;
- gboolean is_default;
- gboolean is_writable;
-- gchar *schema_name;
-+ const gchar *schema_name;
-
- g_return_val_if_fail (dbus_message_iter_get_arg_type (main_iter) == DBUS_TYPE_STRUCT,
- FALSE);
-@@ -587,7 +587,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter,
- value = utils_get_value (&struct_iter);
-
- dbus_message_iter_next (&struct_iter);
-- schema_name = (gchar *) utils_get_optional_string (&struct_iter);
-+ schema_name = utils_get_optional_string (&struct_iter);
-
- dbus_message_iter_next (&struct_iter);
- dbus_message_iter_get_basic (&struct_iter, &is_default);
-@@ -596,7 +596,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter,
- dbus_message_iter_get_basic (&struct_iter, &is_writable);
-
- if (key_p)
-- *key_p = key;
-+ *key_p = g_strdup (key);
-
- if (value_p)
- *value_p = value;
-@@ -604,7 +604,7 @@ gconf_dbus_utils_get_entry_values (DBusMessageIter *main_iter,
- gconf_value_free (value);
-
- if (schema_name_p)
-- *schema_name_p = schema_name;
-+ *schema_name_p = g_strdup (schema_name);
-
- if (is_default_p)
- *is_default_p = is_default;
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index f167fc5..5610fcf 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -1252,12 +1252,13 @@ gconf_engine_get_fuller (GConfEngine *conf,
-
- if (schema_name && schema_name[0] != '/')
- {
-+ g_free (schema_name);
- schema_name = NULL;
- }
-
- if (schema_name_p)
-- *schema_name_p = g_strdup (schema_name);
--
-+ *schema_name_p = schema_name;
-+
- return val;
- }
-
-@@ -2402,7 +2403,7 @@ handle_notify (DBusConnection *connection,
- GConfEngine *conf2)
- {
- GConfEngine *conf;
-- gchar *key, *schema_name;
-+ gchar *key = NULL, *schema_name = NULL;
- gboolean is_default, is_writable;
- DBusMessageIter iter;
- GConfValue *value;
-@@ -2466,6 +2467,8 @@ handle_notify (DBusConnection *connection,
-
- if (value)
- gconf_value_free (value);
-+ g_free (key);
-+ g_free (schema_name);
-
- if (!match)
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
---
-cgit v0.9.0.2
diff --git a/extra/gconf/gsettings-schema-convert-dont-fail.patch b/extra/gconf/gsettings-schema-convert-dont-fail.patch
deleted file mode 100644
index 92040b343..000000000
--- a/extra/gconf/gsettings-schema-convert-dont-fail.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 02f12f41b031a1c2672e7cf1cb8ebde58288c547 Mon Sep 17 00:00:00 2001
-From: Guido Günther <agx@sigxcpu.org>
-Date: Thu, 23 Feb 2012 20:14:18 +0000
-Subject: gsettings-schema-convert: Don't fail to convert lists without default element
-
----
-diff --git a/gsettings/gsettings-schema-convert b/gsettings/gsettings-schema-convert
-index a60dc35..913cc83 100755
---- a/gsettings/gsettings-schema-convert
-+++ b/gsettings/gsettings-schema-convert
-@@ -854,11 +854,10 @@ class GConfSchema:
- # Fix the default value to be parsable by GVariant
- if self.type == 'list':
- l = self.default.strip()
-- if not (l[0] == '[' and l[-1] == ']'):
-- if not l:
-- l = '[]'
-- else:
-- raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
-+ if not l:
-+ l = '[]'
-+ elif not (l[0] == '[' and l[-1] == ']'):
-+ raise GSettingsSchemaConvertException('Cannot parse default list value \'%s\' for key \'%s\'.' % (self.default, self.applyto or self.key))
- values = l[1:-1].strip()
- if not values:
- self.default = '[]'
---
-cgit v0.9.0.2
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index 38916969c..8c7e38e31 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 154806 2012-03-30 18:41:27Z heftig $
+# $Id: PKGBUILD 179965 2013-03-13 14:34:29Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@soulfly.nl>
pkgname=genius
-pkgver=1.0.15
+pkgver=1.0.16
pkgrel=1
pkgdesc="Advanced calculator including a mathematical programming language"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.jirka.org/genius.html"
-depends=('vte>=0.26.2' 'gtksourceview2>=2.10.5' 'mpfr>=3.0.0' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0')
+depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'gnome-doc-utils')
options=('!libtool' '!makeflags')
install=genius.install
source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('941e9d09d9f151f3f36ae190bad3c4e2887a552a301dc99af5fd06f8c5c76377')
+sha256sums=('45ce3e0b02c109588ff9a4c74e7c3541b3de89ea93f20ab08178c51c6ab4fb78')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index 2e91ef567..1f8343a00 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 169903 2012-10-30 22:34:22Z heftig $
+# $Id: PKGBUILD 179951 2013-03-13 11:42:54Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Kritoke <kritoke@nospam.gmail.com>
pkgname=gnome-nettool
pkgver=3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="A Collection of GNOME3 Networking Tools."
arch=(i686 x86_64)
license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
+depends=('gtk3' 'libgtop' 'ldns' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
optdepends=('nmap: Port scanning'
'net-tools: Network statistics')
groups=('gnome-extra')
url="http://www.gnome.org"
install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ ldns.patch)
+sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79'
+ '8bd83fe863d2945689afd753e5908a2bc033206e25f28d88783ae8d859d6bfeb')
build() {
cd $pkgname-$pkgver
+ patch -Np1 -i ../ldns.patch
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-schemas-compile
make
diff --git a/extra/gnome-nettool/ldns.patch b/extra/gnome-nettool/ldns.patch
new file mode 100644
index 000000000..318e89777
--- /dev/null
+++ b/extra/gnome-nettool/ldns.patch
@@ -0,0 +1,21 @@
+diff -u -r gnome-nettool-3.2.0/src/lookup.c gnome-nettool-3.2.0-ldns/src/lookup.c
+--- gnome-nettool-3.2.0/src/lookup.c 2012-01-03 10:38:09.000000000 +0100
++++ gnome-nettool-3.2.0-ldns/src/lookup.c 2013-03-13 12:32:31.551213914 +0100
+@@ -98,7 +98,7 @@
+
+ parent = gtk_widget_get_toplevel (netinfo->output);
+
+- program = util_find_program_dialog ("dig", parent);
++ program = util_find_program_dialog ("drill", parent);
+
+ if (program != NULL) {
+ use_reverse_lookup = pattern_match (host, address_regular_expression);
+@@ -116,7 +116,7 @@
+ command_line = g_new (gchar *, num_terms + 1);
+ i = 0;
+ command_line[i++] = g_strdup (program);
+- command_line[i++] = g_strdup ("dig");
++ command_line[i++] = g_strdup ("drill");
+ if (command_options != NULL) {
+ for (j = 0; command_options[j] != NULL; j++)
+ command_line[i++] = g_strdup (command_options[j]);
diff --git a/extra/gnome-sharp/02_fix_pkg-config_paths.patch b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
new file mode 100644
index 000000000..d8e239032
--- /dev/null
+++ b/extra/gnome-sharp/02_fix_pkg-config_paths.patch
@@ -0,0 +1,49 @@
+## 02_fix_pkg-config_paths.dpatch by Mirco Bauer <meebey@debian.org>
+##
+## Modified by Archlinux: removed libdir change
+
+diff -urNad gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/art/art-sharp-2.0.pc.in 2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/art/art-sharp-2.0.pc.in 2009-03-21 19:03:32.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf/gconf-sharp-2.0.pc.in 2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf/gconf-sharp-2.0.pc.in 2009-03-21 19:03:26.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+
+diff -urNad gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in
+--- gnome-sharp-2.24.1~/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in 2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gconf/GConf.PropertyEditors/gconf-sharp-peditors-2.0.pc.in 2009-03-21 19:03:20.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+
+diff -urNad gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnome/gnome-sharp-2.0.pc.in 2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnome/gnome-sharp-2.0.pc.in 2009-03-21 19:03:07.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
+diff -urNad gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in
+--- gnome-sharp-2.24.1~/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2009-03-21 19:02:54.000000000 +0100
++++ gnome-sharp-2.24.1/gnomevfs/gnome-vfs-sharp-2.0.pc.in 2009-03-21 19:03:12.000000000 +0100
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ gapidir=${prefix}/share/gapi-2.0
diff --git a/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
new file mode 100644
index 000000000..a7f841718
--- /dev/null
+++ b/extra/gnome-sharp/04_initialize_dbus_glib_threading.patch
@@ -0,0 +1,51 @@
+From e9d06b56a54dcd399d1d3eaaf62bdacb7e07084d Mon Sep 17 00:00:00 2001
+From: Mirco Bauer <meebey@meebey.net>
+Date: Sat, 2 Mar 2013 13:44:46 +0100
+Subject: [PATCH] Explicitly initialize D-Bus GLib threading
+
+When gconf was switched from orbit to dbus it was no longer thread-safe by
+default. This behavior can only get back by explicitly initializing dbus-glib's
+threads. This issue affects multi-threaded GConf# users like Banshee leading
+them to SEGVs.
+
+For more details see:
+https://bugzilla.gnome.org/show_bug.cgi?id=683830
+---
+ gconf/GConf/Client.cs | 11 +++++++++++
+ gconf/GConf/gconf-sharp.dll.config.in | 1 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gconf/GConf/Client.cs b/gconf/GConf/Client.cs
+index b8cc881..64efc9f 100644
+--- a/gconf/GConf/Client.cs
++++ b/gconf/GConf/Client.cs
+@@ -31,6 +31,17 @@ namespace GConf
+ [DllImport("gconf-2")]
+ static extern IntPtr gconf_client_get_default ();
+
++ [DllImport("dbus-glib-1")]
++ static extern void dbus_g_thread_init ();
++
++ static Client ()
++ {
++ // HACK: we have to initialize dbus' threading else GConf with its
++ // dbus backend will not be thread safe and SEGVs in our face, see:
++ // https://bugzilla.gnome.org/show_bug.cgi?id=683830
++ dbus_g_thread_init();
++ }
++
+ public Client ()
+ {
+ Initialize ();
+diff --git a/gconf/GConf/gconf-sharp.dll.config.in b/gconf/GConf/gconf-sharp.dll.config.in
+index 9fb7d15..f20ddae 100644
+--- a/gconf/GConf/gconf-sharp.dll.config.in
++++ b/gconf/GConf/gconf-sharp.dll.config.in
+@@ -1,3 +1,4 @@
+ <configuration>
+ <dllmap dll="gconf-2" target="libgconf-2@LIB_PREFIX@.4@LIB_SUFFIX@"/>
++ <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.2@LIB_SUFFIX@"/>
+ </configuration>
+--
+1.7.10.4
+
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 33518bbfe..988ecf5da 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -1,17 +1,21 @@
-# $Id: PKGBUILD 148756 2012-02-05 11:49:19Z ibiru $
+# $Id: PKGBUILD 179961 2013-03-13 13:55:50Z jgc $
# Maintainer: tobias <tobias@archlinux.org>
pkgbase=gnome-sharp
pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
pkgver=2.24.2
-pkgrel=2
+pkgrel=3
arch=(i686 x86_64)
license=(LGPL)
url="http://gtk-sharp.sourceforge.net"
makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
+source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2
+ 02_fix_pkg-config_paths.patch
+ 04_initialize_dbus_glib_threading.patch)
+md5sums=('3b38f53960c736d4afb8f04204efe98b'
+ 'a8c1bf57a384f5fc20a5890f9f1cef5a'
+ '90cd7ea88aaa3011522376153433d115')
build() {
# get rid of that .wapi errors; thanks to brice
@@ -19,6 +23,8 @@ build() {
mkdir -p "${MONO_SHARED_DIR}"
cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -Np1 -i ../04_initialize_dbus_glib_threading.patch
+ patch -Np1 -i ../02_fix_pkg-config_paths.patch
./configure --prefix=/usr --sysconfdir=/etc
make
}
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index eda21bb8a..c25f8186b 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169916 2012-10-30 22:34:57Z heftig $
+# $Id: PKGBUILD 179947 2013-03-13 11:01:23Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-terminal
-pkgver=3.6.0
+pkgver=3.6.1
pkgrel=1
pkgdesc="The GNOME Terminal Emulator"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
groups=('gnome')
install=gnome-terminal.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
+sha256sums=('c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 97721c542..cf6214957 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,32 +1,40 @@
-# $Id: PKGBUILD 173830 2012-12-24 16:09:54Z jgc $
+# $Id: PKGBUILD 179971 2013-03-13 16:25:37Z jgc $
# Maintainer: Eric Belanger <eric@archlinux.org>
# Contributor: Kritoke <typeolinux@yahoo.com>
pkgname=gnumeric
-pkgver=1.12.0
+pkgver=1.12.1
pkgrel=1
pkgdesc="A GNOME Spreadsheet Program"
arch=('i686' 'x86_64')
url="http://www.gnome.org/projects/gnumeric/"
license=('GPL')
depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' 'gobject-introspection')
optdepends=('python2-gobject: for python plugin support'
'perl: for perl plugin support'
'psiconv: for Psion 5 file support'
'yelp: for viewing the help manual')
install=gnumeric.install
options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
+ gnumeric-1.12.1-automake-1.13.patch
+ revert-warnings.patch)
+sha256sums=('0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901'
+ '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
+ 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
+ patch -Np0 -i ../revert-warnings.patch
+
# Remove invalid mime type. (FS#26338)
sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
+ autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-ssindex --disable-schemas-compile
+ --enable-ssindex --disable-schemas-compile --enable-introspection --enable-compile-warnings=no
make
}
diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
new file mode 100644
index 000000000..1ae1fb955
--- /dev/null
+++ b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch
@@ -0,0 +1,104 @@
+diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am
+--- gnumeric-1.12.0/test/Makefile.am.automake-1_13 2011-05-18 02:54:24.000000000 +0200
++++ gnumeric-1.12.0/test/Makefile.am 2013-01-05 18:25:56.380686587 +0100
+@@ -25,7 +25,99 @@
+ #
+ # 90xx: Misc stuff.
+
+-TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl))
++TESTS = \
++t1000-statfuns.pl \
++t1001-mathfuns.pl \
++t1002-finfuns.pl \
++t1003-engfuns.pl \
++t1004-textfuns.pl \
++t1005-logfuns.pl \
++t1006-datefuns.pl \
++t1007-dbfuns.pl \
++t1008-infofuns.pl \
++t1009-lookfuns.pl \
++t1010-bitwise.pl \
++t1011-yalta2008.pl \
++t1100-chitest.pl \
++t1101-ftest.pl \
++t1102-ttest.pl \
++t1103-sumif.pl \
++t1104-linest.pl \
++t1800-operators.pl \
++t1900-array.pl \
++t1901-regress.pl \
++t1902-array-intersection.pl \
++t2000-names-insdel.pl \
++t2001-func-help.pl \
++t2002-nonascii-numbers.pl \
++t2003-random-generators.pl \
++t2800-style-optimizer.pl \
++t5900-sc.pl \
++t5901-qpro.pl \
++t5902-applix.pl \
++t5903-sylk.pl \
++t5904-mps.pl \
++t6000-statfuns.pl \
++t6001-mathfuns.pl \
++t6002-objs.pl \
++t6003-lookfuns.pl \
++t6004-chart-tests.pl \
++t6004-finfuns.pl \
++t6100-statfuns-ods.pl \
++t6101-mathfuns-ods.pl \
++t6102-objs-ods.pl \
++t6103-lookfuns-ods.pl \
++t6104-finfuns-ods.pl \
++t7000-goal-seek.pl \
++t7100-solver-blend.pl \
++t7101-solver-afiro.pl \
++t7110-solver-Misra1a.pl \
++t7111-solver-Chwirut2.pl \
++t7112-solver-Chwirut1.pl \
++t7113-solver-Lanczos3.pl \
++t7114-solver-Gauss1.pl \
++t7115-solver-Gauss2.pl \
++t7116-solver-DanWood.pl \
++t7117-solver-Misra1b.pl \
++t7120-solver-Kirby2.pl \
++t7121-solver-Hahn1.pl \
++t7122-solver-Nelson.pl \
++t7123-solver-MGH17.pl \
++t7124-solver-Lanczos1.pl \
++t7125-solver-Lanczos2.pl \
++t7126-solver-Gauss3.pl \
++t7127-solver-Misra1c.pl \
++t7128-solver-Misra1d.pl \
++t7129-solver-Roszman1.pl \
++t7130-solver-ENSO.pl \
++t7140-solver-MGH09.pl \
++t7141-solver-Thurber.pl \
++t7142-solver-BoxBOD.pl \
++t7143-solver-Rat42.pl \
++t7144-solver-MGH10.pl \
++t7145-solver-Eckerle4.pl \
++t7146-solver-Rat43.pl \
++t7147-solver-Bennett5.pl \
++t8000-valgrind.pl \
++t8001-valgrind-xls.pl \
++t8002-valgrind-gnumeric.pl \
++t8003-valgrind-pdf.pl \
++t8004-valgrind-xls-macro.pl \
++t8005-valgrind-chart-fit.pl \
++t8050-valgrind-sstest.pl \
++t8100-null-false.pl \
++t8101-gfree.pl \
++t8102-glade-visible.pl \
++t8103-gtk.pl \
++t8104-glade-parsing.pl \
++t8200-gslice1.pl \
++t8201-gslice2.pl \
++t8202-gslice3.pl \
++t9000-ssindex.pl \
++t9100-number-match.pl \
++t9999-epilogue.pl
++
++
+ SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp
+
+ import-db:
diff --git a/extra/gnumeric/revert-warnings.patch b/extra/gnumeric/revert-warnings.patch
new file mode 100644
index 000000000..bf9df5dd7
--- /dev/null
+++ b/extra/gnumeric/revert-warnings.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2013-03-13 16:09:02.355422066 +0000
++++ configure.ac 2013-03-13 16:09:26.701917153 +0000
+@@ -269,8 +269,6 @@
+ -Wchar-subscripts -Wwrite-strings \
+ -Wdeclaration-after-statement -Wnested-externs \
+ -Wmissing-noreturn \
+- -Werror=missing-prototypes -Werror=nested-externs \
+- -Werror=implicit-function-declaration \
+ -Wmissing-declarations -Wno-pointer-sign \
+ -Werror=format-security -Wbitwise -Wcast-to-as \
+ -Wdefault-bitfield-sign -Wdo-while -Wparen-string \
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index 835e9bf90..cdd1f57e6 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173831 2012-12-24 16:09:55Z jgc $
+# $Id: PKGBUILD 179967 2013-03-13 14:50:17Z jgc $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
pkgname=goffice
-pkgver=0.10.0
+pkgver=0.10.1
pkgrel=1
pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ options=('!libtool')
makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
depends=('librsvg' 'gtk3' 'libgsf' 'libspectre')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439')
+sha256sums=('5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index 4f5db3a9c..a892a6114 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 173131 2012-12-11 14:42:20Z jgc $
+# $Id: PKGBUILD 179980 2013-03-13 20:13:10Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=gphoto2
-pkgver=2.5.0
+pkgver=2.5.1
pkgrel=1
pkgdesc="A digital camera download and access program."
arch=(i686 x86_64)
@@ -11,6 +11,7 @@ url="http://www.gphoto.org"
license=('GPL' 'LGPL')
depends=('libgphoto2' 'popt' 'readline')
source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('03cda6d5b7c647ac4c90d0081f2cb7c7')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,4 +23,3 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('64c6d291c5bd50388af0c51da71efb59')
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 527036737..1a6ff1011 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,14 +1,15 @@
-#$Id: PKGBUILD 169951 2012-10-30 22:46:41Z heftig $
+#$Id: PKGBUILD 179959 2013-03-13 13:10:14Z jgc $
#Maintainer: Jan De Groot <jgc@archlinux.org>
pkgname=libgnome-keyring
pkgver=3.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME keyring client library"
arch=(i686 x86_64)
license=('GPL' 'LGPL')
depends=('dbus-core' 'glib2' 'libgcrypt')
makedepends=('intltool' 'gobject-introspection')
+optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
options=('!libtool' '!emptydirs')
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD
index eaf184a4a..f419a2f9e 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 173128 2012-12-11 14:42:12Z jgc $
+# $Id: PKGBUILD 179978 2013-03-13 20:08:25Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Eduardo Romero <eduardo@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=libgphoto2
-pkgver=2.5.0
+pkgver=2.5.1
pkgrel=1
pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs."
arch=(i686 x86_64)
@@ -15,7 +15,7 @@ depends=('libexif' 'libjpeg>=8' 'gd' 'libltdl' 'libusb-compat' 'libusb')
install=libgphoto2.install
options=('libtool')
source=(http://downloads.sourceforge.net/gphoto/${pkgname}-${pkgver}.tar.gz)
-md5sums=('ea9b3b07a3738c0a77958d6fe13ae524')
+md5sums=('92780eb4baf7b512b86b5e7300ec91a5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 6dbf141c0..5207bbb34 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169025 2012-10-17 10:20:51Z allan $
+# $Id: PKGBUILD 179941 2013-03-13 02:09:45Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,29 +6,28 @@
pkgbase=python-numpy
pkgname=('python2-numpy' 'python-numpy')
pkgver=1.7.0
-_pkgver=1.7.0b2
-pkgrel=1
+pkgrel=2
pkgdesc="Scientific tools for Python"
arch=('i686' 'x86_64')
license=('custom')
-url="http://numpy.scipy.org/"
+url="http://www.numpy.org/"
makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
-md5sums=('1b62cf0e34e2db58b0241b00d603df24')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
+md5sums=('4fa54e40b6a243416f0248123b6ec332')
build() {
cd "${srcdir}"
- cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
+ cp -a numpy-${pkgver} numpy-py2-${pkgver}
- export Atlas=None
+ export ATLAS=None
export LDFLAGS="$LDFLAGS -shared"
echo "Building Python2"
- cd "${srcdir}/numpy-py2-${_pkgver}"
+ cd "${srcdir}/numpy-py2-${pkgver}"
python2 setup.py config_fc --fcompiler=gnu95 build
echo "Building Python3"
- cd "${srcdir}/numpy-${_pkgver}"
+ cd "${srcdir}/numpy-${pkgver}"
python setup.py config_fc --fcompiler=gnu95 build
}
@@ -36,7 +35,12 @@ package_python2-numpy() {
depends=('lapack' 'python2')
optdepends=('python-nose: testsuite')
- cd "${srcdir}/numpy-py2-${_pkgver}"
+ _pyver=2.7
+
+ export ATLAS=None
+ export LDFLAGS="$LDFLAGS -shared"
+
+ cd "${srcdir}/numpy-py2-${pkgver}"
python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
@@ -46,6 +50,9 @@ package_python2-numpy() {
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
$(find ${pkgdir} -name '*.py')
+
+ install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
+ ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
}
package_python-numpy() {
@@ -54,9 +61,17 @@ package_python-numpy() {
replaces=('python3-numpy')
conflicts=('python3-numpy')
- cd "${srcdir}/numpy-${_pkgver}"
+ _pyver=3.3
+
+ export ATLAS=None
+ export LDFLAGS="$LDFLAGS -shared"
+
+ cd "${srcdir}/numpy-${pkgver}"
python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
- install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
- install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy"
+ install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python-numpy/"
+
+ install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
+ ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
}
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index ba448576f..70a829815 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175827 2013-01-22 09:52:02Z foutrelis $
+# $Id: PKGBUILD 179969 2013-03-13 15:12:30Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
@@ -7,12 +7,12 @@
pkgname=slim
pkgver=1.3.5
-pkgrel=1
+pkgrel=2
pkgdesc="Desktop-independent graphical login manager for X11"
arch=('i686' 'x86_64')
url="http://slim.berlios.de/"
license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
+depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'xorg-xauth')
makedepends=('cmake' 'freeglut')
backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
@@ -34,7 +34,7 @@ build() {
-DCMAKE_SKIP_RPATH=ON \
-DUSE_PAM=yes \
-DUSE_CONSOLEKIT=no
- make
+ make
}
package() {
diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD
index 23934a11a..3210aac2c 100644
--- a/extra/xchm/PKGBUILD
+++ b/extra/xchm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166331 2012-09-06 15:41:21Z giovanni $
+# $Id: PKGBUILD 179976 2013-03-13 18:06:41Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=xchm
-pkgver=1.21
+pkgver=1.22
pkgrel=1
pkgdesc="A cross-platform GUI front-end to chmlib"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ install=xchm.install
source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
'xchm.desktop'
'xchm.xml')
-md5sums=('9bfe439ce94554ebae95d84f7a1db8e7'
+md5sums=('3856ec4e6e54a80d0811707975fc8995'
'31fb9692b9ee9f2a205f58b9ff4bc4fe'
'4102b0a393f5c60236143cc034664dd0')
diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
new file mode 100644
index 000000000..413c11461
--- /dev/null
+++ b/libre/audex-libre/PKGBUILD
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: mightyjaym <jmambrosino@gmail.com>
+# Contributor: moostik <mooostik_at_gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=audex
+pkgname=audex-libre
+pkgver=0.77b1
+pkgrel=1
+pkgdesc="A CDDA extraction tool with a ftp upload function for KDE (without nonfree faac recommendation)"
+arch=('i686' 'x86_64')
+url="http://kde-apps.org/content/show.php?content=77125"
+license=('GPL')
+depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
+makedepends=('cmake' 'automoc4')
+optdepends=('vorbis-tools: OGG encoder'
+ 'flac: FLAC encoder'
+ 'lame: MP3 encoder')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=${_pkgname}.install
+#source=("ftp://ftp.archlinux.org/other/community/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
+source=("http://kde.maniatek.com/${_pkgname}/files/${_pkgname}-${pkgver}.tar.xz"
+ 'gcc47.patch')
+md5sums=('1f3df64b60b15315e958e3e3b151fe92'
+ '64107bcf90e22910e57804be774822dd')
+
+build() {
+ cd ${_pkgname}-${pkgver}
+
+ patch -p1 -i "${srcdir}"/gcc47.patch
+ cd ..
+
+ mkdir build
+ cd build
+
+ cmake ../${_pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/build
+ make DESTDIR=${pkgdir} install
+}
diff --git a/libre/audex-libre/audex.install b/libre/audex-libre/audex.install
new file mode 100644
index 000000000..81ce5c4b0
--- /dev/null
+++ b/libre/audex-libre/audex.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/libre/audex-libre/gcc47.patch b/libre/audex-libre/gcc47.patch
new file mode 100644
index 000000000..3d0ccf024
--- /dev/null
+++ b/libre/audex-libre/gcc47.patch
@@ -0,0 +1,13 @@
+--- audex-0.74b1.orig/utils/hashlist.cpp
++++ audex-0.74b1/utils/hashlist.cpp
+@@ -15,7 +15,8 @@
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+-
++
++#include <unistd.h>
+ #include "hashlist.h"
+
+ Hashlist::Hashlist() {
+
diff --git a/libre/audex-libre/google_regex.patch b/libre/audex-libre/google_regex.patch
new file mode 100644
index 000000000..86917e66f
--- /dev/null
+++ b/libre/audex-libre/google_regex.patch
@@ -0,0 +1,14 @@
+--- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100
++++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200
+@@ -162,7 +162,10 @@
+ cover_tbnids.clear();
+ cover_thumbnails.clear();
+
+- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
++ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
++ QString html = xml;
++ html.replace( QLatin1String("&amp;"), QLatin1String("&") );
++
+ rx.setMinimal(TRUE);
+
+ int pos = 0; int i = 0;
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-libre/ChangeLog
new file mode 100644
index 000000000..c309d74a0
--- /dev/null
+++ b/libre/audio-convert-libre/ChangeLog
@@ -0,0 +1,5 @@
+2013-03-13 André Silva <emulatorman@lavabit.com>
+ * Remove nonfree faac recommendation
+
+2009-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * PKGBUILD syntax corrections
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
new file mode 100644
index 000000000..07dc6e87c
--- /dev/null
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Igor Galic <i.galic@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=audio-convert
+pkgname=audio-convert-libre
+pkgver=0.3.1.1
+pkgrel=6
+pkgdesc="A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma (without nonfree faac recommendation)"
+arch=('any')
+url="http://freshmeat.net/projects/audio-convert"
+license=('GPL')
+depends=('bash' 'zenity')
+optdepends=('faad2: for aac support'
+ 'flac: for flac support'
+ 'id3lib: for mp3 support'
+ 'lame: for mp3 support'
+ 'mplayer: for wma support'
+ 'musepack-tools: for mpc support'
+ 'vorbis-tools: for ogg support')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=(http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.bz2)
+md5sums=('0c6b61bc96be4c9879f85b000192f3fd')
+
+package() {
+ install -D -m755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+}
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
new file mode 100644
index 000000000..77e12957a
--- /dev/null
+++ b/libre/avidemux-libre/PKGBUILD
@@ -0,0 +1,123 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgbase=avidemux
+pkgbase=avidemux-libre
+pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
+pkgver=2.5.6
+pkgrel=6
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
+ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \
+ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
+
+build() {
+ cd "${srcdir}/${_pkgbase}_${pkgver}"
+ mkdir build
+ cd build
+ cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
+ make
+
+# plugin build expects libraries to be already installed; we fake a prefix
+# in build/ by symlinking all libraries to build/lib/
+ mkdir -p lib
+ cd lib
+ find ../avidemux -name '*.so*' | xargs ln -sft .
+ cd ../../plugins
+ mkdir build
+ cd build
+ cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
+ -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
+ -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
+ -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
+ make
+}
+
+package_avidemux-libre-cli() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support"
+ depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+ optdepends=('lame: for the corresponding audio encoder plugin'
+ 'faad2: for the corresponding audio decoder plugin'
+ 'opencore-amr: for the corresponding audio decoder plugin'
+ 'jack: for the corresponding audio device plugin'
+ 'libpulse: for the corresponding audio device plugin'
+ 'sdl: for the corresponding audio device plugin'
+ 'x264: for the corresponding video encoder plugin'
+ 'xvidcore: for the corresponding video encoder plugin')
+ provides=('avidemux' 'avidemux-cli')
+ conflicts=('avidemux' 'avidemux-cli')
+ replaces=('avidemux' "avidemux-cli=$pkgver")
+
+ cd "${srcdir}/${_pkgbase}_${pkgver}/build"
+ make DESTDIR="${pkgdir}" install
+
+ cd "${srcdir}/${_pkgbase}_${pkgver}/plugins/build"
+ make DESTDIR="${pkgdir}" install
+ rm -r "${pkgdir}"/usr/share/avidemux
+ rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
+ rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
+ rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
+ rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
+ rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
+
+ ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
+ ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
+
+ install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+ install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-libre-gtk() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - GTK GUI"
+ depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
+ replaces=('avidemux-gtk')
+ conflicts=('avidemux-gtk')
+ provides=("avidemux-gtk=$pkgver")
+ install=avidemux.install
+
+ cd "${srcdir}/${_pkgbase}_${pkgver}"
+ install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
+
+ install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+ install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+ install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
+ install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+ install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+ install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+ install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+ sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+}
+
+package_avidemux-libre-qt() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split), without nonfree faac support - QT GUI"
+ depends=("avidemux-cli=${pkgver}" 'qt4')
+ replaces=('avidemux-qt')
+ conflicts=('avidemux-qt')
+ provides=("avidemux-qt=$pkgver")
+ install=avidemux.install
+
+ cd "${srcdir}/${_pkgbase}_${pkgver}"
+ install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
+ install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
+ install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
+
+ install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
+ install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
+ install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
+ install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
+
+ install -d "${pkgdir}/usr/share/avidemux/i18n"
+ install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
+
+ install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+}
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
new file mode 100644
index 000000000..c96084eb8
--- /dev/null
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -0,0 +1,83 @@
+# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=avidemux
+pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
+pkgver=2.6.1
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://fixounet.free.fr/avidemux/"
+makedepends=('cmake' 'libxslt' 'gtk3' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
+ 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
+ 'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva' \
+ 'libvdpau' 'libdca' 'fribidi' 'glu')
+options=('!makeflags' '!emptydirs')
+source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
+sha1sums=('a34ffc6409d96c3df30394fbd221e6693ec081ec')
+#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
+#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+
+build() {
+#mv snapshot_8273 ${pkgbase}_${pkgver}
+
+ cd "${srcdir}/${pkgbase}_${pkgver}"
+ sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
+ bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
+}
+
+package_avidemux-cli() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
+ depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+ optdepends=('lame: for the corresponding audio encoder plugin'
+ 'faac: for the corresponding audio encoder plugin'
+ 'faad2: for the corresponding audio decoder plugin'
+ 'opencore-amr: for the corresponding audio decoder plugin'
+ 'jack: for the corresponding audio device plugin'
+ 'libpulse: for the corresponding audio device plugin'
+ 'sdl: for the corresponding audio device plugin'
+ 'x264: for the corresponding video encoder plugin'
+ 'xvidcore: for the corresponding video encoder plugin'
+ 'qt: for the QtScript scripting support'
+ 'libdca: for the corresponding audio decoder plugin'
+ 'fribidi: for the corresponding video filter plugin')
+
+ cd "${srcdir}/${pkgbase}_${pkgver}"
+ (cd buildCli; make DESTDIR="${pkgdir}" install)
+ (cd buildCore; make DESTDIR="${pkgdir}" install)
+ (cd buildPluginsCLI; make DESTDIR="${pkgdir}" install)
+ (cd buildPluginsCommon; make DESTDIR="${pkgdir}" install)
+
+ install -D -m644 avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
+ install -D -m644 man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
+}
+
+package_avidemux-gtk() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
+ depends=("avidemux-cli=${pkgver}" 'gtk3' 'libxv' 'desktop-file-utils')
+ install=avidemux.install
+
+ cd "${srcdir}/${pkgbase}_${pkgver}"
+ (cd buildGtk; make DESTDIR="${pkgdir}" install)
+ (cd buildPluginsGtk; make DESTDIR="${pkgdir}" install)
+
+ install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
+
+ rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+ rm "${pkgdir}/usr/lib/ADM_plugins6/videoEncoders/libADM_ve_x264_other.so"
+}
+
+package_avidemux-qt() {
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+ depends=("avidemux-cli=${pkgver}" 'qt' 'x264' 'glu')
+ install=avidemux.install
+
+ cd "${srcdir}/${pkgbase}_${pkgver}"
+ (cd buildQt4; make DESTDIR="${pkgdir}" install)
+ (cd buildPluginsQt4; make DESTDIR="${pkgdir}" install)
+
+ install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's|gtk|qt4|' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+
+ rm "${pkgdir}"/usr/lib/ADM_plugins6/pluginSettings/x264/1/{PSP.json,iPhone.json}
+}
diff --git a/libre/avidemux-libre/avidemux.install b/libre/avidemux-libre/avidemux.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/libre/avidemux-libre/avidemux.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
new file mode 100644
index 000000000..773aa4dc7
--- /dev/null
+++ b/libre/ecasound-libre/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ecasound
+pkgname=ecasound-libre
+pkgver=2.9.0
+pkgrel=2
+pkgdesc="A software package designed for multitrack audio processing (without nonfree faac recommendation)"
+arch=('i686' 'x86_64')
+url="http://www.eca.cx/ecasound/"
+license=('GPL' 'LGPL')
+depends=('audiofile' 'liblo'
+ 'liboil' 'lilv')
+makedepends=('python2' 'ruby')
+optdepends=('python2: ecamonitor, ECI API'
+ 'ruby: ECI API'
+ 'mpg123: MP3 decoding'
+ 'lame: MP3 encoding'
+ 'vorbis-tools: Ogg Vorbis decoding/encoding'
+ 'faad2: AAC decoding'
+ 'timidity++: MIDI file input'
+ 'libmikmod: tracker module')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool')
+source=(http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz)
+md5sums=('05e7d4664cdf4c7a138c098e9506a551')
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ # use vendor_ruby for ruby files
+ sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
+
+ PYTHONPATH=/usr/bin/python2 ./configure \
+ --prefix=/usr \
+ --with-python-includes=/usr/include/python2.7 \
+ --with-python-modules=/usr/lib/python2.7
+
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+
+ # fix for python 2.7
+ sed -i 's:bin/env python:bin/env python2:' \
+ "$pkgdir/usr/bin/ecamonitor"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
new file mode 100644
index 000000000..8df68e2b6
--- /dev/null
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Chris Brannon <cmbrannon79@gmail.com>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
+# Contributor:JZsolt Varadi (karmaxxl)
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=gnormalize
+pkgname=gnormalize-libre
+pkgver=0.63
+pkgrel=4
+pkgdesc="An audio normalizer, converter, encoder/decoder, ripper, tagger and player (without nonfree faac and mac recommendation)"
+arch=(any)
+url="http://gnormalize.sourceforge.net/"
+license=('GPL')
+depends=(perl cddb_get desktop-file-utils gtk2-perl hicolor-icon-theme)
+makedepends=('xz')
+optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer'
+ 'lame: MP3 encoding'
+ 'mpg321: MP3 playing'
+ 'mplayer: FLAC/WAV playing'
+ 'musepack-tools: full Musepack support'
+ 'perl-mp3-info: MP3 ID3 tags'
+ 'vorbis-tools: full OGG Vorbis support'
+ 'cdcd: CD playing'
+ 'cdparanoia: CD ripping'
+ 'cdrkit: CD ripping - alternative to cdparanoia'
+ 'wavegain: sound normalization')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=gnormalize.install
+source=(http://downloads.sourceforge.net/sourceforge/gnormalize/${_pkgname}-${pkgver}.tar.gz
+ gnormalize.desktop)
+md5sums=('25ca7520731e61a8b7f4b7fa61928d54' '81c6dffab2139816919842e042705884')
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ install -Dm755 gnormalize "${pkgdir}/usr/bin/gnormalize"
+ lzma -qd gnormalize.1.lzma
+ install -Dm644 gnormalize.1 "${pkgdir}/usr/share/man/man1/gnormalize.1"
+ install -d "${pkgdir}/usr/share/gnormalize/animations"
+ install -m644 animations/*.gif "${pkgdir}/usr/share/gnormalize/animations/"
+ install -Dm644 README "${pkgdir}/usr/share/doc/gnormalize/README"
+ install -Dm644 icons/gnormalize.png \
+ "${pkgdir}/usr/share/pixmaps/gnormalize.png"
+ for i in 16 32 48 ; do
+ install -Dm644 icons/gnormalize-${i}.png \
+ "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/apps/gnormalize.png"
+ done
+ install -Dm644 "${srcdir}/gnormalize.desktop" \
+ "${pkgdir}/usr/share/applications/gnormalize.desktop"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/gnormalize-libre/gnormalize.desktop b/libre/gnormalize-libre/gnormalize.desktop
new file mode 100644
index 000000000..4d4061308
--- /dev/null
+++ b/libre/gnormalize-libre/gnormalize.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=gnormalize
+Comment=Encoder/Decoder, normalize frontend, etc.
+Exec=gnormalize
+Icon=gnormalize
+MimeType=audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
+Categories=GTK;AudioVideo;Player;
+Terminal=false
+Type=Application
diff --git a/libre/gnormalize-libre/gnormalize.install b/libre/gnormalize-libre/gnormalize.install
new file mode 100644
index 000000000..ef533df53
--- /dev/null
+++ b/libre/gnormalize-libre/gnormalize.install
@@ -0,0 +1,14 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
new file mode 100644
index 000000000..cd2e48f2b
--- /dev/null
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Daenyth
+# Contributor: Allan McRae <allan@archlinux.org>
+# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=ogmrip
+pkgname=ogmrip-libre
+pkgver=0.13.8
+pkgrel=1
+pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder (without nonfree faac support)"
+arch=('i686' 'x86_64')
+url="http://ogmrip.sourceforge.net/"
+license=('GPL')
+depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant')
+makedepends=('patch' 'intltool' 'perl-xml-parser' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract')
+optdepends=('lame: support for the MP3 audio codec'
+ 'mkvtoolnix: create, alter, and inspect Matroska files'
+ 'libtheora: decode and encode Ogg Theora files'
+ 'ogmtools: support for the Ogg Media container'
+ 'gpac: support for the MP4 container'
+ 'vorbis-tools: support for the Ogg Vorbis audio codec'
+ 'gocr: support for the SRT subtitle format'
+ 'ocrad: support for the SRT subtitle format'
+ 'tesseract: support for the SRT subtitle format')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+options=('!libtool' '!makeflags')
+changelog=$_pkgname.changelog
+install=$_pkgname.install
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423')
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr --sysconfdir=/usr/share
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
new file mode 100644
index 000000000..76179a2d3
--- /dev/null
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -0,0 +1,27 @@
+2013-03-13 André Silva <emulatorman@lavabit.com>
+ * Remove nonfree faac support
+
+2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * ogmrip O.13.8-1
+
+2012-01-26 Eric Belanger <eric@archlinux.org>
+ * Rebuild against libpng 1.5 and libtiff 4.0
+ * Add .install file
+
+2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * ogmrip O.13.7-1
+
+2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * ogmrip O.13.6-1
+
+2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to major release O.13.5
+
+2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to major release O.13.4
+
+2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * FS#17517 fixed in minor release O.13.3-2
+
+2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * Update to major release O.13.3
diff --git a/libre/ogmrip-libre/ogmrip.install b/libre/ogmrip-libre/ogmrip.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/libre/ogmrip-libre/ogmrip.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
new file mode 100644
index 000000000..31ea71824
--- /dev/null
+++ b/libre/openshot-libre/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=openshot
+pkgname=openshot-libre
+pkgver=1.4.3
+pkgrel=1
+pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework (without nonfree faac recommendation)"
+arch=('any')
+url="http://www.openshotvideo.com/"
+license=('GPL')
+depends=('mlt-python-bindings' 'pygoocanvas' 'sdl' 'librsvg' 'mplayer'
+ 'pyxdg' 'pygtk' 'python2-httplib2' 'python-imaging')
+optdepends=('dvgrab: for IEEE digital sources'
+ 'libquicktime' 'libavc1394' 'jack' 'jack-rack' 'ladspa')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=openshot.install
+source=(http://launchpad.net/openshot/${pkgver%.*}/$pkgver/+download/$_pkgname-$pkgver.tar.gz)
+md5sums=('5ec82a7e8b7700ee4a359458aedf19e9')
+
+package() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py install --root=$pkgdir/ --optimize=1
+}
diff --git a/libre/openshot-libre/openshot.install b/libre/openshot-libre/openshot.install
new file mode 100644
index 000000000..cc0de896d
--- /dev/null
+++ b/libre/openshot-libre/openshot.install
@@ -0,0 +1,11 @@
+post_install() {
+ [ -x `which update-mime-database` ] && update-mime-database usr/share/mime
+}
+
+post_upgrade() {
+ [ -x `which update-mime-database` ] && update-mime-database usr/share/mime
+}
+
+post_remove() {
+ [ -x `which update-mime-database` ] && update-mime-database usr/share/mime
+}
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
new file mode 100644
index 000000000..8b3c74d7c
--- /dev/null
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor: Mateusz Herych <heniekk@gmail.com>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Darwin Bautista <djclue917@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+_pkgname=soundkonverter
+pkgname=soundkonverter-libre
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)"
+arch=('i686' 'x86_64')
+url="http://www.kde-apps.org/content/show.php?content=29024"
+license=('GPL')
+depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
+makedepends=('automoc4' 'cmake')
+optdepends=('cdrkit: cdda2wav backend'
+ 'faad2: faad backend'
+ 'ffmpeg: ffmpeg backend'
+ 'flac: flac backend'
+ 'fluidsynth: flouidsynth backend'
+ 'lame: lame backend'
+ 'mplayer: mplayer backend'
+ 'mp3gain: mp3gain backend'
+ 'opus-tools: opus backend'
+ 'speex: speexenc, speexdec backends'
+ 'timidity++: midi backend'
+ 'twolame: twolame backend'
+ 'vorbisgain: vorbisgain backend'
+ 'vorbis-tools: vorbis tools backend'
+ 'wavpack: wavpack backend'
+ 'sox: sox plugin (change sample rate, various effects)')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=$_pkgname.install
+source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz")
+md5sums=('f1df729916b2418c474b859ed6b9eda6')
+
+build() {
+ cd "$srcdir"/$_pkgname-$pkgver
+ cmake . \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd "$srcdir"/$_pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/libre/soundkonverter-libre/soundkonverter.install b/libre/soundkonverter-libre/soundkonverter.install
new file mode 100644
index 000000000..0e8feb79c
--- /dev/null
+++ b/libre/soundkonverter-libre/soundkonverter.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index a57637221..547f0dc2f 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=your-freedom
pkgver=$(LC_ALL=C date -u +%Y%m%d)
pkgrel=1
-pkgdesc="This package conflicts with every unfree package known to date to ensure your system is free."
+pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
arch=('any')
url="https://parabolagnulinux.org"
license=('GPL3')
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index efa16e756..e0477cab9 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -3,18 +3,18 @@ pre_install() {
cat <<EOM
== IMPORTANT NOTICE ==
- This package will help you identify unfree packages that are installed
+ This package will help you identify nonfree packages that are installed
on your system at the time of its installation, as well as protecting
you from (accidentally) installing them.
- Also, if any other unfree package is identified, later updates will ask
+ Also, if any other nonfree package is identified, later updates will ask
you for its removal.
- Have in mind that, if you want to retain certain unfree packages
+ Have in mind that, if you want to retain certain nonfree packages
installed on your system, you'll have to remove your-freedom :)
If you find out any of the following:
- * Cascade package removal due to unfree dependencies,
+ * Cascade package removal due to nonfree dependencies,
* Your-freedom conflicting with a *-libre package,
* Etc.