summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/a52dec/PKGBUILD38
-rw-r--r--extra/aubio/PKGBUILD21
-rw-r--r--extra/automoc4/PKGBUILD27
-rw-r--r--extra/automoc4/license.txt31
-rw-r--r--extra/banshee/PKGBUILD10
-rw-r--r--extra/cdparanoia/PKGBUILD28
-rw-r--r--extra/eject/PKGBUILD29
-rw-r--r--extra/ekiga/PKGBUILD6
-rw-r--r--extra/epiphany/PKGBUILD6
-rw-r--r--extra/gcin/PKGBUILD16
-rw-r--r--extra/gcin/install11
-rw-r--r--extra/gnome-python-desktop/PKGBUILD49
-rw-r--r--extra/gnuchess/PKGBUILD6
-rw-r--r--extra/gv/PKGBUILD23
-rw-r--r--extra/gv/gv.install4
-rw-r--r--extra/htdig/CVE-2007-6110.patch26
-rw-r--r--extra/htdig/PKGBUILD50
-rw-r--r--extra/kaffeine/PKGBUILD10
-rw-r--r--extra/kdeplasma-applets-networkmanagement/PKGBUILD8
-rw-r--r--extra/kshutdown/PKGBUILD6
-rw-r--r--extra/ktorrent/PKGBUILD18
-rw-r--r--extra/libcanberra/PKGBUILD24
-rw-r--r--extra/libcanberra/libcanberra-gtk-module.sh21
-rw-r--r--extra/libdbusmenu-qt/PKGBUILD19
-rw-r--r--extra/libktorrent/PKGBUILD16
-rw-r--r--extra/libofa/PKGBUILD34
-rw-r--r--extra/mercurial/PKGBUILD6
-rw-r--r--extra/mousetweaks/PKGBUILD4
-rw-r--r--extra/nautilus/PKGBUILD16
-rw-r--r--extra/openexr/PKGBUILD32
-rw-r--r--extra/openexr/gcc43.patch29
-rw-r--r--extra/postgresql/PKGBUILD4
-rw-r--r--extra/postgresql/postgresql.install3
-rw-r--r--extra/telepathy-qt4/PKGBUILD17
-rw-r--r--extra/udisks/PKGBUILD11
-rw-r--r--extra/udisks/fix_well_known_filesystems.patch12
-rw-r--r--extra/upower/PKGBUILD10
-rw-r--r--extra/vino/PKGBUILD6
-rw-r--r--extra/webmin/PKGBUILD8
39 files changed, 389 insertions, 306 deletions
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index 8ab0cfeb4..a5743a79e 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -1,26 +1,32 @@
-# $Id: PKGBUILD 5600 2008-07-18 22:05:50Z jgc $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# $Id: PKGBUILD 122062 2011-05-02 05:42:16Z andrea $
+# Maintainer:
+# Contributor: Thomas Baechler <thomas@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
pkgname=a52dec
pkgver=0.7.4
-pkgrel=4
-pkgdesc="liba52 is a free library for decoding ATSC A/52 streams."
+pkgrel=5
+pkgdesc="A free library for decoding ATSC A/52 streams"
+url="http://liba52.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL2')
depends=('glibc')
options=(!libtool)
-source=(http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
- a52dec-0.7.4-build.patch)
-url="http://liba52.sourceforge.net/"
-md5sums=('caa9f5bc44232dc8aeea773fea56be80' 'fa16f224a7dceb7613824380abef0052')
+source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
+ 'a52dec-0.7.4-build.patch')
+md5sums=('caa9f5bc44232dc8aeea773fea56be80'
+ 'fa16f224a7dceb7613824380abef0052')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/a52dec-0.7.4-build.patch || return 1
- ./bootstrap || return 1
- ./configure --prefix=/usr --enable-shared || return 1
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
- install -m644 liba52/a52_internal.h $startdir/pkg/usr/include/a52dec/ || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/a52dec-0.7.4-build.patch"
+ ./bootstrap
+ ./configure --prefix=/usr --enable-shared
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -m644 liba52/a52_internal.h "${pkgdir}/usr/include/a52dec/"
}
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 4d9498afb..e172e1fe1 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 12257 2008-09-12 03:03:42Z eric $
+# $Id: PKGBUILD 122072 2011-05-02 05:51:30Z andrea $
# Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
-# AUR-Maintainer: Andrea Scarpino <bash.lnx@gmail.com>
# Contributor: Peter Baldwin <bald_pete@hotmail.com>
# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
pkgname=aubio
pkgver=0.3.2
-pkgrel=3
+pkgrel=4
pkgdesc="A library for audio labelling"
arch=('i686' 'x86_64')
-url="http://aubio.piem.org/"
+url="http://aubio.org/"
license=('GPL')
-depends=('libsamplerate' 'fftw' 'jack-audio-connection-kit')
+depends=('libsamplerate' 'fftw' 'jack')
options=('!libtool')
-source=(http://aubio.piem.org/pub/${pkgname}-${pkgver}.tar.gz)
+source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz")
md5sums=('ffc3e5e4880fec67064f043252263a44')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr
- make || return 1
- make DESTDIR=${startdir}/pkg install
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/automoc4/PKGBUILD b/extra/automoc4/PKGBUILD
index f62279efd..a6f7bc58d 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -1,28 +1,33 @@
-# $ Id: $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# $Id: PKGBUILD 122082 2011-05-02 06:05:33Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=automoc4
pkgver=0.9.88
-pkgrel=1
-pkgdesc="KDE automoc4"
+pkgrel=2
+pkgdesc="Automatic moc for Qt4"
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('custom')
-depends=('qt>=4.4')
+depends=('qt')
makedepends=('pkgconfig' 'cmake')
-source=("ftp://ftp.archlinux.org/other/automoc4/automoc4-${pkgver}.tar.bz2")
-md5sums=('adffb45ea2b550f284b1e3455f525176')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+ 'license.txt')
+md5sums=('91bf517cb940109180ecd07bc90c69ec'
+ '9014edbb7e2f02fe90b2db8707487bce')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
- make DESTDIR=$pkgdir install
+}
- grep -A 21 '^ Copyright' ${srcdir}/${pkgname}-${pkgver}/kde4automoc.cpp > license.txt
- install -D license.txt ${pkgdir}/usr/share/licenses/automoc4/license.txt
+package() {
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/automoc4/license.txt b/extra/automoc4/license.txt
new file mode 100644
index 000000000..f9db60340
--- /dev/null
+++ b/extra/automoc4/license.txt
@@ -0,0 +1,31 @@
+Upstream Authors:
+
+ Mathias Kretz <kretz@kde.org>
+ Alexander Neundorff <neundorff@kde.org>
+
+Copyright:
+
+ Copyright (c) 2007 Mathias Kretz <kretz@kde.org>
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 77f7f6e86..84b0edcf2 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 119748 2011-04-14 13:27:14Z jgc $
+# $Id: PKGBUILD 122335 2011-05-03 22:31:33Z ibiru $
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=banshee
-pkgver=2.0.0
-pkgrel=3
+pkgver=2.0.1
+pkgrel=1
pkgdesc="Music management and playback for GNOME"
arch=('i686' 'x86_64')
url="http://banshee.fm/"
license=('MIT')
-depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
+depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'ipod-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
makedepends=('intltool' 'gnome-doc-utils')
optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
'gstreamer0.10-ugly-plugins: Extra media codecs'
@@ -18,7 +18,7 @@ optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
options=('!libtool')
install=$pkgname.install
source=(http://download.banshee.fm/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('ecd129a3232bda507b98c90e6f9272cf')
+md5sums=('83d77447936eed84eba2123b341b62ea')
build() {
export MONO_SHARED_DIR="$srcdir/.wabi"
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index 870136f91..c51bd4ce0 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 53529 2009-10-02 03:47:22Z eric $
-# Maintainer: Alexander Fehr <pizzapunk gmail com>
+# $Id: PKGBUILD 122077 2011-05-02 05:53:24Z andrea $
+# Maintainer:
+# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgname=cdparanoia
pkgver=10.2
-pkgrel=2
+pkgrel=3
pkgdesc="Compact Disc Digital Audio extraction tool"
arch=('i686' 'x86_64')
url="http://www.xiph.org/paranoia/"
license=('GPL')
depends=('glibc')
options=('!makeflags')
-source=(http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz gcc.patch)
-md5sums=('b304bbe8ab63373924a744eac9ebc652' '12da14958d2b84c6719fe69890436445')
-sha1sums=('1901e20d3a370ca6afa4c76a9ef30d3f03044320' '67faaf0e3eed2e3de6f66d8168604bc6c7295921')
+source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-$pkgver.src.tgz"
+ 'gcc.patch')
+md5sums=('b304bbe8ab63373924a744eac9ebc652'
+ '12da14958d2b84c6719fe69890436445')
build() {
- cd "$srcdir/cdparanoia-III-$pkgver"
- patch -p0 -i ${srcdir}/gcc.patch || return 1
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make || return 1
- make prefix="$pkgdir/usr" MANDIR="$pkgdir/usr/share/man" install || return 1
+ cd "${srcdir}/${pkgname}-III-${pkgver}"
+ patch -p0 -i ${srcdir}/gcc.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-III-${pkgver}"
+ make prefix="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
}
diff --git a/extra/eject/PKGBUILD b/extra/eject/PKGBUILD
index a10bdcab4..b03fd577d 100644
--- a/extra/eject/PKGBUILD
+++ b/extra/eject/PKGBUILD
@@ -1,24 +1,29 @@
-# $Id: PKGBUILD 84697 2010-07-03 16:22:38Z ibiru $
-# Maintainer: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 122087 2011-05-02 06:23:02Z andrea $
+# Maintainer:
+# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=eject
pkgver=2.1.5
-pkgrel=4
-pkgdesc="Eject is a program for ejecting removable media under software control"
+pkgrel=5
+pkgdesc="A program for ejecting removable media under software control"
arch=('i686' 'x86_64')
-url="http://ca.geocities.com/jefftranter@rogers.com/eject.html"
+url="http://eject.sourceforge.net/"
license=('GPL')
depends=('glibc')
-source=(ftp://mirrors.kernel.org/slackware/slackware-13.1/source/a/$pkgname/$pkgname-$pkgver.tar.bz2
- eject-2.1.5-handle-spaces.patch)
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'eject-2.1.5-handle-spaces.patch')
md5sums=('5a6cab2184ae4ed21128054d931d558f'
'595b97c3bd56fd41e3b01b07885f81dc')
build() {
- cd $srcdir/$pkgname
- patch -Np0 -i ../eject-2.1.5-handle-spaces.patch || return 1
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make || return 1
- make DESTDIR=$pkgdir install || return 1
+ cd "${srcdir}/${pkgname}"
+ patch -Np0 -i "${srcdir}/eject-2.1.5-handle-spaces.patch"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 5bc0f6c4e..1b9b69283 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 112176 2011-03-04 10:45:51Z heftig $
+# $Id: PKGBUILD 122127 2011-05-02 09:20:52Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
pkgver=3.3.0
-pkgrel=2
+pkgrel=3
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2')
+depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
optdepends=('evolution-data-server: Evolution integration')
provides=('gnomemeeting')
diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD
index 1ad8e9631..2e32d5ea8 100644
--- a/extra/epiphany/PKGBUILD
+++ b/extra/epiphany/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117992 2011-04-05 06:37:18Z heftig $
+# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=epiphany
-pkgver=3.0.0
+pkgver=3.0.2
pkgrel=1
install=epiphany.install
pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
@@ -16,7 +16,7 @@ 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.bz2)
-sha256sums=('9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb')
+sha256sums=('befcc9b6061b2e5e9c78399423b09e27dc301dec55d96bf63590d543ce9bb805')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index ad1a393fd..79f3bae6f 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,19 +1,21 @@
-# $Id: PKGBUILD 121293 2011-04-30 12:04:42Z bisson $
+# $Id: PKGBUILD 122190 2011-05-02 18:01:07Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=gcin
pkgver=1.6.1
-pkgrel=1
+pkgrel=2
pkgdesc='Input method server supporting various input methods'
arch=('i686' 'x86_64')
license=('LGPL')
-url='http://www.csie.nctu.edu.tw/~cp76/gcin/'
+url='http://cle.linux.org.tw/gcin/download/'
depends=('gtk2' 'libxtst')
-makedepends=('anthy' 'qt')
-optdepends=('qt: support for qt4 input method')
-source=("${url}download/${pkgname}-${pkgver}.tar.bz2"
+makedepends=('qt' 'gtk3' 'anthy')
+optdepends=('qt: support for qt4 input method'
+ 'gtk3: support for gtk3 input method'
+ 'anthy: support for anthy input method')
+source=("${url}${pkgname}-${pkgver}.tar.bz2"
'fix_x86_64_libdir.patch'
'fix_qt4_paths.patch')
sha1sums=('acbfffbaf7eccd32ef251493e8c03dd126023b51'
@@ -26,6 +28,8 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ../fix_x86_64_libdir.patch
patch -p1 -i ../fix_qt4_paths.patch
+ sed '/^GTK2IM=/c GTK2IM=gtk-2.0/2.10.0/immodules' -i gtk-im/Makefile
+ sed '/^GTK3IM=/c GTK3IM=gtk-3.0/3.0.0/immodules' -i gtk-im/Makefile # FS#24051
./configure --prefix=/usr --use_i18n=Y
make
}
diff --git a/extra/gcin/install b/extra/gcin/install
index 1097ea400..c16d11b5e 100644
--- a/extra/gcin/install
+++ b/extra/gcin/install
@@ -1,13 +1,14 @@
post_install() {
- echo -n "updating gtk.immodules... "
- /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
- echo "done."
+ echo -n "updating gtk immodules... "
+ [ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+ [ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache
+ echo "done."
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- post_install
+ post_install
}
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 8173d0d40..af4e15736 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,45 +1,34 @@
-# $Id: PKGBUILD 108483 2011-01-31 14:39:43Z jgc $
+# $Id: PKGBUILD 122148 2011-05-02 13:38:16Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@soulfly.nl>
# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint')
+pkgname=('gnome-python-desktop' 'python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint')
pkgver=2.32.0
-pkgrel=4
+pkgrel=5
arch=(i686 x86_64)
license=('GPL' 'LGPL')
options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-media' 'gnome-panel-bonobo' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'evince' 'bug-buddy' 'brasero' 'gnome-desktop' 'metacity')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'gtksourceview' 'libgnomeprintui' 'libgtop' 'totem-plparser' 'bug-buddy' 'gnome-desktop2' 'metacity' 'librsvg')
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -i 's|evince-document-2.30|evince-document-2.32|g' configure
- sed -i 's|evince-view-2.30|evince-view-2.32|g' configure
PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
make
}
package_gnome-python-desktop() {
- depends=('python-brasero' 'python-bugbuddy' 'python-evince' 'python-evolution' 'python-gnomeapplet' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-mediaprofiles' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python')
+ depends=('python-bugbuddy' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gtksourceview' 'python-gnomeprint' 'gnome-python')
pkgdesc="Python bindings for the GNOME desktop environment"
cd "${srcdir}/${pkgbase}-${pkgver}"
make install-pkgconfigDATA DESTDIR="${pkgdir}"
}
-package_python-brasero() {
- depends=('pygtk' 'brasero')
- pkgdesc="Python bindings for brasero"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C braseroburn install DESTDIR="${pkgdir}"
- make -C braseromedia install DESTDIR="${pkgdir}"
-}
-
package_python-bugbuddy() {
depends=('pygtk' 'bug-buddy')
pkgdesc="Python module for bug-buddy"
@@ -48,14 +37,6 @@ package_python-bugbuddy() {
make install-pkgpyexecPYTHON DESTDIR="${pkgdir}"
}
-package_python-evince() {
- depends=('pygtk' 'evince')
- pkgdesc="Python bindings for evince"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C evince install DESTDIR="${pkgdir}"
-}
-
package_python-evolution() {
depends=('pygtk' 'evolution-data-server' 'python2-bonobo')
pkgdesc="Python bindings for evolution"
@@ -66,17 +47,9 @@ package_python-evolution() {
install -m644 evolution/ecal.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
}
-package_python-gnomeapplet() {
- depends=('pygtk' 'libgnomeui' 'gnome-panel-bonobo' 'python2-bonobo')
- pkgdesc="Python bindings for gnome-panel"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C gnomeapplet install DESTDIR="${pkgdir}"
-}
-
package_python-gnomedesktop() {
- depends=('pygtk' 'gnome-desktop' 'python2-gnomevfs')
- pkgdesc="Python bindings for gnome-desktop"
+ depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
+ pkgdesc="Python bindings for gnome-desktop 2.x"
cd "${srcdir}/${pkgbase}-${pkgver}"
make -C gnomedesktop install DESTDIR="${pkgdir}"
@@ -98,14 +71,6 @@ package_python-gtop() {
make -C gtop install DESTDIR="${pkgdir}"
}
-package_python-mediaprofiles() {
- depends=('pygtk' 'gnome-media')
- pkgdesc="Python bindings for gnome-media"
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make -C mediaprofiles install DESTDIR="${pkgdir}"
-}
-
package_python-metacity() {
depends=('pygtk' 'metacity')
pkgdesc="Python bindings for metacity"
diff --git a/extra/gnuchess/PKGBUILD b/extra/gnuchess/PKGBUILD
index d24bc17cf..dedeaddb7 100644
--- a/extra/gnuchess/PKGBUILD
+++ b/extra/gnuchess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108753 2011-02-02 19:55:44Z jgc $
+# $Id: PKGBUILD 122210 2011-05-03 05:16:02Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuchess
-pkgver=5.08
+pkgver=6.0.0
pkgrel=1
pkgdesc="Lets most modern computers play a full game of chess"
url="http://www.gnu.org/software/chess/chess.html"
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64')
license=('GPL')
depends=('glibc' 'ncurses' 'readline')
source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
-md5sums=('9db91dbac6b5b86de0c57a420a9fea57')
+md5sums=('1a7a46188dab76f4339d22ff47c31515')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index edf76955e..028bacf99 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 103001 2010-12-13 22:11:14Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id: PKGBUILD 122132 2011-05-02 09:38:25Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gv
-pkgver=3.7.1
-pkgrel=2
+pkgver=3.7.2
+pkgrel=1
pkgdesc="A program to view PostScript and PDF documents"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/gv/"
license=('GPL')
-depends=('xaw3d' 'ghostscript')
+depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
install=gv.install
-source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png aplinedel.patch)
-md5sums=('bf4823d00d8e431f97dbcb7dd87c46ac' 'cf04652952f2d0903bc7578b4826f50c'\
- 'ab0e3879dbe39e59ad1c923020c28a86' '8a57a5d50a0d68dc1d98108e9665bd2d')
-sha1sums=('05fcf76f29de77e67379bae7e9ca1c8a26bbf6e1' 'c8230fe08ee6d22525678a97832f44941237d174'\
- '35b9168e526527001b1b5b8ee34a5b69d9369590' 'e6358e74ec2641730b44443a49df36322df2bdd8')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
+md5sums=('eb47d465755b7291870af66431c6f2e1'
+ 'cf04652952f2d0903bc7578b4826f50c'
+ 'ab0e3879dbe39e59ad1c923020c28a86')
+sha1sums=('d9573e17f5d88d150fccb257ce205dbceab83e8a'
+ 'c8230fe08ee6d22525678a97832f44941237d174'
+ '35b9168e526527001b1b5b8ee34a5b69d9369590')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ../aplinedel.patch
sed -i -e "s:-dGraphicsAlphaBits=2:\0 -dAlignToPixels=0:" src/Makefile.{am,in}
./configure --prefix=/usr
make
diff --git a/extra/gv/gv.install b/extra/gv/gv.install
index dd0e8c9c6..0c048cd5b 100644
--- a/extra/gv/gv.install
+++ b/extra/gv/gv.install
@@ -1,7 +1,8 @@
-infodir=/usr/share/info
+infodir=usr/share/info
file=gv.info.gz
post_install() {
+ update-desktop-database -q
[ -x usr/bin/install-info ] || return 0
install-info $infodir/$file $infodir/dir 2> /dev/null
}
@@ -11,6 +12,7 @@ post_upgrade() {
}
pre_remove() {
+ update-desktop-database -q
[ -x usr/bin/install-info ] || return 0
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
}
diff --git a/extra/htdig/CVE-2007-6110.patch b/extra/htdig/CVE-2007-6110.patch
new file mode 100644
index 000000000..57b0e3b78
--- /dev/null
+++ b/extra/htdig/CVE-2007-6110.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++ String s("invalid sort method");
+
+ displaySyntaxError(s);
+ return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+ // Must temporarily stash the message in a String, since
+ // displaySyntaxError will overwrite the static temp used in form.
+
+- String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++ String s("invalid sort method");
+
+ displaySyntaxError(s);
+ //return;
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index 6e6f12ab2..38418ee68 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -1,39 +1,45 @@
-# $Id: $
+# $Id: PKGBUILD 122102 2011-05-02 07:10:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=htdig
pkgver=3.2.0b6
-pkgrel=6
-pkgdesc="A complete world wide web indexing and searching system for a domain or intranet."
-url="http://www.htdig.org"
+pkgrel=7
+pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
+url="http://www.htdig.org/"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('gcc-libs' 'zlib' 'bash')
-options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- gcc4.3.patch
- quoting.patch)
+depends=('openssl')
+options=('!libtool' 'emptydirs')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ 'gcc4.3.patch'
+ 'CVE-2007-6110.patch')
md5sums=('8b9b9587a411ac7dd278fa5413428960'
'2aeda683f95b58efc0978d7fe951de59'
'0d9099d3b5a32d322a8e0240f85a3578')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ${srcdir}/gcc4.3.patch
- patch -p1 -i ${srcdir}/quoting.patch || return 1
+ patch -p1 -i "${srcdir}/gcc4.3.patch"
+ patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --with-config-dir=/etc/htdig \
- --with-default-config-file=/etc/htdig/htdig.conf \
- --with-database-dir=/var/lib/htdig/db \
- --with-cgi-bin-dir=/usr/bin \
- --with-common-dir=/usr/share/doc/htdig \
- --with-search-dir=/usr/share/doc/htdig \
- --with-image-dir=/usr/share/doc/htdig
- make || return 1
- make DESTDIR=${pkgdir} install
+ --mandir=/usr/share/man \
+ --with-config-dir=/etc/htdig \
+ --with-default-config-file=/etc/htdig/htdig.conf \
+ --with-database-dir=/var/lib/htdig/db \
+ --with-cgi-bin-dir=/usr/bin \
+ --with-common-dir=/usr/share/doc/htdig \
+ --with-search-dir=/usr/share/doc/htdig \
+ --with-image-dir=/usr/share/doc/htdig \
+ --localstatedir=/var/lib/htdig \
+ --with-ssl
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index ff62d9b6e..84a710827 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 118974 2011-04-09 21:02:09Z tpowa $
+# $Id: PKGBUILD 122312 2011-05-03 18:56:11Z tpowa $
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kaffeine
-pkgver=1.2.1
+pkgver=1.2.2
pkgrel=1
pkgdesc='KDE media player'
license=('GPL')
@@ -21,6 +21,10 @@ build() {
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_INSTALL_PREFIX=/usr
make
+}
+
+package() {
+ cd $srcdir/build
make DESTDIR=$pkgdir install
}
-md5sums=('e65a8558836f0aa0d173d76e51ad065f')
+md5sums=('690e48d2e5fe123887109aa9b1bc1c31')
diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
index fafc5730a..5fafa9e93 100644
--- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD
+++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD
@@ -3,9 +3,9 @@
# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110418
-_commit=545967db075ed65b0452def93e1c1588190cdc9a
-pkgrel=2
+pkgver=git20110502
+_commit=fdb4edbc91f60d358d202a694c4ab229c66f9f61
+pkgrel=1
pkgdesc="KDE control panel and widget network connections"
arch=('i686' 'x86_64')
url="http://www.kde.org/"
@@ -15,7 +15,7 @@ makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
install=${pkgname}.install
source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('d7f50b4b6917d39c79332b868ad2d0cf')
+md5sums=('6ac9e04cb917a8ac875b2bffde4b5420')
build() {
cd "${srcdir}"
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
index 0bd65cffc..f9d9a6322 100644
--- a/extra/kshutdown/PKGBUILD
+++ b/extra/kshutdown/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 110106 2011-02-16 13:52:25Z andrea $
+# $Id: PKGBUILD 122317 2011-05-03 18:58:40Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kshutdown
-pkgver=2.0beta12
+pkgver=2.0
pkgrel=1
pkgdesc="Shutdown Utility for KDE"
arch=(i686 x86_64)
@@ -27,4 +27,4 @@ package() {
cd "${srcdir}/build"
make DESTDIR="${pkgdir}" install
}
-md5sums=('392a345dab6fc4f6125007171bc8cb9c')
+md5sums=('af9d2bfda919e7712319e14e6ca89610')
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index b29506657..8acb3c064 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 115087 2011-03-16 19:19:11Z andrea $
+# $Id: PKGBUILD 122112 2011-05-02 07:25:24Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Georg Grabler <ggrabler@gmail.com>
pkgname=ktorrent
-pkgver=4.1.0
+pkgver=4.1.1
pkgrel=1
-pkgdesc="A BitTorrent program for KDE"
+pkgdesc="A powerful BitTorrent client for KDE"
arch=('i686' 'x86_64')
url="http://ktorrent.org"
license=('GPL2')
@@ -16,16 +16,16 @@ source=("http://ktorrent.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
'httpserver.patch')
install=${pkgname}.install
options=('libtool')
-md5sums=('3981c00810217e88b9772438df31df08'
+md5sums=('affadf7c7198e5aa430e91ab75800296'
'1f25b94615b0bbfa0457c99fb20de3e6')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
# build time patch
- patch -Np0 -i ${srcdir}/httpserver.patch
+ patch -p0 -i "${srcdir}/httpserver.patch"
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -36,6 +36,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index 95fc05a5d..93145cbcd 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109949 2011-02-14 08:47:45Z ibiru $
+# $Id: PKGBUILD 122251 2011-05-03 10:40:20Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libcanberra
pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.26
-pkgrel=5
+pkgver=0.28
+pkgrel=1
pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
arch=(i686 x86_64)
license=('LGPL')
@@ -13,17 +13,16 @@ makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
options=(!emptydirs)
url=http://0pointer.de/lennart/projects/libcanberra
source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
- libcanberra-gtk-module.sh libcanberra-quit-add.patch)
-md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
- 'a54799e624aac814b9343ab05f25c38b'
- 'a147bce8a7addcd40b21faaaf028819b')
+ libcanberra-gtk-module.sh)
+md5sums=('c198b4811598c4c161ff505e4531b02c'
+ '21141257a1be80f3bc329829ff13b314')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- patch -Np1 -i "${srcdir}/libcanberra-quit-add.patch"
./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
--disable-static --with-builtin=dso --enable-null --disable-oss \
- --enable-alsa --enable-gstreamer --enable-pulse
+ --enable-alsa --enable-gstreamer --enable-pulse \
+ --with-systemdsystemunitdir=/lib/systemd/system
make
}
@@ -37,11 +36,11 @@ package_libcanberra() {
rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
- install -m755 -d "${pkgdir}/usr/share/gconf"
+ install -d "${pkgdir}/usr/share/gconf"
mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
- install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
- install -m755 "${srcdir}/libcanberra-gtk-module.sh" "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+ install -D "${srcdir}/libcanberra-gtk-module.sh" \
+ "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
# Split plugins
for _p in pulse gstreamer; do
@@ -53,7 +52,6 @@ package_libcanberra() {
package_libcanberra-pulse() {
pkgdesc="PulseAudio plugin for libcanberra"
depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
- groups=('pulseaudio-gnome')
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/libcanberra/libcanberra-gtk-module.sh b/extra/libcanberra/libcanberra-gtk-module.sh
index fbb7ff783..2ae6b7e17 100644
--- a/extra/libcanberra/libcanberra-gtk-module.sh
+++ b/extra/libcanberra/libcanberra-gtk-module.sh
@@ -1,10 +1,15 @@
#!/bin/sh
-if [ -z "$GTK_MODULES" ] ; then
- GTK_MODULES="canberra-gtk-module"
-else
- GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-fi
-
-export GTK_MODULES
-
+case "$SESSION" in
+ GNOME)
+ # Done by gnome-settings-daemon
+ ;;
+ *)
+ if [ -z "$GTK_MODULES" ]; then
+ GTK_MODULES="canberra-gtk-module"
+ else
+ GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
+ fi
+ export GTK_MODULES
+ ;;
+esac
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 98dda1288..9f1126262 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 117011 2011-03-27 14:11:17Z andrea $
+# $Id: PKGBUILD 122259 2011-05-03 14:55:26Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libdbusmenu-qt
-pkgver=0.8.1
+pkgver=0.8.2
pkgrel=1
pkgdesc="A library that provides a Qt implementation of the DBusMenu spec"
arch=('i686' 'x86_64')
url="https://launchpad.net/libdbusmenu-qt"
license=('GPL')
depends=('qt')
-makedepends=('cmake' 'doxygen')
+makedepends=('cmake')
source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('495bf59b9fcc00e4260fd5acbb21b78b')
+md5sums=('88be2548e00acf988c66ed3a35844f64')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_DOC=OFF
make
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
-}
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index b2da7c65e..c4c779b47 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 115082 2011-03-16 19:16:25Z andrea $
+# $Id: PKGBUILD 122107 2011-05-02 07:24:22Z andrea $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libktorrent
-pkgver=1.1.0
+pkgver=1.1.1
pkgrel=1
-pkgdesc="A BitTorrent library based on KDE Platform"
+pkgdesc="A BitTorrent protocol implementation"
arch=('i686' 'x86_64')
url="http://ktorrent.org"
license=('GPL2')
depends=('kdelibs')
makedepends=('automoc4' 'cmake' 'boost')
-source=("http://ktorrent.org/downloads/4.1.0/${pkgname}-${pkgver}.tar.bz2")
+source=("http://ktorrent.org/downloads/4.1.1/${pkgname}-${pkgver}.tar.bz2")
options=('libtool')
-md5sums=('76d3e58bbf2e4df7e97421e06ebf8fb8')
+md5sums=('96de8dd6d6cea4255ce946bb4cd69836')
build() {
- cd ${srcdir}
+ cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -26,6 +26,6 @@ build() {
}
package() {
- cd ${srcdir}/build
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/build"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index c58f98794..97905a1ea 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 80563 2010-05-19 16:11:07Z andrea $
+# $Id: PKGBUILD 122092 2011-05-02 06:40:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libofa
pkgver=0.9.3
-pkgrel=2
-pkgdesc="Open Fingerprint Architecture"
-arch=(i686 x86_64)
+pkgrel=3
+pkgdesc="An open-source audio fingerprint by MusicIP"
+arch=('i686' 'x86_64')
url="http://code.google.com/p/musicip-libofa/"
license=('GPL2' 'custom')
depends=('expat' 'curl' 'fftw' 'gcc-libs')
makedepends=('pkgconfig')
options=('!libtool')
source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz"
- 'gcc-4.patch'
- 'gcc4.3.patch'
- 'gcc4.5.patch')
+ 'gcc-4.patch'
+ 'gcc4.3.patch'
+ 'gcc4.5.patch')
sha1sums=('3dec8e1dcea937f74b4165e9ffd4d4f355e4594a'
'cb19377d0634c03d2a49cfc61915cec918c341f7'
'cae08bdc12de923d5e032696702a0530ae6eafc1'
- '754d69d66ab46219035ccafeeb3ff62433cca4f2')
+ '754d69d66ab46219035ccafeeb3ff62433cca4f2')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np0 -i ${srcdir}/gcc-4.patch || return 1
- patch -Np1 -i ${srcdir}/gcc4.3.patch || return 1
- patch -Np1 -i ${srcdir}/gcc4.5.patch || return 1
- ./configure --prefix=/usr || return 1
- make || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i ${srcdir}/gcc-4.patch
+ patch -p1 -i ${srcdir}/gcc4.3.patch
+ patch -p1 -i ${srcdir}/gcc4.5.patch
+ ./configure --prefix=/usr
+ make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR=${pkgdir} install
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index e3e47f67b..e8f8f6e25 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117449 2011-04-02 08:46:57Z giovanni $
+# $Id: PKGBUILD 122137 2011-05-02 10:27:04Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
-pkgver=1.8.2
+pkgver=1.8.3
pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('python2')
optdepends=('tk: for the hgk GUI')
source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz
mercurial.profile)
-md5sums=('a1634b9b709ecc70662f3257abece2c7'
+md5sums=('7afea936dfdb21220064cac6402f8743'
'43e1d36564d4c7fbe9a091d3ea370a44')
build() {
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 7cf2301af..c8406a438 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=mousetweaks
-pkgver=3.0.0
+pkgver=3.0.1
pkgrel=1
pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
url="http://www.gnome.org"
install=mousetweaks.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('780c6349aa331635d15abc1f119d4f35de1534f1250e1921ec5f05efa098d242')
+sha256sums=('9e9d2d5b183857b75504cc48e017e5419cd754aed08aa5cf39c310583277d722')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 9ef12ad8e..086ad1392 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 121317 2011-04-30 15:08:05Z ibiru $
+# $Id: PKGBUILD 122052 2011-05-02 05:12:25Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nautilus
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.1.1
+pkgrel=1
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,17 +14,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.bz2
- places-sidebar.patch progress-ui-handler.patch)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
- 'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
- '5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- #fixed for 3.0.2
- patch -Np1 -i "${srcdir}/places-sidebar.patch"
- patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nautilus \
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index ada112251..3f4afa72e 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,23 +1,29 @@
-# $Id: PKGBUILD 17474 2008-10-30 16:25:54Z pierre $
+# $Id: PKGBUILD 122097 2011-05-02 06:42:28Z andrea $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=openexr
-pkgver=1.6.1
+pkgver=1.7.0
pkgrel=1
+pkgdesc="An high dynamic-range image file format library"
+url="http://www.openexr.com/"
+arch=('i686' 'x86_64')
+license=('BSD')
depends=('zlib' 'ilmbase')
-pkgdesc="openexr library for EXR images"
-arch=(i686 x86_64)
options=('!libtool')
-license=('custom')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" 'gcc43.patch')
-url="http://www.openexr.org"
-md5sums=('11951f164f9c872b183df75e66de145a' '7c83ee3d69ad688142e7de63cb68e70a')
+source=("http://download.savannah.nongnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ 'gcc43.patch')
+md5sums=('27113284f7d26a58f853c346e0851d7a'
+ 'd91fae759053a70bcedcf02eb33ca4a2')
build() {
- cd $startdir/src/$pkgname-$pkgver
- patch -p1 -i $srcdir/gcc43.patch || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i ${srcdir}/gcc43.patch
./configure --prefix=/usr
- make || return 1
- make DESTDIR=$startdir/pkg install
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/extra/openexr/gcc43.patch b/extra/openexr/gcc43.patch
index 362487276..ab99eb9a1 100644
--- a/extra/openexr/gcc43.patch
+++ b/extra/openexr/gcc43.patch
@@ -1,22 +1,11 @@
-diff -Nura openexr-1.6.1/exrenvmap/main.cpp openexr-1.6.1.new/exrenvmap/main.cpp
---- openexr-1.6.1/exrenvmap/main.cpp 2007-04-25 03:07:51.000000000 +0200
-+++ openexr-1.6.1.new/exrenvmap/main.cpp 2008-10-30 17:18:13.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <iostream>
- #include <exception>
- #include <stdlib.h>
-+#include <string.h>
+--- exrenvmap/blurImage.cpp
++++ exrenvmap/blurImage.cpp
+@@ -39,6 +39,8 @@
+ //
+ //-----------------------------------------------------------------------------
- using namespace Imf;
- using namespace std;
-diff -Nura openexr-1.6.1/exrmaketiled/main.cpp openexr-1.6.1.new/exrmaketiled/main.cpp
---- openexr-1.6.1/exrmaketiled/main.cpp 2007-04-25 03:08:45.000000000 +0200
-+++ openexr-1.6.1.new/exrmaketiled/main.cpp 2008-10-30 17:18:40.000000000 +0100
-@@ -46,6 +46,7 @@
- #include <exception>
- #include <string>
- #include <stdlib.h>
-+#include <string.h>
++#include <cstring>
++
+ #include <blurImage.h>
- using namespace Imf;
- using namespace std;
+ #include <resizeImage.h>
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 5c5ffd2db..a0d0e3cc5 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 120393 2011-04-23 18:29:42Z dan $
+# $Id: PKGBUILD 122182 2011-05-02 17:54:57Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
pkgver=9.0.4
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.postgresql.org"
license=('custom:PostgreSQL')
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index c3fa4fc3e..d65bb6a7f 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -1,4 +1,7 @@
post_install() {
+ if [ ! -d '/var/lib/postgres' ]; then
+ mkdir -p '/var/lib/postgres'
+ fi
getent group postgres >/dev/null || groupadd -g 88 postgres
getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
passwd -l postgres >/dev/null
diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD
index 6d3b6e5d1..72c54c85e 100644
--- a/extra/telepathy-qt4/PKGBUILD
+++ b/extra/telepathy-qt4/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 120824 2011-04-26 16:25:58Z ibiru $
+# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+
pkgname=telepathy-qt4
-pkgver=0.5.15
+pkgver=0.5.16
pkgrel=1
-pkgdesc="A library for Qt-based Telepathy clients."
+pkgdesc="A library for Qt-based Telepathy clients"
arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
+url="http://telepathy.freedesktop.org/wiki/"
license=('LGPL')
options=('!libtool')
depends=('qt' 'telepathy-farsight')
makedepends=('libxslt' 'python2' 'cmake')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2066d447a46ca3d767ff82ca562244a0')
+source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('82e36c051c74d323b329f69ac2c5427f')
build() {
cd "${srcdir}"
-
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -26,5 +27,5 @@ build() {
package() {
cd "${srcdir}"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index e431b7500..d5b172adb 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 119537 2011-04-11 22:26:25Z ibiru $
+# $Id: PKGBUILD 122326 2011-05-03 20:32:37Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=udisks
pkgver=1.0.3
-pkgrel=1
+pkgrel=2
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -13,13 +13,16 @@ makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
options=(!libtool)
#source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
- 01-mkfs-tempdir.patch)
+ 01-mkfs-tempdir.patch
+ fix_well_known_filesystems.patch)
sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5'
- '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
+ '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c'
+ '00d92030de44c5856c7408339c4849bf9b88b66d6cfa6617364b4e8d9ed2bc5e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
+ patch -Np1 -i "${srcdir}/fix_well_known_filesystems.patch"
./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/udisks --disable-static
diff --git a/extra/udisks/fix_well_known_filesystems.patch b/extra/udisks/fix_well_known_filesystems.patch
new file mode 100644
index 000000000..77eee26ba
--- /dev/null
+++ b/extra/udisks/fix_well_known_filesystems.patch
@@ -0,0 +1,12 @@
+diff -Nur udisks-1.0.3.orig/src/device.c udisks-1.0.3/src/device.c
+--- udisks-1.0.3.orig/src/device.c 2011-04-05 13:16:00.000000000 -0700
++++ udisks-1.0.3/src/device.c 2011-05-03 13:27:39.064679418 -0700
+@@ -5902,7 +5902,7 @@
+ "msdos",
+ "umsdos",
+ "vfat",
+- "exfat"
++ "exfat",
+ "ntfs",
+ NULL,
+ };
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 53e71553a..c050ee4b0 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 116154 2011-03-22 19:35:44Z ibiru $
+# $Id: PKGBUILD 122280 2011-05-03 18:02:14Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=upower
-pkgver=0.9.9
+pkgver=0.9.10
pkgrel=1
pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
arch=('i686' 'x86_64')
@@ -13,12 +13,16 @@ makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
replaces=('devicekit-power')
options=('!libtool')
source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2')
+sha256sums=('fa567509c4ce8d1975259665b907929cac692a59dbe0e217e7494b1cdc949288')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--libexecdir=/usr/lib/upower --disable-static
make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index b3a5a76fb..50f7af45a 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $
+# $Id: PKGBUILD 122171 2011-05-02 16:51:49Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=vino
-pkgver=3.0.1
+pkgver=3.0.2
pkgrel=1
pkgdesc="a VNC server for the GNOME desktop"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.gnome.org"
options=(!emptydirs)
install=vino.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca')
+sha256sums=('ca2d72f70d2a94e31e63d0267ec41820aab168c6545954c355a609f3c6c31923')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD
index 6e8cf2d01..d1a55f636 100644
--- a/extra/webmin/PKGBUILD
+++ b/extra/webmin/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 118950 2011-04-09 15:28:29Z tpowa $
+# $Id: PKGBUILD 122336 2011-05-03 22:31:36Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
-pkgver=1.540
+pkgver=1.550
pkgrel=1
pkgdesc="a web-based interface for system administration"
arch=(i686 x86_64)
@@ -210,7 +210,9 @@ build() {
# install license
install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE
}
-md5sums=('8086fc60419937c4b2844796cfd2aea1'
+
+
+md5sums=('d892599a6e3e6f102a8261d2804fb1b5'
'da6bea412a5be8cf82a813078fec5847'
'bfebb75bb94029b48c46b7f1ba1aa811'
'0673e51af0e81418b4a6c1e205f7e5cd')