diff options
62 files changed, 1808 insertions, 546 deletions
diff --git a/community-staging/dee/PKGBUILD b/community-staging/dee/PKGBUILD new file mode 100644 index 000000000..00b13d216 --- /dev/null +++ b/community-staging/dee/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 77761 2012-10-14 15:22:02Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=dee +pkgver=1.0.14 +pkgrel=2 +pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" +arch=('i686' 'x86_64') +url="https://launchpad.net/dee" +license=('LGPL') +depends=('glib2' 'icu') +makedepends=('python2' 'gobject-introspection' 'vala') +options=('!libtool') +source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('473b4181e26538af0fb753255da7945c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-tests \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + + # Install GI overrides for python 3 as well + install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" + ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py" +} diff --git a/community-staging/lxdm/PKGBUILD b/community-staging/lxdm/PKGBUILD index a35c35f31..1430d5160 100644 --- a/community-staging/lxdm/PKGBUILD +++ b/community-staging/lxdm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 72524 2012-06-16 08:50:39Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 77741 2012-10-14 07:48:01Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=12 +pkgrel=16 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" license=('GPL') groups=('lxde') -depends=('gtk2' 'xorg-server' 'consolekit') +depends=('gtk2' 'xorg-server') makedepends=('intltool') install=${pkgname}.install backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' @@ -19,43 +19,45 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch rc.d lxdm-pam service) + greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' 'a1e3c46a8bef691bc544028f5b6cfe22' 'baed9055e8825a5511712bc095197519' 'c50dd01b715b0a236407d48066191601' 'd2e4a4a22ee2aa1a986be154c647b6c6' '28475239d0c8b4fd778ec49f5ec72962' + '4c1d43e81e9a256e8d1ea7686c24b3d3' '705f394052fdd0dec22e95321d170de0' - 'b20fe3c8487a039050986d60e45233a9' - '4aaa9a7175cf327d9f7651c2586ef922') + '34908bc0ec15b6ae4e1074f39fce44df' + 'e8cc66eb1a2405d2d9d184a727cbd9d8') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/glib2-2.32.0.patch + patch -Np1 -i $srcdir/glib2-2.32.0.patch patch -Np1 -i $srcdir/greeter-session.patch + patch -Np1 -i $srcdir/pam-env-vars.patch ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm - make + make - patch -Np0 -i $srcdir/lxdm.patch + patch -Np0 -i $srcdir/lxdm.patch patch -Np0 -i $srcdir/lxdm.conf.patch patch -Np0 -i $srcdir/Xsession.patch } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install - install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service + install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm + install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm + install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service install -d $pkgdir/var/{lib,run}/lxdm - # fix the greeter location - sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf + # fix the greeter location + sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf # avoid conflict with filesystem>=2012.06 rm -r $pkgdir/var/run diff --git a/community-staging/lxdm/lxdm-pam b/community-staging/lxdm/lxdm-pam index 3f5df04a7..c62f62721 100644 --- a/community-staging/lxdm/lxdm-pam +++ b/community-staging/lxdm/lxdm-pam @@ -6,3 +6,5 @@ account required pam_unix.so session required pam_limits.so session required pam_unix.so password required pam_unix.so +-session optional pam_systemd.so +-session optional pam_loginuid.so diff --git a/community-staging/lxdm/lxdm.install b/community-staging/lxdm/lxdm.install index eaf2339cd..4d1285dc5 100644 --- a/community-staging/lxdm/lxdm.install +++ b/community-staging/lxdm/lxdm.install @@ -1,24 +1,18 @@ -pkgname=lxdm - post_install() { - if [ -z "`getent group "lxdm" 2> /dev/null`" ]; then - groupadd lxdm - chown root:lxdm /etc/lxdm/lxdm.conf - fi - chown -R root:lxdm /var/lib/lxdm > /dev/null - chmod +r /etc/lxdm/lxdm.conf + if ! getent group lxdm > /dev/null ; then + groupadd --system lxdm + chgrp -R lxdm /var/lib/lxdm + chgrp lxdm /etc/lxdm/lxdm.conf + chmod +r /etc/lxdm/lxdm.conf + fi } post_upgrade() { - post_install + post_install $1 } post_remove() { - getent group "lxdm" &>/dev/null && groupdel lxdm #1>/dev/null - return 0 + if ! getent group lxdm > /dev/null ; then + groupdel lxdm + fi } - -op=$1 -shift - -$op "$@" diff --git a/community-staging/lxdm/pam-env-vars.patch b/community-staging/lxdm/pam-env-vars.patch new file mode 100644 index 000000000..ab8605ff1 --- /dev/null +++ b/community-staging/lxdm/pam-env-vars.patch @@ -0,0 +1,50 @@ +diff --git a/src/lxdm.c b/src/lxdm.c +index 369aedf..cd1d486 100644 +--- a/src/lxdm.c ++++ b/src/lxdm.c +@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) + g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); + } + +-void append_pam_environ(pam_handle_t *pamh,char **env) ++static char **append_pam_environ(pam_handle_t *pamh,char **env) + { +- int i,j,n; ++ int i,j,n,a; + char **penv; +- if(!pamh) return; ++ if(!pamh) return env; + penv=pam_getenvlist(pamh); +- if(!penv) return; ++ if(!penv) return env; ++ a=g_strv_length(penv); ++ if(a==0) ++ { ++ free(penv); ++ return env; ++ } ++ env=g_renew(char *,env,g_strv_length(env)+1+a+10); + for(i=0;penv[i]!=NULL;i++) + { +- //printf("PAM %s\n",penv[i]); ++ fprintf(stderr,"PAM %s\n",penv[i]); + n=strcspn(penv[i],"=")+1; + for(j=0;env[j]!=NULL;j++) + { +@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) + free(penv[i]); + } + free(penv); ++ return env; + } + + #endif +@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) + if(s->child==0) + { + #if HAVE_LIBPAM +- append_pam_environ(s->pamh,env); ++ env=append_pam_environ(s->pamh,env); + pam_end(s->pamh,0); + #endif + switch_user(pw, session_exec, env); diff --git a/community-staging/lxdm/service b/community-staging/lxdm/service index b76e1190e..e1840476c 100644 --- a/community-staging/lxdm/service +++ b/community-staging/lxdm/service @@ -6,4 +6,4 @@ After=systemd-user-sessions.service ExecStart=/usr/sbin/lxdm [Install] -WantedBy=graphical.target +Alias=display-manager.service diff --git a/community-staging/python-bsddb/LICENSE b/community-staging/python-bsddb/LICENSE new file mode 100644 index 000000000..7d6035775 --- /dev/null +++ b/community-staging/python-bsddb/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2008-2009 Jesus Cea Avion + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE.
\ No newline at end of file diff --git a/community-staging/python-bsddb/PKGBUILD b/community-staging/python-bsddb/PKGBUILD new file mode 100644 index 000000000..1f83cd005 --- /dev/null +++ b/community-staging/python-bsddb/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 77787 2012-10-14 18:15:13Z stephane $ +# Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgbase=python-bsddb +pkgname=('python2-bsddb' 'python-bsddb') +pkgver=5.3.0 +pkgrel=3 +pkgdesc="Python interface for BerkeleyDB" +license=('MIT') +arch=('i686' 'x86_64') +url="http://www.jcea.es/programacion/pybsddb.htm" +makedepends=('python2-distribute' 'python-distribute') +source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz + LICENSE) +sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' + 'ef4e4caf618781104dbf5824279ed39d127b4713') + +build () { + cd "${srcdir}" + + cp -r bsddb3-${pkgver}{,-python2} + + # Build python 3 module + cd bsddb3-${pkgver} + python3 setup.py --berkeley-db=/usr build + + # Build python 2 module + cd ../bsddb3-${pkgver}-python2 + python2 setup.py --berkeley-db=/usr build +} + +package_python2-bsddb() { + depends=('db' 'python2>=2.7') + cd "${srcdir}/bsddb3-${pkgver}-python2" + + python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python-bsddb() { + depends=('db' 'python>=3.3') + cd "${srcdir}/bsddb3-${pkgver}" + + python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 + install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community-staging/python-openbabel/PKGBUILD b/community-staging/python-openbabel/PKGBUILD new file mode 100644 index 000000000..1c229f553 --- /dev/null +++ b/community-staging/python-openbabel/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 77768 2012-10-14 16:13:27Z ebelanger $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Michal Bozon <bozonm@vscht.cz> + +pkgname=python-openbabel +pkgver=2.3.1 +pkgrel=3 +pkgdesc="Python bindings of openbabel library" +arch=('i686' 'x86_64') +url="http://openbabel.org/wiki/Python" +license=('GPL') +depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') +makedepends=('swig' 'cmake') +options=('!libtool') +source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) +md5sums=('1f029b0add12a3b55582dc2c832b04f8') + +build() { + cd "${srcdir}/openbabel-$pkgver" + + # Create babelconfig.h + cmake . + + # Regenerate interface with the patched swig 2.0.2 + cd scripts + swig -I../include/ -python -py3 -c++ openbabel-python.i + mv openbabel-python_wrap.cxx python/openbabel-python.cpp + mv openbabel.py python/ + + cd python + sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py + sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py +} + +package() { + cd "${srcdir}/openbabel-$pkgver/scripts/python" + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 +} diff --git a/community-staging/python-pymongo/PKGBUILD b/community-staging/python-pymongo/PKGBUILD new file mode 100644 index 000000000..91df7cb6a --- /dev/null +++ b/community-staging/python-pymongo/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 77784 2012-10-14 18:11:53Z jelle $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Thomas S Hatch <thatch45@gmail.com> + +pkgbase=python-pymongo +pkgname=('python-pymongo' 'python2-pymongo') +pkgver=2.3 +pkgrel=2 +pkgdesc='Python driver for MongoDB' +arch=('x86_64' 'i686') +license=('APACHE') +url='http://pypi.python.org/pypi/pymongo/' +makedepends=('python-distribute' 'python2-distribute') +source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") +sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') + +build() { + cd "$srcdir" + cp -a "pymongo-$pkgver" "pymongo2-$pkgver" + +} + +package_python2-pymongo() { + depends=('python2') + cd "$srcdir/pymongo2-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} + +package_python-pymongo() { + depends=('python') + + cd "$srcdir/pymongo-$pkgver" + + python setup.py install --root="$pkgdir" --optimize=1 +} +# vim:set ts=2 sw=2 et: diff --git a/community-staging/python-sqlalchemy/PKGBUILD b/community-staging/python-sqlalchemy/PKGBUILD new file mode 100644 index 000000000..c59dcf0da --- /dev/null +++ b/community-staging/python-sqlalchemy/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 77772 2012-10-14 16:35:27Z ebelanger $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=python-sqlalchemy +pkgname=('python-sqlalchemy' 'python2-sqlalchemy') +pkgver=0.7.9 +pkgrel=1 +arch=('i686' 'x86_64') # python2 package contain .so +url="http://www.sqlalchemy.org/" +license=('custom: MIT') +makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') +source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") +md5sums=('c4852d586d95a59fbc9358f4467875d5') + +build() { + cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver + cd SQLAlchemy-$pkgver + python setup.py build + cd ../SQLAlchemy2-$pkgver + python2 setup.py build +} + +package_python-sqlalchemy() { + pkgdesc='Python SQL toolkit and Object Relational Mapper' + depends=('python') + + cd SQLAlchemy-${pkgver} + python setup.py install --root="${pkgdir}" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-sqlalchemy() { + pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' + depends=('python2') + + cd SQLAlchemy2-$pkgver + python2 setup.py install --root="$pkgdir" + install -D -m644 LICENSE \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD index 078681e5a..87415eeea 100644 --- a/community/calf/PKGBUILD +++ b/community/calf/PKGBUILD @@ -1,35 +1,31 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> +# $Id: PKGBUILD 77743 2012-10-14 09:43:37Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Ray Rashif <schiv@archlinux.org> pkgname=calf -pkgver=0.0.18.6 +pkgver=0.0.19 +_rc=8 pkgrel=1 -pkgdesc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host" -arch=('i686' 'x86_64') -url="http://calf.sf.net/" +pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host' +arch=('x86_64' 'i686') +url='http://calf.sf.net/' license=('LGPL') -depends=('libglade' 'lash') +depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('lv2core' 'ladspa' 'dssi') -source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz" - 'include_fix.patch') -md5sums=('780854561dad1cb873041d7a0b98cbcd' - '5aab4d057fb3646c43e6dfcad4c7128f') +source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver-rc$_rc.tar.gz") +install=calf.install +options=('!libtool') +sha256sums=('57cb536a24a7b9df890dc665fd75c2f4d307859e55f3b25015c73cdc726a56b5') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/include_fix.patch" - - ./configure --prefix=/usr \ - --enable-experimental + cd $srcdir/$pkgname-$pkgver-rc$_rc + ./configure --prefix=/usr --enable-experimental --enable-sse make } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - rm "$pkgdir/usr/share/icons/hicolor/icon-theme.cache" + cd $srcdir/$pkgname-$pkgver-rc$_rc + make DESTDIR=$pkgdir install } # vim:set ts=2 sw=2 et: diff --git a/community/calf/calf.install b/community/calf/calf.install new file mode 100644 index 000000000..b83f56c72 --- /dev/null +++ b/community/calf/calf.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database /usr/share/applications +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD index e07fc5c7d..75a71810d 100644 --- a/community/easystroke/PKGBUILD +++ b/community/easystroke/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Kevin Sullivan <ksullivan@archlinux.us> pkgname=easystroke -pkgver=0.5.5.1 -pkgrel=2 +pkgver=0.5.6 +pkgrel=1 pkgdesc='Use mouse gestures to initiate commands and hotkeys.' arch=('i686' 'x86_64') url='http://easystroke.sourceforge.net/' @@ -12,7 +12,7 @@ depends=('gtkmm' 'boost' 'libxtst' 'dbus-glib' 'xorg-server') makedepends=('inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man') install=easystroke.install source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz") -md5sums=('ba989d1745415be94afd567e33d124bb') +md5sums=('a9f06576a47deaf6f612bb993685af0f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 1bb6e6868..d57e9373a 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76749 2012-09-28 22:40:14Z arodseth $ +# $Id: PKGBUILD 77818 2012-10-15 00:41:07Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -10,11 +10,11 @@ pkgname=go pkgver=1.0.3 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Google Go compiler and tools' arch=('x86_64' 'i686') -url="http://golang.org/" +url='http://golang.org/' license=('custom') depends=('perl' 'gawk') makedepends=('inetutils') @@ -22,7 +22,7 @@ options=('!strip' '!emptydirs') install=go.install backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" - "$pkgname.sh") + $pkgname.sh) sha256sums=('7fba3533d172f13629d3d8a79e57c620632b0bd075abe11d7698b338be0ae3df' 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') @@ -36,69 +36,70 @@ build() { # Set GOARCH to arm for crosscompilation (currently doesn't work) - cd "$srcdir/$pkgname" - export GOROOT_FINAL="/usr/lib/go" + cd $srcdir/$pkgname + export GOROOT_FINAL=/usr/lib/go export GOOS=linux cd src bash make.bash } check() { - cd "$srcdir/$pkgname" + cd $srcdir/$pkgname - export GOROOT="$srcdir/$pkgname" - export PATH="$srcdir/$pkgname/bin:$PATH" + export GOROOT=$srcdir/$pkgname + export PATH=$srcdir/$pkgname/bin:$PATH # TestSimpleMulticastListener will fail in standard chroot. cd src && bash run.bash --no-rebuild || true } package() { - cd "$srcdir/$pkgname" + cd $srcdir/$pkgname install -Dm644 LICENSE \ - "$pkgdir/usr/share/licenses/go/LICENSE" + $pkgdir/usr/share/licenses/go/LICENSE install -Dm644 misc/bash/go \ - "$pkgdir/usr/share/bash-completion/completions/go" + $pkgdir/usr/share/bash-completion/completions/go install -Dm644 misc/emacs/go-mode-load.el \ - "$pkgdir/usr/share/emacs/site-lisp/go-mode-load.el" + $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el install -Dm644 misc/emacs/go-mode.el \ - "$pkgdir/usr/share/emacs/site-lisp/go-mode.el" + $pkgdir/usr/share/emacs/site-lisp/go-mode.el install -Dm644 misc/zsh/go \ - "$pkgdir/usr/share/zsh/site-functions/_go" + $pkgdir/usr/share/zsh/site-functions/_go for f in ftdetect/gofiletype.vim autoload/go/complete.vim indent/go.vim \ ftplugin/go/fmt.vim ftplugin/go/godoc.vim ftplugin/go/import.vim \ syntax/go.vim syntax/godoc.vim plugin/godoc.vim; do - install -Dm644 "misc/vim/$f" "$pkgdir/usr/share/vim/vimfiles/$f" + install -Dm644 misc/vim/$f $pkgdir/usr/share/vim/vimfiles/$f done - mkdir -p "$pkgdir/"{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} + mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} - cp -r doc misc -t "$pkgdir/usr/share/go" - ln -s /usr/share/go/doc "$pkgdir/usr/lib/go/doc" - cp -a bin "$pkgdir/usr" - cp -a pkg "$pkgdir/usr/lib/go" - cp -a $GOROOT/src/pkg "$pkgdir/usr/lib/go/src/" - cp -a $GOROOT/src/cmd "$pkgdir/usr/lib/go/src/cmd" - cp -a $GOROOT/src/lib9 "$pkgdir/usr/lib/go/src/" - cp -a $GOROOT/lib "$pkgdir/usr/lib/go/" + cp -r doc misc -t $pkgdir/usr/share/go + ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc + cp -a bin $pkgdir/usr + cp -a pkg $pkgdir/usr/lib/go + cp -a $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ + cp -a $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd + cp -a $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ + cp -a $GOROOT/lib $pkgdir/usr/lib/go/ + cp -a $GOROOT/include $pkgdir/usr/lib/go/ - install -Dm644 src/Make.* "$pkgdir/usr/lib/go/src" + install -Dm644 src/Make.* $pkgdir/usr/lib/go/src # Remove object files from target src dir - find "$pkgdir/usr/lib/go/src/" -type f -name '*.[ao]' -delete - find "$pkgdir/usr/lib/go/src/pkg" -type f -executable -delete + find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete + find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete # Headers for C modules install -Dm644 src/pkg/runtime/runtime.h \ - "$pkgdir/usr/lib/go/src/pkg/runtime/runtime.h" + $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h install -Dm644 src/pkg/runtime/cgocall.h \ - "$pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h" + $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h # For packages that source /etc/profile.d/go.sh - install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" + install -Dm755 $srcdir/$pkgname.sh $pkgdir/etc/profile.d/$pkgname.sh # This is to make go get code.google.com/p/go-tour/gotour and # then running the gotour executable work out of the box. @@ -107,12 +108,14 @@ package() { # not /usr/lib/go/bin. Users should use different paths by # setting the appropriate environment variables. # - ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" + ln -sf /usr/bin $pkgdir/usr/lib/go/bin # For godoc - install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico" + install -Dm644 favicon.ico $pkgdir/usr/lib/go/favicon.ico - rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin" + rm -f $pkgdir/usr/share/go/doc/articles/wiki/get.bin + + install -Dm644 VERSION $pkgdir/usr/lib/go/VERSION } # vim:set ts=2 sw=2 et: diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 629285c73..573b5188d 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,26 +1,21 @@ -# $Id: PKGBUILD 77356 2012-10-09 04:18:31Z tdziedzic $ +# $Id: PKGBUILD 77797 2012-10-14 20:10:04Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar -pkgver=0.4.0.0 -pkgrel=3 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." +pkgver=0.4.0.1 +pkgrel=1 +pkgdesc="Reading, writing and manipulating tar archive files" url="http://hackage.haskell.org/package/tar" license=('custom:BSD3') arch=('x86_64' 'i686') depends=('ghc=7.6.1-1') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz" - '0001-update-changed-time-code-for-ghc-7.6.1.patch') +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install -sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113' - '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6') +sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d') build() { - cd "$srcdir/tar-$pkgver" - - # time functions have changed in ghc 7.6.1 - patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch + cd $srcdir/tar-$pkgver runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ @@ -33,18 +28,18 @@ build() { } package() { - cd "$srcdir/tar-$pkgver" + cd $srcdir/tar-$pkgver install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" + $pkgdir/usr/share/haskell/$pkgname/register.sh install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/tar" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + $pkgdir/usr/share/haskell/$pkgname/unregister.sh + install -dm 755 $pkgdir/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/$pkgname/html \ + $pkgdir/usr/share/doc/ghc/html/libraries/tar + runhaskell Setup copy --destdir=$pkgdir + install -Dm 644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE + rm -f $pkgdir/usr/share/doc/$pkgname/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index 2d0b771a3..d9d5ec4bc 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 75414 2012-08-22 16:11:51Z bgyorgy $ +# $Id: PKGBUILD 77776 2012-10-14 17:40:17Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=rygel -pkgver=0.14.3 -pkgrel=2 +pkgver=0.16.1 +pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64') url="http://live.gnome.org/Rygel" license=('LGPL') -depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'hicolor-icon-theme' 'xdg-utils') +depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e615d4fea616ecaedfaba57e70a455ac8339048490a423af66a70d05c7186ace') +sha256sums=('c8ffc0492c60b1c66f13f3f72cbee622307225d7e4cb20b43e299601463cd28d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/seahorse-nautilus/PKGBUILD b/community/seahorse-nautilus/PKGBUILD index 884840d1f..92f94c6dd 100644 --- a/community/seahorse-nautilus/PKGBUILD +++ b/community/seahorse-nautilus/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 69331 2012-04-14 01:17:42Z bgyorgy $ +# $Id: PKGBUILD 77770 2012-10-14 16:18:22Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=seahorse-nautilus -pkgver=3.4.0 +pkgver=3.6.0 pkgrel=1 pkgdesc="PGP encryption and signing for nautilus" arch=('i686' 'x86_64') url="http://git.gnome.org/browse/seahorse-nautilus/" license=('GPL') -depends=('gconf' 'libcryptui' 'nautilus') +depends=('libcryptui' 'gcr' 'nautilus') makedepends=('intltool') replaces=('seahorse-plugins') options=('!libtool') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4724438b8c09d5c25c30a304cbc398950d5a2fdd1e2ef3f6389ffbf18ac01480') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + fix-schema.patch) +sha256sums=('edae97cf7bab38ed928e25a7805913977f892ec9b9120783d874cda07912519d' + '3c5a3fe557fc56d5d5cda12d4b4909f513260da9b439d8bbaca2bf42b4fd114c') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix-schema.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static + --disable-static --disable-schemas-compile make } diff --git a/community/seahorse-nautilus/fix-schema.patch b/community/seahorse-nautilus/fix-schema.patch new file mode 100644 index 000000000..cd68e7a7f --- /dev/null +++ b/community/seahorse-nautilus/fix-schema.patch @@ -0,0 +1,20 @@ +From 8f48809c0fb6633bb45eac2144c1125f79933053 Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Mon, 01 Oct 2012 08:15:13 +0000 +Subject: Fix the schema identifier for GSettings window settings + +https://bugzilla.gnome.org/show_bug.cgi?id=685124 +--- +diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml +index 9263a25..89f49f1 100644 +--- a/data/org.gnome.seahorse.nautilus.window.gschema.xml ++++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml +@@ -1,5 +1,5 @@ + <schemalist> +- <schema id="org.gnome.seahorse.window"> ++ <schema id="org.gnome.seahorse.nautilus.window"> + <key name="width" type="i"> + <default>-1</default> + <summary>Width of the window</summary> +-- +cgit v0.9.0.2 diff --git a/community/seahorse-nautilus/seahorse-nautilus.install b/community/seahorse-nautilus/seahorse-nautilus.install index 2eaa60550..21f12fbda 100644 --- a/community/seahorse-nautilus/seahorse-nautilus.install +++ b/community/seahorse-nautilus/seahorse-nautilus.install @@ -1,4 +1,5 @@ post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q } diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD index 7565db319..bfb561b9c 100644 --- a/community/tig/PKGBUILD +++ b/community/tig/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Nathan Jones <nathanj@insightbb.com> pkgname=tig -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc='Text-mode interface for Git.' depends=('git' 'ncurses') @@ -12,7 +12,7 @@ url='http://jonas.nitro.dk/tig/' license=('GPL') arch=('i686' 'x86_64') source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('a2d414d1cebbc9cd4f3d545bc6f225c6') +md5sums=('adeb797a8320962eeb345a615257cbac') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD index 6816bc347..51e54fff1 100644 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ b/community/ubuntuone-client-gnome/PKGBUILD @@ -1,33 +1,23 @@ -# $Id: PKGBUILD 72615 2012-06-17 13:54:12Z bgyorgy $ +# $Id: PKGBUILD 77831 2012-10-15 01:46:26Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client-gnome -pkgver=3.0.2 +pkgver=4.0.0 pkgrel=1 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client-gnome" license=('GPL') -depends=('nautilus' 'evolution-data-server' 'ubuntuone-client') +depends=('nautilus' 'gconf' 'ubuntuone-client') makedepends=('intltool' 'gnome-settings-daemon') optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client-gnome/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz - fix-build.patch) -md5sums=('59a871d767e832b37e95e1aca2ee4374' - 'cabbf043f9be0ea8df4c9a4b020cd2c3' - '8d34fed775be23d1743dda079a293b78') +source=(http://launchpad.net/ubuntuone-client-gnome/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz) +md5sums=('26e9e391cabe1047eeb203d99ee2d9c6') build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-build.patch" - - # Install language files - echo 'am ar ast az be bg bn bs ca ca@valencia cs da de el en_AU en_GB eo es et eu fi fo fr gd gl gu he hi hr hu id it ja kk km ko ku lt lv ms my nb nl nn oc pa pl pt pt_BR ro ru shn si sk sl sq sr sv ta te th tr ug uk vi zh_CN zh_HK zh_TW' >po/LINGUAS - rename $pkgname- '' ../po/$pkgname-*.po - mv -f -t po ../po/* ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile diff --git a/community/ubuntuone-client/1339_1338.diff b/community/ubuntuone-client/1339_1338.diff new file mode 100644 index 000000000..cbd966a70 --- /dev/null +++ b/community/ubuntuone-client/1339_1338.diff @@ -0,0 +1,57 @@ +=== modified file 'tests/platform/sync_menu/test_linux.py' +--- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000 ++++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000 +@@ -124,6 +124,7 @@ + """Check that the dummy has the proper methods required by the API.""" + dummy = linux.DummySyncMenu('random', 'args') + self.assertIsInstance(dummy.update_transfers, Callable) ++ self.assertIsInstance(dummy.sync_status_changed, Callable) + + + class SyncMenuTestCase(TestCase): + +=== modified file 'ubuntuone/platform/sync_menu/linux.py' +--- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000 ++++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000 +@@ -183,7 +183,7 @@ + self.timer.addCallback(self._timeout) + + +-class TransfersMenu(Dbusmenu.Menuitem): ++class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object): + """Menu that handles the recent and current transfers.""" + + def __init__(self, status_frontend): +@@ -227,7 +227,7 @@ + items_added = 0 + remove = [] + for item in self._uploading_items: +- if item in uploading_data: ++ if item in uploading_data.keys(): + size, written = uploading_data[item] + percentage = written * 100 / size + upload_item = self._uploading_items[item] +@@ -243,7 +243,7 @@ + for item in remove: + self._uploading_items.pop(item) + if items_added < 5: +- for item in uploading_data: ++ for item in uploading_data.keys(): + if item not in self._uploading_items and items_added < 5: + size, written = uploading_data[item] + percentage = written * 100 / size +@@ -270,4 +270,12 @@ + def update_transfers(self): + """Do nothing.""" + +-UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu ++ def sync_status_changed(self): ++ """Do nothing.""" ++ ++ ++if use_syncmenu: ++ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux ++else: ++ UbuntuOneSyncMenu = DummySyncMenu ++ TransfersMenu = None + diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 31e198468..296bed607 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,37 +1,34 @@ -# $Id: PKGBUILD 72611 2012-06-17 13:44:37Z bgyorgy $ +# $Id: PKGBUILD 77827 2012-10-15 01:33:32Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client -pkgver=3.0.2 +pkgver=4.0.0 pkgrel=1 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" license=('GPL') depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake' 'gobject-introspection' 'vala') -optdepends=('ubuntu-sso-client-qt: required for first-time log in or' - 'ubuntu-sso-client-gtk: required for first-time log in' - 'python2-pyqt: proxy support') +makedepends=('intltool' 'imake' 'gobject-introspection') options=('!libtool') install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client/stable-3-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20120513.tar.gz) -md5sums=('5251fad8d316e8730188078239a4dd73' - '6f4603f11ea21d030bfaef34d3567f68') +source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz + 1339_1338.diff + fix-notify-hint.patch) +md5sums=('738039703d4dcf54518a725f8ffbc4de' + 'e82e80c229de06692988c1f938a34fb9' + '54dfeb2be011f0a12ea7cfa0f0c19bec') build() { cd "$srcdir/$pkgname-$pkgver" sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* - # Install language files - echo 'ace af am an ar ast az be bg bn bo br bs ca ca@valencia ckb crh cv cy cs csb da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy gd gl gu he hi hr hu hy id is it ja jv kk km kn ko ku ky lt lv ml mr ms my nb nds nl nn oc pl pt pt_BR ro ru sd shn si sk sl sq sr sv ta te th tr ug uk ur uz vi zh_CN zh_HK zh_TW' >po/LINGUAS - rename $pkgname- '' ../po/$pkgname-*.po - mv -f -t po ../po/* + # Improve TransfersMenu declaration to avoid problems + patch -Np0 -i "$srcdir/1339_1338.diff" - # Fix desktop file - sed -i 's/ubuntuone-installer/ubuntuone-control-panel-qt/' \ - ubuntuone/platform/linux/{messaging,launcher}.py + # Workaround for crash in notification-daemon + # https://bugzilla.gnome.org/show_bug.cgi?id=665166 + patch -Np1 -i "$srcdir/fix-notify-hint.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static \ diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch new file mode 100644 index 000000000..f32280de9 --- /dev/null +++ b/community/ubuntuone-client/fix-notify-hint.patch @@ -0,0 +1,20 @@ +diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py +--- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200 ++++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200 +@@ -40,7 +40,7 @@ + + if 'gi' in sys.modules and sys.modules['gi'] is not None: + try: +- from gi.repository import Notify ++ from gi.repository import GLib, Notify + Notify # pyflakes + NOTIFY_MODULE = 'gi' + except ImportError: +@@ -85,5 +85,6 @@ + if append: + self.notification.set_hint_string('x-canonical-append', '') + +- self.notification.set_hint_int32('transient', int(True)) ++ if NOTIFY_MODULE == 'gi': ++ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) + self.notification.show() diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD index 0534df0bd..7c8fd1726 100644 --- a/community/uget/PKGBUILD +++ b/community/uget/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 76258 2012-09-15 09:29:53Z bgyorgy $ +# $Id: PKGBUILD 77782 2012-10-14 18:09:15Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=uget -pkgver=1.10 -_pkgver=$pkgver-git.20120907 -pkgrel=2 +pkgver=1.10.2 +pkgrel=1 pkgdesc="GTK+ download manager featuring download classification and HTML import" arch=('i686' 'x86_64') url="http://urlget.sourceforge.net/" @@ -13,8 +12,8 @@ depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-uti makedepends=('intltool') optdepends=('aria2: alternative backend') install=$pkgname.install -source=(http://downloads.sourceforge.net/urlget/$pkgname-$_pkgver.tar.gz) -md5sums=('6e3ada8f4edd7e841639e57d352d9d89') +source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) +md5sums=('c766e94fcf12e4b425c53c7c598fd702') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 9459cf97f..91b782d87 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164670 2012-08-02 13:25:33Z dreisner $ +# $Id: PKGBUILD 168697 2012-10-14 14:55:36Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,9 +6,9 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.27.0 +pkgver=7.28.0 pkgrel=1 -pkgdesc="An URL retrival utility and library" +pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') @@ -16,8 +16,8 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('f0e48fdb635b5939e02a9291b89e5336' - 'b5d6d54f97adcaf5c871174e5460f081' +md5sums=('cbdc0a79bdf6e657dd387c3d88d802e3' + '7359e07276cdaff6317bbc39e6d5899c' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 6630fd69f..99848822a 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 168538 2012-10-13 09:11:11Z bisson $ +# $Id: PKGBUILD 168695 2012-10-14 06:06:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin pkgver=2.7.9 -pkgrel=1 +pkgrel=2 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' license=('LGPL') arch=('i686' 'x86_64') -depends=('gtk3' 'libxtst') -makedepends=('qt' 'gtk2' 'anthy' 'libchewing') +depends=('gtk2' 'libxtst') +makedepends=('qt' 'gtk3' 'anthy' 'libchewing') optdepends=('qt: support for qt4 input method' - 'gtk2: support for gtk2 input method' + 'gtk3: support for gtk3 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index a650c965a..95cfcb98a 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162322 2012-06-25 01:51:33Z bisson $ +# $Id: PKGBUILD 168727 2012-10-14 22:47:56Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Anton Leontiev <bunder@t-25.ru> pkgname=graphicsmagick -pkgver=1.3.16 +pkgver=1.3.17 pkgrel=1 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' @@ -16,7 +16,7 @@ depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz' 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl') options=('!libtool') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz") -sha1sums=('3949030b101d66811242a0d30abc9965481ed035') +sha1sums=('6428eb4bd19635c833750ac9d56c9b89bef4c975') build() { cd "${srcdir}/GraphicsMagick-${pkgver}" diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index d31668f9b..3a02c9737 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156872 2012-04-23 09:08:01Z ibiru $ +# $Id: PKGBUILD 168733 2012-10-15 02:01:46Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=gtk-vnc -pkgver=0.5.0 +pkgver=0.5.1 pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('gtk2: GTK2 widget') makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81') +sha256sums=('1ad1847a23f8ea8fbf2396de46c51ec0900ee3698cde4e205760518cd1e01a40') build() { rm -rf gtk2-build gtk3-build @@ -35,6 +35,6 @@ build() { } package() { - make -C gtk2-build -j1 DESTDIR="${pkgdir}" install - make -C gtk3-build -j1 DESTDIR="${pkgdir}" install + make -C gtk2-build DESTDIR="${pkgdir}" install + make -C gtk3-build DESTDIR="${pkgdir}" install } diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 98788202c..99f5db087 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 168020 2012-10-05 10:53:35Z andrea $ +# $Id: PKGBUILD 168704 2012-10-14 16:38:05Z thomas $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace pkgver=4.9.2 -pkgrel=2 +pkgrel=4 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kde-workspace' @@ -30,25 +30,32 @@ options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'kdm.logrotate' 'logind-support.patch') sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' - '712a90999bd429883dcef5dcaf288aace332ced8' - 'b321b5e613b60231330e606fdf1e124646148388' + '660eae40a707d2711d8d7f32a93214865506b795' + 'b7980f2e199963caf8e92b499042d244ece2fca0' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' 'b6f8e8692737b11eec1f8022ce74b5b23e247b1b' 'd7b5883f7e65c6839b1f65f94d58026673dd0226' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' 'd509dac592bd8b310df27991b208c95b6d907514' + 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'ccde71c42e19feaf40d3bd76e7396a0cb6df012f') build() { cd ${_pkgname}-${pkgver} + + # FS#26120 patch -p1 -i "${srcdir}"/kdm-xinitrd.patch + patch -p0 -i "${srcdir}"/fixpath.patch + + # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch - # KDEBUG 307412 + # KDEBUG#307412 (fixed upstream) patch -p1 -i "${srcdir}"/logind-support.patch cd ../ @@ -83,4 +90,5 @@ package() { install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm install -D -m644 "${srcdir}"/kdm.service \ "${pkgdir}"/usr/lib/systemd/system/kdm.service + install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm } diff --git a/extra/kdebase-workspace/kde-np.pam b/extra/kdebase-workspace/kde-np.pam index 7d60cc35c..eccaa08f4 100644 --- a/extra/kdebase-workspace/kde-np.pam +++ b/extra/kdebase-workspace/kde-np.pam @@ -1,9 +1,12 @@ #%PAM-1.0 -auth required pam_nologin.so -auth required pam_permit.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth required pam_tally.so onerr=succeed file=/var/log/faillog +auth required pam_shells.so +auth requisite pam_nologin.so +auth required pam_env.so +auth optional pam_permit.s + +account include system-login + +password include system-login + +session include system-login diff --git a/extra/kdebase-workspace/kde.pam b/extra/kdebase-workspace/kde.pam index ec1d8277f..a0a29483d 100644 --- a/extra/kdebase-workspace/kde.pam +++ b/extra/kdebase-workspace/kde.pam @@ -1,9 +1,8 @@ #%PAM-1.0 -auth required pam_unix.so -auth required pam_nologin.so -auth required pam_env.so -account required pam_unix.so -password required pam_unix.so -session required pam_unix.so -session required pam_limits.so --session optional pam_systemd.so +auth include system-login + +account include system-login + +password include system-login + +session include system-login diff --git a/extra/kdebase-workspace/kdm.logrotate b/extra/kdebase-workspace/kdm.logrotate new file mode 100644 index 000000000..34331feae --- /dev/null +++ b/extra/kdebase-workspace/kdm.logrotate @@ -0,0 +1,6 @@ +/var/log/kdm.log { + maxage 365 + size=+1024k + notifempty + missingok +} diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 084545294..0732107ea 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -3,22 +3,14 @@ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Jeramy Rutley <jrutley@gmail.com> -pkgname=ruby -pkgver=1.9.3_p194 -pkgrel=2 -pkgdesc='An object-oriented language for quick and easy programming' +pkgname=('ruby' 'ruby-docs') +pkgver=1.9.3_p286 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.ruby-lang.org/en/' license=('BSD' 'custom') -backup=('etc/gemrc') -provides=('rubygems' 'rake') -conflicts=('rake') -depends=('openssl' 'libffi' 'libyaml') -makedepends=('tk') -optdepends=('tk: for Ruby/TK' - 'ruby-docs: Ruby documentation') +makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') -install='ruby.install' source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') md5sums=('2278eff4cfed3cbc0653bc73085caa34' @@ -32,8 +24,7 @@ build() { --sysconfdir=/etc \ --enable-shared \ --enable-pthread \ - --disable-rpath \ - --disable-install-doc + --disable-rpath make } @@ -44,7 +35,16 @@ check() { make test } -package() { +package_ruby() { + pkgdesc='An object-oriented language for quick and easy programming' + depends=('openssl' 'libffi' 'libyaml') + optdepends=('tk: for Ruby/TK' + 'ruby-docs: Ruby documentation') + provides=('rubygems' 'rake') + conflicts=('rake') + backup=('etc/gemrc') + install='ruby.install' + cd ruby-${pkgver//_/-} make DESTDIR="${pkgdir}" install-nodoc @@ -54,3 +54,16 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" } + +package_ruby-docs() { + pkgdesc='Documentation files for ruby' + + cd ruby-${pkgver//_/-} + + make DESTDIR="${pkgdir}" install-doc install-capi + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" +} +md5sums=('e76848a86606a4fd5dcf14fc4b4e755e' + '6fb8e7a09955e0f64be3158fb4a27e7a') diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD index 91885eae6..323462d23 100644 --- a/extra/x11vnc/PKGBUILD +++ b/extra/x11vnc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165299 2012-08-15 01:45:56Z bisson $ +# $Id: PKGBUILD 168731 2012-10-15 02:00:18Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=x11vnc pkgver=0.9.13 -pkgrel=2 +pkgrel=3 pkgdesc='VNC server for real X displays' url='http://www.karlrunge.com/x11vnc/' arch=('i686' 'x86_64') @@ -32,5 +32,6 @@ package() { make DESTDIR="${pkgdir}" install install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/x11vnc" install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/x11vnc" + install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service" rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver } diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD index 841cc9417..d5454aab4 100644 --- a/extra/xfce4-mixer/PKGBUILD +++ b/extra/xfce4-mixer/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 161812 2012-06-14 23:39:44Z foutrelis $ +# $Id: PKGBUILD 168699 2012-10-14 15:01:42Z eric $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-mixer -pkgver=4.8.0 -pkgrel=4 +pkgver=4.10.0 +pkgrel=1 pkgdesc="The volume control plugin for the Xfce panel" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') -depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'hicolor-icon-theme') +depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'libunique') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/apps/$pkgname/4.8/$pkgname-$pkgver.tar.bz2) -sha256sums=('9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab') +source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD index debe2701f..552d189d6 100644 --- a/gnome-unstable/networkmanager/PKGBUILD +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168649 2012-10-13 19:17:30Z heftig $ +# $Id: PKGBUILD 168706 2012-10-14 16:54:10Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -9,7 +9,7 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -35,7 +35,7 @@ sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07' '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' 'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06' 'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6' - '8fe72946aa3b01d2205f3910bf07a3669c6c0218fb8d2bad45b6a27b48e3e496') + '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a') build() { cd $_pkgname-$pkgver diff --git a/gnome-unstable/networkmanager/systemd-sleep.patch b/gnome-unstable/networkmanager/systemd-sleep.patch index 2240594b2..3470d4654 100644 --- a/gnome-unstable/networkmanager/systemd-sleep.patch +++ b/gnome-unstable/networkmanager/systemd-sleep.patch @@ -1,35 +1,94 @@ -From 64fd8eea7706038e5d38c8463a1c765ed9331db2 Mon Sep 17 00:00:00 2001 +From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001 From: Matthias Clasen <mclasen@redhat.com> Date: Tue, 9 Oct 2012 00:36:35 -0400 -Subject: [PATCH 1/2] core: factor out the upower suspend/resume code (bgo +Subject: [PATCH] core: factor out the upower suspend/resume code (bgo #677694) Factor the code that listens for upower sleeping and resuming signals out into a class code NMSleepMonitor. + +core: add a systemd suspend/resume monitor (bgo #677694) + +This implementation uses a delay inhibitor to get systemd to +emit PrepareForSleep, and then emits ::Sleeping and ::Resuming +when receiving the before/after PrepareForSleep emissions. + +core: DBusGConnections are not GObjects + +Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2. + +core: fix suspend/resume signal names which the manager listens for + +Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly +I also thought GObject lower-cased signal names since it munges them +for - and _ too. Apparently not. --- - src/Makefile.am | 2 + - src/nm-manager.c | 40 +++++-------- - src/nm-sleep-monitor.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/nm-sleep-monitor.h | 46 +++++++++++++++ - 4 files changed, 214 insertions(+), 26 deletions(-) - create mode 100644 src/nm-sleep-monitor.c + configure.ac | 2 +- + src/Makefile.am | 9 +- + src/nm-manager.c | 40 +++----- + src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++ + src/nm-sleep-monitor-upower.c | 151 ++++++++++++++++++++++++++++ + src/nm-sleep-monitor.h | 46 +++++++++ + 6 files changed, 437 insertions(+), 28 deletions(-) + create mode 100644 src/nm-sleep-monitor-systemd.c + create mode 100644 src/nm-sleep-monitor-upower.c create mode 100644 src/nm-sleep-monitor.h +diff --git a/configure.ac b/configure.ac +index e76e193..9152c23 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) + AC_SUBST(GUDEV_CFLAGS) + AC_SUBST(GUDEV_LIBS) + +-PKG_CHECK_MODULES(GIO, gio-2.0) ++PKG_CHECK_MODULES(GIO, gio-unix-2.0) + AC_SUBST(GIO_CFLAGS) + AC_SUBST(GIO_LIBS) + diff --git a/src/Makefile.am b/src/Makefile.am -index b155209..9484a1f 100644 +index b155209..ba7d2d6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -191,6 +191,8 @@ NetworkManager_SOURCES = \ +@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \ nm-session-monitor.h \ nm-session-utils.c \ nm-session-utils.h \ + nm-sleep-monitor.h \ -+ nm-sleep-monitor.c \ nm-connection-provider.h \ nm-connection-provider.c \ nm-dispatcher.c \ +@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h + endif + + if SESSION_TRACKING_SYSTEMD +-NetworkManager_SOURCES += nm-session-monitor-systemd.c ++NetworkManager_SOURCES += \ ++ nm-session-monitor-systemd.c \ ++ nm-sleep-monitor-systemd.c + else + if SESSION_TRACKING_CK + NetworkManager_SOURCES += nm-session-monitor-ck.c + else + NetworkManager_SOURCES += nm-session-monitor-null.c + endif ++ ++# UPower suspend/resume used whenever systemd is not enabled ++NetworkManager_SOURCES += nm-sleep-monitor-upower.c + endif + + nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml +@@ -283,6 +289,7 @@ BUILT_SOURCES = \ + NetworkManager_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GLIB_CFLAGS) \ ++ $(GIO_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(GMODULE_CFLAGS) \ diff --git a/src/nm-manager.c b/src/nm-manager.c -index 618c4ed..8adb409 100644 +index 618c4ed..c8ce115 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -69,6 +69,7 @@ @@ -113,298 +172,13 @@ index 618c4ed..8adb409 100644 - nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); + /* sleep/wake handling */ + priv->sleep_monitor = nm_sleep_monitor_get (); -+ g_signal_connect (priv->sleep_monitor, "Sleeping", -+ G_CALLBACK (sleeping_cb), manager); -+ g_signal_connect (priv->sleep_monitor, "Resuming", -+ G_CALLBACK (resuming_cb), manager); ++ g_signal_connect (priv->sleep_monitor, "sleeping", ++ G_CALLBACK (sleeping_cb), manager); ++ g_signal_connect (priv->sleep_monitor, "resuming", ++ G_CALLBACK (resuming_cb), manager); /* Listen for authorization changes */ nm_auth_changed_func_register (authority_changed_cb, manager); -diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c -new file mode 100644 -index 0000000..488200e ---- /dev/null -+++ b/src/nm-sleep-monitor.c -@@ -0,0 +1,152 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2012 Red Hat, Inc. -+ * Author: Matthias Clasen <mclasen@redhat.com> -+ */ -+ -+#include "config.h" -+#include <errno.h> -+#include <string.h> -+#include <sys/stat.h> -+#include <dbus/dbus-glib-lowlevel.h> -+#include <dbus/dbus-glib.h> -+#include <gio/gio.h> -+#include "nm-logging.h" -+#include "nm-dbus-manager.h" -+ -+#include "nm-sleep-monitor.h" -+ -+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" -+ -+struct _NMSleepMonitor { -+ GObject parent_instance; -+ -+ DBusGProxy *upower_proxy; -+}; -+ -+struct _NMSleepMonitorClass { -+ GObjectClass parent_class; -+ -+ void (*sleeping) (NMSleepMonitor *monitor); -+ void (*resuming) (NMSleepMonitor *monitor); -+}; -+ -+ -+enum { -+ SLEEPING, -+ RESUMING, -+ LAST_SIGNAL, -+}; -+static guint signals[LAST_SIGNAL] = {0}; -+ -+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); -+ -+/********************************************************************/ -+ -+static void -+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) -+{ -+ nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); -+ g_signal_emit (user_data, signals[SLEEPING], 0); -+} -+ -+static void -+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) -+{ -+ nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); -+ g_signal_emit (user_data, signals[RESUMING], 0); -+} -+ -+static void -+nm_sleep_monitor_init (NMSleepMonitor *self) -+{ -+ NMDBusManager *dbus_mgr; -+ DBusGConnection *bus; -+ -+ dbus_mgr = nm_dbus_manager_get (); -+ bus = nm_dbus_manager_get_connection (dbus_mgr); -+ self->upower_proxy = dbus_g_proxy_new_for_name (bus, -+ UPOWER_DBUS_SERVICE, -+ "/org/freedesktop/UPower", -+ "org.freedesktop.UPower"); -+ if (self->upower_proxy) { -+ dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID); -+ dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping", -+ G_CALLBACK (upower_sleeping_cb), -+ self, NULL); -+ -+ dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID); -+ dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming", -+ G_CALLBACK (upower_resuming_cb), -+ self, NULL); -+ } else -+ nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); -+ g_object_unref (bus); -+ g_object_unref (dbus_mgr); -+} -+ -+static void -+finalize (GObject *object) -+{ -+ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); -+ -+ if (self->upower_proxy) -+ g_object_unref (self->upower_proxy); -+ -+ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) -+ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); -+} -+ -+static void -+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) -+{ -+ GObjectClass *gobject_class; -+ -+ gobject_class = G_OBJECT_CLASS (klass); -+ -+ gobject_class->finalize = finalize; -+ -+ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, -+ NM_TYPE_SLEEP_MONITOR, -+ G_SIGNAL_RUN_LAST, -+ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), -+ NULL, /* accumulator */ -+ NULL, /* accumulator data */ -+ g_cclosure_marshal_VOID__VOID, -+ G_TYPE_NONE, 0); -+} -+ -+NMSleepMonitor * -+nm_sleep_monitor_get (void) -+{ -+ static NMSleepMonitor *singleton = NULL; -+ -+ if (singleton) -+ return g_object_ref (singleton); -+ -+ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); -+ return singleton; -+} -+ -+/* ---------------------------------------------------------------------------------------------------- */ -diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h -new file mode 100644 -index 0000000..173e6a1 ---- /dev/null -+++ b/src/nm-sleep-monitor.h -@@ -0,0 +1,46 @@ -+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -+/* This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License along -+ * with this program; if not, write to the Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+ * (C) Copyright 2012 Red Hat, Inc. -+ * Author: Matthias Clasen <mclasen@redhat.com> -+ */ -+ -+#ifndef NM_SLEEP_MONITOR_H -+#define NM_SLEEP_MONITOR_H -+ -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) -+#define NM_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor)) -+#define NM_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) -+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) -+#define NM_IS_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR)) -+#define NM_IS_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR)) -+ -+#define NM_SLEEP_MONITOR_SLEEPING "sleeping" -+#define NM_SLEEP_MONITOR_RESUMING "resuming" -+ -+typedef struct _NMSleepMonitor NMSleepMonitor; -+typedef struct _NMSleepMonitorClass NMSleepMonitorClass; -+ -+GType nm_sleep_monitor_get_type (void) G_GNUC_CONST; -+NMSleepMonitor *nm_sleep_monitor_get (void); -+ -+G_END_DECLS -+ -+#endif /* NM_SLEEP_MONITOR_H */ -+ --- -1.7.12.2 - - - -From ea0c3a3e0fcbe400a704692d3b436d4733d348a1 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Tue, 9 Oct 2012 00:39:03 -0400 -Subject: [PATCH 2/2] core: add a systemd suspend/resume monitor (bgo #677694) - -This implementation uses a delay inhibitor to get systemd to -emit PrepareForSleep, and then emits ::Sleeping and ::Resuming -when receiving the before/after PrepareForSleep emissions. ---- - configure.ac | 2 +- - src/Makefile.am | 9 +- - src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++ - ...m-sleep-monitor.c => nm-sleep-monitor-upower.c} | 0 - 4 files changed, 225 insertions(+), 3 deletions(-) - create mode 100644 src/nm-sleep-monitor-systemd.c - rename src/{nm-sleep-monitor.c => nm-sleep-monitor-upower.c} (100%) - -diff --git a/configure.ac b/configure.ac -index e76e193..9152c23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147) - AC_SUBST(GUDEV_CFLAGS) - AC_SUBST(GUDEV_LIBS) - --PKG_CHECK_MODULES(GIO, gio-2.0) -+PKG_CHECK_MODULES(GIO, gio-unix-2.0) - AC_SUBST(GIO_CFLAGS) - AC_SUBST(GIO_LIBS) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9484a1f..ba7d2d6 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -192,7 +192,6 @@ NetworkManager_SOURCES = \ - nm-session-utils.c \ - nm-session-utils.h \ - nm-sleep-monitor.h \ -- nm-sleep-monitor.c \ - nm-connection-provider.h \ - nm-connection-provider.c \ - nm-dispatcher.c \ -@@ -203,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h - endif - - if SESSION_TRACKING_SYSTEMD --NetworkManager_SOURCES += nm-session-monitor-systemd.c -+NetworkManager_SOURCES += \ -+ nm-session-monitor-systemd.c \ -+ nm-sleep-monitor-systemd.c - else - if SESSION_TRACKING_CK - NetworkManager_SOURCES += nm-session-monitor-ck.c - else - NetworkManager_SOURCES += nm-session-monitor-null.c - endif -+ -+# UPower suspend/resume used whenever systemd is not enabled -+NetworkManager_SOURCES += nm-sleep-monitor-upower.c - endif - - nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml -@@ -285,6 +289,7 @@ BUILT_SOURCES = \ - NetworkManager_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GLIB_CFLAGS) \ -+ $(GIO_CFLAGS) \ - $(GUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(GMODULE_CFLAGS) \ diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c new file mode 100644 index 0000000..70adc89 @@ -628,10 +402,215 @@ index 0000000..70adc89 +} + +/* ---------------------------------------------------------------------------------------------------- */ -diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor-upower.c -similarity index 100% -rename from src/nm-sleep-monitor.c -rename to src/nm-sleep-monitor-upower.c +diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c +new file mode 100644 +index 0000000..3c93f66 +--- /dev/null ++++ b/src/nm-sleep-monitor-upower.c +@@ -0,0 +1,151 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * (C) Copyright 2012 Red Hat, Inc. ++ * Author: Matthias Clasen <mclasen@redhat.com> ++ */ ++ ++#include "config.h" ++#include <errno.h> ++#include <string.h> ++#include <sys/stat.h> ++#include <dbus/dbus-glib-lowlevel.h> ++#include <dbus/dbus-glib.h> ++#include <gio/gio.h> ++#include "nm-logging.h" ++#include "nm-dbus-manager.h" ++ ++#include "nm-sleep-monitor.h" ++ ++#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower" ++ ++struct _NMSleepMonitor { ++ GObject parent_instance; ++ ++ DBusGProxy *upower_proxy; ++}; ++ ++struct _NMSleepMonitorClass { ++ GObjectClass parent_class; ++ ++ void (*sleeping) (NMSleepMonitor *monitor); ++ void (*resuming) (NMSleepMonitor *monitor); ++}; ++ ++ ++enum { ++ SLEEPING, ++ RESUMING, ++ LAST_SIGNAL, ++}; ++static guint signals[LAST_SIGNAL] = {0}; ++ ++G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT); ++ ++/********************************************************************/ ++ ++static void ++upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data) ++{ ++ nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal"); ++ g_signal_emit (user_data, signals[SLEEPING], 0); ++} ++ ++static void ++upower_resuming_cb (DBusGProxy *proxy, gpointer user_data) ++{ ++ nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal"); ++ g_signal_emit (user_data, signals[RESUMING], 0); ++} ++ ++static void ++nm_sleep_monitor_init (NMSleepMonitor *self) ++{ ++ NMDBusManager *dbus_mgr; ++ DBusGConnection *bus; ++ ++ dbus_mgr = nm_dbus_manager_get (); ++ bus = nm_dbus_manager_get_connection (dbus_mgr); ++ self->upower_proxy = dbus_g_proxy_new_for_name (bus, ++ UPOWER_DBUS_SERVICE, ++ "/org/freedesktop/UPower", ++ "org.freedesktop.UPower"); ++ if (self->upower_proxy) { ++ dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping", ++ G_CALLBACK (upower_sleeping_cb), ++ self, NULL); ++ ++ dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming", ++ G_CALLBACK (upower_resuming_cb), ++ self, NULL); ++ } else ++ nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy"); ++ g_object_unref (dbus_mgr); ++} ++ ++static void ++finalize (GObject *object) ++{ ++ NMSleepMonitor *self = NM_SLEEP_MONITOR (object); ++ ++ if (self->upower_proxy) ++ g_object_unref (self->upower_proxy); ++ ++ if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL) ++ G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object); ++} ++ ++static void ++nm_sleep_monitor_class_init (NMSleepMonitorClass *klass) ++{ ++ GObjectClass *gobject_class; ++ ++ gobject_class = G_OBJECT_CLASS (klass); ++ ++ gobject_class->finalize = finalize; ++ ++ signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++ signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING, ++ NM_TYPE_SLEEP_MONITOR, ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (NMSleepMonitorClass, resuming), ++ NULL, /* accumulator */ ++ NULL, /* accumulator data */ ++ g_cclosure_marshal_VOID__VOID, ++ G_TYPE_NONE, 0); ++} ++ ++NMSleepMonitor * ++nm_sleep_monitor_get (void) ++{ ++ static NMSleepMonitor *singleton = NULL; ++ ++ if (singleton) ++ return g_object_ref (singleton); ++ ++ singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL)); ++ return singleton; ++} ++ ++/* ---------------------------------------------------------------------------------------------------- */ +diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h +new file mode 100644 +index 0000000..173e6a1 +--- /dev/null ++++ b/src/nm-sleep-monitor.h +@@ -0,0 +1,46 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with this program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * (C) Copyright 2012 Red Hat, Inc. ++ * Author: Matthias Clasen <mclasen@redhat.com> ++ */ ++ ++#ifndef NM_SLEEP_MONITOR_H ++#define NM_SLEEP_MONITOR_H ++ ++#include <glib-object.h> ++ ++G_BEGIN_DECLS ++ ++#define NM_TYPE_SLEEP_MONITOR (nm_sleep_monitor_get_type ()) ++#define NM_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor)) ++#define NM_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) ++#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass)) ++#define NM_IS_SLEEP_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR)) ++#define NM_IS_SLEEP_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR)) ++ ++#define NM_SLEEP_MONITOR_SLEEPING "sleeping" ++#define NM_SLEEP_MONITOR_RESUMING "resuming" ++ ++typedef struct _NMSleepMonitor NMSleepMonitor; ++typedef struct _NMSleepMonitorClass NMSleepMonitorClass; ++ ++GType nm_sleep_monitor_get_type (void) G_GNUC_CONST; ++NMSleepMonitor *nm_sleep_monitor_get (void); ++ ++G_END_DECLS ++ ++#endif /* NM_SLEEP_MONITOR_H */ ++ -- 1.7.12.2 diff --git a/multilib/lib32-sqlite/PKGBUILD b/multilib/lib32-sqlite/PKGBUILD index fce5a8978..33f846a88 100644 --- a/multilib/lib32-sqlite/PKGBUILD +++ b/multilib/lib32-sqlite/PKGBUILD @@ -4,9 +4,11 @@ _pkgbasename=sqlite pkgname=lib32-sqlite -_amalgamationver=3071400 -pkgver=3.7.14 -pkgrel=2 +_amalgamationver=3071401 +#_docver=${_amalgamationver} +_docver=3071400 +pkgver=3.7.14.1 +pkgrel=1 pkgdesc="A C library that implements an SQL database engine (32-bit)" arch=('x86_64') license=('custom') @@ -15,7 +17,7 @@ depends=(lib32-glibc $_pkgbasename) makedepends=('tcl' 'gcc-multilib' 'lib32-readline') source=(http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz) options=(!libtool) -md5sums=('6464d429b1396a8db35864e791673b65') +md5sums=('4cf3fd434bbb6e50777019ff3507bfa5') provides=("lib32-sqlite3=$pkgver") replaces=("lib32-sqlite3") conflicts=("lib32-sqlite3") diff --git a/staging/python-iwscan/PKGBUILD b/staging/python-iwscan/PKGBUILD new file mode 100644 index 000000000..3abb6747e --- /dev/null +++ b/staging/python-iwscan/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 168715 2012-10-14 20:19:42Z eric $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgbase=python-iwscan +pkgname=python2-iwscan +pkgver=20090609 +pkgrel=4 +pkgdesc="A Python interface to iwlist, using the iwlib library" +arch=('i686' 'x86_64') +url="http://projects.otaku42.de/browser/python-iwscan" +license=('LGPL') +depends=('python2' 'wireless_tools') +conflicts=('python-iwscan<=20090609-3') +replaces=('python-iwscan<=20090609-3') +source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz) +md5sums=('30fbe8ad3b07e67c1c35db2de16077d8') + +build() { + cd "${srcdir}/${pkgbase}" + python2 setup.py build +} + +package_python2-iwscan() { + cd "${srcdir}/${pkgbase}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD new file mode 100644 index 000000000..6cf46c8dc --- /dev/null +++ b/staging/python-notify/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 168721 2012-10-14 20:45:08Z eric $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> + +pkgbase=python-notify +pkgname=python2-notify +pkgver=0.1.1 +pkgrel=12 +pkgdesc="Python bindings for libnotify" +arch=('i686' 'x86_64') +url="http://www.galago-project.org/" +license=('GPL') +depends=('pygtk>=2.22.0' 'libnotify>=0.7.1') +makedepends=('python2') +conflicts=('python-notify<=0.1.1-11') +replaces=('python-notify<=0.1.1-11') +options=(!libtool) +source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz + libnotify07.patch + notify-python-0.1.1-fix-GTK-symbols.patch) +md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4' + 'b40c4542575d5aef559908fe60a21634' + 'c6922028da5951e69a6a0167bdb4461c') + +build() { + cd "${srcdir}/notify-python-${pkgver}" + + patch -Np1 -i "${srcdir}/libnotify07.patch" + patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch" + + ./configure --prefix=/usr + + # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c + # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed + touch src/pynotify.override + + make clean + make +} + +package_python2-notify() { + cd "${srcdir}/notify-python-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch new file mode 100644 index 000000000..289573d50 --- /dev/null +++ b/staging/python-notify/libnotify07.patch @@ -0,0 +1,36 @@ +diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs +--- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 ++++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 +@@ -38,7 +38,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "message" (null-ok) (default "NULL")) + '("const-gchar*" "icon" (null-ok) (default "NULL")) +- '("GtkWidget*" "attach" (null-ok) (default "NULL")) + ) + ) + +@@ -53,24 +52,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "attach") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch new file mode 100644 index 000000000..f985c0136 --- /dev/null +++ b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch @@ -0,0 +1,25 @@ +diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py +--- notify-python-0.1.1/src/__init__.py.BAD 2010-08-31 09:04:45.353844005 -0400 ++++ notify-python-0.1.1/src/__init__.py 2010-08-31 09:04:49.281844300 -0400 +@@ -1 +1,21 @@ ++""" ++Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea ++was to support being linked against different parallel-installable ++GTK stacks. ++ ++Unfortunately, python needs to jump through some special hoops in order ++to share symbols with extension modules, specifically, pygtk, which does ++link against GTK2. ++ ++Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL), ++the result is: ++libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name' ++ ++Thanks to David Malcolm for figuring out the workaround. ++""" ++import ctypes ++import sys ++sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL) ++import gtk ++ + from _pynotify import * diff --git a/staging/python-pysqlite/PKGBUILD b/staging/python-pysqlite/PKGBUILD new file mode 100644 index 000000000..f5985ebca --- /dev/null +++ b/staging/python-pysqlite/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 168723 2012-10-14 21:14:34Z eric $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgbase=python-pysqlite +pkgname=python2-pysqlite +pkgver=2.6.3 +pkgrel=3 +pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" +license=('custom') +arch=('i686' 'x86_64') +url="http://code.google.com/p/pysqlite/" +depends=('python2' 'sqlite') +conflicts=('python-pysqlite<=2.6.3-2') +replaces=('python-pysqlite<=2.6.3-2') +source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ + setup.cfg) +md5sums=('711afa1062a1d2c4a67acdf02a33d86e' + '86dd356c65afd14a22f2f8f64a26441e') + +check() { + cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/ + python2 -c "from pysqlite2 import test; test.test()" +} + +build() { + cd "${srcdir}/pysqlite-${pkgver}" + cp "${srcdir}/setup.cfg" . + python2 setup.py build +} + +package_python2-pysqlite() { + cd "${srcdir}/pysqlite-${pkgver}" + python2 setup.py install --root="${pkgdir}" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + rm -r "${pkgdir}/usr/pysqlite2-doc" +} diff --git a/staging/python-pysqlite/setup.cfg b/staging/python-pysqlite/setup.cfg new file mode 100644 index 000000000..ba6c77075 --- /dev/null +++ b/staging/python-pysqlite/setup.cfg @@ -0,0 +1,5 @@ +[build_ext] +define= +include_dirs=/usr/include +library_dirs=/usr/lib +libraries=sqlite3 diff --git a/staging/python-wpactrl/PKGBUILD b/staging/python-wpactrl/PKGBUILD new file mode 100644 index 000000000..692b3e8c3 --- /dev/null +++ b/staging/python-wpactrl/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 168717 2012-10-14 20:27:32Z eric $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgbase=python-wpactrl +pkgname=python2-wpactrl +pkgver=20090609 +pkgrel=4 +pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access" +arch=('i686' 'x86_64') +url="http://projects.otaku42.de/wiki/PythonWpaCtrl" +license=('GPL2') +depends=('python2') +conflicts=('python-wpactrl<=20090609-3') +replaces=('python-wpactrl<=20090609-3') +source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz) +md5sums=('8d45739aa9bfa1110a4570bb5ceda768') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py build +} + +package_python2-wpactrl() { + cd "${srcdir}/${pkgbase}-${pkgver}" + python2 setup.py install --root="${pkgdir}" +} diff --git a/staging/slim/PKGBUILD b/staging/slim/PKGBUILD new file mode 100644 index 000000000..a4580b756 --- /dev/null +++ b/staging/slim/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 168702 2012-10-14 15:17:29Z tomegun $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Hugo Ideler <hugoideler@dse.nl> + +pkgname=slim +pkgver=1.3.4 +pkgrel=4 +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') +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" + 'rc.d' + 'pam.d' + 'logrotate' + 'slim.service' + 'session-name.patch' + 'libpng-1.4+-support.patch' + 'fix-glibc-segfault-1.3.4.patch') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../session-name.patch # FS#26693: fix default session name + patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build + patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864 + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_PAM=yes -DUSE_CONSOLEKIT=no + make +} + +package() { + cd ${srcdir}/build/ + make DESTDIR="${pkgdir}" install + + install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim + install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim + install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim + + # Provide sane defaults + sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf + sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf + # install systemd files + install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service +} +md5sums=('51543533e492b41007811f7d880720fa' + 'd8ea9c4dee2811524b67f4f666311a1f' + '37ef35079139544d04b8316c7f66f754' + '43da096480bf72c3ccec8ad8400f34f0' + 'a5d6bde9e63899df7d2081e1585bbe54' + 'ebcb6829028615686de7b64ceeaaf8ed' + '6d19bd7a91592ed2bb902b22b9594565' + '9efc4e0d82d354f0c578be7723870769') diff --git a/staging/slim/fix-glibc-segfault-1.3.4.patch b/staging/slim/fix-glibc-segfault-1.3.4.patch new file mode 100644 index 000000000..b035f8a78 --- /dev/null +++ b/staging/slim/fix-glibc-segfault-1.3.4.patch @@ -0,0 +1,13 @@ +Index: app.cpp +=================================================================== +--- app.cpp (revision 223) ++++ app.cpp (working copy) +@@ -593,7 +593,7 @@ + + n++; + +- child_env = static_cast<char**>(malloc(sizeof(char*)*n)); ++ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1))); + memcpy(child_env, old_env, sizeof(char*)*n); + child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie()); + child_env[n] = NULL; diff --git a/staging/slim/libpng-1.4+-support.patch b/staging/slim/libpng-1.4+-support.patch new file mode 100644 index 000000000..57b39272b --- /dev/null +++ b/staging/slim/libpng-1.4+-support.patch @@ -0,0 +1,14 @@ +--- a/image.cpp 2012-06-26 04:20:14.000000000 -0400 ++++ b/image.cpp 2012-06-27 11:41:34.000000000 -0400 +@@ -781,7 +781,11 @@ + (png_infopp) NULL); + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png_ptr)))) { ++#else + if (setjmp(png_ptr->jmpbuf)) { ++#endif + goto png_destroy; + } + diff --git a/staging/slim/logrotate b/staging/slim/logrotate new file mode 100644 index 000000000..26ec3b0f4 --- /dev/null +++ b/staging/slim/logrotate @@ -0,0 +1,9 @@ +/var/log/slim.log { + compress + rotate 1 + size 1024k + notifempty + missingok + copytruncate + noolddir +} diff --git a/staging/slim/pam.d b/staging/slim/pam.d new file mode 100644 index 000000000..59db5a8c5 --- /dev/null +++ b/staging/slim/pam.d @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_loginuid.so +-session optional pam_systemd.so diff --git a/staging/slim/rc.d b/staging/slim/rc.d new file mode 100755 index 000000000..b0be7ffc5 --- /dev/null +++ b/staging/slim/rc.d @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/slim` +case "$1" in + start) + stat_busy "Starting Simple Login Manager" + [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon slim + stat_done + fi + ;; + stop) + stat_busy "Stopping Simple Login Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon slim + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch new file mode 100644 index 000000000..8211c4f72 --- /dev/null +++ b/staging/slim/session-name.patch @@ -0,0 +1,21 @@ +diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp +--- slim-1.3.2.old/panel.cpp 2010-10-24 06:01:15.117000019 +0000 ++++ slim-1.3.2.new/panel.cpp 2010-10-24 17:26:30.987999967 +0000 +@@ -23,7 +23,7 @@ + Root = root; + cfg = config; + +- session = ""; ++ session = cfg->nextSession(session); + + // Init GC + XGCValues gcv; +@@ -188,7 +188,7 @@ + } + + void Panel::ClearPanel() { +- session = ""; ++ session = cfg->nextSession(session); + Reset(); + XClearWindow(Dpy, Root); + XClearWindow(Dpy, Win); diff --git a/staging/slim/slim.service b/staging/slim/slim.service new file mode 100644 index 000000000..b894085a0 --- /dev/null +++ b/staging/slim/slim.service @@ -0,0 +1,9 @@ +[Unit] +Description=SLiM Simple Login Manager +After=systemd-user-sessions.service + +[Service] +ExecStart=/usr/bin/slim -nodaemon + +[Install] +Alias=display-manager.service diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch new file mode 100644 index 000000000..c590fbed8 --- /dev/null +++ b/staging/slim/tty-slowness.patch @@ -0,0 +1,30 @@ +diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp +--- slim-1.3.2.a/app.cpp 2010-08-21 15:10:13.702755711 +0200 ++++ slim-1.3.2.b/app.cpp 2010-08-21 15:10:48.579631179 +0200 +@@ -280,21 +280,22 @@ + signal(SIGALRM, AlarmSignal); + + #ifndef XNEST_DEBUG +- OpenLog(); +- + if (!force_nodaemon && cfg->getOption("daemon") == "yes") { + daemonmode = true; + } + + // Daemonize + if (daemonmode) { +- if (daemon(0, 1) == -1) { ++ if (daemon(0, 0) == -1) { + cerr << APPNAME << ": " << strerror(errno) << endl; + exit(ERR_EXIT); + } +- UpdatePid(); + } + ++ OpenLog(); ++ ++ if (daemonmode) UpdatePid(); ++ + CreateServerAuth(); + StartServer(); + alarm(2); diff --git a/staging/sonata/PKGBUILD b/staging/sonata/PKGBUILD new file mode 100644 index 000000000..d2a3d8d71 --- /dev/null +++ b/staging/sonata/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 168713 2012-10-14 19:47:10Z eric $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: William Rea <sillywilly@gmail.com> + +pkgname=sonata +pkgver=1.6.2.1 +pkgrel=8 +pkgdesc="Elegant GTK+ music client for MPD" +arch=('i686' 'x86_64') +url="http://sonata.berlios.de/" +license=('GPL3') +depends=('pygtk' 'python2-mpd') +optdepends=('gnome-python-extras: Enhanced system tray support' + 'tagpy: Metadata editing support' + 'python2-dbus: Various extra functionality (e.g. multimedia keys support)') +source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz + info.py.patch) +md5sums=('0b912325e7175abad3bf6c0edc071e05' + '595fcf7615035829b264afecb5a1beeb') + +build() { + cd "$srcdir/${pkgname}-$pkgver" + patch -Np0 -i "$srcdir/info.py.patch" + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py +} + +package() { + cd "$srcdir/${pkgname}-$pkgver" + python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir" +} diff --git a/staging/sonata/info.py.patch b/staging/sonata/info.py.patch new file mode 100644 index 000000000..e95cc3a08 --- /dev/null +++ b/staging/sonata/info.py.patch @@ -0,0 +1,15 @@ +--- sonata/info.py 2011-07-05 22:32:08.452556016 -0500 ++++ sonata/info.py 2011-07-05 22:45:50.849311466 -0500 +@@ -393,9 +393,9 @@ + if content.startswith("#REDIRECT [["): + addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0]) + content = urllib.urlopen(addr).read() +- lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0] +- if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": +- lyrics = misc.unescape_html(lyrics) ++ content = misc.unescape_html(content) ++ lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip() ++ if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->": + lyrics = misc.wiki_to_html(lyrics) + lyrics = lyrics.decode("utf-8") + # Save lyrics to file: diff --git a/staging/xfce4-session/PKGBUILD b/staging/xfce4-session/PKGBUILD index 11ff3e201..c3fccce41 100644 --- a/staging/xfce4-session/PKGBUILD +++ b/staging/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168641 2012-10-13 17:34:14Z foutrelis $ +# $Id: PKGBUILD 168729 2012-10-14 23:01:20Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.10.0 -pkgrel=4 +pkgrel=5 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -12,7 +12,7 @@ license=('GPL2') groups=('xfce4') depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit' 'hicolor-icon-theme') -makedepends=('intltool') +makedepends=('intltool' 'xfce4-dev-tools') optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled' 'xscreensaver: for locking screen with xflock4' 'gnome-screensaver: for locking screen with xflock4' @@ -20,18 +20,26 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab replaces=('xfce-utils') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfce4-session-4.10.0-add-systemd-support.patch) +sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce' + 'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ + # https://bugzilla.xfce.org/show_bug.cgi?id=8729 + patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch" + + xdt-autogen + + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --localstatedir=/var \ --disable-static \ - --enable-libgnome-keyring \ + --disable-legacy-sm \ --disable-debug make } diff --git a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch new file mode 100644 index 000000000..7ab637b26 --- /dev/null +++ b/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch @@ -0,0 +1,388 @@ +diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c +index 4076586..90e7873 100644 +--- /dev/null ++++ b/xfce4-session/xfsm-systemd.c +@@ -0,0 +1,123 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2012 Christian Hesse ++ * ++ * Licensed under the GNU General Public License Version 2 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++#include <config.h> ++ ++#include <gio/gio.h> ++#include <polkit/polkit.h> ++ ++#include "xfsm-systemd.h" ++ ++#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" ++#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" ++#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" ++#define SYSTEMD_REBOOT_ACTION "org.freedesktop.login1.reboot" ++#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off" ++ ++struct _SystemdProxy { ++ PolkitAuthority *authority; ++ PolkitSubject *subject; ++}; ++ ++SystemdProxy * ++systemd_proxy_new (void) ++{ ++ SystemdProxy *proxy; ++ ++ proxy = g_new0 (SystemdProxy, 1); ++ ++ proxy->authority = polkit_authority_get_sync (NULL, NULL); ++ proxy->subject = polkit_unix_process_new (getpid()); ++ ++ return proxy; ++} ++ ++void ++systemd_proxy_free (SystemdProxy *proxy) ++{ ++ g_object_unref (proxy->authority); ++ g_object_unref (proxy->subject); ++ ++ g_free (proxy); ++} ++ ++gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error) ++{ ++ PolkitAuthorizationResult *res; ++ GError *local_error = NULL; ++ ++ *can_method = FALSE; ++ res = polkit_authority_check_authorization_sync (proxy->authority, ++ proxy->subject, ++ method, ++ NULL, ++ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, ++ NULL, ++ &local_error); ++ if (res == NULL) { ++ g_propagate_error (error, local_error); ++ return FALSE; ++ } ++ ++ *can_method = polkit_authorization_result_get_is_authorized (res) || ++ polkit_authorization_result_get_is_challenge (res); ++ ++ g_object_unref (res); ++ ++ return TRUE; ++} ++ ++gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error) ++{ ++ return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error); ++} ++ ++gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error) ++{ ++ return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error); ++} ++ ++gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error) ++{ ++ GDBusConnection *bus; ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); ++ g_dbus_connection_call_sync (bus, ++ SYSTEMD_DBUS_NAME, ++ SYSTEMD_DBUS_PATH, ++ SYSTEMD_DBUS_INTERFACE, ++ method, ++ g_variant_new ("(b)", TRUE), ++ NULL, 0, G_MAXINT, NULL, NULL); ++ g_object_unref (bus); ++ ++ return TRUE; ++} ++ ++gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error) ++{ ++ return systemd_proxy_method(proxy, "Reboot", error); ++} ++ ++gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error) ++{ ++ return systemd_proxy_method(proxy, "PowerOff", error); ++} +diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h +index 3fa8317..2c4d868 100644 +--- /dev/null ++++ b/xfce4-session/xfsm-systemd.h +@@ -0,0 +1,42 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2012 Christian Hesse ++ * ++ * Licensed under the GNU General Public License Version 2 ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++#ifndef __SYSTEMD_PROXY_H__ ++#define __SYSTEMD_PROXY_H__ ++ ++#include <glib.h> ++ ++G_BEGIN_DECLS ++ ++typedef struct _SystemdProxy SystemdProxy; ++ ++SystemdProxy *systemd_proxy_new (void); ++void systemd_proxy_free (SystemdProxy *proxy); ++gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error); ++gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error); ++gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error); ++gboolean systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error); ++gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error); ++gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error); ++ ++G_END_DECLS ++ ++#endif /* __SYSTEMD_PROXY_H__ */ + +commit 518a28c23f110617aad36e64c02cdab6a36adf37 +Author: Christian Hesse <eworm@leda.eworm.de> +Date: Fri Jul 27 14:21:14 2012 +0200 + + ... + +diff --git a/configure.in.in b/configure.in.in +index 9aa4f8f..aa0b8bb 100644 +--- a/configure.in ++++ b/configure.in +@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) + XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) + XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) + ++dnl systemd integration ++AC_ARG_ENABLE([systemd], ++ AS_HELP_STRING([--enable-systemd], [Use systemd]), ++ [with_systemd=$enableval], ++ [with_systemd=auto]) ++PKG_CHECK_MODULES(SYSTEMD, ++ [libsystemd-login polkit-gobject-1], ++ [have_systemd=yes], [have_systemd=no]) ++AC_MSG_CHECKING([whether to use systemd]) ++if test x$with_systemd = xauto ; then ++ if test x$have_systemd = xno ; then ++ with_systemd=no ++ else ++ with_systemd=yes ++ fi ++fi ++AC_MSG_RESULT($with_systemd) ++if test x$with_systemd = xyes; then ++ if test x$have_systemd = xno; then ++ AC_MSG_ERROR([Systemd support explicitly required, but systemd not found]) ++ fi ++ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) ++fi ++AC_SUBST(SYSTEMD_CFLAGS) ++AC_SUBST(SYSTEMD_LIBS) ++AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd]) ++ + dnl Check for debugging support + XDT_FEATURE_DEBUG([xfsm_debug_default]) + + +commit f1279eba9452f027a2037be77388767437161d51 +Author: Christian Hesse <eworm@leda.eworm.de> +Date: Fri Jul 27 14:18:16 2012 +0200 + + ... + +diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c +index 1429abd..077cdf3 100644 +--- a/xfce4-session/xfsm-shutdown.c ++++ b/xfce4-session/xfsm-shutdown.c +@@ -96,7 +96,11 @@ struct _XfsmShutdown + { + GObject __parent__; + ++#ifdef HAVE_SYSTEMD ++ SystemdProxy *systemd_proxy; ++#else + XfsmConsolekit *consolekit; ++#endif + XfsmUPower *upower; + + /* kiosk settings */ +@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown) + { + XfceKiosk *kiosk; + ++#ifdef HAVE_SYSTEMD ++ shutdown->systemd_proxy = systemd_proxy_new (); ++#else + shutdown->consolekit = xfsm_consolekit_get (); ++#endif + shutdown->upower = xfsm_upower_get (); + shutdown->helper_state = SUDO_NOT_INITIAZED; + shutdown->helper_require_password = FALSE; +@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object) + { + XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); + ++#ifdef HAVE_SYSTEMD ++ systemd_proxy_free (shutdown->systemd_proxy); ++#else + g_object_unref (G_OBJECT (shutdown->consolekit)); ++#endif + g_object_unref (G_OBJECT (shutdown->upower)); + + /* close down helper */ +@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown *shutdown, + if (shutdown->helper_state == SUDO_AVAILABLE) + return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); + else ++#ifdef HAVE_SYSTEMD ++ return systemd_proxy_restart (shutdown->systemd_proxy, error); ++#else + return xfsm_consolekit_try_restart (shutdown->consolekit, error); ++#endif + } + + +@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown *shutdown, + if (shutdown->helper_state == SUDO_AVAILABLE) + return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); + else ++#ifdef HAVE_SYSTEMD ++ return systemd_proxy_shutdown (shutdown->systemd_proxy, error); ++#else + return xfsm_consolekit_try_shutdown (shutdown->consolekit, error); ++#endif + } + + +@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown *shutdown, + return TRUE; + } + ++#ifdef HAVE_SYSTEMD ++ if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error)) ++#else + if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error)) ++#endif + return TRUE; + + if (xfsm_shutdown_sudo_init (shutdown, error)) +@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown *shutdown, + return TRUE; + } + ++#ifdef HAVE_SYSTEMD ++ if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error)) ++#else + if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error)) ++#endif + return TRUE; + + if (xfsm_shutdown_sudo_init (shutdown, error)) + +commit 5aea3fb853683246a537a67423cf5b32076b8dfb +Author: Christian Hesse <eworm@leda.eworm.de> +Date: Fri Jul 27 14:03:27 2012 +0200 + + ... + +diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am +index c015154..7e3b311 100644 +--- a/xfce4-session/Makefile.am ++++ b/xfce4-session/Makefile.am +@@ -38,8 +38,6 @@ xfce4_session_SOURCES = \ + xfsm-compat-gnome.h \ + xfsm-compat-kde.c \ + xfsm-compat-kde.h \ +- xfsm-consolekit.c \ +- xfsm-consolekit.h \ + xfsm-dns.c \ + xfsm-dns.h \ + xfsm-error.c \ +@@ -65,6 +63,16 @@ xfce4_session_SOURCES = \ + xfsm-upower.c \ + xfsm-upower.h + ++if WITH_SYSTEMD ++xfce4_session_SOURCES += \ ++ xfsm-systemd.c \ ++ xfsm-systemd.h ++else ++xfce4_session_SOURCES += \ ++ xfsm-consolekit.c \ ++ xfsm-consolekit.h ++endif ++ + xfce4_session_CFLAGS = \ + $(LIBSM_CFLAGS) \ + $(LIBX11_CFLAGS) \ +@@ -72,6 +80,7 @@ xfce4_session_CFLAGS = \ + $(DBUS_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ + $(LIBWNCK_CFLAGS) \ ++ $(SYSTEMD_CFLAGS) \ + $(XFCONF_CFLAGS) \ + $(GMODULE_CFLAGS) \ + $(PLATFORM_CFLAGS) +@@ -91,6 +100,7 @@ xfce4_session_LDADD = \ + $(DBUS_LIBS) \ + $(DBUS_GLIB_LIBS) \ + $(LIBWNCK_LIBS) \ ++ $(SYSTEMD_LIBS) \ + $(XFCONF_LIBS) \ + -lm + +diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c +index d8757a8..1429abd 100644 +--- a/xfce4-session/xfsm-shutdown.c ++++ b/xfce4-session/xfsm-shutdown.c +@@ -66,10 +66,13 @@ + #include <xfce4-session/xfsm-fadeout.h> + #include <xfce4-session/xfsm-global.h> + #include <xfce4-session/xfsm-legacy.h> +-#include <xfce4-session/xfsm-consolekit.h> + #include <xfce4-session/xfsm-upower.h> + +- ++#ifdef HAVE_SYSTEMD ++#include <xfce4-session/xfsm-systemd.h> ++#else ++#include <xfce4-session/xfsm-consolekit.h> ++#endif + + static void xfsm_shutdown_finalize (GObject *object); + static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); diff --git a/testing/mod_wsgi/PKGBUILD b/testing/mod_wsgi/PKGBUILD new file mode 100644 index 000000000..24c2d0767 --- /dev/null +++ b/testing/mod_wsgi/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 168687 2012-10-14 04:16:02Z eric $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Ryan Coyner <rcoyner@gmail.com> + +pkgname=mod_wsgi +pkgver=3.4 +pkgrel=1 +pkgdesc="Python WSGI adapter module for Apache" +arch=('i686' 'x86_64') +url="http://www.modwsgi.org/" +license=('APACHE') +depends=('apache' 'python2') +install=mod_wsgi.install +source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +md5sums=('f42d69190ea0c337ef259cbe8d94d985') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-apxs=/usr/sbin/apxs \ + --with-python=/usr/bin/python2 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mod_wsgi/mod_wsgi.install b/testing/mod_wsgi/mod_wsgi.install new file mode 100644 index 000000000..d26d61631 --- /dev/null +++ b/testing/mod_wsgi/mod_wsgi.install @@ -0,0 +1,14 @@ +post_install() { +/bin/cat << ENDOFMESSAGE +==> +==> +==> To install mod_wsgi, add the following line in +==> /etc/httpd/conf/httpd.conf file : +==> +==> LoadModule wsgi_module modules/mod_wsgi.so +==> +==> and restart/reload Apache. +==> +==> +ENDOFMESSAGE +} |