diff options
Diffstat (limited to 'extra')
252 files changed, 3684 insertions, 1748 deletions
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index 0222f00e5..41be55fdd 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 141268 2011-10-27 16:31:57Z ibiru $ +# $Id: PKGBUILD 156697 2012-04-23 09:03:20Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.15 +pkgver=0.6.18 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) url="http://cgit.freedesktop.org/accountsservice/" license=('GPL3') -depends=('dbus-glib' 'polkit') -makedepends=('intltool' 'gobject-introspection') +depends=('glib2' 'polkit' 'libsystemd') +makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') -source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('939e58e57334801ca578b182a09141c4') +source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.xz) +md5sums=('31bc335f7d96b88e0d572a67a9df063d') build() { - cd "$srcdir/$pkgname-$pkgver" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/accountsservice \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD index e074968c5..1fee6da87 100644 --- a/extra/anjuta-extras/PKGBUILD +++ b/extra/anjuta-extras/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 139219 2011-10-01 18:55:44Z ibiru $ -# Mantainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156701 2012-04-23 09:03:26Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=anjuta-extras -pkgver=3.2.0 -pkgrel=1 +pkgver=3.4.0 +pkgrel=2 pkgdesc="Anjuta Integrated Development Environment extra plugins" arch=('i686' 'x86_64') license=('GPL') depends=('anjuta') -makedepends=('intltool') +makedepends=('intltool' 'gnome-doc-utils') install=anjuta-extras.install url="http://anjuta.sourceforge.net/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('cda9624952d1e9e5b442c1b972256b618b3d3c6aa3f1069bb6ae1796eecf55a4') +sha256sums=('e9aa21dfa7e182c85e15eb4c3f1d0db928826572350f0aaeeae8ee9c947440bd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index db8a5fc82..fdc3ecb23 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142974 2011-11-19 10:42:16Z ibiru $ +# $Id: PKGBUILD 156699 2012-04-23 09:03:23Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.2.2 -pkgrel=1 +pkgver=3.4.0 +pkgrel=3 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('909fee6af9b86192eecac47e417f1de8bd8c759dfd2bf3ee288bb146a575683e') +sha256sums=('c8175e04e797dc0e2aaede4ae73ee9cd7f37d3e59b158961703db546d4660abf') build() { cd "$srcdir/$pkgname-$pkgver" @@ -26,7 +26,8 @@ build() { package(){ cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + # j1: Race during linking + make -j1 DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/python$|&2|" \ $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index 6179b042e..ab986cffb 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146694 2012-01-16 14:00:07Z ibiru $ +# $Id: PKGBUILD 156703 2012-04-23 09:03:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.2.2 +pkgver=2.4.0 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,10 +13,10 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b63b214cec23163bf59239c59b350d55a7fcfab7a95858ea833815e0b16a4041') +sha256sums=('28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -27,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index d77a8e8cf..794705d17 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146684 2012-01-16 11:06:00Z ibiru $ +# $Id: PKGBUILD 156705 2012-04-23 09:03:33Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.2.3 +pkgver=2.4.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,10 +12,10 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1') +sha256sums=('5a1d8026bbe1d40d1f5a2c956d10b9ed39766f7880a73d80f37aa6e48c6c11e5') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i -e '/AC_PATH_XTRA/d' configure.ac autoreconf --force --install @@ -26,7 +26,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD index 33b1f015c..626785f2f 100644 --- a/extra/atk/PKGBUILD +++ b/extra/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139221 2011-10-01 18:55:46Z ibiru $ +# $Id: PKGBUILD 156707 2012-04-23 09:03:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=2.2.0 +pkgver=2.4.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) @@ -10,17 +10,17 @@ license=('LGPL') depends=('glib2') makedepends=('gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d') +sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD new file mode 100644 index 000000000..a856594ef --- /dev/null +++ b/extra/baobab/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156709 2012-04-23 09:03:37Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=baobab +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A graphical directory tree analyzer" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libgtop') +makedepends=('intltool' 'itstool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/baobab/baobab.install b/extra/baobab/baobab.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/extra/baobab/baobab.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 16a86bb17..0b75e5ece 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155687 2012-04-04 17:16:05Z ibiru $ +# $Id: PKGBUILD 156711 2012-04-23 09:03:40Z ibiru $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,7 +8,7 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.49.0 _boostver=${pkgver//./_} -pkgrel=1.1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index 6e033451c..069a41cdc 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139227 2011-10-01 18:55:55Z ibiru $ +# $Id: PKGBUILD 156713 2012-04-23 09:03:43Z ibiru $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64') @@ -20,11 +20,11 @@ optdepends=('libburn: alternative back-end' 'vcdimager: video project') replaces=('nautilus-cd-burner') install=brasero.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e4fcd5dca1c7b0a930a43ae59953fa96db3f6beef41ceedb2f0ef8636e26a7a6') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-caches \ --disable-schemas-compile @@ -32,7 +32,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "$pkgname-$pkgver" + make DESTDIR=$pkgdir install } diff --git a/extra/brasero/brasero.install b/extra/brasero/brasero.install index b6c57055e..9248062f7 100644 --- a/extra/brasero/brasero.install +++ b/extra/brasero/brasero.install @@ -1,14 +1,14 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q - update-mime-database usr/share/mime > /dev/null + update-mime-database /usr/share/mime > /dev/null } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 663eff676..dc67b756d 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150160 2012-02-13 19:59:22Z ibiru $ +# $Id: PKGBUILD 156715 2012-04-23 09:03:46Z ibiru $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.3 -pkgrel=4 +pkgrel=5 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64') url="http://mielke.cc/brltty" diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 0feb4c2bc..83b4b65f6 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140843 2011-10-20 05:41:46Z ibiru $ +# $Id: PKGBUILD 156718 2012-04-23 09:03:54Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Adam Hani Schakaki <krzd@krzd.net> pkgname=caribou -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ makedepends=('gnome-doc-utils' 'intltool') install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('d4d2328e0eadbf037f7e0ec146e835097fe56cb2b940985655e649c5556e4ed1') +sha256sums=('bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py export PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ @@ -29,7 +29,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index ba33b8416..1cba0857d 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,32 +1,34 @@ -# $Id: PKGBUILD 148533 2012-02-03 15:37:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156720 2012-04-23 09:04:00Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) license=('GPL') -depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' - 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection') +depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee' + 'gnome-video-effects' 'hicolor-icon-theme' 'dconf' 'cogl') +makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool' + 'nautilus-sendto') +optdepends=('nautilus-sendto: Send images') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8f050b03365310d739c54e48c8c62f8e2d6d9a028fed3eb3c8da4c7654a9009a') +sha256sums=('b7a07c45217bdea6b9bc3ad56c19b5b7de4ddf939074efe94add7afb66a26dd0') build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cheese/cheese.install b/extra/cheese/cheese.install index c042fba42..f7e8c46ac 100644 --- a/extra/cheese/cheese.install +++ b/extra/cheese/cheese.install @@ -1,20 +1,12 @@ -pkgname=cheese - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 409fb40c1..8729d1374 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 146820 2012-01-18 18:28:11Z ibiru $ +# $Id: PKGBUILD 156724 2012-04-23 09:04:05Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=1.4.6 +pkgver=1.5.4 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" license=('LGPL') depends=('clutter' 'gstreamer0.10-base' 'libxdamage') -makedepends=('gobject-introspection' 'gtk-doc') +makedepends=('gobject-introspection') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5368ded143b2f73c3128315dab7b45c5dd8d681341cbae8f83664d2f9bbba3c3') +sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ --sysconfdir=/etc @@ -23,7 +23,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="${pkgdir}" install } diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index 92b9a1d2c..baa0ba5d7 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139235 2011-10-01 18:56:12Z ibiru $ +# $Id: PKGBUILD 156726 2012-04-23 09:04:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk -pkgver=1.0.4 +pkgver=1.2.0 pkgrel=1 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') @@ -10,17 +10,17 @@ url="http://clutter-project.org/" options=('!libtool') license=('LGPL') depends=('clutter' 'gtk3') -makedepends=('gobject-introspection' 'gtk-doc') -source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0741fd2feb7d065dd5949a0b47f9cd740272c1428ca93431dea677acb6de464e') +makedepends=('gobject-introspection') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 94a693017..fd58222d2 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148405 2012-01-31 12:11:47Z ibiru $ +# $Id: PKGBUILD 156722 2012-04-23 09:04:02Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.8.4 +pkgver=1.10.2 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,15 +14,15 @@ license=('LGPL') depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') makedepends=('gobject-introspection' 'mesa') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6fedb4c344b4cab37e249b8a5ffeccff2f384f11335dee25c6466927461e1345') +sha256sums=('d5c11b464d1a80eb6b73dbf7a98532917a055068fec3508f2a849c850e70d5b7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --enable-introspection make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 16321ce85..8263db504 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140849 2011-10-20 05:41:52Z ibiru $ +# $Id: PKGBUILD 156728 2012-04-23 09:04:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.8.2 +pkgver=1.10.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') @@ -10,18 +10,18 @@ url="http://www.clutter-project.org/" license=('GPL2') depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') -options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('ec26fd90c4ba5643875b5f3a04b4ab14b24f0d618ba3d239d61e773c3e3ca8c7') +options=(!libtool !emptydirs) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 97d3c91ad..35a6d3036 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 150827 2012-02-23 11:03:34Z ibiru $ +# $Id: PKGBUILD 156730 2012-04-23 09:04:12Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=0.1.17 +pkgver=0.1.19 pkgrel=1 pkgdesc="Color daemon" arch=('i686' 'x86_64') url="http://www.freedesktop.org/software/colord" license=('GPL2') -depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev') makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') -source=($url/releases/$pkgname-$pkgver.tar.xz - fix-compilation.patch) +source=($url/releases/$pkgname-$pkgver.tar.xz) options=('!libtool') -sha1sums=('7716c58a7ab85029637c7e88bdb77e48b6cd5ce9' - 'b77dd47f623a05055e8988dd568695fcbf457500') +sha1sums=('d133c6320fcdd069be86f4a7afa723f48f99acb3') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/fix-compilation.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/colord \ --localstatedir=/var --disable-static \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index f56f035f1..229141eda 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,7 +1,7 @@ -#$Id: PKGBUILD 149302 2012-02-06 18:14:45Z ibiru $ +#$Id: PKGBUILD 156732 2012-04-23 09:04:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cups-pk-helper -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64) @@ -9,19 +9,18 @@ url="http://www.freedesktop.org/software/cups-pk-helper/releases/" license=('GPL') depends=(polkit libcups) makedepends=(intltool) -install= -source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('b620abc83d5e8595c533264c00c6f6d9f44ec020b62968797747687857679c9c ') +source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.xz) +sha256sums=('56a10efbc0f37db39a940d99d549c7f37fa95f1af4745b30b79c240b0f37cfd7') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/cups-pk-helper make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 8da8cc7fe..c93f485fe 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 139241 2011-10-01 18:56:24Z ibiru $ +# $Id: PKGBUILD 156734 2012-04-23 09:04:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.10.0 +pkgver=0.12.0 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" license=('LGPL2.1') -depends=('glib2') -makedepends=('vala' 'gobject-introspection' 'gtk3') +depends=('glib2' 'gtk-update-icon-cache') +makedepends=('vala' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install -source=(http://download.gnome.org/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/dconf @@ -24,8 +24,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/dconf/dconf.install b/extra/dconf/dconf.install index 39bce8f45..75d713d64 100644 --- a/extra/dconf/dconf.install +++ b/extra/dconf/dconf.install @@ -1,6 +1,7 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade(){ diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index aa24c7ccd..e31421856 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 139243 2011-10-01 18:56:27Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156736 2012-04-23 09:04:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> pkgname=devhelp -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64) @@ -14,17 +15,17 @@ makedepends=('pkgconfig' 'intltool' 'python2') options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e') +sha256sums=('3d1148d45d6fac5bb9a4fdf223f19ffa5774aa56df6bbf5b6e86363d8f55552c') build() { - cd "${srcdir}/devhelp-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/devhelp-${pkgver}" + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 48227086d..9db3fd9bc 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155947 2012-04-09 14:48:18Z andyrtr $ +# $Id: PKGBUILD 157092 2012-04-23 16:33:36Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.1.4 +pkgver=2.1.5 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('9a360fc39462da71e2bfd1d6928f3902' - '1ba2a0f1f7b5f226ce867ea8243abe46' +md5sums=('c857e3442f2f14b3e46f1154b13b0b4b' + '4ef0a9647b82e0a1bdc667492a151881' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index a93063aa6..40a736d38 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152204 2012-03-05 08:55:56Z ibiru $ +# $Id: PKGBUILD 156738 2012-04-23 09:04:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -15,11 +15,14 @@ optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gcc47.patch) +sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a' + '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/gcc47.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus @@ -27,10 +30,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/ekiga/ekiga.install b/extra/ekiga/ekiga.install index b1d76a4a3..91f3a57a0 100644 --- a/extra/ekiga/ekiga.install +++ b/extra/ekiga/ekiga.install @@ -1,8 +1,8 @@ pkgname=ekiga post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gconfpkg --install $pkgname + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { @@ -14,9 +14,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/ekiga/gcc47.patch b/extra/ekiga/gcc47.patch new file mode 100644 index 000000000..f12c37524 --- /dev/null +++ b/extra/ekiga/gcc47.patch @@ -0,0 +1,99 @@ +From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001 +From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> +Date: Sat, 24 Mar 2012 09:17:40 +0000 +Subject: Fix compile error with gcc 4.7 + +--- +diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h +index e16848e..b0a8775 100644 +--- a/lib/engine/account/bank-impl.h ++++ b/lib/engine/account/bank-impl.h +@@ -203,7 +203,7 @@ template<typename AccountType> + void + Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account) + { +- add_object (account); ++ this->add_object (account); + + account->questions.connect (boost::ref (questions)); + } +@@ -213,7 +213,7 @@ template<typename AccountType> + void + Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account) + { +- remove_object (account); ++ this->remove_object (account); + } + + #endif +diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h +index 711d8d9..4fea7d5 100644 +--- a/lib/engine/addressbook/book-impl.h ++++ b/lib/engine/addressbook/book-impl.h +@@ -204,7 +204,7 @@ void + Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact) + { + contact->questions.connect (boost::ref (questions)); +- add_object (contact); ++ this->add_object (contact); + } + + +@@ -212,7 +212,7 @@ template<typename ContactType> + void + Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact) + { +- remove_object (contact); ++ this->remove_object (contact); + } + + #endif +diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h +index a30cd03..630236f 100644 +--- a/lib/engine/addressbook/source-impl.h ++++ b/lib/engine/addressbook/source-impl.h +@@ -206,7 +206,7 @@ template<typename BookType> + void + Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book) + { +- add_object (book); ++ this->add_object (book); + + add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1))); + +diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h +index 245a7c6..92074a8 100644 +--- a/lib/engine/presence/cluster-impl.h ++++ b/lib/engine/presence/cluster-impl.h +@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap) + + add_connection (heap, heap->questions.connect (boost::ref (questions))); + +- add_object (heap); ++ this->add_object (heap); + } + + template<typename HeapType> +diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h +index d63c491..15fe86f 100644 +--- a/lib/engine/presence/heap-impl.h ++++ b/lib/engine/presence/heap-impl.h +@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp + { + presentity->questions.connect (boost::ref (questions)); + +- add_object (presentity); ++ this->add_object (presentity); + } + + template<typename PresentityType> + void + Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity) + { +- remove_object (presentity); ++ this->remove_object (presentity); + } + + #endif +-- +cgit v0.9.0.2 diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 3e3f66aa6..e7ed03e86 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,32 +1,37 @@ -# $Id: PKGBUILD 149338 2012-02-06 20:53:31Z stephane $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 157084 2012-04-23 13:56:25Z allan $ +# Maintainer: # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils -pkgver=0.152 -pkgrel=2 +pkgver=0.153 +pkgrel=1 pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" license=('GPL2') depends=('glibc') -#optdepends=('zlib' 'xz' 'bzip2') provides=('libelf') replaces=('libelf') conflicts=('libelf') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2) -md5sums=('39739ed58a0fa1862eff8735f111fe5c') +options=('!makeflags') +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +md5sums=('289a146182bc29f0236eaa15d8ebdf98' + '1af9fe25e9316173b81fa4fad3a17ed5') -build() -{ +build() { cd "${srcdir}/${pkgname}-${pkgver}" + CFLAGS+=" -g" # required for test-suite success ./configure --prefix=/usr --program-prefix="eu-" make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i "s#./alldts#testrun ./alldts#" tests/run-alldts.sh make check } -package() -{ +package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 8d25db7eb..ac6370abe 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,41 +1,38 @@ -# $Id: PKGBUILD 142866 2011-11-17 18:34:20Z ibiru $ +# $Id: PKGBUILD 156740 2012-04-23 09:04:26Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') url="http://live.gnome.org/Empathy" license=('GPL2') -depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' -'libcanberra' 'iso-codes' 'networkmanager') -makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto') +depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') +makedepends=('intltool' 'itstool') optdepends=('telepathy-gabble: XMPP/Jabber support' - 'telepathy-butterfly: MSN support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' - 'telepathy-sofiasip: SIP support' + 'telepathy-rakia: SIP support' 'telepathy-haze: libpurple support') options=('!libtool') groups=('gnome-extra') install=empathy.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b12493f47b932dcd3d8b5101d414a00447a6eea60a575db7211ee24cfe8c4565') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ --disable-static \ - --disable-scrollkeeper \ --disable-schemas-compile sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/empathy/empathy.install b/extra/empathy/empathy.install index c3f7abf13..f8d2dfb1f 100644 --- a/extra/empathy/empathy.install +++ b/extra/empathy/empathy.install @@ -1,18 +1,16 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor echo "To use Empathy you need to install at least one Telepathy connection manager." } post_upgrade() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_upgrade } diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 74e60403b..6ddf8ae6b 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 143098 2011-11-22 18:39:54Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156744 2012-04-23 09:04:31Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') @@ -14,17 +14,17 @@ install=eog-plugins.install options=('!libtool') groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('123e50be69c33bddc5d6def0a1f618970e01207c2e959edbaf0afc56717d8975') +sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index f8f55ebb0..679d874f1 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 142868 2011-11-17 18:34:22Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156742 2012-04-23 09:04:28Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -14,17 +15,17 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('315625babf04293341bd0b3ae26337d11c8696422d5dc4442ad551b25db42530') +sha256sums=('cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install # remove it from Xfce menu that ships its own thingy diff --git a/extra/eog/eog.install b/extra/eog/eog.install index 284b24b18..1571179ca 100644 --- a/extra/eog/eog.install +++ b/extra/eog/eog.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall eog - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD index 89b738142..0cf4f080a 100644 --- a/extra/epiphany-extensions/PKGBUILD +++ b/extra/epiphany-extensions/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 142997 2011-11-20 09:46:20Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156748 2012-04-23 09:04:37Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=epiphany-extensions -pkgver=3.2.0 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 url="http://www.gnome.org/projects/epiphany/" pkgdesc="Various extentions for the Epiphany web browser" arch=('i686' 'x86_64') @@ -12,24 +13,16 @@ depends=('epiphany' 'opensp' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') options=('!libtool' '!emptydirs') install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - rss-link-dbus-glib.patch) -sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae' - '6e1ba177e8480984b4c5447aca5e7cf8bcfacbb90bcf041fa1b6d2a4dc3e818b') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5') build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i "$srcdir/rss-link-dbus-glib.patch" - autoreconf -fi - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 21aa3faac..cafcc74d1 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140855 2011-10-20 05:41:59Z ibiru $ +# $Id: PKGBUILD 156746 2012-04-23 09:04:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." @@ -14,11 +14,11 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5ade10d9becce1ca43c30d755fda477c5595a1c0514047f07f7d4b817a2154fe') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('01f5763340f9fac0994f689ea6655c2c9760bddd77bbd8628b9c6075d9b6ed0d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ @@ -27,6 +27,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/epiphany/epiphany.install b/extra/epiphany/epiphany.install index 00b1abb96..8b17fa3d4 100644 --- a/extra/epiphany/epiphany.install +++ b/extra/epiphany/epiphany.install @@ -1,20 +1,13 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then - usr/sbin/gconfpkg --uninstall epiphany - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - post_install + post_install } post_remove() { - post_install + post_install } diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 1cca0cead..091fef405 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 148708 2012-02-05 11:47:44Z ibiru $ +# $Id: PKGBUILD 156750 2012-04-23 09:04:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.2.1 -pkgrel=3 +pkgver=3.4.0 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64') license=('GPL') -depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') optdepends=('texlive-bin: DVI support') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9db61a39c977eb939deaee3ed1e66937f15532f46de988cacd5b638f3960ed35') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/evince \ --disable-static --enable-nautilus \ @@ -31,6 +31,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/evince/evince.install b/extra/evince/evince.install index 9643a9ba0..1571179ca 100644 --- a/extra/evince/evince.install +++ b/extra/evince/evince.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall evince - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index 80b1ed2aa..2700ea509 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 146465 2012-01-11 15:22:02Z stephane $ +# $Id: PKGBUILD 156754 2012-04-23 09:04:48Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64') depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') options=('!libtool') +install=$pkgname.install url="http://www.gnome.org" license=('GPL') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('378c4eedb11ea359c49734393ba764ac1f1230b298c36d2256129dae00c78298') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings + --enable-vala-bindings \ + --disable-schemas-install sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/evolution-data-server/evolution-data-server.install b/extra/evolution-data-server/evolution-data-server.install new file mode 100644 index 000000000..29a359805 --- /dev/null +++ b/extra/evolution-data-server/evolution-data-server.install @@ -0,0 +1,11 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade () { + post_install +} + +post_remove () { + post_install +} diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 28f1deac6..ced4764e0 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146374 2012-01-09 21:40:58Z ibiru $ +# $Id: PKGBUILD 156756 2012-04-23 09:04:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=evolution-ews -pkgver=3.2.3 +pkgver=3.4.1 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64') @@ -12,16 +12,16 @@ depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0c26fb822ced5bca7c6888ade35f47821317fa45e33a93c8a2a81fcb06d6f483') +sha256sums=('afa56ce08a8bfb9878f5303308aa5c68eab4ffe67a70ba3bd54b0c4f868053ef') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/evolution --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/evolution-exchange/PKGBUILD b/extra/evolution-exchange/PKGBUILD index b0a9f8837..81f8e2c0d 100644 --- a/extra/evolution-exchange/PKGBUILD +++ b/extra/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146489 2012-01-11 15:43:47Z ibiru $ +# $Id: PKGBUILD 156758 2012-04-23 09:04:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.2.3 +pkgver=3.4.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') @@ -13,10 +13,10 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('759a73c7c49aaf45a5ea9d846b44e1314e13e78d4bfe959fc3ded311c1c690a2') +sha256sums=('a123b943e5a7128435b65219bfcd2a8f71223f8d7ef0319ec06011fbd392ea80') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/evolution --disable-static \ --with-libdb=/usr --with-krb5=/usr @@ -24,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -m755 -d "$pkgdir/usr/share/gconf/schemas" diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD index 852e8feb9..95c25b3ae 100644 --- a/extra/evolution-groupwise/PKGBUILD +++ b/extra/evolution-groupwise/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146487 2012-01-11 15:36:59Z ibiru $ +# $Id: PKGBUILD 156760 2012-04-23 09:04:57Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=evolution-groupwise -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="GroupWise connector for evolution" arch=(i686 x86_64) url="http://projects.gnome.org/evolution/" @@ -14,10 +14,10 @@ makedepends=(intltool evolution) optdepends=('evolution: evolution plugin') options=(!libtool) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9972cf6ab05168e2364f7d7af1a5d9dd2bb994ab833fc2aaf926a4390e6b8062') +sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static @@ -25,7 +25,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index 168d89d71..9d3ad3730 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 146376 2012-01-09 21:56:36Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156752 2012-04-23 09:04:45Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Manage your email, contacts and schedule" arch=('i686' 'x86_64') license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') optdepends=('bogofilter: possible junk filter plugin' 'spamassassin: possible junk filter plugin') @@ -15,27 +16,29 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('a25d523e775c022ec9e68d7b989316e7252b687d70b9db2f60b72bb833099e9d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('43311bc38302fc26efff98852d72981b791941622d32a2e6e346377341c1814d') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib \ - --disable-scrollkeeper \ --enable-nss=yes \ --with-openldap=yes \ --enable-smime=yes \ --with-krb5=/usr \ --disable-image-inline + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make make -C plugins/tnef-attachments } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install make -C plugins/tnef-attachments DESTDIR="$pkgdir" install diff --git a/extra/evolution/evolution.install b/extra/evolution/evolution.install index a2c3aaa54..500c5e2da 100644 --- a/extra/evolution/evolution.install +++ b/extra/evolution/evolution.install @@ -1,24 +1,24 @@ -pkgname=evolution - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas + gconfpkg --install evolution update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + pre_remove } post_upgrade() { - post_install $1 + post_install } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall evolution } post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD new file mode 100644 index 000000000..ccfa4887c --- /dev/null +++ b/extra/farstream/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 156762 2012-04-23 09:05:00Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=farstream +pkgver=0.1.2 +pkgrel=1 +pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/Farstream" +license=('LGPL2.1') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('farsight2') +replaces=('farsight2') +options=(!libtool) +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz + vp8.patch) +md5sums=('5d6e561b3688d0d0c8906fec4f356df3' + 'c4e76d03d678d29b872b610f9cff42cd') + +build() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/vp8.patch" + ./configure --prefix=/usr \ + --with-package-name='Arch Linux farstream package' \ + --with-package-origin='http://archlinux.org' \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/farstream/vp8.patch b/extra/farstream/vp8.patch new file mode 100644 index 000000000..67009a8ad --- /dev/null +++ b/extra/farstream/vp8.patch @@ -0,0 +1,12 @@ +diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences +--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 ++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 +@@ -41,6 +41,8 @@ feedback:nack/pli= + [video/H263] + feedback:nack/pli= + ++[video/VP8-DRAFT-IETF-01] ++ + [video/THEORA] + #feedback:tfrc= + feedback:nack/pli= diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 02dfbebc0..e4a36666e 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 153564 2012-03-16 02:38:35Z eric $ +# $Id: PKGBUILD 157020 2012-04-23 09:27:29Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.1 +pkgver=4.2.2 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') -source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215') +source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) +sha1sums=('09d2e7110f652027ea7c285c5845070f8a353f38') build() { cd "${srcdir}" diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index ff17fe991..e06f098fa 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145054 2011-12-15 21:54:15Z ibiru $ +# $Id: PKGBUILD 156766 2012-04-23 09:05:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.6.6 -pkgrel=1 +pkgver=0.6.9 +pkgrel=2 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64) url="http://telepathy.freedesktop.org/wiki/Folks" @@ -11,18 +11,17 @@ license=('LGPL2.1') depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') makedepends=('gobject-introspection' 'intltool') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) -sha256sums=('3dd6a2983969a6369c6b0e25f28ec92415b5570dd6c89b25385807ecc4aeb0a8') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('cb14657f581e3d4b50884ac099ab13c7f9949c99f95806d1b8ad865345d26540') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD index 20dc1db3d..44b61129f 100644 --- a/extra/gcalctool/PKGBUILD +++ b/extra/gcalctool/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 139265 2011-10-01 18:56:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156768 2012-04-23 09:05:08Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gcalctool -pkgver=6.2.0 +pkgver=6.4.1.1 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64') license=('GPL') depends=('gtk3' 'dconf') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'yelp-tools') groups=('gnome-extra') options=(!emptydirs) url="http://www.gnome.org" install=gcalctool.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6c166b1d0fec157e523caf82d6357c4a2f572cb21729272c9975003661b8c84e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD index b44c806e1..9a4d1f6b5 100644 --- a/extra/gconf/PKGBUILD +++ b/extra/gconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141600 2011-10-31 15:48:45Z ibiru $ +# $Id: PKGBUILD 156770 2012-04-23 09:05:12Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=3.2.3 -pkgrel=1 +pkgver=3.2.5 +pkgrel=2 pkgdesc="A configuration database system" arch=(i686 x86_64) license=('LGPL') @@ -12,23 +12,23 @@ makedepends=('intltool' 'gtk-doc' 'gobject-introspection') options=('!libtool') install=gconf.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz gconf-merge-schema gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('9eb55dd1d009b6eba9c32e3fae87d3aa45a33629a5e2031ed9f5acb05efaa149' +sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') build() { - cd "${srcdir}/GConf-${pkgver}" + cd "GConf-$pkgver" # Patch from fedora - reloads gconf after installing schemas - patch -Np1 -i "${srcdir}/gconf-reload.patch" + patch -Np1 -i "$srcdir/gconf-reload.patch" # http://bugzilla.gnome.org/show_bug.cgi?id=568845 - patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch" + patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch" # Python2 fix sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert @@ -42,10 +42,10 @@ build() { } package() { - cd "${srcdir}/GConf-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "GConf-$pkgver" + make DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system" - install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/" - install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg" + install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" + install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" + install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" } diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD new file mode 100644 index 000000000..15b7d095f --- /dev/null +++ b/extra/gcr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 156772 2012-04-23 09:05:15Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gcr +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A library for bits of crypto UI and parsing" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +install=gcr.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a0812b6e9623465b0053f4b1b09f3b9316317b2c6ed69a73bc2c5b3b6b849609') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexec=/usr/lib/gcr \ + --disable-static \ + --disable-update-mime \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gcr/gcr.install b/extra/gcr/gcr.install new file mode 100644 index 000000000..8677671c4 --- /dev/null +++ b/extra/gcr/gcr.install @@ -0,0 +1,14 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade () { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index ab0aad374..d2818346e 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 148726 2012-02-05 11:48:20Z ibiru $ +# $Id: PKGBUILD 156774 2012-04-23 09:05:18Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=gdk-pixbuf2 -pkgver=2.24.1 -pkgrel=3 +pkgver=2.26.1 +pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL2') -depends=('glib2' 'libpng>=1.5.7' 'libtiff' 'libjpeg' 'libx11') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1') +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('a60af12b58d9cc15ba4c680c6730ce5d38e8d664af1d575a379385b94b4ec7ba') build() { - cd "$srcdir/gdk-pixbuf-$pkgver" + cd "gdk-pixbuf-$pkgver" ./configure --prefix=/usr \ --without-libjasper \ @@ -25,7 +26,7 @@ build() { } package() { - cd "$srcdir/gdk-pixbuf-$pkgver" + cd "gdk-pixbuf-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gdk-pixbuf2/gdk-pixbuf2.install b/extra/gdk-pixbuf2/gdk-pixbuf2.install index 1b35942cb..f04c0967a 100644 --- a/extra/gdk-pixbuf2/gdk-pixbuf2.install +++ b/extra/gdk-pixbuf2/gdk-pixbuf2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { @@ -7,5 +7,5 @@ post_upgrade() { } pre_remove() { - rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache + rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache } diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index fe83158e8..e311ad991 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139625 2011-10-03 20:22:38Z ibiru $ +# $Id: PKGBUILD 156776 2012-04-23 09:05:20Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.2.0 +pkgver=3.4.2 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64) @@ -11,17 +11,17 @@ url="http://www.gnome.org/" depends=('gtk3') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f4839224b7837efb8fbec8666f8a3bb1ce9ea110f06c57a8b9438faa0abab533') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('66eeca8aa8e7205abf38911a9eadfbd288967f92388682bd62942ed4f1db4906') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index 038f85375..db3d8994b 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140873 2011-10-20 05:42:19Z ibiru $ +# $Id: PKGBUILD 156778 2012-04-23 09:05:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.2.1.1 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -14,28 +14,29 @@ groups=('gnome-extra') options=('!libtool') depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') -optdepends=('gnome-shell: new login interface') +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz fix_external_program_directories.patch gdm-vt-allocation-hack.patch gdm gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) -sha256sums=('85a1383f93870fb5d47a938cc2e04b6f0d74cb611a2b5d94d9651b78a5ccffbd' - '2014ae3a6077546f7c07e80a6acc8a1c80c6765ad319ec389f52500c5a4fb363' +sha256sums=('6292968dff5fc89877b5e1aaa3c7d1484dd3ed2d4f388e935841d053439be665' + 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' - 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' - '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' + '6a8b286d1ffa04150b3cc401f64e6ddec778c7b65f5bfc831031b64345d7e6b2' + 'dd50f5bd28807a16c5ebe89fc868b7c47fa571138498e879f2b1c9da1ad6eb84' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' - '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' - 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' + '1a1e9b3f26de4eb9f45d1e9a0b5d0db902ca734461ba46b4bb620b0298bb98aa' + '844d5fae0df59241d34099a3d458289bd95707b2aae976627c663904294043d8' '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch" + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ @@ -43,24 +44,24 @@ build() { --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ --disable-scrollkeeper \ --disable-static \ - --without-tcp-wrappers + --without-tcp-wrappers \ + --disable-schemas-compile \ + --with-systemd=no sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do - install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}" + install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" done - install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" + install -Dm755 "$srcdir/gdm" "$pkgdir/etc/rc.d/gdm" - chmod 1770 "${pkgdir}/var/log/gdm" - chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf" - rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf" + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" } diff --git a/extra/gdm/fix_external_program_directories.patch b/extra/gdm/fix_external_program_directories.patch index 997ea5405..b3a0f0cf6 100644 --- a/extra/gdm/fix_external_program_directories.patch +++ b/extra/gdm/fix_external_program_directories.patch @@ -1,7 +1,7 @@ -diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c ---- gdm-3.2.0.orig/daemon/gdm-server.c 2011-10-02 01:13:37.772372528 +0000 -+++ gdm-3.2.0/daemon/gdm-server.c 2011-10-02 01:14:58.036444496 +0000 -@@ -131,7 +131,7 @@ +diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c +--- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 +@@ -139,7 +139,7 @@ g_return_val_if_fail (GDM_IS_SERVER (server), NULL); error = NULL; @@ -10,9 +10,9 @@ diff -Nur gdm-3.2.0.orig/daemon/gdm-server.c gdm-3.2.0/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.session.in ---- gdm-3.2.0.orig/data/gdm-shell.session.in 2011-10-02 01:17:01.394246573 +0000 -+++ gdm-3.2.0/data/gdm-shell.session.in 2011-10-02 01:16:22.210552560 +0000 +diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in +--- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 @@ -1,5 +1,5 @@ [GNOME Session] Name=Display Manager @@ -20,9 +20,9 @@ diff -Nur gdm-3.2.0.orig/data/gdm-shell.session.in gdm-3.2.0/data/gdm-shell.sess -IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' +IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' FallbackSession=gdm-fallback -diff -Nur gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.2.0.orig/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:13:37.775705892 +0000 -+++ gdm-3.2.0/gui/simple-chooser/gdm-chooser-session.c 2011-10-02 01:14:58.036444496 +0000 +diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 ++++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 @@ -131,7 +131,7 @@ ret = FALSE; diff --git a/extra/gdm/gdm-autologin.pam b/extra/gdm/gdm-autologin.pam index c77c78917..bc0193df0 100644 --- a/extra/gdm/gdm-autologin.pam +++ b/extra/gdm/gdm-autologin.pam @@ -7,6 +7,8 @@ auth requisite pam_permit.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-fingerprint.pam b/extra/gdm/gdm-fingerprint.pam index 5b74bf6d6..38fab5782 100644 --- a/extra/gdm/gdm-fingerprint.pam +++ b/extra/gdm/gdm-fingerprint.pam @@ -7,6 +7,8 @@ auth requisite pam_fprintd.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_deny.so diff --git a/extra/gdm/gdm-password.pam b/extra/gdm/gdm-password.pam index aa4d4dd47..eed5e1003 100644 --- a/extra/gdm/gdm-password.pam +++ b/extra/gdm/gdm-password.pam @@ -8,6 +8,8 @@ auth optional pam_gnome_keyring.so auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_unix.so diff --git a/extra/gdm/gdm-smartcard.pam b/extra/gdm/gdm-smartcard.pam index baacb8bed..c5c29e73f 100644 --- a/extra/gdm/gdm-smartcard.pam +++ b/extra/gdm/gdm-smartcard.pam @@ -7,6 +7,8 @@ auth requisite pam_pkcs11.so wait_for_card card_only auth sufficient pam_succeed_if.so uid >= 1000 quiet auth required pam_deny.so +account required pam_access.so +account required pam_time.so account required pam_unix.so password required pam_pkcs11.so diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install index fda42d319..c48faf4ae 100644 --- a/extra/gdm/gdm.install +++ b/extra/gdm/gdm.install @@ -6,14 +6,13 @@ post_install() { passwd -l gdm > /dev/null chown -R gdm:gdm /var/lib/gdm > /dev/null - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gconfpkg --install ${pkgname} - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor dconf update } -pre_remove() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then gconfpkg --uninstall ${pkgname} fi } @@ -23,9 +22,9 @@ post_upgrade() { } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas dconf update - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor getent passwd gdm >/dev/null 2>&1 && userdel gdm getent group gdm >/dev/null 2>&1 && groupdel gdm } diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 702ee9809..f8703a3d1 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 146050 2012-01-04 17:54:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156780 2012-04-23 09:05:29Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.2.6 +pkgver=3.4.1 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') license=('GPL') depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('yelp-tools' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('92b5c44203dbc222c79cb35ba43d32de115e2ef89b7bb80451239d0c3fa02f7f') +sha256sums=('9b1f0164d6c6bc08e391efde7e6a2aa9290a65bda543fe3a7adc6ef73b722a64') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib --disable-scrollkeeper \ - --disable-updater --disable-schemas-compile \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ --enable-python make } package(){ - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gedit/gedit.install b/extra/gedit/gedit.install index 9d88a1341..606920688 100644 --- a/extra/gedit/gedit.install +++ b/extra/gedit/gedit.install @@ -1,11 +1,11 @@ post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q } pre_upgrade() { - if [ -f usr/share/gconf/schemas/gedit.schemas ]; then - usr/sbin/gconfpkg --uninstall gedit + if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then + gconfpkg --uninstall gedit fi } diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD new file mode 100644 index 000000000..851e5725f --- /dev/null +++ b/extra/geoclue/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 156782 2012-04-23 09:05:31Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=geoclue +pkgver=0.12.0 +pkgrel=5 +pkgdesc="Modular geoinformation service built on the D-Bus messaging system." +arch=('i686' 'x86_64') +url="http://geoclue.freedesktop.org/" +license=('LGPL') +depends=('dbus-glib' 'libxml2') +optdepends=('networkmanager: geolocation' + 'gconf: geolocation' + 'libsoup-gnome: Skyhook location provider') +makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc') +options=('!libtool') +source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz + geoclue-gcc46.patch) +md5sums=('33af8307f332e0065af056ecba65fec2' + '0cf8ecc350be702f623ed9a9715818c5') + +build() { + cd $pkgname-$pkgver + patch -Np1 -i ../geoclue-gcc46.patch + + sed -i 's/libnm_glib/libnm-glib/g' configure.ac + sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac + autoreconf -f -i + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/geoclue/geoclue-gcc46.patch b/extra/geoclue/geoclue-gcc46.patch new file mode 100644 index 000000000..11bf48547 --- /dev/null +++ b/extra/geoclue/geoclue-gcc46.patch @@ -0,0 +1,23 @@ +From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001 +From: Dan Williams <dcbw@redhat.com> +Date: Mon, 07 Mar 2011 23:46:15 +0000 +Subject: master: Fix warning with GCC 4.6 + +--- +diff --git a/src/master-provider.c b/src/master-provider.c +index 790c043..e4ea053 100644 +--- a/src/master-provider.c ++++ b/src/master-provider.c +@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider) + static gboolean + gc_master_provider_initialize (GcMasterProvider *provider) + { +- GcMasterProviderPrivate *priv; +- +- priv = GET_PRIVATE (provider); +- + if (!gc_master_provider_initialize_interfaces (provider)) { + return FALSE; + } +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index b4a6c226e..747350c0f 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138657 2011-09-27 14:19:40Z ibiru $ +# $Id: PKGBUILD 156784 2012-04-23 09:05:34Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=ghex -pkgver=3.0.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64') @@ -13,11 +13,11 @@ depends=('gtk3' 'hicolor-icon-theme') makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=ghex.install -source=(http://ftp.gnome.org/pub/GNOME/sources/ghex/3.0/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c1b44a962ff1d6c7f1ad012ef1971a227e6d00a0de6f1275cbb714db1a96c674') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('59e409cc629fddeb06552c505b60be1d20274cea75eb22f1d65d7ca0aaf1e64d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --disable-schemas-compile @@ -25,6 +25,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index b7dc6877c..7ba1b164a 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146616 2012-01-14 12:13:58Z ibiru $ +# $Id: PKGBUILD 156786 2012-04-23 09:05:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gjs -pkgver=1.30.1 +pkgver=1.32.0 pkgrel=1 pkgdesc="Javascript Bindings for GNOME" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f5db07ddf70458a33a5d0bdf83f84070fc234237ecb0d49a8676e67b52119a05') +sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 39a5f92f2..40b2f5361 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 140391 2011-10-12 06:17:27Z ibiru $ +# $Id: PKGBUILD 156788 2012-04-23 09:05:39Z ibiru $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.10.2 +pkgver=3.12.0 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject2') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject') optdepends=('python2: Python widgets support') options=('!libtool') url="http://glade.gnome.org/" install=glade.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0f59ffbd7e1e595396593fedcdb85c51fd01ed05d5ef7c6f724f3a0bcf24d5c4') +sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d') build() { - cd "${srcdir}/$pkgname-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/$pkgname-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index 529ee0675..02c8650d0 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 146052 2012-01-04 17:56:55Z ibiru $ +# $Id: PKGBUILD 156790 2012-04-23 09:05:42Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.30.2 +pkgver=2.32.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') @@ -13,10 +13,10 @@ makedepends=('intltool') options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc') +sha256sums=('051ab469356327404dc53ae36dda5b85b99a12e5573a838d927abb49e58fa950') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/glib-networking --disable-static @@ -24,7 +24,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/glib-networking/glib-networking.install b/extra/glib-networking/glib-networking.install index 595f1c75b..8214e1968 100644 --- a/extra/glib-networking/glib-networking.install +++ b/extra/glib-networking/glib-networking.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules + gio-querymodules /usr/lib/gio/modules } post_upgrade() { diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index dd8fce6d2..d237d821b 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142936 2011-11-18 15:46:22Z ibiru $ +# $Id: PKGBUILD 156794 2012-04-23 09:05:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.30.1 +pkgver=2.32.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,10 +12,10 @@ makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) options=('!libtool') url="http://www.gtkmm.org/" -sha256sums=('69582b584666cab1dc4253faffee548054730bc058e28466871e6a954d7ff897') +sha256sums=('e1806f884c6e9f904ee2af0d39dd8d4de3f91a039f897f54333b0890de06f94b') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr make } @@ -23,13 +23,13 @@ build() { package_glibmm() { pkgdesc="Glib-- (glibmm) is a C++ interface for glib" depends=('glib2' 'libsigc++2.0') - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile make DESTDIR="$pkgdir" install } package_glibmm-docs() { pkgdesc="Developer documentation for glibmm" - cd "$srcdir/$pkgbase-$pkgver/docs" + cd "$pkgbase-$pkgver/docs" make DESTDIR="$pkgdir" install } diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index d128e0381..f3fbe98e7 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152860 2012-03-10 12:02:22Z ibiru $ +# $Id: PKGBUILD 156796 2012-04-23 09:05:49Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.7 +pkgver=2.6.9 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f382c2c5bba4e6a384905d536a58661d09783c389c5610e2e447f3c9853ffa1b') +sha256sums=('5ebb60a35fa5c0789fe10f6e4af5040cb7bc4a707a8a962fbd57b4fc5595c0b9') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD index bb3ad8083..4845c9b76 100644 --- a/extra/gnome-applets/PKGBUILD +++ b/extra/gnome-applets/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 140879 2011-10-20 05:42:26Z ibiru $ +# $Id: PKGBUILD 156798 2012-04-23 09:05:53Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-applets -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME Applets" arch=(i686 x86_64) license=('GPL') depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager') options=(!emptydirs) url="http://www.gnome.org" groups=(gnome) install=gnome-applets.install -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('cba1dff05bf2aad57f0df2ea746a9bf1c3483a0388a70bf501f61d95b1017dc1') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('ec5487eb81fb29851b6336de94a329f5623e73830d61022e0e20fe3d038a415e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ --localstatedir=/var --disable-static \ @@ -27,10 +27,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index e0b1316f0..0295db565 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 149409 2012-02-07 16:18:44Z heftig $ +# $Id: PKGBUILD 156801 2012-04-23 09:06:01Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gnome-bluetooth.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('30ba375f4d9b08fc31b9eb86f17ea2d3fc1696b3e778236270414260d4e26905' +sha256sums=('97a229e81997c14064899bdec2a62f94738d00d2f88cc18bcbeb2bdf0610e272' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -30,11 +30,9 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install - install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \ - "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" - install -d ${pkgdir}/etc/ld.so.conf.d - echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf + install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ + "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" } diff --git a/extra/gnome-bluetooth/gnome-bluetooth.install b/extra/gnome-bluetooth/gnome-bluetooth.install index 927142ee0..8c991877f 100644 --- a/extra/gnome-bluetooth/gnome-bluetooth.install +++ b/extra/gnome-bluetooth/gnome-bluetooth.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index a13062ece..032a6e2f0 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 148748 2012-02-05 11:49:06Z ibiru $ +# $Id: PKGBUILD 156803 2012-04-23 09:06:07Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=2 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) url="http://projects.gnome.org/gnome-color-manager/" license=(GPL2) -depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash' 'shared-color-profiles' 'shared-color-targets') +depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop') makedepends=('intltool' 'gtk-doc') install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4898fe8c29761d8dc0859c4a3a1bf725d3b80d552caab1225202f6030a118d9a') +sha256sums=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d') build(){ - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver # man pages need docbook-sgml, which we don't have - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-color-manager \ - --disable-static --disable-man-pages + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -31,6 +30,6 @@ build(){ } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index ccbdbcb4e..065987150 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141004 2011-10-21 08:06:14Z ibiru $ +# $Id: PKGBUILD 156806 2012-04-23 09:06:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-contacts -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) @@ -11,19 +11,19 @@ license=('GPL2') groups=(gnome-extra) depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') makedepends=('intltool' 'vala') -install= -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('9dfd56a40f3b89512a09d9e54c18227ae4bfe9b4cff87a72f7e17f6a35367d88') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/gnome-contacts/gnome-contacts.install b/extra/gnome-contacts/gnome-contacts.install new file mode 100644 index 000000000..326aa98a2 --- /dev/null +++ b/extra/gnome-contacts/gnome-contacts.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index df8b95706..b9f00fba0 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,29 +1,38 @@ -# $Id: PKGBUILD 142419 2011-11-09 07:46:48Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156808 2012-04-23 09:06:19Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet') +depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' + 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' + 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' + 'libsystemd' 'cheese') optdepends=('mesa-demos: provides glxinfo for graphics information' 'apg: adds password generation for user accounts' 'gnome-color-manager: for color management tasks') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') url="http://www.gnome.org" groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e675f8cfde06775919eb0c9fa4ee8c61310702989eecac6083098beb5afd9369') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('c6ce4ecf5b747aa33a5904b053c1c4fd18a39ddcd0908463558e8b4b40ec3fd1' + '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-update-mimedb + --enable-systemd --with-libsocialweb \ + --disable-update-mimedb #https://bugzilla.gnome.org/show_bug.cgi?id=656229 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool @@ -31,8 +40,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } - diff --git a/extra/gnome-control-center/gnome-control-center.install b/extra/gnome-control-center/gnome-control-center.install index eb703319f..079e0fa34 100644 --- a/extra/gnome-control-center/gnome-control-center.install +++ b/extra/gnome-control-center/gnome-control-center.install @@ -1,13 +1,5 @@ -pkgname=gnome-control-center - post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-control-center/systemd-fallback.patch b/extra/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/extra/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:12:11 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index aee97ac..867f061 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- SYSTEMD=libsystemd-login ++ SYSTEMD="libsystemd-login libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) + else + SYSTEMD= +diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c +index f027754..5ebbe29 100644 +--- a/panels/user-accounts/um-user.c ++++ b/panels/user-accounts/um-user.c +@@ -37,6 +37,11 @@ + + #include <gio/gunixoutputstream.h> + ++#ifdef HAVE_SYSTEMD ++# include <systemd/sd-login.h> ++# include <systemd/sd-daemon.h> ++#endif ++ + #include "um-user.h" + #include "um-account-type.h" + #include "um-utils.h" +@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, + } + } + +-#ifdef HAVE_SYSTEMD +- +-#include <systemd/sd-login.h> +- + gboolean + um_user_is_logged_in (UmUser *user) + { +- int n_sessions; +- +- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; +- +- return n_sessions > 0; +-} ++#ifdef HAVE_SYSTEMD ++ if (sd_booted () > 0) { ++ int n_sessions; + +-#else ++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); + +-gboolean +-um_user_is_logged_in (UmUser *user) +-{ ++ return n_sessions > 0; ++ } ++#endif + GVariant *result; + GVariantIter *iter; + gint n_sessions; +@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) + return n_sessions > 0; + } + +-#endif +- + void + um_user_set_automatic_login (UmUser *user, + gboolean enabled) diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index b13331cfc..c74861b00 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153780 2012-03-19 17:06:57Z ibiru $ +# $Id: PKGBUILD 156810 2012-04-23 09:06:23Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" @@ -14,14 +14,13 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4cb00d22360f9ae4bc3fb79efe7868fd54fcbfcd4f7050c71fc97699ec3a86a2') +sha256sums=('7b36f16eeb36bb8feec9f51b53b50036df8d75d5b1c91e28b036e85b17fdb974') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --with-gnome-distributor="Arch Linux" \ - --disable-scrollkeeper + --with-gnome-distributor="Arch Linux" make } diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD new file mode 100644 index 000000000..86a252322 --- /dev/null +++ b/extra/gnome-dictionary/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156812 2012-04-23 09:06:27Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=gnome-dictionary +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Look up words in dictionary sources" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-dictionary/gnome-dictionary.install b/extra/gnome-dictionary/gnome-dictionary.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/gnome-dictionary/gnome-dictionary.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index d9de3d900..211f1ddac 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,52 +1,30 @@ -# $Id: PKGBUILD 139202 2011-10-01 17:02:00Z heftig $ +# $Id: PKGBUILD 157100 2012-04-23 20:43:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) -pkgbase=gnome-disk-utility -pkgname=(gnome-disk-utility libgdu) -pkgver=3.0.2 -pkgrel=2 -pkgdesc="GNOME libraries and applications for dealing with storage devices" +pkgname=gnome-disk-utility +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org" -makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi' - 'hicolor-icon-theme' 'gtk-doc' 'intltool') +groups=('gnome-extra') +depends=('gtk3' 'udisks2' 'hicolor-icon-theme') +makedepends=('intltool') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz - fix-freeze.patch) -sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5' - '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526') +install=gnome-disk-utility.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-freeze.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-disk-utility \ - --disable-scrollkeeper --disable-nautilus --disable-static - make -} - -package_gnome-disk-utility() { - depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi') - groups=('gnome-extra') - install=gnome-disk-utility.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc -### Split libgdu - - mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig} - - mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib" - mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu - mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc + make } -package_libgdu() { - pkgdesc="$pkgdesc (library)" - depends=('dbus-glib' 'libgnome-keyring' 'udisks') - - mv "$srcdir"/libgdu/* "$pkgdir" +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-disk-utility/gnome-disk-utility.install b/extra/gnome-disk-utility/gnome-disk-utility.install index 43ed0a554..71d138f2d 100644 --- a/extra/gnome-disk-utility/gnome-disk-utility.install +++ b/extra/gnome-disk-utility/gnome-disk-utility.install @@ -1,11 +1,11 @@ post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 6865f4fdc..033fcd205 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142279 2011-11-07 20:29:49Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156816 2012-04-23 09:06:38Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.2.1 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" @@ -14,11 +14,11 @@ makedepends=('intltool') optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('f04356d6620a3fa47cfdb4b72c80ac3748ca229fe24b57ccf229536afa934f52') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2b2c6b15ed9e6a46602977f1e8dc15e6655c171df8ede6a3f8a749ed6682da46') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -28,7 +28,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-documents/gnome-documents.install b/extra/gnome-documents/gnome-documents.install index 95114273e..1571179ca 100644 --- a/extra/gnome-documents/gnome-documents.install +++ b/extra/gnome-documents/gnome-documents.install @@ -1,7 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD new file mode 100644 index 000000000..9a94d6a74 --- /dev/null +++ b/extra/gnome-font-viewer/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156818 2012-04-23 09:06:42Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-font-viewer +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME font viewer and thumbnailer" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'desktop-file-utils') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-font-viewer.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-font-viewer/gnome-font-viewer.install b/extra/gnome-font-viewer/gnome-font-viewer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/gnome-font-viewer/gnome-font-viewer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD index b891651d3..b0ba03dc2 100644 --- a/extra/gnome-games/PKGBUILD +++ b/extra/gnome-games/PKGBUILD @@ -1,44 +1,37 @@ -# $Id: PKGBUILD 148440 2012-01-31 22:33:21Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156820 2012-04-23 09:06:47Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games -pkgver=3.2.1 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') options=('!emptydirs' '!libtool') install=gnome-games.install url="http://www.gnome.org" groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-sudoku-fix.patch) -sha256sums=('b40fe59537fd58af1bd8163897684883b730ee0f0257d23b493b13e21d105a3b' - '00daafd11078355e16f384fe98dab69ee7e03037c8c311e7180f8f896965a715') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('01726b0631205ccbd9f02938f7ccb1d7bd0c4c001cb4596f871fed7c3afc25d4') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gnome-sudoku-fix.patch" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-static \ + --localstatedir=/var --disable-static --disable-schemas-compile \ --with-scores-user=root --with-scores-group=games \ --enable-introspection=yes make } package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install # Remove all scores, we generate them from postinstall rm -rf "$pkgdir/var" - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-games "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas - sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" } diff --git a/extra/gnome-games/gnome-games.install b/extra/gnome-games/gnome-games.install index 1f67c2e01..aaa36a896 100644 --- a/extra/gnome-games/gnome-games.install +++ b/extra/gnome-games/gnome-games.install @@ -1,5 +1,4 @@ -pkgname=gnome-games -scores=(glines.Large.scores +_scores=(glines.Large.scores glines.Medium.scores glines.Small.scores gnibbles.1.0.scores @@ -88,66 +87,36 @@ scores=(glines.Large.scores quadrapassel.scores) post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - for sz in Large Medium Small; do - if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then - mv "opt/gnome/var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - elif [ -e "var/games/same-gnome.${sz}.scores" ]; then - mv "var/games/same-gnome.${sz}.scores" \ - "var/games/swell-foop.${sz}.scores" - fi - done - if [ -e "opt/gnome/var/games/gnometris.scores" ]; then - mv "opt/gnome/var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - elif [ -e "var/games/gnometris.scores" ]; then - mv "var/games/gnometris.scores" \ - "var/games/quadrapassel.scores" - fi - - for score in "${scores[@]}" ; do - if [ -e "var/games/${score}" ]; then + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then continue fi - if [ -e "opt/gnome/var/games/${score}" ]; then - mv "opt/gnome/var/games/${score}" var/games/ - else - touch "var/games/${score}" - fi - chown root:games "var/games/${score}" - chmod 664 "var/games/${score}" + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" done } pre_upgrade() { - pre_remove $1 + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} - - if [ -f usr/share/ggz/gnect-client.dsc ]; then - ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null - ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null - fi + post_install } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas usr/share/glib-2.0/schemas update-desktop-database -q gtk-update-icon-cache -q -f -t usr/share/icons/hicolor - for score in "${scores[@]}" ; do - rm -f "var/games/${score}" + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" done } diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 542137746..2d5dd9a3b 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,35 +1,32 @@ -#$Id: PKGBUILD 145317 2011-12-21 19:21:50Z ibiru $ +#$Id: PKGBUILD 156825 2012-04-23 09:06:58Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.2.2 -pkgrel=3 +pkgver=3.4.1 +pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2') +depends=('gtk3' 'gcr' 'libcap-ng') +makedepends=('intltool') groups=('gnome') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gnome-keyring.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - silence_no_socket_to_connect.patch) -sha256sums=('f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3' - '4cf3965e9beea747a7916682d37f36bc481bee10247788d4dd53f6e27fe5c041') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/silence_no_socket_to_connect.patch" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --disable-update-mime + --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-keyring/gnome-keyring.install b/extra/gnome-keyring/gnome-keyring.install index 9635ee505..c351377a2 100644 --- a/extra/gnome-keyring/gnome-keyring.install +++ b/extra/gnome-keyring/gnome-keyring.install @@ -1,8 +1,5 @@ post_install() { glib-compile-schemas /usr/share/glib-2.0/schemas - update-mime-database /usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon } @@ -12,7 +9,4 @@ post_upgrade() { post_remove() { glib-compile-schemas /usr/share/glib-2.0/schemas - update-mime-database /usr/share/mime 1> /dev/null - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - update-desktop-database -q } diff --git a/extra/gnome-media/PKGBUILD b/extra/gnome-media/PKGBUILD index 5697957f8..d3c017b1c 100644 --- a/extra/gnome-media/PKGBUILD +++ b/extra/gnome-media/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 139627 2011-10-03 20:26:30Z ibiru $ +# $Id: PKGBUILD 156827 2012-04-23 09:07:01Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-media -pkgver=2.91.2 -pkgrel=3 +pkgver=3.4.0 +pkgrel=1 pkgdesc="GNOME Media Tools" arch=('i686' 'x86_64') license=('GPL') depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome-extra') options=('!libtool' '!emptydirs') install=gnome-media.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4aadc834d04c3d6f573fad667a69c6dc9668240e759cbd8cfb14d053d8e4da5f') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-media \ @@ -27,8 +27,9 @@ build() { } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd $pkgname-$pkgver make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index 9589872bb..883071fee 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 139303 2011-10-01 18:57:57Z ibiru $ +# $Id: PKGBUILD 156829 2012-04-23 09:07:05Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.2.0.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') -depends=('glib2' 'python2') +depends=('glib2' 'python2-gobject') makedepends=('intltool' 'gobject-introspection') options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz menus.patch) -sha256sums=('17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b' +sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" patch -Np0 -i "$srcdir/menus.patch" @@ -28,8 +28,8 @@ build() { } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install sed -i "1s|#!/usr/bin/env python$|&2|" \ "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index ca155f1ef..53e129ad3 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 145870 2012-01-03 14:09:44Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156831 2012-04-23 09:07:07Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=gnome-nettool -pkgver=3.0.1 +pkgver=3.1.1 pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme') +depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/3.0/$pkgname-$pkgver.tar.xz) -sha256sums=('2c21b44b351ee470226e1e5580bb9acf0326d9b6c3040deff75322f8ca132317') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ - --disable-schemas-compile + --localstatedir=/var --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 7edd769fe..0e83dc1e3 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140899 2011-10-20 05:42:46Z ibiru $ +# $Id: PKGBUILD 156833 2012-04-23 09:07:10Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -12,17 +12,17 @@ depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) -sha256sums=('549c210c358fd05598a00cb7a8d8f5b0fd6e18f7cb321c3c1641fb18f1312234') +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('d5636b8da29aae04757ca528de65e3617d85696bd7e434c48dbd1199c105f4ae') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-online-accounts/gnome-online-accounts.install b/extra/gnome-online-accounts/gnome-online-accounts.install index 2e02b7952..525ecff63 100644 --- a/extra/gnome-online-accounts/gnome-online-accounts.install +++ b/extra/gnome-online-accounts/gnome-online-accounts.install @@ -1,5 +1,5 @@ post_install () { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD index 61e38e405..ce6a1dd1b 100644 --- a/extra/gnome-panel/PKGBUILD +++ b/extra/gnome-panel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140901 2011-10-20 05:42:50Z ibiru $ +# $Id: PKGBUILD 157064 2012-04-23 10:29:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=3.2.1 -pkgrel=1 +pkgver=3.4.1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') pkgdesc="The GNOME Panel" @@ -12,14 +12,13 @@ depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnc makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') install=gnome-panel.install groups=('gnome') -replaces=('gnome-panel-bonobo') provides=("gnome-panel-bonobo=${pkgver}") options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('ae5ed578f9f54ad763bf5e46fd5431cdbc06fa2eefea03b390c90a3ffb18870d') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('513be6e709db88babac9f3ce9e517cb597d8c89569e5c9aaa957b74e0765a77f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-panel \ @@ -29,10 +28,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-panel/gnome-panel.install b/extra/gnome-panel/gnome-panel.install index e3175df5e..0f9324937 100644 --- a/extra/gnome-panel/gnome-panel.install +++ b/extra/gnome-panel/gnome-panel.install @@ -1,9 +1,9 @@ pkgname=gnome-panel post_install() { - usr/sbin/gconfpkg --install ${pkgname} - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gconfpkg --install $pkgname + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { @@ -15,10 +15,10 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index e69a65c27..69816dd1e 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,32 +1,32 @@ -# $Id: PKGBUILD 140903 2011-10-20 05:42:55Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156837 2012-04-23 09:07:16Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.2.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64) url="http://www.gnome.org/projects/gnome-power-manager/" license=('GPL') depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool') options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('11bc604dd237e28eb08a67e6d507c3edebb96a43a3483390bd0c8100a206dbdb') +sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-power-manager \ - --disable-scrollkeeper \ --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-power-manager/gnome-power-manager.install b/extra/gnome-power-manager/gnome-power-manager.install index 4666938db..f7e8c46ac 100644 --- a/extra/gnome-power-manager/gnome-power-manager.install +++ b/extra/gnome-power-manager/gnome-power-manager.install @@ -1,13 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - gtk-update-icon-cache -q -t -f usr/share/icons/gnome -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.92) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-power-manager - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index 872a3eb51..6e1ae0501 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,36 +1,37 @@ -# $Id: PKGBUILD 139315 2011-10-01 18:58:16Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156839 2012-04-23 09:07:19Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.2.0 +pkgver=3.4.1 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) -depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas') +depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd') makedepends=('pkgconfig' 'intltool' 'libxss') groups=('gnome') options=(!emptydirs) install=gnome-screensaver.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('305f4a5be8736c4cf5e55b8288b7e177907bafa26e39273d1bb65ad1862295ed' - '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2') +sha256sums=('d54a253f826ff6cd48eba53724339896a6dea39029848b6a8d5972c8e162069b' + 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-screensaver \ --localstatedir=/var \ - --with-mit-ext + --with-mit-ext --with-systemd make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/gnome-screensaver.pam" "$pkgdir/etc/pam.d/gnome-screensaver" } diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/extra/gnome-screensaver/gnome-screensaver.install index 3b0e06046..d1a42c6ce 100644 --- a/extra/gnome-screensaver/gnome-screensaver.install +++ b/extra/gnome-screensaver/gnome-screensaver.install @@ -2,6 +2,6 @@ pkgname=gnome-screensaver pre_upgrade() { if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall ${pkgname} fi } diff --git a/extra/gnome-screensaver/gnome-screensaver.pam b/extra/gnome-screensaver/gnome-screensaver.pam index c776a5410..453dae646 100644 --- a/extra/gnome-screensaver/gnome-screensaver.pam +++ b/extra/gnome-screensaver/gnome-screensaver.pam @@ -1,3 +1,3 @@ #%PAM-1.0 -auth required pam_unix_auth.so +auth required pam_unix_auth.so nullok auth optional pam_gnome_keyring.so diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD new file mode 100644 index 000000000..904764905 --- /dev/null +++ b/extra/gnome-screenshot/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 156841 2012-04-23 09:07:21Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-screenshot +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Take pictures of your screen" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libcanberra') +makedepends=('intltool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('47c227e43404d6cc101cf473d8f48f7572064b2b10724f2660066f9a4718d488') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-screenshot/gnome-screenshot.install b/extra/gnome-screenshot/gnome-screenshot.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/gnome-screenshot/gnome-screenshot.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD new file mode 100644 index 000000000..7cbd3d7ef --- /dev/null +++ b/extra/gnome-search-tool/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 156843 2012-04-23 09:07:23Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-search-tool +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Utility to search for files" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('gconf' 'gtk3' 'libsm') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=('!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-install + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-search-tool/gnome-search-tool.install b/extra/gnome-search-tool/gnome-search-tool.install new file mode 100644 index 000000000..9bc909b92 --- /dev/null +++ b/extra/gnome-search-tool/gnome-search-tool.install @@ -0,0 +1,17 @@ +pkgname=gnome-search-tool + +post_install() { + gconfpkg --install $pkgname +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 671597662..efc3eebbf 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 140905 2011-10-20 05:42:59Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156845 2012-04-23 09:07:26Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-session -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') +depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' + 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' + 'startup-notification' 'upower') makedepends=('intltool' 'mesa' 'xtrans') options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('a87dcf57fec83cc8fad4e7b84542c5005a70a2107d184f247f0b112f07a043b3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0ad29c2c3158b9e0109d3463e587fe09f312b810a9db51775750b9af8ce457aa') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ - --disable-schemas-compile + --disable-schemas-compile --enable-systemd make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-session/gnome-session.install b/extra/gnome-session/gnome-session.install index 74cf4ed22..f7e8c46ac 100644 --- a/extra/gnome-session/gnome-session.install +++ b/extra/gnome-session/gnome-session.install @@ -1,12 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91.3-3) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-session - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index c34dc67ff..60da0cb70 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,35 +1,39 @@ -# $Id: PKGBUILD 142417 2011-11-09 07:29:52Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156847 2012-04-23 09:07:29Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') -depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower') -makedepends=('intltool' 'gtk-doc' 'gnome-desktop') +depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify' + 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower') +makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -replaces=(gnome-settings-daemon-pulse) -conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d91cac869e23f36942720485f04c3029fd5286fafb6ad12b07377e527b1f6884') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('d5d4a270ec5692cdc56a58cfb57bc7f8fa93374566912a65e78c1c3db7faf4ed' + '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ + --enable-systemd - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \ - --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-settings-daemon/gnome-settings-daemon.install b/extra/gnome-settings-daemon/gnome-settings-daemon.install index 483fb9450..f7e8c46ac 100644 --- a/extra/gnome-settings-daemon/gnome-settings-daemon.install +++ b/extra/gnome-settings-daemon/gnome-settings-daemon.install @@ -1,12 +1,6 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-settings-daemon - fi + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/gnome-settings-daemon/systemd-fallback.patch b/extra/gnome-settings-daemon/systemd-fallback.patch new file mode 100644 index 000000000..da0496623 --- /dev/null +++ b/extra/gnome-settings-daemon/systemd-fallback.patch @@ -0,0 +1,154 @@ +commit b9ded09387f0b99ece97baee18595eb9e86a5b9b +Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +Date: Mon Mar 12 01:52:54 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index 3b4789f..d522852 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) + SESSION_TRACKING=systemd + else +diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c +index 5786300..83fe21e 100644 +--- a/gnome-settings-daemon/gnome-settings-session.c ++++ b/gnome-settings-daemon/gnome-settings-session.c +@@ -30,6 +30,7 @@ + #include "gnome-settings-session.h" + + #ifdef HAVE_SYSTEMD ++#include <systemd/sd-daemon.h> + #include <systemd/sd-login.h> + + typedef struct +@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate + { + #ifdef HAVE_SYSTEMD + GSource *sd_source; +-#else ++#endif + GDBusProxy *proxy_session; + GCancellable *cancellable; +-#endif + gchar *session_id; + GnomeSettingsSessionState state; + }; +@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) + return TRUE; + } + +-#else /* HAVE_SYSTEMD */ ++#endif /* HAVE_SYSTEMD */ + + static void + gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, +@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d + g_object_unref (proxy_manager); + } + +-#endif /* HAVE_SYSTEMD */ +- + static void + gnome_settings_session_init (GnomeSettingsSession *session) + { + session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_SYSTEMD +- sd_pid_get_session (getpid(), &session->priv->session_id); ++ session->priv->sd_source = NULL; ++ ++ if (sd_booted () > 0) { ++ sd_pid_get_session (getpid(), &session->priv->session_id); + +- session->priv->sd_source = sd_source_new (); +- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +- g_source_attach (session->priv->sd_source, NULL); ++ session->priv->sd_source = sd_source_new (); ++ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); ++ g_source_attach (session->priv->sd_source, NULL); + +- sessions_changed (session); +-#else ++ sessions_changed (session); ++ return; ++ } ++#endif + session->priv->cancellable = g_cancellable_new (); + + /* connect to ConsoleKit */ +@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) + session->priv->cancellable, + got_manager_proxy_cb, + session); +-#endif + } + + static void +@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) + if (session->priv->sd_source != NULL) { + g_source_destroy (session->priv->sd_source); + g_source_unref (session->priv->sd_source); ++ goto out; + } +-#else ++#endif ++ + g_cancellable_cancel (session->priv->cancellable); + + if (session->priv->proxy_session != NULL) + g_object_unref (session->priv->proxy_session); + g_object_unref (session->priv->cancellable); +-#endif + ++out: + G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); + } + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 8db04e5..9883d76 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -2031,7 +2031,7 @@ systemd_stop (void) + g_object_unref (bus); + } + +-#else ++#endif + + static void + consolekit_stop_cb (GObject *source_object, +@@ -2081,7 +2081,6 @@ consolekit_stop (void) + consolekit_stop_cb, NULL); + g_object_unref (proxy); + } +-#endif + + static void + upower_sleep_cb (GObject *source_object, +@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ + #ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); ++ if (sd_booted () > 0) ++ systemd_stop (); ++ else + #endif ++ consolekit_stop (); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index dd0ecc6be..41154de40 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 146998 2012-01-20 11:30:17Z ibiru $ +# $Id: PKGBUILD 156849 2012-04-23 09:07:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.2.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" license=('GPL2') -depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou' 'nautilus' 'telepathy-mission-control' 'unzip') +depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip') makedepends=('intltool' 'gnome-doc-utils') optdepends=('network-manager-applet: shell integration for networkmanager') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('209363084ef2d58777d70d8430e4659b058cf854c4b9766f3019d69ffea34d6f') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6abfd2fca104aae64ce9d027dd233fc218a58b861176a64831b68e3f90ab56a9') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ @@ -29,10 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-shell "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-shell/gnome-shell.install b/extra/gnome-shell/gnome-shell.install index a07105c24..27d70b19d 100644 --- a/extra/gnome-shell/gnome-shell.install +++ b/extra/gnome-shell/gnome-shell.install @@ -1,22 +1,19 @@ pkgname=gnome-shell post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - glib-compile-schemas usr/share/glib-2.0/schemas + post_install } diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD new file mode 100644 index 000000000..542a60e9e --- /dev/null +++ b/extra/gnome-system-log/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156851 2012-04-23 09:07:33Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-system-log +pkgver=3.4.1 +pkgrel=1 +pkgdesc="View your system logs" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('288bb4db72d5e86874198f3a879a89cd0ddec373db9838d8ea772df1c5267736') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/gnome-system-log/gnome-system-log.install b/extra/gnome-system-log/gnome-system-log.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/extra/gnome-system-log/gnome-system-log.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index 5ebfe3b3c..65b09f0f6 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,29 +1,29 @@ -# $Id: PKGBUILD 140912 2011-10-20 05:43:17Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156853 2012-04-23 09:07:36Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-system-monitor -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64) license=('GPL') -depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme') -makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +makedepends=('gnome-doc-utils' 'intltool') options=(!emptydirs) url="http://www.gnome.org" groups=('gnome-extra') install=gnome-system-monitor.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f9ecca05609c0ff346727e0f24e32ba5284aea47dfe958e2b6d4a7912e5c1180') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('60f53f1b37c717b2f12502bf6f3b4b43c8e8f3d2fb1198ba66bf933ec4c3130b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-system-monitor/gnome-system-monitor.install b/extra/gnome-system-monitor/gnome-system-monitor.install index e2957a570..c25dff2d3 100644 --- a/extra/gnome-system-monitor/gnome-system-monitor.install +++ b/extra/gnome-system-monitor/gnome-system-monitor.install @@ -1,19 +1,11 @@ -pkgname=gnome-system-monitor - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { - post_install $1 + post_install } post_remove() { - post_install $1 + post_install } diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index 484db511a..b0b42fde5 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140914 2011-10-20 05:43:22Z ibiru $ +# $Id: PKGBUILD 156855 2012-04-23 09:07:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.2.1 +pkgver=3.4.1.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64') @@ -13,21 +13,21 @@ options=('!emptydirs') url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c36a6bce466447526cb73779ee8e861f079e86cef68a50f7c8fbed540d5f373e') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('14d4a252fcbadf0a5fff89f1ff65f0a84d02f5e51c42f8fc14cee73eabc43fdd') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-scrollkeeper make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install index 04c2b3c2c..1d8510f06 100644 --- a/extra/gnome-terminal/gnome-terminal.install +++ b/extra/gnome-terminal/gnome-terminal.install @@ -1,7 +1,7 @@ pkgname=gnome-terminal post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install $pkgname } pre_upgrade() { @@ -13,5 +13,5 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 1a34c44db..fa0ed1ae5 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 140916 2011-10-20 05:43:25Z ibiru $ +# $Id: PKGBUILD 156857 2012-04-23 09:07:41Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') -url="http://abattis.org/cantarell/" +url="http://www.gnome.org" license=('GPL2') -depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg') +depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg') makedepends=('intltool') groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') -source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz) -sha256sums=('ab9e7f6001f4f18420df6a66407ace4340ee815b31e571bc55de7983370e26f3') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0096f3d8ba5416e77a5b4d398140a7f53480ee706740cb698df3f5267540169f') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index 92baa37ad..aa9f6a69b 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 140919 2011-10-20 05:43:32Z ibiru $ +# $Id: PKGBUILD 156861 2012-04-23 09:07:46Z ibiru $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-user-share -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'libunique3') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') makedepends=('intltool' 'gnome-doc-utils' 'nautilus') options=('!emptydirs' '!libtool') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('9d1188c316e536ad6f84b595f118040474f8b9017acd492e80bce30d0c5d54ea') +sha256sums=('34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 7128afb90..e7dae31b5 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139334 2011-10-01 18:58:44Z ibiru $ +# $Id: PKGBUILD 156865 2012-04-23 09:07:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection -pkgver=1.30.0 +pkgver=1.32.1 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" @@ -11,19 +11,19 @@ license=('LGPL' 'GPL') depends=('glib2' 'python2') makedepends=('cairo') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('44f3fb933f76e4728818cc360cb5f9e2edcbdf9bc8a8f9aded99b3e3ef5cb858') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install sed -i '1s|#!/usr/bin/env python$|&2|' \ - "${pkgdir}"/usr/lib/gobject-introspection/giscanner/*.py + "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py } diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 0c973910a..fe645903f 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 155968 2012-04-10 10:51:55Z tomegun $ -# Maintainer: +# $Id: PKGBUILD 157111 2012-04-23 23:54:24Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=3.4 -pkgrel=3 +pkgver=3.5 +pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://catb.org/gpsd/" @@ -21,10 +21,6 @@ options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('c01353459faa68834309109d4e868460' - '8aea27e1b0c23f254f94861f7d898106' - '1f3402f8e33a7032b9ae6dfd077234f7' - '3e963df3f9f7ef3572ecc648ae829315') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -78,3 +74,7 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('e96881798a0ab67aa3cd5f3249f0e536' + 'f6b3718b205be7853d49bae6ef587853' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index b174bbaba..b7b7db583 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 154315 2012-03-26 03:36:27Z foutrelis $ +# $Id: PKGBUILD 157022 2012-04-23 09:27:34Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 22a211769..d248642f9 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 146719 2012-01-16 19:50:53Z dreisner $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156867 2012-04-23 09:07:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins pkgver=0.1.18 -pkgrel=2 +pkgrel=3 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo') makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' - 'rest' 'libtracker-sparql') + 'rest' 'libtracker-sparql' 'gnome-common') optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin' @@ -22,18 +22,22 @@ optdepends=('gupnp-av: uPnP plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + tracker-0.14.patch) +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79' + 'c48201ed1633e2b0eb5132ef823d7b060e9c2cddb808c6981fb546133cd4ea63') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver + + patch -Np1 -i ../tracker-0.14.patch - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/grilo-plugins/tracker-0.14.patch b/extra/grilo-plugins/tracker-0.14.patch new file mode 100644 index 000000000..c9c79fe7c --- /dev/null +++ b/extra/grilo-plugins/tracker-0.14.patch @@ -0,0 +1,32 @@ +From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001 +From: Vincent Untz <vuntz@gnome.org> +Date: Thu, 19 Jan 2012 09:30:28 +0000 +Subject: build: Support build against tracker 0.13/0.14 + +https://bugzilla.gnome.org/show_bug.cgi?id=667855 +--- +diff --git a/configure.ac b/configure.ac +index 1fd6743..71aceed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, + HAVE_GMIME=yes, + HAVE_GMIME=no)]) + +-PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) + + if test "x$HAVE_TRACKER_SPARQL" = "xno"; then ++ PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++ HAVE_TRACKER_SPARQL=yes, ++ HAVE_TRACKER_SPARQL=no) ++fi ++ ++if test "x$HAVE_TRACKER_SPARQL" = "xno"; then + PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) +-- +cgit v0.9.0.2 diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index aa78f6b01..cd79a4e96 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139610 2011-10-03 19:05:04Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157078 2012-04-23 13:10:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gssdp -pkgver=0.12.0 +pkgver=0.12.1 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" arch=('i686' 'x86_64') @@ -14,18 +14,16 @@ makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') optdepends=('gtk2: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7f02903989b4ac7cfb7508898706a5b4a01c9ace2f6345bd96bf8a3faa30ae1a') +sha256sums=('16acb4cc5249836ebe0e1758b75b85b8d529b51f72d9f68d8e4ae524d55f3347') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 09a83f3f8..3739518d0 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,34 +1,43 @@ -# $Id: PKGBUILD 148766 2012-02-05 11:49:40Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157098 2012-04-23 20:32:20Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=2.14.2 +pkgver=3.0.0 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) license=('GPL') -url="http://gthumb.sourceforge.net/" -depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base') -optdepends=('gstreamer0.10-base: video support') +url="http://live.gnome.org/gthumb" +depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' + 'gstreamer0.10-base') +makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' + 'brasero' 'librsvg' 'libopenraw' 'liboauth') +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'libsoup-gnome: web albums' + 'liboauth: web albums') options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5386e50e934c7f276584a6c47d0208f4756cf72e0dc6cff19eaf9d8a3ab53d7c') +sha256sums=('5b6116a69897ee9aeba8db3d1ac800e9a62308738367533268acea40519f58b4') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gthumb "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gthumb/gthumb.install b/extra/gthumb/gthumb.install index 6046ebb6f..9d4e7822f 100644 --- a/extra/gthumb/gthumb.install +++ b/extra/gthumb/gthumb.install @@ -1,24 +1,19 @@ -pkgname=gthumb - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD index a793618de..d31668f9b 100644 --- a/extra/gtk-vnc/PKGBUILD +++ b/extra/gtk-vnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142786 2011-11-15 06:28:23Z eric $ -# Maintainer: +# $Id: PKGBUILD 156872 2012-04-23 09:08:01Z ibiru $ +# 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.4.4 +pkgver=0.5.0 pkgrel=1 pkgdesc="A VNC viewer widget for GTK" arch=('i686' 'x86_64') @@ -16,13 +16,14 @@ 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=('c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7') +sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81') build() { - cd "$srcdir" - cp -a $pkgname-$pkgver gtk3-build + rm -rf gtk2-build gtk3-build + cp -a $pkgname-$pkgver gtk2-build + mv $pkgname-$pkgver gtk3-build - ( cd $pkgname-$pkgver + ( cd gtk2-build PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --with-python --disable-static --with-gtk=2.0 make ) @@ -34,7 +35,6 @@ build() { } package() { - cd "${srcdir}" - make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install + make -C gtk2-build -j1 DESTDIR="${pkgdir}" install make -C gtk3-build -j1 DESTDIR="${pkgdir}" install } diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 6510d5e8a..ab9cdb7c0 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151544 2012-02-27 16:18:08Z ibiru $ +# $Id: PKGBUILD 156874 2012-04-23 09:08:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.2.3 -pkgrel=3 -pkgdesc="GTK+ is a multi-platform toolkit (v3)" +pkgver=3.4.1 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" install=gtk3.install @@ -13,16 +13,12 @@ makedepends=('gobject-introspection') options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz - settings.ini - empty_grid.patch) -sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d' - 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - 'd05ccfeaf4c558668b72aaacdd11356b6419d2359def6c1b9af1b465fa5a3c25') - +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini) +sha256sums=('0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { - cd "$srcdir/gtk+-$pkgver" - patch -Np1 -i "$srcdir/empty_grid.patch" + cd "gtk+-$pkgver" CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -34,7 +30,7 @@ build() { } package() { - cd "$srcdir/gtk+-$pkgver" + cd "gtk+-$pkgver" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" diff --git a/extra/gtk3/gtk3.install b/extra/gtk3/gtk3.install index cd8965d1f..ca20d2865 100644 --- a/extra/gtk3/gtk3.install +++ b/extra/gtk3/gtk3.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/gtk-query-immodules-3.0 --update-cache - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { @@ -8,8 +8,9 @@ post_upgrade() { } pre_remove() { - rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache } + post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index 09cd85827..12c5d4e62 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 146306 2012-01-09 13:55:21Z heftig $ +# $Id: PKGBUILD 156876 2012-04-23 09:08:07Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.2.3 +pkgver=4.4.1 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -12,11 +12,11 @@ depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('e9867dafd5685a7887afe77f2eb584aeaf5f8e20df83100b8f24adcfc1e422d1') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('2fb3286c5ab8b6349a694156f803e1162c5a234d30548eb0afdf82e139923236') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gtkhtml4 \ --localstatedir=/var --disable-static @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 943c518e0..34a32d973 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 139350 2011-10-01 18:59:11Z ibiru $ +# $Id: PKGBUILD 156878 2012-04-23 09:08:09Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.2.0 +pkgver=3.4.0 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') license=('LGPL') options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.2/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('6195dac58454e287ae17d380c028827f0a49669a3b93f85e2d4f6eb9459674f2') +url="http://www.gtkmm.org/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('42ea4e9acdd37fc3fe7026f8249a5427927b51048adff827bc1312900d6b12e9') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr make } @@ -23,16 +23,16 @@ build() { package_gtkmm3() { pkgdesc="C++ bindings for gtk3" depends=('gtk3' 'pangomm' 'atkmm') - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install } package_gtkmm3-docs() { pkgdesc="Developer documentation for gtkmm v3" - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -C docs DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make -C docs DESTDIR="$pkgdir" install } diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index ef7d50468..ac3784d62 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151329 2012-02-25 14:28:40Z pierre $ +# $Id: PKGBUILD 157035 2012-04-23 09:53:22Z ibiru $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=2.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 794aab706..49da091b8 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145888 2012-01-03 19:46:57Z ibiru $ +# $Id: PKGBUILD 156880 2012-04-23 09:08:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.3 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') license=('GPL') @@ -13,10 +13,10 @@ makedepends=('intltool' 'gobject-introspection' 'glade') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947') +sha256sums=('8387b33c61efffcafed99ae896aed224a1ea8b3af45677c5d57e0d1842f6ffc1') build() { - cd "$srcdir/$_pkgbasename-$pkgver" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-glade-catalog @@ -24,6 +24,6 @@ build() { } package() { - cd "$srcdir/$_pkgbasename-$pkgver" + cd "$_pkgbasename-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 900ac4e94..a2a824288 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 142885 2011-11-17 18:34:47Z ibiru $ -# Maintainer: Jan De Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156882 2012-04-23 09:08:14Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.2.2 +pkgver=3.4.1.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org" -depends=('gconf' 'hicolor-icon-theme') +depends=('dconf' 'gtk3' 'hicolor-icon-theme') makedepends=('gtk-doc' 'intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=gucharmap.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --enable-introspection + --disable-schemas-compile --enable-introspection make } package() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gucharmap $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gucharmap/gucharmap.install b/extra/gucharmap/gucharmap.install index 4de3253f6..0a9ddf4c2 100644 --- a/extra/gucharmap/gucharmap.install +++ b/extra/gucharmap/gucharmap.install @@ -1,22 +1,17 @@ -pkgname=gucharmap - post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap + return 0 } post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index 16dcc2de5..97ea02440 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139612 2011-10-03 19:05:21Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157080 2012-04-23 13:11:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Thijs Vermeir <thijsvermeir@gmail.com> # Contributor: Denis Zawada <deno@rootnode.net> pkgname=gupnp-av -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" arch=('i686' 'x86_64') @@ -14,17 +14,16 @@ depends=('gupnp') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('41aeb5d243426b293c315788b41bc79a2be1f466eeff114cf6c89a37140f507e') +sha256sums=('4863c9bcbfa2e9fcb215d43c8d1e4090fbd078f8ae65e45a3314e7f6d59a8cbf') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 5c8810754..6b18c0279 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139611 2011-10-03 19:05:21Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157079 2012-04-23 13:11:06Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: György Balló <ballogy@freestart.hu> pkgname=gupnp -pkgver=0.18.0 +pkgver=0.18.2 pkgrel=1 pkgdesc="An object-oriented UPNP framework" arch=('i686' 'x86_64') @@ -14,19 +14,17 @@ makedepends=('gobject-introspection' 'gtk-doc') optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('82f4758b26ef0531cf6301f526fe705f06c329eaef403bb30925128fcbb6a71a') +sha256sums=('3715fa56c1f351132cffe7d69127da1daada7ff50481838c6dbfd17d7182743d') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --with-context-manager=linux make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index b347eae87..d8f5938a8 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 150878 2012-02-23 13:48:04Z allan $ +# $Id: PKGBUILD 156884 2012-04-23 09:08:18Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.10.1 -pkgrel=3 +pkgver=1.12.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('d75dbb0cee87ca93f393c96da56affa51609114814b87771cfc9871c09b5355e') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -24,7 +24,7 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' @@ -32,13 +32,13 @@ package_gvfs() { 'gvfs-afp: Apple Filing Protocol (AFP) support') install=gvfs.install - cd "${srcdir}/${pkgbase}-${pkgver}" - sed -e 's/^am__append_3/#am__append_3/' \ - -e 's/^am__append_4/#am__append_4/' \ + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ -i monitor/Makefile - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install - cd "${pkgdir}" + cd "$pkgdir" rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml @@ -47,67 +47,66 @@ package_gvfs() { package_gvfs-smb() { pkgdesc="SMB/CIFS (Windows client) backend for gvfs" - depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring') + depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') install=gvfs-smb.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" - install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" install -Dm644 org.gnome.system.smb.gschema.xml \ - "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" install -Dm644 gvfs-smb.convert \ - "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert" + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" } package_gvfs-afc() { pkgdesc="AFC (mobile devices) backend for gvfs" - depends=("gvfs=${pkgver}" 'libimobiledevice') + depends=("gvfs=$pkgver" 'libimobiledevice') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc" - install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install } package_gvfs-gphoto2() { pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev') + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2" - install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" - cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install } package_gvfs-obexftp() { pkgdesc="ObexFTP (bluetooth) backend for gvfs" - depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server') + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') install=gvfs-module.install - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp" - install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount" + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" } package_gvfs-afp() { pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" - depends=("gvfs=${pkgver}") + depends=("gvfs=$pkgver") install=gvfs-module.install - install -m755 -d "${pkgdir}/usr/lib/gvfs" - install -m755 -d "${pkgdir}/usr/share/gvfs/mounts" - - cd "${srcdir}/${pkgbase}-${pkgver}/daemon" - install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/" - install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" } diff --git a/extra/gvfs/gvfs-smb.install b/extra/gvfs/gvfs-smb.install index 0b8783c7b..da6a2ab6d 100644 --- a/extra/gvfs/gvfs-smb.install +++ b/extra/gvfs/gvfs-smb.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas killall -USR1 gvfsd >&/dev/null || : } @@ -8,5 +8,5 @@ post_upgrade() { } post_remove() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/gvfs/gvfs.install b/extra/gvfs/gvfs.install index 9458b1513..3482d99e3 100644 --- a/extra/gvfs/gvfs.install +++ b/extra/gvfs/gvfs.install @@ -1,6 +1,6 @@ post_install() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas killall -USR1 gvfsd >&/dev/null || : } @@ -9,6 +9,6 @@ post_upgrade() { } post_remove() { - usr/bin/gio-querymodules usr/lib/gio/modules - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas } diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 9c62275f0..3469310ad 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141339 2011-10-29 15:01:45Z andyrtr $ +# $Id: PKGBUILD 156886 2012-04-23 09:08:21Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=4.8.1.1 +pkgver=49.1.1 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) @@ -11,9 +11,9 @@ url="http://www.icu-project.org/" license=('custom:"icu"') depends=('gcc-libs' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz - http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz - icu.8198.revert.icu5431.patch) -md5sums=('ea93970a0275be6b42f56953cd332c17' + http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz + icu.8198.revert.icu5431.patch) +md5sums=('7c53f83e0327343f4060c0eb83842daf' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index a505d4e56..0f033c092 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139369 2011-10-01 18:59:40Z ibiru $ +# $Id: PKGBUILD 156888 2012-04-23 09:08:23Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Michael Kanis <mkanis@gmx.de> pkgname=libchamplain -pkgver=0.12.0 +pkgver=0.12.2 pkgrel=1 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" @@ -13,16 +13,15 @@ options=('!libtool') depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85') +sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static --disable-debug \ - --enable-vala + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-debug --enable-vala make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD index fb070215a..caffa7ec1 100644 --- a/extra/libcroco/PKGBUILD +++ b/extra/libcroco/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152706 2012-03-09 01:01:22Z heftig $ +# $Id: PKGBUILD 156890 2012-04-23 09:08:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libcroco -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc="A CSS parsing library" arch=('x86_64' 'i686') @@ -12,15 +12,15 @@ license=('LGPL') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) url="http://www.gnome.org" -sha256sums=('c816bad3406c52a98d84a2222c0e4a7b70ee0640b49cde4a236deaa02c4232ea') +sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index aac075ddd..903af6fb2 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143012 2011-11-20 22:59:47Z heftig $ +# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=5.0.2 +pkgver=5.0.3 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) @@ -17,7 +17,7 @@ options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593') +sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD index 4512150d0..af823f6ba 100644 --- a/extra/libgdata/PKGBUILD +++ b/extra/libgdata/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 139373 2011-10-01 18:59:45Z ibiru $ +# $Id: PKGBUILD 156894 2012-04-23 09:08:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgdata -pkgver=0.10.1 +pkgver=0.12.0 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64') license=('GPL') depends=('libsoup-gnome' 'liboauth') -makedepends=('pkgconfig' 'intltool' 'gobject-introspection') +makedepends=('intltool' 'gobject-introspection') url="http://www.gnome.org" options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d7f27b1019905792246336599cadc7470b362806ed5e2c038a9f7c0da257f6ef') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e5acd1ca88433306e740fc4cb3836f9710358d0acd48d4ddee1876dd77d2aca3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 7f4b0e095..6a9dff1c5 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,21 +1,21 @@ -#$Id: PKGBUILD 142889 2011-11-17 18:34:54Z ibiru $ +#$Id: PKGBUILD 156896 2012-04-23 09:08:34Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('dbus-core' 'libgcrypt' 'glib2') -makedepends=('intltool' 'pkgconfig') +depends=('dbus-core' 'glib2' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2bcbe47b1960737866835a516056c36d1a3d82d5ad101c70d5a87e1ad616adb3') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e74a3e4521767fe5f05cc97cda8a355239567d9763ec628280ede8c2a4a379e8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring @@ -23,6 +23,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD index 2b142f59a..b3370700c 100644 --- a/extra/libgnomekbd/PKGBUILD +++ b/extra/libgnomekbd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139375 2011-10-01 18:59:47Z ibiru $ +# $Id: PKGBUILD 156898 2012-04-23 09:08:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgnomekbd -pkgver=3.2.0 +pkgver=3.4.0.2 pkgrel=1 pkgdesc="Gnome keyboard library" url="http://gswitchit.sourceforge.net" @@ -12,17 +12,17 @@ depends=('libxklavier' 'gtk3' 'dconf') makedepends=('intltool' 'gobject-introspection') options=('!libtool' '!emptydirs') install=libgnomekbd.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libgnomekbd/libgnomekbd.install b/extra/libgnomekbd/libgnomekbd.install index 2ef26aaa9..a3d820459 100644 --- a/extra/libgnomekbd/libgnomekbd.install +++ b/extra/libgnomekbd/libgnomekbd.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD index 87a0928a8..c3416902e 100644 --- a/extra/libgsf/PKGBUILD +++ b/extra/libgsf/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 145205 2011-12-19 17:59:06Z jgc $ +# $Id: PKGBUILD 156900 2012-04-23 09:08:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libgsf -pkgver=1.14.22 -pkgrel=2 +pkgver=1.14.23 +pkgrel=1 arch=(i686 x86_64) pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" url="http://www.gnome.org/" license=('GPL' 'LGPL') options=('!libtool') depends=('libxml2' 'gdk-pixbuf2' 'bzip2') -conflicts=("libgsf-gnome<$pkgver") -makedepends=('intltool' 'pygtk') +makedepends=('intltool' 'gobject-introspection') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) -sha256sums=('a5f23be3cab72abd91bb443a32f41d6adc73250285b53787460750b6d60b783f') +sha256sums=('bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package_libgsf() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index d4b3b4e3b..47f592f47 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 141132 2011-10-24 16:18:24Z ibiru $ +# $Id: PKGBUILD 156902 2012-04-23 09:08:42Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libgweather -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') license=('LGPL') depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme') -makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') options=('!libtool' '!emptydirs') url="http://www.gnome.org/" install=libgweather.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch) -sha256sums=('495f6d0f79947d6e601db3220360b1fcd6ae43608cd1571be5bcd5c05b7388d5' - '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3') +sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60' + '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/gettext-not-xml.patch" + patch -Np1 -i "$srcdir/gettext-not-xml.patch" gtkdocize autoreconf -fi @@ -31,10 +31,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain libgweather "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/libgweather/gettext-not-xml.patch b/extra/libgweather/gettext-not-xml.patch index db9c64148..46ea98f48 100644 --- a/extra/libgweather/gettext-not-xml.patch +++ b/extra/libgweather/gettext-not-xml.patch @@ -1,7 +1,7 @@ -diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac ---- libgweather-3.1.3/configure.ac.gettext 2011-07-04 10:52:13.000000000 -0400 -+++ libgweather-3.1.3/configure.ac 2011-07-06 20:26:17.180168365 -0400 -@@ -43,19 +43,16 @@ GNOME_MAINTAINER_MODE_DEFINES +diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac +--- libgweather-3.4.0.orig/configure.ac 2012-03-08 20:49:21.497783149 +0000 ++++ libgweather-3.4.0/configure.ac 2012-03-08 20:59:21.082941563 +0000 +@@ -43,19 +43,16 @@ LT_PREREQ([2.2.6]) LT_INIT([dlopen win32-dll disable-static]) @@ -16,16 +16,16 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac AC_PATH_PROG(GCONFTOOL, gconftool-2) -AC_ARG_ENABLE(all-translations-in-one-xml, -- [AC_HELP_STRING([--enable-all-translations-in-one-xml], +- [AS_HELP_STRING([--enable-all-translations-in-one-xml], - [Put all translations in a big Locations.xml file (slow to parse)])], - [enable_big_xml=yes], - [enable_big_xml=no]) -AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") - AC_ARG_ENABLE(locations-compression, - [AC_HELP_STRING([--enable-locations-compression], + [AS_HELP_STRING([--enable-locations-compression], [Compress Locations.xml files])], -@@ -191,7 +188,7 @@ AC_OUTPUT([ +@@ -178,7 +175,7 @@ Makefile doc/Makefile po/Makefile.in @@ -34,9 +34,9 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac libgweather/Makefile libgweather/gweather-3.0.pc libgweather/gweather-3.0-uninstalled.pc -@@ -199,12 +196,6 @@ data/Makefile - icons/Makefile +@@ -187,12 +184,6 @@ ]) + AC_OUTPUT -if test "x$enable_big_xml" = "xyes"; then - LOCATIONS_XML_TRANSLATIONS="one big file" @@ -47,17 +47,17 @@ diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac dnl *************************************************************************** dnl *** Display Summary *** dnl *************************************************************************** -@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary: +@@ -203,6 +194,4 @@ Source code location: ${srcdir} Compiler: ${CC} Introspection support: ${found_introspection} - Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} - Locations.xml compression: ${enable_locations_compression} " >&2 -diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makefile.am ---- libgweather-3.1.3/data/Makefile.am.gettext 2011-04-04 16:52:54.000000000 -0400 -+++ libgweather-3.1.3/data/Makefile.am 2011-07-06 20:18:42.244855841 -0400 -@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd +diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am +--- libgweather-3.4.0.orig/data/Makefile.am 2012-03-08 20:49:21.484449916 +0000 ++++ libgweather-3.4.0/data/Makefile.am 2012-03-08 21:00:28.359065326 +0000 +@@ -4,55 +4,23 @@ libgweatherlocationsdir = $(pkgdatadir) libgweatherlocations_in_files = Locations.xml.in @@ -119,9 +119,9 @@ diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makef ### Locations.xml.in rebuild rebuild-locations: locationdb.sqlite update-locations.py $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new -diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3.1.3/libgweather/gweather-location.c ---- libgweather-3.1.3/libgweather/gweather-location.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-3.1.3/libgweather/gweather-location.c 2011-07-06 20:18:42.251855754 -0400 +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c +--- libgweather-3.4.0.orig/libgweather/gweather-location.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-location.c 2012-03-08 21:00:28.359065326 +0000 @@ -22,11 +22,14 @@ #include <config.h> #endif @@ -137,7 +137,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "gweather-location.h" -@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p +@@ -185,10 +188,20 @@ tagname = (const char *) xmlTextReaderConstName (parser->xml); if (!strcmp (tagname, "name") && !loc->name) { @@ -160,9 +160,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3 xmlFree (value); normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); loc->sort_name = g_utf8_casefold (normalized, -1); -diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3.1.3/libgweather/gweather-timezone.c ---- libgweather-3.1.3/libgweather/gweather-timezone.c.gettext 2010-02-09 07:28:03.000000000 -0500 -+++ libgweather-3.1.3/libgweather/gweather-timezone.c 2011-07-06 20:18:42.252855742 -0400 +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c +--- libgweather-3.4.0.orig/libgweather/gweather-timezone.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-timezone.c 2012-03-08 21:00:28.359065326 +0000 @@ -23,6 +23,7 @@ #endif @@ -171,7 +171,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE #include "gweather-timezone.h" -@@ -152,7 +153,7 @@ static GWeatherTimezone * +@@ -154,7 +155,7 @@ parse_timezone (GWeatherParser *parser) { GWeatherTimezone *zone = NULL; @@ -180,7 +180,7 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 int offset = 0, dst_offset = 0; gboolean has_dst = FALSE; -@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser) +@@ -177,27 +178,34 @@ continue; } @@ -219,9 +219,9 @@ diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3 if (name) xmlFree (name); -diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-locations/LINGUAS ---- libgweather-3.1.3/po-locations/LINGUAS.gettext 2011-07-06 20:18:42.253855730 -0400 -+++ libgweather-3.1.3/po-locations/LINGUAS 2011-07-06 20:18:42.253855730 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS +--- libgweather-3.4.0.orig/po-locations/LINGUAS 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/LINGUAS 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,78 @@ +ang +ar @@ -301,9 +301,9 @@ diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-loc +zh_CN +zh_HK +zh_TW -diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3/po-locations/Makefile.in.in ---- libgweather-3.1.3/po-locations/Makefile.in.in.gettext 2011-07-06 20:18:42.254855718 -0400 -+++ libgweather-3.1.3/po-locations/Makefile.in.in 2011-07-06 20:18:42.254855718 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in +--- libgweather-3.4.0.orig/po-locations/Makefile.in.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/Makefile.in.in 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,217 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> @@ -522,9 +522,9 @@ diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3 +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: -diff -up libgweather-3.1.3/po-locations/POTFILES.in.gettext libgweather-3.1.3/po-locations/POTFILES.in ---- libgweather-3.1.3/po-locations/POTFILES.in.gettext 2011-07-06 20:18:42.254855718 -0400 -+++ libgweather-3.1.3/po-locations/POTFILES.in 2011-07-06 20:18:42.254855718 -0400 +diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in +--- libgweather-3.4.0.orig/po-locations/POTFILES.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/POTFILES.in 2012-03-08 21:00:28.359065326 +0000 @@ -0,0 +1,4 @@ +# This list should contain *only* data/Locations.xml.in. +# Everything else should be in POTFILES.skip. diff --git a/extra/libgweather/libgweather.install b/extra/libgweather/libgweather.install index 7062d4167..0d646b872 100644 --- a/extra/libgweather/libgweather.install +++ b/extra/libgweather/libgweather.install @@ -1,8 +1,8 @@ pkgname=libgweather post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/gnome + gconfpkg --install $pkgname + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome } pre_upgrade() { @@ -14,9 +14,9 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall $pkgname } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/gnome + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome } diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD new file mode 100644 index 000000000..3436c4868 --- /dev/null +++ b/extra/libgxps/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156904 2012-04-23 09:08:44Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=libgxps +pkgver=0.2.2 +pkgrel=1 +pkgdesc="XPS Documents library" +arch=(i686 x86_64) +url="https://live.gnome.org/libgxps" +license=('GPL2') +depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index 1a9d5ea59..c9a22e8d3 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,31 +1,33 @@ -# $Id: PKGBUILD 135796 2011-08-18 15:04:27Z andyrtr $ +# $Id: PKGBUILD 156906 2012-04-23 09:08:47Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') -depends=('glib2' 'gnutls' 'libgcrypt' 'libplist' 'usbmuxd') -makedepends=('swig' 'python2') +depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') +makedepends=('python2' 'swig') options=('!libtool') -source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2 +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 swig-version-check.patch) md5sums=('cdc13037e822d9ac2e109536701d153a' '8bb215e36fe0e08a72332c108c7842cc') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" + # SWIG version check is wrong (still not fixed upstream) - patch -p1 -i "$srcdir"/swig-version-check.patch + patch -p1 -i ../swig-version-check.patch + PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD index 79601b0be..f6ad2056c 100644 --- a/extra/libmp4v2/PKGBUILD +++ b/extra/libmp4v2/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 137907 2011-09-12 11:57:06Z pierre $ -# Maintainer: +# $Id: PKGBUILD 157108 2012-04-23 23:49:53Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libmp4v2 pkgver=1.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="MPEG-4 library" arch=('i686' 'x86_64') license=('MPL') url="http://code.google.com/p/mp4v2/" depends=('gcc-libs') options=('!libtool') -source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") -md5sums=('986701929ef15b03155ac4fb16444797') +#source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2") +source=("http://mp4v2.googlecode.com/files/mp4v2-trunk-r479.tar.bz2") build() { - cd ${srcdir}/mp4v2-${pkgver} +# cd ${srcdir}/mp4v2-${pkgver} + cd ${srcdir}/mp4v2-trunk-r479 ./configure --prefix=/usr make } package() { - cd ${srcdir}/mp4v2-${pkgver} +# cd ${srcdir}/mp4v2-${pkgver} + cd ${srcdir}/mp4v2-trunk-r479 make DESTDIR=${pkgdir} install make DESTDIR=${pkgdir} install-man } +md5sums=('9ffd774fa88ad993e28236551511850b') diff --git a/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch new file mode 100644 index 000000000..e1c099aae --- /dev/null +++ b/extra/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch @@ -0,0 +1,28 @@ +From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau <cfergeau@redhat.com> +Date: Sun, 4 Mar 2012 14:32:49 +0100 +Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration + +Without this, compilation fails with: + +libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const': +libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope +--- + src/Query.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/Query.cc b/src/Query.cc +index 5f5934f..9332346 100644 +--- a/src/Query.cc ++++ b/src/Query.cc +@@ -33,6 +33,7 @@ + + #include <string.h> + #include <sys/time.h> ++#include <unistd.h> + + #include <ne_uri.h> + +-- +1.7.7.6 + diff --git a/extra/libmusicbrainz4/PKGBUILD b/extra/libmusicbrainz4/PKGBUILD new file mode 100644 index 000000000..c1e4af3f5 --- /dev/null +++ b/extra/libmusicbrainz4/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156908 2012-04-23 09:08:49Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Max Fehrm max.fehrm@gmail.com + +pkgname=libmusicbrainz4 +pkgver=4.0.0 +pkgrel=1 +pkgdesc="Library That Provides Access to the MusicBrainz Server " +url="http://musicbrainz.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('neon') +makedepends=('cmake') +source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz + 0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch) +md5sums=('21c33f5dd20b8bb945b800e2a964f27e' + 'df1dfa423d32a7a1d08b3fc0114bf087') + +build() { + cd libmusicbrainz-$pkgver + patch -Np1 -i ../0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch + cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + make +} + +package() { + cd libmusicbrainz-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD index 37d43bf7b..8c321b117 100644 --- a/extra/libnice/PKGBUILD +++ b/extra/libnice/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: William DÃaz <wdiaz@archlinux.us> pkgname=libnice -pkgver=0.1.1 +pkgver=0.1.2 pkgrel=1 pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)" arch=('i686' 'x86_64') @@ -11,16 +11,16 @@ url="http://nice.freedesktop.org" license=('LGPL') depends=('gstreamer0.10') options=('!libtool') -source=(http://nice.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('0906c3523eb78cb3caad170cc75af4b0') +source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz) +md5sums=('1914dd98380dd68632d3d448cc23f1e8') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 0b03fc544..d9c52e4f8 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 139383 2011-10-01 19:00:04Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 156912 2012-04-23 09:08:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libpeas -pkgver=1.2.0 +pkgver=1.4.0 pkgrel=1 pkgdesc="A GObject-based plugins engine" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL2') depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') -makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed') +makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade') optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' - 'seed: gbject-based plugin engine - seed runtime loader') + 'seed: gobject-based plugin engine - seed runtime loader') options=('!libtool') install=libpeas.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c') +sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --localstatedir=/var + --sysconfdir=/etc --localstatedir=/var --enable-vala make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD index 0121e951c..ebf732b69 100644 --- a/extra/libplist/PKGBUILD +++ b/extra/libplist/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 120143 2011-04-20 11:59:42Z ibiru $ +# $Id: PKGBUILD 156914 2012-04-23 09:08:57Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist -pkgver=1.4 -pkgrel=1 +pkgver=1.8 +pkgrel=2 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') depends=('glib2' 'libxml2' 'python2') makedepends=('cmake' 'swig') -source=(http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2ad226abe1131a72e7ecbb2b921ad92f54b8e787c2281c89b00145b519479a71') +source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) +sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { - cd "${srcdir}" mkdir build cd build - cmake ../"${pkgname}-${pkgver}" \ + cmake ../$pkgname-$pkgver \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr make } package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install + cd build + make DESTDIR="$pkgdir" install } diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index c9f0c41f5..2bfcd37be 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153604 2012-03-16 15:27:04Z andyrtr $ +# $Id: PKGBUILD 157024 2012-04-23 09:27:44Z ibiru $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,8 +19,8 @@ pkgname=('libreoffice-common' 'libreoffice-extension-presenter-screen' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-report-builder') -_LOver=3.5.1.2 -pkgver=3.5.1 +_LOver=3.5.2.2 +pkgver=3.5.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') @@ -33,7 +33,7 @@ makedepends=( # makedepends #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg' + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -75,7 +75,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 - buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a) + buildfix_icu49.diff + libreoffice-common.sh libreoffice-common.csh) noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz 185d60944ea767075d27247c3162b3bc-unowinreg.dll @@ -104,9 +105,9 @@ noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' - '607b544cd7b38f9e6db6fe7da25007a7' - 'a3fa7818bfab14a6cccec645193e9982' +md5sums=('a21156d5657b8619a523ffdc5cc0003e' + '3c064a24191274fcd8fd466ce9d5dc42' + '17ebcd0d25e716d3905b1a905907fd67' '18f577b374d60b3c760a3a3350407632' 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' @@ -137,7 +138,9 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '185d60944ea767075d27247c3162b3bc' '60ce5dc9bd098f95c2e621a930c98dd9' '661a52a02a31b3afbe4b3b3146061afd' - '15fe8b5d79fbdc0b6bc2b454086671e7') + '9734ea20c9f67e1b6e1c5a1247fbd3ff' + '32fcd844935434807e68d7bd06b94f09' + '06a45184aefe078c4314e002ba666b52') build() { @@ -161,7 +164,7 @@ build() { # one late fix to solve make distro-pack-install issue patch -Np1 -i ${srcdir}/gmake_install.diff patch -Np1 -i ${srcdir}/smp_buildfix.diff - patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff + patch -Np0 -i ${srcdir}/buildfix_icu49.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -280,7 +283,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' "icu>=4.6" 'libsm' 'redland' 'hyphen' 'graphite' + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' @@ -329,12 +332,15 @@ package_libreoffice-common() { ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ ln -vsf /etc/libreoffice/psprint.conf . - - #fix http://bugs.archlinux.org/task/17656 - find ${pkgdir} -perm 444 -exec ls -lh {} \; - find ${pkgdir} -perm 444 -exec chmod 644 {} \; - find ${pkgdir} -perm 555 -exec ls -lh {} \; - find ${pkgdir} -perm 555 -exec chmod 755 {} \; + + # set python-uno PYTHON path + install -dm755 ${pkgdir}/etc/profile.d + install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ + + # move bash-completion files to its new place + install -dm755 ${pkgdir}/usr/share/bash-completion/completions + mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh + rm -rf ${pkgdir}/etc/bash_completion.d } package_libreoffice-base() { @@ -538,19 +544,9 @@ package_libreoffice-sdk() { mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done - # fix ArchLinux LibreOffice installation paths - sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \ - -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \ - -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \ - -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \ - -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \ - -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \ - -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \ - -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \ - -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \ - -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in + # fix environment path to keep compatibility with openjdk6 and openjdk7 + #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} } package_libreoffice-sdk-doc() { diff --git a/extra/libreoffice/buildfix_icu49.diff b/extra/libreoffice/buildfix_icu49.diff new file mode 100644 index 000000000..7a774dee0 --- /dev/null +++ b/extra/libreoffice/buildfix_icu49.diff @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/show_bug.cgi?id=410307 + +--- i18npool/source/breakiterator/data/char_in.txt ++++ i18npool/source/breakiterator/data/char_in.txt +@@ -15,7 +15,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; +@@ -72,7 +72,7 @@ + [^$Control $CR $LF] $Extend; + + [^$Control $CR $LF] $SpacingMark; +-$Prepend [^$Control $CR $LF]; ++# $Prepend [^$Control $CR $LF]; + + + ## ------------------------------------------------- +@@ -94,7 +94,7 @@ + + $Extend [^$Control $CR $LF]; + $SpacingMark [^$Control $CR $LF]; +-[^$Control $CR $LF] $Prepend; ++# [^$Control $CR $LF] $Prepend; + + + ## ------------------------------------------------- +--- i18npool/source/breakiterator/data/char.txt ++++ i18npool/source/breakiterator/data/char.txt +@@ -16,7 +16,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/extra/libreoffice/libreoffice-common.csh b/extra/libreoffice/libreoffice-common.csh new file mode 100644 index 000000000..625917add --- /dev/null +++ b/extra/libreoffice/libreoffice-common.csh @@ -0,0 +1 @@ +setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program diff --git a/extra/libreoffice/libreoffice-common.sh b/extra/libreoffice/libreoffice-common.sh new file mode 100644 index 000000000..ea04b2e6d --- /dev/null +++ b/extra/libreoffice/libreoffice-common.sh @@ -0,0 +1 @@ +export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program" diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 6cd022366..284f405ed 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,31 +1,28 @@ -# $Id: PKGBUILD 148836 2012-02-05 11:52:19Z ibiru $ +# $Id: PKGBUILD 156916 2012-04-23 09:09:00Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg -pkgver=2.34.2 -pkgrel=3 +pkgver=2.36.1 +pkgrel=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') -depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco') -makedepends=('intltool' 'gtk2') -optdepends=('gtk2: for rsvg-view support') +depends=('gdk-pixbuf2' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.34/$pkgname-$pkgver.tar.xz) -sha256sums=('5de701325b84c0a15ab6892f49ffd6471722044bfe0b350725bf420642ee4464') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('786b95e1a091375c5ef2997a21c69ff24d7077afeff18197355f54d9dcbcd8c5') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in - ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname \ - --with-croco --disable-static \ - --with-svgz + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/librsvg/librsvg.install b/extra/librsvg/librsvg.install index 4d48b071f..8852ebf28 100644 --- a/extra/librsvg/librsvg.install +++ b/extra/librsvg/librsvg.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gdk-pixbuf-query-loaders --update-cache + gdk-pixbuf-query-loaders --update-cache } post_upgrade() { diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index 9d8c866fb..31cf02778 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153544 2012-03-15 18:27:40Z ibiru $ +# $Id: PKGBUILD 156918 2012-04-23 09:09:02Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libsocialweb pkgver=0.25.20 -pkgrel=0 +pkgrel=1 pkgdesc="A personal social data server" arch=('i686' 'x86_64') url="http://www.gtk.org/" diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 745f90c09..7144432e5 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 140935 2011-10-20 05:43:56Z ibiru $ +# $Id: PKGBUILD 156920 2012-04-23 09:09:05Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.36.1 +pkgver=2.38.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('73722407ff5fa7fcff2dae384aa04d85e7900c0e3fed46389f1289a1409e1f65') +sha256sums=('71b8923fc7a5fef9abc5420f7f3d666fdb589f43a8c50892d584d58b3c513f9a') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make @@ -24,25 +24,25 @@ package_libsoup() { pkgdesc="GNOME HTTP Library - base library" depends=('glib2' 'libxml2' 'glib-networking') - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install - rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4" - rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" + rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" + rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" } package_libsoup-gnome() { pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=${pkgver}" 'libgnome-keyring') + depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install - rm -f "${pkgdir}"/usr/lib/libsoup-2.4.* - rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc" - rm -rf "${pkgdir}/usr/include/libsoup-2.4" - rm -rf "${pkgdir}/usr/share" - rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib" + rm -f "$pkgdir"/usr/lib/libsoup-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-2.4" + rm -rf "$pkgdir/usr/share" + rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" } diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD new file mode 100644 index 000000000..794b02c55 --- /dev/null +++ b/extra/libwacom/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 156922 2012-04-23 09:09:07Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libwacom +pkgver=0.4 +pkgrel=1 +pkgdesc="Library to identify Wacom tablets and their features" +arch=('x86_64' 'i686') +depends=('glib2' 'udev') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index 315690cfc..50308481c 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 148844 2012-02-05 11:52:38Z ibiru $ +# $Id: PKGBUILD 156924 2012-04-23 09:09:10Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.6.3 -pkgrel=1 +pkgver=1.8.0 +pkgrel=2 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') -depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant') -makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3') +depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl' + 'geoclue') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') options=('!libtool' '!emptydirs') -install=libwebkit.install -source=(http://webkitgtk.org/webkit-$pkgver.tar.xz) -sha256sums=('12d0dbce6a895c7a8491a028e34a1dc55ae13ab76ac6202b2e489da9468077c3') +source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz) +sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc') build() { cd "$srcdir/webkit-$pkgver" mkdir build-gtk{2,3} + # clear makeflags: race during introspection. + # WebKit*.gir should be created before WebKit*.typelib, but isn't + MAKEFLAGS= + ( cd build-gtk2 && _build --with-gtk=2.0 ) ( cd build-gtk3 && _build --with-gtk=3.0 ) } @@ -38,7 +42,7 @@ package_libwebkit() { depends+=(gtk2) cd "$srcdir/webkit-$pkgver/build-gtk2" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" } @@ -50,3 +54,6 @@ package_libwebkit3() { make DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" } + + + diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index ff006192b..e1bd38b96 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140937 2011-10-20 05:43:59Z ibiru $ +# $Id: PKGBUILD 156926 2012-04-23 09:09:12Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.2.1 +pkgver=3.4.0 pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64') @@ -12,17 +12,17 @@ depends=('gtk3' 'startup-notification' 'libxres') makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -sha256sums=('eaba586d8e092770e45ab8a3073eb57b5386e1ea7512b5424fa558906f26a3da') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad') build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$_pkgbasename-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/libxklavier/PKGBUILD b/extra/libxklavier/PKGBUILD index baa578352..84fc4a7cf 100644 --- a/extra/libxklavier/PKGBUILD +++ b/extra/libxklavier/PKGBUILD @@ -1,28 +1,28 @@ -# $Id: PKGBUILD 151075 2012-02-24 18:04:26Z ibiru $ +# $Id: PKGBUILD 156928 2012-04-23 09:09:15Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> pkgname=libxklavier -pkgver=5.1 +pkgver=5.2.1 pkgrel=2 pkgdesc="High-level API for X Keyboard Extension" arch=(i686 x86_64) license=('LGPL') depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') -makedepends=('pkgconfig') +makedepends=('gobject-introspection') options=('!libtool' '!emptydirs') url="http://gswitchit.sourceforge.net" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --with-xkb-base=/usr/share/X11/xkb --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD index 57dc50d44..f6fbc9e9b 100644 --- a/extra/mash/PKGBUILD +++ b/extra/mash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139393 2011-10-01 19:00:18Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 157037 2012-04-23 09:53:25Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=mash -pkgver=0.1.0 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="A small library for using 3D models within a Clutter scene" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -11,8 +11,8 @@ options=('!libtool') license=('LGPL') depends=('clutter') makedepends=('gtk-doc' 'gobject-introspection') -source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('81f4b01d5661010dd742d4a82f9af4555624601ba3fb4e0780cfe2b34c13c24f') +source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD index 39f314b11..66ef94d20 100644 --- a/extra/metacity/PKGBUILD +++ b/extra/metacity/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 148852 2012-02-05 11:52:53Z ibiru $ +# $Id: PKGBUILD 156930 2012-04-23 09:09:17Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=metacity -pkgver=2.34.1 -pkgrel=2 +pkgver=2.34.3 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') -makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f144cb43925ca00d8eaac129a14df3260c54a32324b5cd0a4d78b0fd7ff1028a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/metacity/metacity.install b/extra/metacity/metacity.install index 2eb1e5094..ba0feffc1 100644 --- a/extra/metacity/metacity.install +++ b/extra/metacity/metacity.install @@ -1,17 +1,19 @@ pkgname=metacity post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_remove() { + post_install } diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index 707fb70fa..9e68b8769 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -1,8 +1,9 @@ # $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=mousetweaks -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64) @@ -14,16 +15,16 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=mousetweaks.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6c1ec6780c8dcaa1e3a6a462f7870c4c91574067a4936727a40b011d46d47734') +sha256sums=('92571119dd0ee0c74e508bb8155b7b894c5185da52753fa431bb12e9bfe10c6f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 7d0440991..5c88e297d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,36 +1,33 @@ -# $Id: PKGBUILD 149222 2012-02-06 13:47:09Z ibiru $ +# $Id: PKGBUILD 156934 2012-04-23 09:09:23Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.2.2 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') -depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') makedepends=('intltool' 'gnome-doc-utils') url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('cd5977d86a100d89cfef557c22900b6d061730e2bda66e314e4943505d2bd5a1') +sha256sums=('dbf08b014179980ab3d0cce645c5391c83b0ce070c73504feea8eec0ad000449') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ - --localstatedir=/var --disable-static + --localstatedir=/var --disable-static \ + --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain mutter "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/mutter/mutter.install b/extra/mutter/mutter.install index 199f12584..c47f1cef2 100644 --- a/extra/mutter/mutter.install +++ b/extra/mutter/mutter.install @@ -1,17 +1,19 @@ pkgname=mutter post_install() { - usr/sbin/gconfpkg --install ${pkgname} + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then + /usr/sbin/gconfpkg --uninstall $pkgname + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} +post_remove() { + post_install } diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD index e441575d8..380fe3732 100644 --- a/extra/mx/PKGBUILD +++ b/extra/mx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 152895 2012-03-10 15:57:25Z heftig $ +# $Id: PKGBUILD 156936 2012-04-23 09:09:25Z ibiru $ # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Guenther Wutz <admin@wutzara.de> pkgname=mx pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc="A widget toolkit using Clutter" arch=('i686' 'x86_64') url="http://www.clutter-project.org" diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index 059c58eda..1e785917c 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139403 2011-10-01 19:00:34Z ibiru $ +# $Id: PKGBUILD 156940 2012-04-23 09:09:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Tor Krill <tor@krill.nu> pkgname=nautilus-sendto -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Nautilus context menu for sending files." arch=('i686' 'x86_64') url="http://download.gnome.org/sources/nautilus-sendto/" @@ -15,17 +15,17 @@ depends=('evolution-data-server' 'nautilus' 'dconf') makedepends=('pidgin' 'gajim' 'gettext' 'intltool') options=('!libtool' '!emptydirs') install=nautilus-sendto.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/nautilus-sendto/nautilus-sendto.install b/extra/nautilus-sendto/nautilus-sendto.install index e5204bcab..d33a1b261 100644 --- a/extra/nautilus-sendto/nautilus-sendto.install +++ b/extra/nautilus-sendto/nautilus-sendto.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index d8a2f7351..d3df231ed 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140943 2011-10-20 05:44:06Z ibiru $ +# $Id: PKGBUILD 156938 2012-04-23 09:09:28Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64') @@ -13,11 +13,11 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('02581c9475e9c4250960555b248378a6a1c63a5c029728ec48347c78ca77392d') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nautilus \ @@ -29,6 +29,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/nautilus/nautilus.install b/extra/nautilus/nautilus.install index 631e38649..082126d24 100644 --- a/extra/nautilus/nautilus.install +++ b/extra/nautilus/nautilus.install @@ -1,14 +1,8 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime > /dev/null -} - -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall nautilus - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime > /dev/null } post_upgrade() { diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 3a719ec0e..ee37765ba 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142489 2011-11-10 19:42:01Z ibiru $ +# $Id: PKGBUILD 156942 2012-04-23 09:09:34Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,22 +6,23 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.9.2.0 +pkgver=0.9.4.1 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/NetworkManager/" -depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes') +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' + 'mobile-broadband-provider-info' 'gconf' 'iso-codes') makedepends=('intltool' 'gnome-bluetooth') optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) -sha256sums=('ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de') +sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/networkmanager \ @@ -31,7 +32,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD index 9a18dddc4..db21b131f 100644 --- a/extra/networkmanager-openconnect/PKGBUILD +++ b/extra/networkmanager-openconnect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142493 2011-11-10 19:42:06Z ibiru $ +# $Id: PKGBUILD 156946 2012-04-23 09:09:41Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openconnect -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN integration for openconnect" arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) -sha256sums=('169094ae93f982a45e4c57fa7226637eb948ae309a2a6ece88e179ce798a86c0') +sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084') build() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + cd NetworkManager-openconnect-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-openconnect-${pkgver}" + cd NetworkManager-openconnect-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD index 96053ed65..40965dce5 100644 --- a/extra/networkmanager-openvpn/PKGBUILD +++ b/extra/networkmanager-openvpn/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142495 2011-11-10 19:42:11Z ibiru $ +# $Id: PKGBUILD 156948 2012-04-23 09:09:44Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) -sha256sums=('a23705a0ece4d9c5438ca7c3905abc25a43aaf3a49cabb9ef21d043c338a2744') +sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0') build() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + cd NetworkManager-openvpn-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-openvpn-${pkgver}" + cd NetworkManager-openvpn-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD index 9e79dccf1..0ac5e5f5f 100644 --- a/extra/networkmanager-pptp/PKGBUILD +++ b/extra/networkmanager-pptp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142497 2011-11-10 19:42:13Z ibiru $ +# $Id: PKGBUILD 156950 2012-04-23 09:09:48Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) -sha256sums=('2b340db7f63d39aa781099b888d4e3352e8eaa14ec4d46154bf504262fda42ba') +sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d') build() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" + cd NetworkManager-pptp-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-pptp-${pkgver}" + cd NetworkManager-pptp-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD index e69ef38ef..fefdf35d4 100644 --- a/extra/networkmanager-vpnc/PKGBUILD +++ b/extra/networkmanager-vpnc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142499 2011-11-10 19:42:16Z ibiru $ +# $Id: PKGBUILD 156952 2012-04-23 09:09:52Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.9.2.0 +pkgver=0.9.4.0 pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') @@ -14,10 +14,10 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) -sha256sums=('d74bda9df11f4d3f0589d08c7f6247dc884de6daa1bab8d9c33636bc09752e40') +sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d') build() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + cd NetworkManager-vpnc-${pkgver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/networkmanager \ @@ -26,6 +26,6 @@ build() { } package() { - cd "${srcdir}/NetworkManager-vpnc-${pkgver}" + cd NetworkManager-vpnc-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index ae0fbd88d..8d75599c2 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152264 2012-03-06 08:15:52Z heftig $ +# $Id: PKGBUILD 156944 2012-04-23 09:09:38Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,13 +6,15 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.9.2.0 -pkgrel=3 +_pkgname=NetworkManager +pkgver=0.9.4.0 +pkgrel=2 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +url="http://www.gnome.org/projects/$_pkgname/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' + 'libsoup') makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' @@ -23,18 +25,19 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz +#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch) -sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' +sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb') build() { - cd "${srcdir}/NetworkManager-${pkgver}" + cd $_pkgname-$pkgver - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" - patch -Np1 -i "${srcdir}/dnsmasq-path.patch" + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch ./configure \ --prefix=/usr \ @@ -46,8 +49,10 @@ build() { --with-dhclient=/usr/sbin/dhclient \ --with-dhcpcd=/sbin/dhcpcd \ --with-iptables=/usr/sbin/iptables \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=ck \ + --with-wext=no \ --disable-static \ --enable-more-warnings=no \ --disable-wimax @@ -56,10 +61,10 @@ build() { } package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - rm -rf "${pkgdir}/var/run/" + rm -r "$pkgdir/var/run" } diff --git a/extra/networkmanager/systemd-fallback.patch b/extra/networkmanager/systemd-fallback.patch new file mode 100644 index 000000000..f5acc9dc6 --- /dev/null +++ b/extra/networkmanager/systemd-fallback.patch @@ -0,0 +1,470 @@ +diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac +--- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100 +@@ -344,7 +344,7 @@ + case $with_session_tracking in + ck|none) ;; + systemd) +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + ;; + *) + AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) +diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c +--- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100 +@@ -28,6 +28,10 @@ + #include <glib/gstdio.h> + #include <systemd/sd-login.h> + #include <stdlib.h> ++#include <systemd/sd-daemon.h> ++#include <sys/stat.h> ++#include <gio/gio.h> ++#include "nm-logging.h" + + #include "nm-session-utils.h" + #include "nm-session-monitor.h" +@@ -107,10 +111,20 @@ + return source; + } + ++/********************************************************************/ ++ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + struct _NMSessionMonitor { + GObject parent_instance; + + GSource *sd_source; ++ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; ++ GHashTable *sessions_by_uid; ++ GHashTable *sessions_by_user; + }; + + struct _NMSessionMonitorClass { +@@ -130,6 +144,215 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++typedef struct { ++ char *user; ++ uid_t uid; ++ gboolean local; ++ gboolean active; ++} Session; ++ ++static void ++session_free (Session *s) ++{ ++ g_free (s->user); ++ memset (s, 0, sizeof (Session)); ++ g_free (s); ++} ++ ++static gboolean ++check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) ++{ ++ if (g_key_file_has_key (keyfile, group, key, error)) ++ return TRUE; ++ ++ if (!error) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, ++ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", ++ group, key); ++ } ++ return FALSE; ++} ++ ++static Session * ++session_new (GKeyFile *keyfile, const char *group, GError **error) ++{ ++ GError *local = NULL; ++ Session *s; ++ const char *uname = NULL; ++ ++ s = g_new0 (Session, 1); ++ g_assert (s); ++ ++ s->uid = G_MAXUINT; /* paranoia */ ++ if (!check_key (keyfile, group, "uid", &local)) ++ goto error; ++ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_active", &local)) ++ goto error; ++ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_local", &local)) ++ goto error; ++ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); ++ if (local) ++ goto error; ++ ++ if (!nm_session_uid_to_user (s->uid, &uname, error)) ++ return FALSE; ++ s->user = g_strdup (uname); ++ ++ return s; ++ ++error: ++ session_free (s); ++ g_propagate_error (error, local); ++ return NULL; ++} ++ ++static void ++session_merge (Session *src, Session *dest) ++{ ++ g_return_if_fail (src != NULL); ++ g_return_if_fail (dest != NULL); ++ ++ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); ++ g_warn_if_fail (src->uid == dest->uid); ++ ++ dest->local = (dest->local || src->local); ++ dest->active = (dest->active || src->active); ++} ++ ++/********************************************************************/ ++ ++static void ++free_database (NMSessionMonitor *self) ++{ ++ if (self->database != NULL) { ++ g_key_file_free (self->database); ++ self->database = NULL; ++ } ++ ++ g_hash_table_remove_all (self->sessions_by_uid); ++ g_hash_table_remove_all (self->sessions_by_user); ++} ++ ++static gboolean ++reload_database (NMSessionMonitor *self, GError **error) ++{ ++ struct stat statbuf; ++ char **groups = NULL; ++ gsize len = 0, i; ++ Session *s; ++ ++ free_database (self); ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto error; ++ } ++ self->database_mtime = statbuf.st_mtime; ++ ++ self->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) ++ goto error; ++ ++ groups = g_key_file_get_groups (self->database, &len); ++ if (!groups) { ++ g_set_error_literal (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Could not load groups from " CKDB_PATH ""); ++ goto error; ++ } ++ ++ for (i = 0; i < len; i++) { ++ Session *found; ++ ++ if (!g_str_has_prefix (groups[i], "Session ")) ++ continue; ++ ++ s = session_new (self->database, groups[i], error); ++ if (!s) ++ goto error; ++ ++ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); ++ if (found) { ++ session_merge (s, found); ++ session_free (s); ++ } else { ++ /* Entirely new user */ ++ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); ++ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); ++ } ++ } ++ ++ g_strfreev (groups); ++ return TRUE; ++ ++error: ++ if (groups) ++ g_strfreev (groups); ++ free_database (self); ++ return FALSE; ++} ++ ++static gboolean ++ensure_database (NMSessionMonitor *self, GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (self->database != NULL) { ++ struct stat statbuf; ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ if (statbuf.st_mtime == self->database_mtime) { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (self, error); ++ ++out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor * file_monitor, ++ GFile * file, ++ GFile * other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ free_database (self); ++ ++ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); ++} ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -143,9 +366,50 @@ + static void + nm_session_monitor_init (NMSessionMonitor *monitor) + { +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted () > 0) { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ ++ monitor->database_monitor = NULL; ++ monitor->database = NULL; ++ } else { ++ monitor->sd_source = NULL; ++ ++ GError *error = NULL; ++ GFile *file; ++ ++ /* Sessions-by-user is responsible for destroying the Session objects */ ++ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, ++ NULL, (GDestroyNotify) session_free); ++ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); ++ ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) { ++ /* Ignore the first error if the CK database isn't found yet */ ++ if (g_error_matches (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { ++ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); ++ } ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) { ++ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } else { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -158,6 +422,12 @@ + g_source_unref (monitor->sd_source); + } + ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ free_database (monitor); ++ + if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); + } +@@ -206,15 +476,36 @@ + uid_t *out_uid, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; + +- if (out_uid) +- *out_uid = uid; ++ if (out_uid) ++ *out_uid = uid; + +- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } ++ ++ if (out_uid) ++ *out_uid = s->uid; ++ return TRUE; ++ } + } + + gboolean +@@ -222,12 +513,31 @@ + const char *username, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; ++ ++ return nm_session_monitor_uid_active (monitor, uid, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } + +- return nm_session_monitor_uid_active (monitor, uid, error); ++ return s->active; ++ } + } + + gboolean +@@ -236,10 +546,31 @@ + const char **out_user, + GError **error) + { +- if (!nm_session_uid_to_user (uid, out_user, error)) +- return FALSE; ++ if (monitor->sd_source != NULL) { ++ if (!nm_session_uid_to_user (uid, out_user, error)) ++ return FALSE; + +- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid %d", ++ uid); ++ return FALSE; ++ } ++ ++ if (out_user) ++ *out_user = s->user; ++ return TRUE; ++ } + } + + gboolean +@@ -247,5 +578,24 @@ + uid_t uid, + GError **error) + { +- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ if (monitor->sd_source != NULL) ++ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid '%d'", ++ uid); ++ return FALSE; ++ } ++ ++ return s->active; ++ } + } diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index 5366a6574..edecb9cff 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139410 2011-10-01 19:00:42Z ibiru $ +# $Id: PKGBUILD 156955 2012-04-23 09:09:56Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pango -pkgver=1.29.4 +pkgver=1.30.0 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2') makedepends=('gobject-introspection' 'libxt' 'gtk-doc') options=('!libtool' '!emptydirs') install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f') +sha256sums=('7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --with-included-modules=basic-fc @@ -24,6 +24,6 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 7c961ddaa..04e73d509 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149966 2012-02-11 23:31:22Z allan $ +# $Id: PKGBUILD 157026 2012-04-23 09:27:54Z ibiru $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -23,7 +23,7 @@ pkgname=('php' 'php-xsl') pkgver=5.3.10 _suhosinver=5.3.9-0.9.10 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 1021fcb3e..29d04ce3b 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154327 2012-03-26 11:27:11Z foutrelis $ +# $Id: PKGBUILD 156957 2012-04-23 09:10:00Z ibiru $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,29 +7,29 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.10.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' - 'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 - port-to-farstream-v2.patch) + port-to-farstream-v3.patch) sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' - '03ba48e0da1331a976efc28a66810be4f51599a2b8065ac449965e0aefca4482') + '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') build() { cd "$srcdir/$pkgname-$pkgver" # Apply patch for farsight -> farstream transition # http://developer.pidgin.im/ticket/14936 - #patch -Np1 -i "$srcdir/port-to-farstream-v2.patch" + patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" # The farstream patch changes configure.ac - #autoreconf -vi + autoreconf -vi # Use Python 2 sed -i 's/env python$/&2/' */plugins/*.py \ @@ -77,7 +77,7 @@ package_pidgin(){ package_libpurple(){ pkgdesc="IM library extracted from Pidgin" - depends=('farsight2' 'libsasl' 'libidn' 'dbus-glib' 'nss') + depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') optdepends=('avahi: Bonjour protocol support' 'dbus-python: for purple-remote and purple-url-handler') diff --git a/extra/pidgin/port-to-farstream-v3.patch b/extra/pidgin/port-to-farstream-v3.patch new file mode 100644 index 000000000..93e29af50 --- /dev/null +++ b/extra/pidgin/port-to-farstream-v3.patch @@ -0,0 +1,447 @@ +diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac +--- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 ++++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 +@@ -780,18 +780,18 @@ else + fi + + dnl ####################################################################### +-dnl # Check for Farsight ++dnl # Check for Farstream + dnl ####################################################################### +-AC_ARG_ENABLE(farsight, +- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], +- enable_farsight="$enableval", enable_farsight="yes") +-if test "x$enable_farsight" != "xno"; then +- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ +- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) +- AC_SUBST(FARSIGHT_CFLAGS) +- AC_SUBST(FARSIGHT_LIBS) ++AC_ARG_ENABLE(farstream, ++ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], ++ enable_farstream="$enableval", enable_farstream="yes") ++if test "x$enable_farstream" != "xno"; then ++ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ ++ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) ++ AC_SUBST(FARSTREAM_CFLAGS) ++ AC_SUBST(FARSTREAM_LIBS) + ], [ +- enable_farsight="no" ++ enable_farstream="no" + ]) + fi + +@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, + [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], + enable_vv="$enableval", enable_vv="yes") + if test "x$enable_vv" != "xno"; then +- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then ++ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + if test "x$force_deps" = "xyes"; then + AC_MSG_ERROR([ + Dependencies for voice/video were not met. +-Install the necessary gstreamer and farsight packages first. ++Install the necessary gstreamer and farstream packages first. + Or use --disable-vv if you do not need voice/video support. + ]) + fi + fi + fi +-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") ++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") + + dnl ####################################################################### + dnl # Check for Internationalized Domain Name support +diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am +--- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 +@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ + $(LIBXML_LIBS) \ + $(NETWORKMANAGER_LIBS) \ + $(INTLLIBS) \ +- $(FARSIGHT_LIBS) \ ++ $(FARSTREAM_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(IDN_LIBS) \ +@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ + $(DEBUG_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBXML_CFLAGS) \ +- $(FARSIGHT_CFLAGS) \ ++ $(FARSTREAM_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ + $(IDN_CFLAGS) \ +diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c +--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /** +- * @file backend-fs2.c Farsight 2 backend for media API ++ * @file backend-fs2.c Farstream backend for media API + * @ingroup core + */ + +@@ -34,8 +34,9 @@ + #include "network.h" + #include "media-gst.h" + +-#include <gst/farsight/fs-conference-iface.h> +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-conference.h> ++#include <farstream/fs-element-added-notifier.h> ++#include <farstream/fs-utils.h> + + /** @copydoc _PurpleMediaBackendFs2Class */ + typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; +@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream + gchar *participant; + FsStream *stream; + ++ gboolean supports_add; ++ + GstElement *src; + GstElement *tee; + GstElement *volume; +@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private + FsConference *conference; + gchar *conference_type; + ++ FsElementAddedNotifier *notifier; ++ + GHashTable *sessions; + GHashTable *participants; + +@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject + + purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); + ++ if (priv->notifier) { ++ g_object_unref(priv->notifier); ++ priv->notifier = NULL; ++ } ++ + if (priv->confbin) { + GstElement *pipeline; + +@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, + priv->conference != FS_CONFERENCE(src)) + return; + +- if (gst_structure_has_name(msg->structure, "farsight-error")) { ++ if (gst_structure_has_name(msg->structure, "farstream-error")) { + FsError error_no; + gst_structure_get_enum(msg->structure, "error-no", + FS_TYPE_ERROR, (gint*)&error_no); +@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, + " strict.")); + purple_media_end(priv->media, NULL, NULL); + break; +- case FS_ERROR_UNKNOWN_CNAME: +- /* +- * Unknown CName is only a problem for the +- * multicast transmitter which isn't used. +- * It is also deprecated. +- */ +- break; + default: + purple_debug_error("backend-fs2", +- "farsight-error: %i: %s\n", ++ "farstream-error: %i: %s\n", + error_no, + gst_structure_get_string( + msg->structure, "error-msg")); +@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, + + if (FS_ERROR_IS_FATAL(error_no)) { + purple_media_error(priv->media, _("A non-recoverable " +- "Farsight2 error has occurred.")); ++ "Farstream error has occurred.")); + purple_media_end(priv->media, NULL, NULL); + } + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-local-candidate")) { ++ "farstream-new-local-candidate")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, + session->id, name, candidate); + g_object_unref(candidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-local-candidates-prepared")) { ++ "farstream-local-candidates-prepared")) { + const GValue *value; + FsStream *stream; + FsParticipant *participant; +@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, + g_signal_emit_by_name(self, "candidates-prepared", + session->id, name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-active-candidate-pair")) { ++ "farstream-new-active-candidate-pair")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, + g_object_unref(lcandidate); + g_object_unref(rcandidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-recv-codecs-changed")) { ++ "farstream-recv-codecs-changed")) { + const GValue *value; + GList *codecs; + FsCodec *codec; +@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, + codec = codecs->data; + + purple_debug_info("backend-fs2", +- "farsight-recv-codecs-changed: %s\n", ++ "farstream-recv-codecs-changed: %s\n", + codec->encoding_name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-component-state-changed")) { ++ "farstream-component-state-changed")) { + const GValue *value; + FsStreamState fsstate; + guint component; +@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, + } + + purple_debug_info("backend-fs2", +- "farsight-component-state-changed: " ++ "farstream-component-state-changed: " + "component: %u state: %s\n", + component, state); + } else if (gst_structure_has_name(msg->structure, +- "farsight-send-codec-changed")) { ++ "farstream-send-codec-changed")) { + const GValue *value; + FsCodec *codec; + gchar *codec_str; +@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, + codec_str = fs_codec_to_string(codec); + + purple_debug_info("backend-fs2", +- "farsight-send-codec-changed: codec: %s\n", ++ "farstream-send-codec-changed: codec: %s\n", + codec_str); + + g_free(codec_str); + } else if (gst_structure_has_name(msg->structure, +- "farsight-codecs-changed")) { ++ "farstream-codecs-changed")) { + const GValue *value; + FsSession *fssession; + GList *sessions; +@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl + purple_media_is_initiator(media, sid, name)) + return; + +- fs_stream_set_remote_candidates(stream->stream, +- stream->remote_candidates, &err); ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); + + if (err == NULL) + return; +@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s + GstElement *pipeline; + GstBus *bus; + gchar *name; ++ GKeyFile *default_props; + + priv->conference = FS_CONFERENCE( + gst_element_factory_make(priv->conference_type, NULL)); +@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s + return FALSE; + } + ++ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); ++ if (default_props != NULL) { ++ priv->notifier = fs_element_added_notifier_new(); ++ fs_element_added_notifier_add(priv->notifier, ++ GST_BIN(priv->confbin)); ++ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); ++ } ++ + g_signal_connect(G_OBJECT(bus), "message", + G_CALLBACK(gst_bus_cb), self); + gst_object_unref(bus); +@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se + * receiving the src-pad-added signal. + * Only works for non-multicast FsRtpSessions. + */ +- if (is_nice || !strcmp(transmitter, "rawudp")) ++ if (!!strcmp(transmitter, "multicast")) + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 + GError *err = NULL; + + participant = fs_conference_new_participant( +- priv->conference, name, &err); ++ priv->conference, &err); + + if (err) { + purple_debug_error("backend-fs2", +@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 + return FALSE; + } + ++ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), ++ "cname")) { ++ g_object_set(participant, "cname", name, NULL); ++ } ++ ++ + if (!priv->participants) { + purple_debug_info("backend-fs2", + "Creating hash table for participants\n"); +@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel + } + } + ++ ++ session = get_session(self, sess_id); ++ ++ if (session == NULL) { ++ purple_debug_error("backend-fs2", ++ "Couldn't find session to create stream.\n"); ++ return FALSE; ++ } ++ ++ participant = get_participant(self, who); ++ ++ if (participant == NULL) { ++ purple_debug_error("backend-fs2", "Couldn't find " ++ "participant to create stream.\n"); ++ return FALSE; ++ } ++ ++ fsstream = fs_session_new_stream(session->session, participant, ++ initiator == TRUE ? type_direction : ++ (type_direction & FS_DIRECTION_RECV), &err); ++ ++ if (fsstream == NULL) { ++ if (err) { ++ purple_debug_error("backend-fs2", ++ "Error creating stream: %s\n", ++ err && err->message ? ++ err->message : "NULL"); ++ g_error_free(err); ++ } else ++ purple_debug_error("backend-fs2", ++ "Error creating stream\n"); ++ return FALSE; ++ } ++ + memcpy(_params, params, sizeof(GParameter) * num_params); + + /* set the controlling mode parameter */ +@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel + _num_params++; + } + +- session = get_session(self, sess_id); + +- if (session == NULL) { +- purple_debug_error("backend-fs2", +- "Couldn't find session to create stream.\n"); +- return FALSE; +- } +- +- participant = get_participant(self, who); +- +- if (participant == NULL) { +- purple_debug_error("backend-fs2", "Couldn't find " +- "participant to create stream.\n"); +- return FALSE; ++ if(!fs_stream_set_transmitter(fsstream, transmitter, ++ _params, _num_params, &err)) { ++ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); ++ g_clear_error(&err); ++ g_free(_params); ++ return FALSE; + } +- +- fsstream = fs_session_new_stream(session->session, participant, +- initiator == TRUE ? type_direction : +- (type_direction & FS_DIRECTION_RECV), transmitter, +- _num_params, _params, &err); + g_free(_params); + +- if (fsstream == NULL) { +- if (err) { +- purple_debug_error("backend-fs2", +- "Error creating stream: %s\n", +- err && err->message ? +- err->message : "NULL"); +- g_error_free(err); +- } else +- purple_debug_error("backend-fs2", +- "Error creating stream\n"); +- return FALSE; +- } + + stream = g_new0(PurpleMediaBackendFs2Stream, 1); + stream->participant = g_strdup(who); + stream->session = session; + stream->stream = fsstream; ++ stream->supports_add = !strcmp(transmitter, "nice"); + + priv->streams = g_list_append(priv->streams, stream); + +@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand + if (purple_media_is_initiator(priv->media, sess_id, participant) || + purple_media_accepted( + priv->media, sess_id, participant)) { +- fs_stream_set_remote_candidates(stream->stream, ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, + stream->remote_candidates, &err); + + if (err) { +diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c +--- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med + { + #ifdef USE_VV + PurpleMediaSession *session; +- PurpleMediaStream *stream = NULL; + + g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); + +@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med + } + + if (purple_media_get_stream(media, sess_id, who) == NULL) { +- stream = purple_media_insert_stream(session, who, initiator); ++ purple_media_insert_stream(session, who, initiator); + + g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_NEW, +diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c +--- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 +@@ -39,7 +39,7 @@ + #ifdef USE_VV + #include <media/backend-fs2.h> + +-#include <gst/farsight/fs-element-added-notifier.h> ++#include <farstream/fs-element-added-notifier.h> + #include <gst/interfaces/xoverlay.h> + + /** @copydoc _PurpleMediaManagerPrivate */ diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 30d565001..43ed3a9b5 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 145056 2011-12-15 22:17:57Z ibiru $ +# $Id: PKGBUILD 156960 2012-04-23 09:10:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.0.3 +pkgver=3.2.0 pkgrel=1 arch=('i686' 'x86_64') url="https://live.gnome.org/PyGObject" @@ -11,10 +11,9 @@ license=('LGPL') makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('088b1e682be02a969a0a3f2e650e4fe72bb3638ee8229819841d3e8f4cde2d7c') +sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3') build() { - cd "$srcdir" cp -a "$pkgbase-$pkgver" python2-build mkdir devel @@ -36,7 +35,7 @@ package_python-gobject() { pkgdesc="Python 3 bindings for GObject" depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make DESTDIR="$pkgdir" install rm -r "$pkgdir"/usr/{include,lib/pkgconfig} } @@ -45,14 +44,14 @@ package_python2-gobject() { pkgdesc="Python 2 bindings for GObject" depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - cd "$srcdir/python2-build" + cd "python2-build" make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" } package_pygobject-devel() { pkgdesc="Development files for the pygobject bindings" - cd "$srcdir/devel" + cd "devel" mkdir -p "$pkgdir"/usr/{include,lib} mv include "$pkgdir/usr/" mv pkgconfig "$pkgdir/usr/lib/" diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index c6900aee8..961522e87 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154325 2012-03-26 11:01:20Z tomegun $ +# $Id: PKGBUILD 157028 2012-04-23 09:28:03Z ibiru $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> @@ -6,7 +6,7 @@ pkgname=raptor pkgver=2.0.7 -pkgrel=1 +pkgrel=2 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 35eb90993..1853ae971 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 146665 2012-01-15 21:21:39Z ibiru $ +# $Id: PKGBUILD 156962 2012-04-23 09:10:07Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.95 -pkgrel=1 +pkgver=2.96 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64') license=('GPL') url="http://www.rhythmbox.org" depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3' - 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser') + 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb') makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,10 +19,10 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs') install=rhythmbox.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('12cab95c89514b5c01a2daf9d6bdf74c8652b35e49625e2906d51b487bc68c06') +sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ @@ -32,7 +32,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/rhythmbox/rhythmbox.install b/extra/rhythmbox/rhythmbox.install index cbea0e6b3..e02ee2c16 100644 --- a/extra/rhythmbox/rhythmbox.install +++ b/extra/rhythmbox/rhythmbox.install @@ -1,22 +1,13 @@ -pkgname=rhythmbox - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor } post_upgrade() { - post_install $1 + post_install } - post_remove() { - post_install $1 + post_install } diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 9d569b19e..429c9b70a 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156964 2012-04-23 09:10:10Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.2.2 -pkgrel=2 +pkgver=3.4.1 +pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) license=('GPL') url="http://projects.gnome.org/seahorse/" -depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') +depends=('gtk3' 'gcr' 'libgnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('libldap' 'intltool' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') optdepends=('openssh: SSH support') provides=('x11-ssh-askpass') options=('!libtool' '!emptydirs') @@ -18,22 +19,20 @@ groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' +sha256sums=('841443ed6d7f865e1c9347867527591287bcc5b2e281c8da11b2cb355d678faa' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-ldap --enable-hkp \ - --disable-scrollkeeper \ - --disable-update-mime-database \ --disable-schemas-compile make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" diff --git a/extra/seahorse/seahorse.install b/extra/seahorse/seahorse.install index 9a98d52e0..1571179ca 100644 --- a/extra/seahorse/seahorse.install +++ b/extra/seahorse/seahorse.install @@ -1,15 +1,7 @@ -pkgname=seahorse - post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then - usr/sbin/gconfpkg --uninstall $pkgname - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD index e7be7905d..438630e95 100644 --- a/extra/sound-juicer/PKGBUILD +++ b/extra/sound-juicer/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 151078 2012-02-24 18:18:27Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributer: Ben <contrasutra@myrealbox.com> +# $Id: PKGBUILD 156966 2012-04-23 09:10:13Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Ben <contrasutra@myrealbox.com> pkgname=sound-juicer -pkgver=2.32.1 -pkgrel=2 +pkgver=3.4.0 +pkgrel=1 pkgdesc="A cd ripper application" arch=(i686 x86_64) license=('GPL') -depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc') +depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') options=(!emptydirs) -#source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110501.tar.xz) +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) groups=('gnome-extra') install=sound-juicer.install -url="http://www.burtonini.com/blog/computers/sound-juicer" -sha256sums=('e4312ebf75c8798dd3f7a9d2d9ee7291b593bd68c7b0559742b91ca7a52674fe') +sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-scrollkeeper make } diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index 721620a38..4c12fd746 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 140953 2011-10-20 05:44:16Z ibiru $ +# $Id: PKGBUILD 156968 2012-04-23 09:10:15Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=sushi -pkgver=0.2.1 +pkgver=0.4.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) @@ -12,17 +12,17 @@ groups=(gnome-extra) depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince') makedepends=('intltool' 'gobject-introspection') options=(!libtool) -source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz) -sha256sums=('b18d166a52738bceeca178318212ef4bd6a5562122f105df40bcd436621cbdb1') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7889e4309443dd7dfd5c9546af23565d15813c3f8f2af6c6776702ca8911a7bd') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --libexecdir=/usr/lib/sushi make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD index a4354dac5..bb91b1e81 100644 --- a/extra/telepathy-farstream/PKGBUILD +++ b/extra/telepathy-farstream/PKGBUILD @@ -1,21 +1,23 @@ -# $Id: PKGBUILD 142940 2011-11-18 18:23:32Z ibiru $ +# $Id: PKGBUILD 156970 2012-04-23 09:10:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-farstream -pkgver=0.1.2 +pkgver=0.4.0 pkgrel=1 pkgdesc="A telepathy-backend to use stream engine." arch=(i686 x86_64) url="http://telepathy.freedesktop.org" license=('LGPL2.1') -depends=('telepathy-glib' 'farsight2') -makedepends=('libxslt' 'python2') +depends=('telepathy-glib' 'farstream') +makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('telepathy-farsight') +replaces=('telepathy-farsight') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('f858fc02e1981bb8ccd29c2bed567e50') +md5sums=('52d110f8a9f27bce0a6c2c07e18aee56') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -25,7 +27,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD index 19294d97f..bd0c6c8f0 100644 --- a/extra/telepathy-gabble/PKGBUILD +++ b/extra/telepathy-gabble/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 143507 2011-11-25 10:37:09Z ibiru $ +# $Id: PKGBUILD 156972 2012-04-23 09:10:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.14.1 +pkgver=0.16.0 pkgrel=1 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') @@ -12,19 +12,20 @@ groups=('telepathy') license=('LGPL2.1') depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') makedepends=('libxslt' 'python2') -options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/$pkgname-$pkgver.tar.gz) +options=('!libtool' '!emptydirs') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) install=telepathy-gabble.install -md5sums=('f6dfcd3da49eb6a558085fc917cdbdd4') +md5sums=('15b15fb58a3c54102c3e3489b4bd5ee0') build() { - cd $srcdir/$pkgname-$pkgver + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy --with-tls=openssl make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" } diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index 50899f7a9..3839d4a34 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145052 2011-12-15 21:38:17Z ibiru $ +# $Id: PKGBUILD 156974 2012-04-23 09:10:23Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.16.4 +pkgver=0.18.1 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -13,11 +13,11 @@ license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') -source=("http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('8335f83117323d2c1b8b012c233b7e4e') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('461732739e3fbf8467991bbe661fb29a') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-vala-bindings \ @@ -26,6 +26,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD index d2bce6be0..beffbe5da 100644 --- a/extra/telepathy-haze/PKGBUILD +++ b/extra/telepathy-haze/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 131178 2011-07-11 14:00:11Z ibiru $ +# $Id: PKGBUILD 157068 2012-04-23 12:17:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=telepathy-haze -pkgver=0.5.0 -pkgrel=1 +pkgver=0.6.0 +pkgrel=2 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" license=('GPL') depends=('telepathy-glib' 'libpurple') -makedepends=('libxslt') +makedepends=('libxslt' 'python2') +replaces=('telepathy-butterfly') install=telepathy-haze.install groups=('telepathy') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('4378726d61e1e5df789a05760a94d172') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('622e0b2f7ff4050a29f907f2ef0f039c') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy make } package(){ - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 0a0cb7a0c..7ab3b68c1 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 143877 2011-11-30 08:41:16Z andrea $ +# $Id: PKGBUILD 157039 2012-04-23 09:53:28Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-accounts-kcm -pkgver=0.2.0 -pkgrel=2 +_pkgname=ktp-accounts-kcm +pkgver=0.3.1 +pkgrel=1 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-mission-control' 'telepathy-kde-contact-list' - 'telepathy-kde-auth-handler' 'telepathy-kde-integration-module' 'telepathy-kde-approver' - 'telepathy-kde-filetransfer-handler') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support' 'telepathy-haze: all protocols supported by libpurple') -groups=('telepathy-kde') +groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('2ebc4ac117a3e28e2812a2a9c97f7d0ee97dac67') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('290daae2530a0bb8473fbb5239a039766776c831') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index a6ef75257..0c2782e25 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143563 2011-11-26 13:58:28Z andrea $ +# $Id: PKGBUILD 157041 2012-04-23 09:53:31Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-approver -pkgver=0.2.0 +_pkgname=ktp-approver +pkgver=0.3.1 pkgrel=1 pkgdesc="KDE Channel Approver for Telepathy" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4' 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('6488f3119a19c38fc72e0afe3007a49394f36b13') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('156418a7f194a1df8f50fe6f8b371adac067f840') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index f74689855..74f1d7a27 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143577 2011-11-26 14:06:41Z andrea $ +# $Id: PKGBUILD 157043 2012-04-23 09:53:33Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler -pkgver=0.2.0 +_pkgname=ktp-auth-handler +pkgver=0.3.1 pkgrel=1 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f482134e041541a5d45ff14b9dc6a1fb2db9520c') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('153ddfd1c19c4a6719993df27357c70f18700f88') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD new file mode 100644 index 000000000..3d86f181d --- /dev/null +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 157059 2012-04-23 09:55:28Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=telepathy-kde-common-internals +_pkgname=ktp-common-internals +pkgver=0.3.1 +pkgrel=2 +pkgdesc="Common components for KDE-Telepathy" +arch=('i686' 'x86_64') +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" +license=('GPL') +depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f68c4587377fde7e2bd0e7201b30219f8aa7ce84') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD index 4e8e4421c..0e52c568e 100644 --- a/extra/telepathy-kde-contact-applet/PKGBUILD +++ b/extra/telepathy-kde-contact-applet/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143578 2011-11-26 14:07:09Z andrea $ +# $Id: PKGBUILD 157045 2012-04-23 09:53:35Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-applet -pkgver=0.2.0 +_pkgname=ktp-contact-applet +pkgver=0.3.1 pkgrel=1 -pkgdesc="The kde-telepathy contact plasmoid" +pkgdesc="The KDE-Telepathy contact plasmoid" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('b1e2ad706deccd6ca4d745828a8b54fd87bc2066') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f0eba19beaa97029e3012047108c27710d3a9a63') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index f8157097c..ffc1e46d8 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 143879 2011-11-30 08:42:07Z andrea $ +# $Id: PKGBUILD 157047 2012-04-23 09:53:38Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-contact-list -pkgver=0.2.0 -pkgrel=2 +_pkgname=ktp-contact-list +pkgver=0.3.1 +pkgrel=1 pkgdesc="Telepathy contact list application" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-text-ui' 'telepathy-kde-send-file') +depends=('telepathy-kde-common-internals' 'kdebase-runtime') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') +groups=('kde-telepathy') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('7ec01e08d991123db9c2ce17d6350d8dd835793f') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('5126abb03184da209b8745afb6ee0ab70a24536e') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index 45beddc20..988ee6d06 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143567 2011-11-26 13:59:37Z andrea $ +# $Id: PKGBUILD 157049 2012-04-23 09:53:40Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler -pkgver=0.2.0 +_pkgname=ktp-filetransfer-handler +pkgver=0.3.1 pkgrel=1 pkgdesc="Telepathy file transfer handler" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('25c52485cb5653fa79d0eb9724b494803a8f0ad9') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('16c677416bf2c3ac8f99cdb6da10140af9252b3b') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index d844d3350..c6cfb7dc2 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 143579 2011-11-26 14:07:39Z andrea $ +# $Id: PKGBUILD 157051 2012-04-23 09:53:43Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module -pkgver=0.2.0 +_pkgname=ktp-kded-integration-module +pkgver=0.3.1 pkgrel=1 -pkgdesc="Provide several plugins for the Telepathy KDE suite" +pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdelibs' 'telepathy-qt4') +depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('5ad3e5786707b624a0f785c6891ed6de4a5d79c7') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('f5c9cd6ddd300ae824d63e7a69ae5ae4c7c4da20') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD new file mode 100644 index 000000000..02b922435 --- /dev/null +++ b/extra/telepathy-kde-presence-applet/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 157053 2012-04-23 09:53:45Z ibiru $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Laurent Carlier <lordheavym@gmail.com> + +pkgname=telepathy-kde-presence-applet +_pkgname=ktp-presence-applet +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Plasma applet for managing your Telepathy account presence" +arch=('i686' 'x86_64') +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" +license=('GPL') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') +makedepends=('cmake' 'automoc4') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('b15b66dd0783fefb9df2acaedb242c9008cb688b') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index 949597c5d..d35d74b58 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143573 2011-11-26 14:01:08Z andrea $ +# $Id: PKGBUILD 157055 2012-04-23 09:53:48Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file -pkgver=0.2.0 +_pkgname=ktp-send-file +pkgver=0.3.1 pkgrel=1 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') +groups=('kde-telepathy') install=${pkgname}.install -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d6cdd99b6feef58f81c2c0c39325954c239deb2d') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('ce523b929c05df3149e3e674ba3bc4f61658aac3') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 2e69f7a5f..f5b831287 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 143575 2011-11-26 14:01:45Z andrea $ +# $Id: PKGBUILD 157057 2012-04-23 09:53:50Z ibiru $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> pkgname=telepathy-kde-text-ui -pkgver=0.2.0 +_pkgname=ktp-text-ui +pkgver=0.3.1 pkgrel=1 -pkgdesc="Telepathy text chat handler" +pkgdesc="Telepathy handler for Text Chats" arch=('i686' 'x86_64') -url="http://www.kde.org" +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" license=('GPL') -depends=('kdebase-runtime' 'telepathy-qt4' 'telepathy-kde-contact-list') +depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') -groups=('telepathy-kde') -source=("http://download.kde.org/unstable/telepathy-kde/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('fb7c5dc02bb9d150d0e372c3584f50670d620f4a') +groups=('kde-telepathy') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('78741579fa62d5beca6ff87f074a3821c02d1f15') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${_pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD index 5938b8311..fdf5ebb17 100644 --- a/extra/telepathy-logger/PKGBUILD +++ b/extra/telepathy-logger/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 141683 2011-11-02 09:28:54Z ibiru $ +# $Id: PKGBUILD 156978 2012-04-23 09:10:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=telepathy-logger -pkgver=0.2.12 +pkgver=0.4.0 pkgrel=1 pkgdesc="Telepathy framework logging daemon" arch=(i686 x86_64) @@ -10,11 +10,12 @@ license=('LGPL2.1') depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection') options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('102a622855a3e20a191b0812ae7c9b8e') +install=telepathy-logger.install +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('0b891b860c7f3a01926f5cc22fd26120') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -27,7 +28,7 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/extra/telepathy-logger/telepathy-logger.install b/extra/telepathy-logger/telepathy-logger.install index 8fd591f55..56fb6a232 100644 --- a/extra/telepathy-logger/telepathy-logger.install +++ b/extra/telepathy-logger/telepathy-logger.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas } post_upgrade() { diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index be3daa482..d7cba23ca 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 142335 2011-11-08 15:59:21Z ibiru $ +# $Id: PKGBUILD 156980 2012-04-23 09:10:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> + pkgname=telepathy-mission-control -pkgver=5.10.1 +pkgver=5.12.0 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org/wiki/Mission Control" license=('LGPL2.1') -depends=('telepathy-glib' 'libgnome-keyring') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf') makedepends=('libxslt' 'python2') install=telepathy-mission-control.install options=('!libtool') -source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('50594028ebb2dba0181fec99e6f56ff5') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f39dcfef785a37dc21efa9af06be2e61') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-gnome-keyring \ @@ -27,6 +28,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD new file mode 100644 index 000000000..18ffc0fba --- /dev/null +++ b/extra/telepathy-qt/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 156982 2012-04-23 09:10:33Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=telepathy-qt +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A library for Qt-based Telepathy clients" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/" +license=('LGPL') +options=('!libtool') +depends=('qt' 'telepathy-farstream') +makedepends=('libxslt' 'python2' 'cmake' 'doxygen') +conflicts=('telepathy-qt4') +replaces=('telepathy-qt4') +provides=('telepathy-qt4') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gcc47.patch') +md5sums=('e0e6c1a987bbeae44c778344a2cc9d80' + '32aa8eb06c76cb03af5ced27a674ebfb') + +build() { + cd "$srcdir" + patch -Np0 -i gcc47.patch + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} diff --git a/extra/telepathy-qt/gcc47.patch b/extra/telepathy-qt/gcc47.patch new file mode 100644 index 000000000..ac6ae67fb --- /dev/null +++ b/extra/telepathy-qt/gcc47.patch @@ -0,0 +1,36 @@ +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp 2012-04-01 17:44:00.013466055 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -39,6 +39,8 @@ + #include <TelepathyQt/MethodInvocationContext> + #include <TelepathyQt/PendingComposite> + #include <TelepathyQt/PendingReady> ++ ++#include <stdint.h> + + namespace Tp + { +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:44:00.006799442 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include <QAbstractSocket> + #include <QHash> + ++#include <stdint.h> ++ + namespace Tp + { + +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:44:00.003466134 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include <TelepathyQt/OutgoingStreamTubeChannel> + #include <TelepathyQt/StreamTubeChannel> + ++#include <stdint.h> ++ + namespace Tp + { + diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index 4de770ea2..b28012cc6 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 140754 2011-10-18 17:03:04Z ibiru $ +# $Id: PKGBUILD 156984 2012-04-23 09:10:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> pkgname=telepathy-salut -pkgver=0.6.0 +pkgver=0.8.0 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" groups=('telepathy') license=('LGPL') -depends=('telepathy-glib' 'avahi' 'libsoup') +depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3') makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install -source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('a0df48e6c2e137a928f8f39655b8dc26') +options=(!libtool) +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('43639c23de33e8466540de02816d23bf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$pkgname-$pkgver" ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --disable-plugins --disable-Werror \ - --with-tls=openssl + --with-tls=openssl \ + --enable-avahi-tests=no \ + --enable-static=no make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index 1602e2ca0..2394aee06 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 142896 2011-11-17 18:35:10Z ibiru $ +# $Id: PKGBUILD 156986 2012-04-23 09:10:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.8.3 +pkgver=1.10.1 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64') @@ -13,25 +13,25 @@ makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') options=('!libtool' '!emptydirs' '!makeflags') groups=('gnome-extra') install=tomboy.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz) -sha256sums=('3f704bac772a54cf668aca769c766bc1fb9ebc8823a903ef108927805c020bea') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('85bc277b278fe6aaa38fc0ec8b1777804ea0de647111a5065d43614d1ad10077') build() { export MONO_SHARED_DIR="$srcdir/.wabi" mkdir -p "$MONO_SHARED_DIR" - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper \ + --localstatedir=/var \ --disable-update-mimedb make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain tomboy "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas } diff --git a/extra/tomboy/tomboy.install b/extra/tomboy/tomboy.install index f8e2e4a07..84e225486 100644 --- a/extra/tomboy/tomboy.install +++ b/extra/tomboy/tomboy.install @@ -1,10 +1,10 @@ pkgname=tomboy post_install() { - usr/sbin/gconfpkg --install ${pkgname} + gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime } pre_upgrade() { @@ -16,10 +16,10 @@ post_upgrade() { } pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} + gconfpkg --uninstall ${pkgname} } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime } diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 18feb7958..096035720 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 146713 2012-01-16 19:49:27Z dreisner $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156990 2012-04-23 09:10:44Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=totem-plparser -pkgver=2.32.6 -pkgrel=3 -url="http://www.hadess.net/totem.php3" +pkgver=3.4.1 +pkgrel=1 +url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') arch=(i686 x86_64) -depends=('gmime' 'libsoup-gnome' 'libarchive') +depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi') makedepends=('intltool' 'gobject-introspection') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('8e6ccef547f1ad311474a975032d2482e621550ee3d4d22c725cdc6b496e4874') +source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) +sha256sums=('00b5b6c7a7a3679a1e4b03146eab71cb387a71f5c0c8c16a7c24697b9f56a192') build() { - cd "$srcdir/totem-pl-parser-$pkgver" + cd totem-pl-parser-$pkgver ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -24,6 +25,6 @@ build() { } package(){ - cd "$srcdir/totem-pl-parser-$pkgver" + cd totem-pl-parser-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index c164aa418..a1b0891b4 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 150691 2012-02-20 11:01:31Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 156988 2012-04-23 09:10:41Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A GNOME3 integrated movie player based on Gstreamer." url="http://www.gnome.org" @@ -12,15 +13,17 @@ license=('GPL2' 'custom') depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst' - 'clutter-gtk' 'mx') -makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'lirc-utils' + 'clutter-gtk' 'mx' 'python2-gobject' 'pylint') +makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils' 'libepc' 'bluez' 'vala' 'grilo') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('b065e486e6b70b27d3a589e70c5459ff16a7affeff0b219ead5942585d4d0c9a') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + browser-plugins.ini) +sha256sums=('eadf138068c2e31bf8fe31b3d63536cb0fe32f834fcf4fbfb453a3fff5eec7ef' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/totem \ @@ -44,11 +47,11 @@ package_totem() { 'grilo-plugins: Browse sidebar (remote media)' 'pyxdg: opensubtitles plugin') - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make DESTDIR="${pkgdir}" install rm -r "$pkgdir/usr/lib/mozilla" - rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer" + rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py} @@ -59,12 +62,15 @@ package_totem() { package_totem-plugin() { pkgdesc="Totem plugin for web browsers" depends=("totem=$pkgver") + backup=(etc/totem/browser-plugins.ini) - cd "$srcdir/$pkgbase-$pkgver" + cd "$pkgbase-$pkgver" make -C browser-plugin \ plugindir=/usr/lib/mozilla/plugins \ xptdir=/usr/lib/mozilla/plugins \ DESTDIR="$pkgdir" install + + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" } diff --git a/extra/totem/browser-plugins.ini b/extra/totem/browser-plugins.ini new file mode 100644 index 000000000..cf3014997 --- /dev/null +++ b/extra/totem/browser-plugins.ini @@ -0,0 +1,2 @@ +[Plugins] +application/x-shockwave-flash.disabled=true diff --git a/extra/totem/totem.install b/extra/totem/totem.install index 07cb42dcb..7f0fc704b 100644 --- a/extra/totem/totem.install +++ b/extra/totem/totem.install @@ -1,13 +1,7 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.91) < 0 )); then - usr/sbin/gconfpkg --uninstall totem - fi + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor } post_upgrade() { diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 91d317fb2..099481254 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 150242 2012-02-15 16:56:51Z heftig $ +# $Id: PKGBUILD 156992 2012-04-23 09:10:47Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.10 +pkgver=0.14.0 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=3 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') @@ -19,10 +19,10 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('42722831fdde63cfa07e4f0bb75805425c09b1f1801d3d5280de8be37a357b69') +sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4') build() { - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver ./configure \ --prefix=/usr \ @@ -53,7 +53,7 @@ package_tracker() { groups=('gnome-extra') install=tracker.install - cd "$srcdir/$pkgbase-$pkgver" + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install ### Split libtracker-sparql @@ -78,7 +78,7 @@ package_tracker() { package_libtracker-sparql() { pkgdesc="$pkgdesc (SPARQL library)" - depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') mv "$srcdir"/sparql/* "$pkgdir" } diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD new file mode 100644 index 000000000..5b2177e49 --- /dev/null +++ b/extra/udisks2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 156994 2012-04-23 09:10:49Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=udisks2 +pkgver=1.94.0 +pkgrel=1 +pkgdesc="Disk Management Service, version 2" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL2') +depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +optdepends=('parted: partition management' + 'gptfdisk: GUID partition table support') +options=(!libtool) +source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) +sha256sums=('e58193c2f2f4fba030b6dd684708352b1eccf6826843e42899a26fef4249b0bc') + +build() { + cd "udisks-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "udisks-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index 5fbf6a990..ff6c90c87 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148412 2012-01-31 15:56:29Z ibiru $ +# $Id: PKGBUILD 156996 2012-04-23 09:10:51Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> pkgname=vala -pkgver=0.14.2 +pkgver=0.16.0 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('LGPL') depends=('glib2') makedepends=('libxslt') options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.14/$pkgname-$pkgver.tar.xz) -sha256sums=('807e6978484f66cab3cf4fefd72f37a4293d2831d7a5fd29119bdf9d38a5b3d0') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index c25b490eb..5b33a9b9d 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 156998 2012-04-23 09:10:54Z ibiru $ +# 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=vinagre -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') @@ -14,24 +15,20 @@ install=vinagre.install depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') optdepends=('openssh: SSH plugin' 'rdesktop: RDP plugin') -makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') +makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') +sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f') build() { - cd "$srcdir/$pkgname-$pkgver" - - #building with as-needed breaks rdp - #https://bugzilla.gnome.org/show_bug.cgi?id=653558 - export LDFLAGS="$LDFLAGS,--no-as-needed" - ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/vinagre/vinagre.install b/extra/vinagre/vinagre.install index 68158ac80..4998e6e8b 100644 --- a/extra/vinagre/vinagre.install +++ b/extra/vinagre/vinagre.install @@ -1,16 +1,10 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-mime-database usr/share/mime > /dev/null } -pre_upgrade() { - if (( $(vercmp $2 2.91.91-2) < 0 )); then - usr/sbin/gconfpkg --uninstall vinagre - fi -} - post_upgrade() { post_install } diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index a7da32570..afeadbd87 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 142900 2011-11-17 18:35:14Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157000 2012-04-23 09:10:56Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,10 +15,10 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('51089c35b5187c37ebcd4f8ad921123f9a56713316876531189a3f3765dc87d1') +sha256sums=('85011594e9b5c4c5449c049e7c3563538c7a80dafecbb5891720b22290b83cb8') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vino \ --localstatedir=/var \ @@ -28,6 +29,6 @@ build() { } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/vino/vino.install b/extra/vino/vino.install index 469266843..fabaa1ed7 100644 --- a/extra/vino/vino.install +++ b/extra/vino/vino.install @@ -1,14 +1,8 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q } -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall vino - fi -} - post_upgrade() { post_install } diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 8b2f70aed..9bbc30e5b 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 142687 2011-11-12 18:46:20Z ibiru $ +# $Id: PKGBUILD 157002 2012-04-23 09:10:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.30.1 -pkgrel=2 +pkgver=0.32.1 +pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') license=('LGPL') options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-$pkgver.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) -sha256sums=('bbe421de3015935c22f685eea0eb8be2c1fecd5021c1f822996b8f0a282f6b64' +sha256sums=('543e489943d439dc82a4ba54871984ea843c3ef0a1fffa24aa65dabc57e7e4da' '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') build() { - cd "$srcdir/vte-$pkgver" - #warning: type-punning to incomplete type might break strict-aliasing rules - export CFLAGS="$CFLAGS -fno-strict-aliasing" - + cd "vte-$pkgver" patch -Np1 -R -i "$srcdir/make_alt_work.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vte \ @@ -31,7 +28,7 @@ build() { package_vte3(){ depends=('gtk3' 'vte-common') - cd "$srcdir/vte-$pkgver" + cd "vte-$pkgver" make DESTDIR="$pkgdir" install rm "$pkgdir"/usr/lib/vte/gnome-pty-helper @@ -39,7 +36,7 @@ package_vte3(){ package_vte-common() { pkgdesc="Common files used by vte and vte3" - cd "$srcdir/vte-$pkgver" + cd "vte-$pkgver" make -C gnome-pty-helper DESTDIR="$pkgdir" install } diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD new file mode 100644 index 000000000..6f80312ed --- /dev/null +++ b/extra/xdg-user-dirs-gtk/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 157004 2012-04-23 09:11:01Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=xdg-user-dirs-gtk +pkgver=0.8 +pkgrel=1 +pkgdesc="Creates user dirs and asks to relocalize them" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk2' 'xdg-user-dirs') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2 + lxde.patch) +sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32' + '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4') + +build() { + cd $pkgname-$pkgver + patch -p1 -i ../lxde.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/xdg-user-dirs-gtk/lxde.patch b/extra/xdg-user-dirs-gtk/lxde.patch new file mode 100644 index 000000000..c5520475c --- /dev/null +++ b/extra/xdg-user-dirs-gtk/lxde.patch @@ -0,0 +1,15 @@ +diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in +--- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde 2010-02-13 23:52:49.130115833 -0500 ++++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in 2010-02-13 23:54:57.574114211 -0500 +@@ -1,10 +1,9 @@ + [Desktop Entry] +-Encoding=UTF-8 + Exec=xdg-user-dirs-gtk-update + _Name=User folders update + _Comment=Update common folders names to match current locale + Terminal=false +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;LXDE; + Type=Application + StartupNotify=false + X-KDE-autostart-after=panel diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 2d6ecc158..f295b1ef6 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 140963 2011-10-20 05:44:26Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 157006 2012-04-23 09:11:04Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.2.1 +pkgver=3.4.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') -depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') -makedepends=('intltool' 'gtk-doc') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' + 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'gtk-doc' 'itstool') groups=('gnome') license=('GPL') options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f22cc5e24df4349bffc42a75844615d86924f6b3f4a1951e0240a03a1a40981d') +sha256sums=('0485c170210b681a07b709fad7c43010cd683f33f7cb5a62eb05fcccf2507184') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/yelp/yelp.install b/extra/yelp/yelp.install index f3bf19a93..2a1cb91e9 100644 --- a/extra/yelp/yelp.install +++ b/extra/yelp/yelp.install @@ -1,15 +1,9 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-desktop-database -q } -pre_upgrade() { - if (( $(vercmp $2 2.90.0) < 0 )); then - usr/sbin/gconfpkg --uninstall yelp - fi -} - post_upgrade() { post_install } diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index eece8d587..ffdcd6b15 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139461 2011-10-01 19:02:18Z ibiru $ +# $Id: PKGBUILD 157010 2012-04-23 09:11:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=zenity -pkgver=3.2.0 +pkgver=3.4.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64) @@ -11,16 +11,16 @@ depends=('gtk3' 'libnotify') makedepends=('intltool' 'gtk-doc') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e6a778db3655957770653745a2ecaef08a41a71f4a0a92cb7c5dc8ce0e9902d8') +sha256sums=('5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + --localstatedir=/var make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } |