From e37e888e9ecdc23a004eb19d72c64c02c5af3249 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 10 Dec 2011 23:14:51 +0000 Subject: Sat Dec 10 23:14:51 UTC 2011 --- community/calibre/PKGBUILD | 8 ++++---- community/r8168-lts/PKGBUILD | 32 ++++++++++++++++++++++++++++++++ community/r8168-lts/r8168-lts.install | 17 +++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 community/r8168-lts/PKGBUILD create mode 100644 community/r8168-lts/r8168-lts.install (limited to 'community') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index e34512718..760f8c429 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59984 2011-12-02 22:33:05Z giovanni $ +# $Id: PKGBUILD 60299 2011-12-09 17:18:34Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.29 +pkgver=0.8.30 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -18,10 +18,10 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('e51c2b889e0bdfc217000ebba93af8a7' +md5sums=('0af59b942b6184ce7b9c4247555b68dd' '253ce4fe5d01f8ff76b63cd3825755ea' '675cd87d41342119827ef706055491e7') diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD new file mode 100644 index 000000000..254303c85 --- /dev/null +++ b/community/r8168-lts/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo + +pkgname=r8168-lts +_pkgname=r8168 +pkgver=8.027.00 +pkgrel=2 +pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts" +url="http://www.realtek.com.tw" +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' "kernel26-lts>=2.6.32" "kernel26-lts<2.6.33") +makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33") +source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2) +install=$pkgname.install + +_extramodules=extramodules-2.6.32-lts +_kernver="$(cat /lib/modules/$_extramodules/version || true)" + +build() { + cd "$srcdir/$_pkgname-$pkgver" + make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules +} + +package() { + cd "$srcdir/$_pkgname-$pkgver/src" + install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; +} + +md5sums=('98155ce1ad5c248eeb7a93c9954d8344') +sha256sums=('5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2') diff --git a/community/r8168-lts/r8168-lts.install b/community/r8168-lts/r8168-lts.install new file mode 100644 index 000000000..fd4f92f63 --- /dev/null +++ b/community/r8168-lts/r8168-lts.install @@ -0,0 +1,17 @@ +rebuild_module_dependencies() { + EXTRAMODULES='extramodules-2.6.32-lts' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + +post_install() { + rebuild_module_dependencies + echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:' + echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`' +} +post_upgrade() { + rebuild_module_dependencies +} + +post_remove() { + rebuild_module_dependencies +} -- cgit v1.2.3-54-g00ecf From 22b0fa480661b6247dabf39059fe629e1d233a9a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 11 Dec 2011 23:15:00 +0000 Subject: Sun Dec 11 23:15:00 UTC 2011 --- community/gnome-commander/PKGBUILD | 20 ++--- community/nautilus-actions/PKGBUILD | 20 ++--- community/nsd/PKGBUILD | 26 +++---- community/nsd/install | 19 +++++ community/python-pymongo/PKGBUILD | 22 +++--- extra/gcin/PKGBUILD | 6 +- extra/grilo-plugins/PKGBUILD | 11 +-- extra/grilo/PKGBUILD | 8 +- extra/libdrm/PKGBUILD | 22 ++++-- extra/libdrm/git_fixes.diff | 19 +++++ extra/libdrm/list.h | 137 +++++++++++++++++++++++++++++++++ extra/libdrm/rbo.h | 50 ++++++++++++ extra/pidgin/PKGBUILD | 11 ++- extra/putty/PKGBUILD | 11 +-- extra/seahorse/PKGBUILD | 6 +- extra/seahorse/seahorse-ssh-askpass.sh | 2 +- 16 files changed, 314 insertions(+), 76 deletions(-) create mode 100644 community/nsd/install create mode 100644 extra/libdrm/git_fixes.diff create mode 100644 extra/libdrm/list.h create mode 100644 extra/libdrm/rbo.h (limited to 'community') diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD index 0555e3a39..6ca662aec 100644 --- a/community/gnome-commander/PKGBUILD +++ b/community/gnome-commander/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56333 2011-10-05 18:51:32Z ibiru $ +# $Id: PKGBUILD 60311 2011-12-10 09:50:50Z ibiru $ # Maintainer : Ionut Biru # Contributor: Roman Kyrylych # Contributor: Johannes Sjolund pkgname=gnome-commander -pkgver=1.2.8.14 +pkgver=1.2.8.15 pkgrel=1 pkgdesc="A graphical two-pane filemanager for Gnome" arch=('i686' 'x86_64') @@ -15,10 +15,10 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool') options=(!libtool) install=gnome-commander.install source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz) -sha256sums=('3519ff0a6e0b287e9cc700df41c61f4bf29110ad16545a4e2f9445ed9a17df08') +sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" # python2 fix for file in doc/*/gnome-commander.xml; do @@ -32,11 +32,11 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - mkdir -p "${pkgdir}"/usr/share/gconf/schemas - gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas \ - --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -rf "${pkgdir}"/etc/gconf/schemas/ + mkdir -p "$pkgdir"/usr/share/gconf/schemas + gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \ + --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -rf "$pkgdir"/etc/gconf/schemas/ } diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD index 2171f91ef..429204815 100644 --- a/community/nautilus-actions/PKGBUILD +++ b/community/nautilus-actions/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56331 2011-10-05 18:42:40Z ibiru $ +# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $ # Maintainer : Ionut Biru # Contributor: Roman Kyrylych # Contributor: Tor Krill pkgname=nautilus-actions -pkgver=3.1.4 +pkgver=3.1.5 pkgrel=1 pkgdesc="Configures programs to be launched when files are selected in Nautilus" arch=('i686' 'x86_64') @@ -15,20 +15,20 @@ makedepends=('intltool' 'gnome-doc-utils') install=nautilus-actions.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz) -sha256sums=('071013f1037a2c22875e4c9a5efa6f28a1626965b4d5c8aa4576f319427cd0e3') +sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/nautilus-actions make } package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/share/gconf/schemas - gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain nautilus-actions \ - ${pkgdir}/etc/gconf/schemas/*.schemas - rm -rf ${pkgdir}/etc/gconf/schemas/ + cd $srcdir/$pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install + mkdir -p $pkgdir/usr/share/gconf/schemas + gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \ + $pkgdir/etc/gconf/schemas/*.schemas + rm -rf $pkgdir/etc/gconf/schemas/ } diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD index ef11a6dc1..abd455dbb 100644 --- a/community/nsd/PKGBUILD +++ b/community/nsd/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 43285 2011-03-24 13:35:27Z bisson $ +# $Id: PKGBUILD 60316 2011-12-10 11:25:09Z bisson $ # Maintainer: Kaiting Chen # Maintainer: Gaetan Bisson # Contributor: Roberto Alsina pkgname=nsd -pkgver=3.2.8 +pkgver=3.2.9 pkgrel=1 pkgdesc='Authoritative only, high performance and simple DNS server' -arch=('i686' 'x86_64') url='http://www.nlnetlabs.nl/nsd/' license=('BSD') depends=('openssl') makedepends=('flex') -source=("http://www.nlnetlabs.nl/downloads/nsd/nsd-$pkgver.tar.gz") -sha1sums=('e8db690a09f53152f0dca6e4fbfabcc89003fced') +arch=('i686' 'x86_64') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9') -install=nsd.install +install=install build() { - cd "$srcdir/$pkgname-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -d "$pkgdir"/{etc/rc.d,usr/share/{doc,licenses}/"$pkgname"} + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}"/{etc/rc.d,usr/share/{doc,licenses}/"${pkgname}"} rm doc/differences.pdf - install -m644 doc/* "$pkgdir"/usr/share/doc/"$pkgname" - ln -s ../../doc/"$pkgname"/LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE - ln -s ../../usr/sbin/nsdc "$pkgdir"/etc/rc.d/nsd + install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}" + ln -s ../../doc/"${pkgname}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE + ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd } diff --git a/community/nsd/install b/community/nsd/install new file mode 100644 index 000000000..d90c83521 --- /dev/null +++ b/community/nsd/install @@ -0,0 +1,19 @@ +post_install() { + getent group nsd &>/dev/null || groupadd -r nsd >/dev/null + getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null + chown nsd:nsd /var/db/nsd + chmod 700 /var/db/nsd + install -o nsd -d /var/run/nsd +} + +post_upgrade() { + [[ `vercmp $2 3.2.9` -lt 0 ]] && cat <<\EOF +==> The database format was updated; please run `nsdc rebuild`. +EOF +} + +post_remove() { + getent passwd nsd &>/dev/null && userdel nsd >/dev/null + getent group nsd &>/dev/null && groupdel nsd >/dev/null + true +} diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 7c5d1d00b..98d193a89 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 59902 2011-12-02 11:04:21Z andrea $ -# Maintainer: +# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $ +# Maintainer: Alexander Rødseth # Contributor: Thomas S Hatch - pkgname=python-pymongo pkgver=1.9b1 -pkgrel=2 +pkgrel=3 pkgdesc="Python driver for MongoDB" +arch=('x86_64' 'i686') license=("APACHE") -url="http://pypi.python.org/pypi/pymongo/" -arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/pymongo3/" depends=('python') makedepends=('python-distribute') -source=(http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz) -md5sums=('6c65dcad8674f37ffc8bc3d6e1fd4155') +source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz") +sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20') package() { - cd $srcdir/pymongo3-$pkgver - LANG=en_US.UTF8 python setup.py install --root=$pkgdir --optimize=1 + cd "$srcdir/pymongo3-$pkgver" + + LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1 } + +# vim:set ts=2 sw=2 et: diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index fa3c19bfa..c28f672da 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143496 2011-11-25 03:20:54Z bisson $ +# $Id: PKGBUILD 144921 2011-12-10 11:25:45Z bisson $ # Maintainer: Gaetan Bisson # Contributor: Andreas Radke # Contributor: damir pkgname=gcin -pkgver=2.1.0 +pkgver=2.5.2 pkgrel=1 pkgdesc='Input method server supporting various input methods' url='http://hyperrate.com/dir.php?eid=67' @@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" 'qt4-lib64.patch') -sha1sums=('9ab09afece8d94faacdcadb150f87c0337108857' +sha1sums=('2d4eddf52fd7a7d6c936afb3c42b12dfc86aed01' '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc') install=install diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index 6c9daaaa4..95d13fa3f 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141116 2011-10-24 10:42:39Z heftig $ +# $Id: PKGBUILD 144927 2011-12-10 21:25:05Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=grilo-plugins -pkgver=0.1.17 -pkgrel=3 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -23,14 +23,11 @@ optdepends=('gupnp-av: uPnP plugin' 'libtracker-sparql: Tracker plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a') +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # support tracker 0.12, already fixed in git master. - sed -i 's/sparql-0.11/sparql-0.12/g' configure - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD index 802a350ec..34c099ffb 100644 --- a/extra/grilo/PKGBUILD +++ b/extra/grilo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139336 2011-10-01 18:58:47Z ibiru $ +# $Id: PKGBUILD 144926 2011-12-10 21:23:58Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=grilo -pkgver=0.1.17 -pkgrel=2 +pkgver=0.1.18 +pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf') +sha256sums=('dc5bc1ea74ed3d47c4ec2d94886234346671509bdc63ce181f98824e7178ae83') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index c33d279c9..6904b9ca3 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 141675 2011-11-02 06:41:48Z andyrtr $ +# $Id: PKGBUILD 144919 2011-12-10 10:45:30Z andyrtr $ # Maintainer: Jan de Groot pkgname=libdrm -pkgver=2.4.27 +pkgver=2.4.28 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -13,16 +13,26 @@ options=('!libtool') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 no-pthread-stubs.patch - COPYING) -md5sums=('0fba4f42735cd3d24dd7a8cde0023fbd' + COPYING + git_fixes.diff + #missing files from http://cgit.freedesktop.org/mesa/drm/snapshot/drm-902ee661f1864aaf8325621085f6a1b5a6a3673a.tar.bz2 - https://bugs.freedesktop.org/show_bug.cgi?id=43538 + rbo.h list.h) +md5sums=('6488f64119c6439fa4038e9cd7b30b67' 'c722c8406507b7e3a8da7a3030d1d9cf' - 'ba65e71c481b94ef0fb6c23c7f21ffa1') + 'ba65e71c481b94ef0fb6c23c7f21ffa1' + '671b87f9670e709e54a19cd292c6330d' + '073846ea43fb4d6130062c1897d92e40' + 'ce867d3331862c2b87d1a37461b42dbe') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" + + # add a missing file in the release tarball + patch -Np1 -i ${srcdir}/git_fixes.diff + cp ${srcdir}/{rbo,list}.h "${srcdir}/${pkgname}-${pkgver}"/tests/radeon/ -# libtoolize --force + #libtoolize --force autoreconf --force --install ./configure --prefix=/usr \ --enable-udev \ diff --git a/extra/libdrm/git_fixes.diff b/extra/libdrm/git_fixes.diff new file mode 100644 index 000000000..5ebcb606a --- /dev/null +++ b/extra/libdrm/git_fixes.diff @@ -0,0 +1,19 @@ +From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 05 Dec 2011 21:24:48 +0000 +Subject: test/radeon: add missing files for dist + +--- +diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am +index 021ca72..1775669 100644 +--- a/tests/radeon/Makefile.am ++++ b/tests/radeon/Makefile.am +@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ + + radeon_ttm_SOURCES = \ + rbo.c \ ++ rbo.h \ ++ list.h \ + radeon_ttm.c +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h new file mode 100644 index 000000000..305c903e1 --- /dev/null +++ b/extra/libdrm/list.h @@ -0,0 +1,137 @@ +/* + * + * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ + +/** + * \file + * List macros heavily inspired by the Linux kernel + * list handling. No list looping yet. + * + * Is not threadsafe, so common operations need to + * be protected using an external mutex. + */ +#ifndef _U_DOUBLE_LIST_H_ +#define _U_DOUBLE_LIST_H_ + +#include + +struct list_head +{ + struct list_head *prev; + struct list_head *next; +}; + +static void list_inithead(struct list_head *item) +{ + item->prev = item; + item->next = item; +} + +static void list_add(struct list_head *item, struct list_head *list) +{ + item->prev = list; + item->next = list->next; + list->next->prev = item; + list->next = item; +} + +static void list_addtail(struct list_head *item, struct list_head *list) +{ + item->next = list; + item->prev = list->prev; + list->prev->next = item; + list->prev = item; +} + +static void list_replace(struct list_head *from, struct list_head *to) +{ + to->prev = from->prev; + to->next = from->next; + from->next->prev = to; + from->prev->next = to; +} + +static void list_del(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; +} + +static void list_delinit(struct list_head *item) +{ + item->prev->next = item->next; + item->next->prev = item->prev; + item->next = item; + item->prev = item; +} + +#define LIST_INITHEAD(__item) list_inithead(__item) +#define LIST_ADD(__item, __list) list_add(__item, __list) +#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) +#define LIST_REPLACE(__from, __to) list_replace(__from, __to) +#define LIST_DEL(__item) list_del(__item) +#define LIST_DELINIT(__item) list_delinit(__item) + +#define LIST_ENTRY(__type, __item, __field) \ + ((__type *)(((char *)(__item)) - offsetof(__type, __field))) + +#define LIST_IS_EMPTY(__list) \ + ((__list)->next == (__list)) + +#ifndef container_of +#define container_of(ptr, sample, member) \ + (void *)((char *)(ptr) \ + - ((char *)&(sample)->member - (char *)(sample))) +#endif + +#define LIST_FOR_EACH_ENTRY(pos, head, member) \ + for (pos = container_of((head)->next, pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ + for (pos = container_of((head)->next, pos, member), \ + storage = container_of(pos->member.next, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.next, storage, member)) + +#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ + for (pos = container_of((head)->prev, pos, member), \ + storage = container_of(pos->member.prev, pos, member); \ + &pos->member != (head); \ + pos = storage, storage = container_of(storage->member.prev, storage, member)) + +#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.next, pos, member)) + +#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ + for (pos = container_of((start), pos, member); \ + &pos->member != (head); \ + pos = container_of(pos->member.prev, pos, member)) + +#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h new file mode 100644 index 000000000..c25c73a4c --- /dev/null +++ b/extra/libdrm/rbo.h @@ -0,0 +1,50 @@ +/* + * Copyright © 2011 Red Hat + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Jerome Glisse + */ +#ifndef RBO_H +#define RBO_H + +#include "list.h" + +struct rbo { + struct list_head list; + int fd; + unsigned refcount; + unsigned mapcount; + unsigned handle; + unsigned size; + unsigned alignment; + void *data; +}; + +struct rbo *rbo(int fd, unsigned handle, unsigned size, + unsigned alignment, void *ptr); +int rbo_map(struct rbo *bo); +void rbo_unmap(struct rbo *bo); +struct rbo *rbo_incref(struct rbo *bo); +struct rbo *rbo_decref(struct rbo *bo); +int rbo_wait(struct rbo *bo); + +#endif diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index c2c25c33a..b15b93d53 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141476 2011-10-30 16:50:53Z foutrelis $ +# $Id: PKGBUILD 144934 2011-12-10 23:19:27Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Ionut Biru # Contributor: Andrea Scarpino @@ -6,8 +6,8 @@ # Contributor: Lucien Immink pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.0 -pkgrel=3 +pkgver=2.10.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') @@ -18,7 +18,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 nm09-more.patch) -sha256sums=('f31f6a32c03e870a1774c827b8cee47ae8edd2c1ba8db98e8d58d9911cbaafcd' +sha256sums=('2f28bddc5edcd714d607d74126c8958ae7c258602b3929e3e6e783d3cb1beac8' '7e173ea37b86b604284da18ea015ee03ccd444f3e980f440c201957d37ee820e') build() { @@ -32,6 +32,9 @@ build() { sed -i 's/env python$/&2/' */plugins/*.py \ libpurple/purple-{remote,notifications-example,url-handler} + # Pidgin doesn't explicitly link to libm + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD index c4b3adcc9..5a6f2f536 100644 --- a/extra/putty/PKGBUILD +++ b/extra/putty/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 131725 2011-07-14 01:51:53Z eric $ +# $Id: PKGBUILD 144938 2011-12-11 04:46:16Z eric $ # Maintainer: Eric Bélanger pkgname=putty -pkgver=0.61 +pkgver=0.62 pkgrel=1 pkgdesc="A terminal integrated SSH/Telnet client" arch=('i686' 'x86_64') url="http://www.chiark.greenend.org.uk/~sgtatham/putty/" license=('MIT') depends=('gtk2') -source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz) -md5sums=('db0e37f6b82ea62f0ace87927d29b2a4') -sha1sums=('cbb82fd392142e3455e859ca8bc7b1e61b246204') +source=(http://the.earth.li/~sgtatham/putty/${pkgver}/${pkgname}-${pkgver}.tar.gz + putty-${pkgver}.tar.gz.sig::http://the.earth.li/~sgtatham/putty/latest/putty-${pkgver}.tar.gz.DSA) +sha1sums=('5898438614117ee7e3704fc3f30a3c4bf2041380' + '128cded001647e3b47494dbfb1eeb70cbed49a7c') build() { cd "${srcdir}/${pkgname}-${pkgver}/unix" diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index a2b0c0585..9d569b19e 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142894 2011-11-17 18:35:07Z ibiru $ +# $Id: PKGBUILD 144929 2011-12-10 21:36:00Z heftig $ # Maintainer: Jan de Groot # Contributor: Michel Brabants pkgname=seahorse pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) license=('GPL') @@ -19,7 +19,7 @@ install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) sha256sums=('25146aa4c4bb4c375ec1afec524e1907852989bd1b0c9e12490326616ac6a7e9' - '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh index 44281ac2b..04f79d8f2 100644 --- a/extra/seahorse/seahorse-ssh-askpass.sh +++ b/extra/seahorse/seahorse-ssh-askpass.sh @@ -1,3 +1,3 @@ -if [ -z "$SSH_ASKPASS" ]; then +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass fi -- cgit v1.2.3-54-g00ecf