From 650a87f5a67f6e71d4a56e52139a718d86ebbb46 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 15 Feb 2012 20:35:25 +0000 Subject: Wed Feb 15 20:35:25 UTC 2012 --- extra/conky/PKGBUILD | 8 +++++--- extra/conky/PKGBUILD.cmake | 2 ++ extra/git/PKGBUILD | 12 +++++------- extra/gpsd/PKGBUILD | 8 ++++---- extra/kdebindings-python/PKGBUILD | 4 ++-- extra/metalog/PKGBUILD | 16 +++++++--------- extra/pyqt/PKGBUILD | 20 ++++++++++---------- extra/pyqt/fix-qthelp-build.patch | 6 +++--- extra/sip/PKGBUILD | 9 ++++----- extra/uim/PKGBUILD | 10 +++++----- extra/windowmaker/PKGBUILD | 13 ++++++------- 11 files changed, 53 insertions(+), 55 deletions(-) (limited to 'extra') diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index 543348b26..037f0a618 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 142242 2011-11-07 05:35:59Z bisson $ +# $Id: PKGBUILD 150215 2012-02-15 03:04:18Z bisson $ # Contributor: Giovanni Scafora # Contributor: James Rayner # Contributor: Partha Chowdhury @@ -6,7 +6,7 @@ pkgname=conky pkgver=1.8.2git20111107 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight system monitor for X' url='http://conky.sourceforge.net/' license=('BSD' 'GPL') @@ -44,5 +44,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim + install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } diff --git a/extra/conky/PKGBUILD.cmake b/extra/conky/PKGBUILD.cmake index 7f980868f..a4d50d737 100644 --- a/extra/conky/PKGBUILD.cmake +++ b/extra/conky/PKGBUILD.cmake @@ -44,4 +44,6 @@ package() { make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 ../conky/{COPYING,LICENSE}* "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim + install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 48cdca748..18c09ed34 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 149948 2012-02-11 23:30:42Z allan $ +# $Id: PKGBUILD 150206 2012-02-14 20:14:21Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.9 -pkgrel=2 +pkgver=1.7.9.1 +pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) url="http://git-scm.com/" @@ -22,8 +22,6 @@ optdepends=('tk: gitk and git gui' replaces=('git-core') provides=('git-core') backup=('etc/conf.d/git-daemon.conf') -#source=("http://kernel.org/pub/software/scm/git/${pkgname}-${pkgver}.tar.bz2" -# "http://kernel.org/pub/software/scm/git/git-manpages-$pkgver.tar.bz2" source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz" "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz" git-daemon @@ -80,7 +78,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('ed51ef5ef250daaa6e98515cf2641820cd268d4c' - '1ca1fc430b2814f9e9cf82ec3bf7f2eaf5209b7a' +sha1sums=('bd85327627f96c4e98071a4d1d32c30f210aa54a' + '8c6ee031b39da5c5e53f927952838796e0959ce9' 'f2b41828bd912b72e2cb3e14677739c4f370de66' '149e2da1ecb48872ddb31c0945afeaad1f9653d7') diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 1c9ae1425..bf665d310 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 142040 2011-11-04 20:43:48Z andrea $ +# $Id: PKGBUILD 150180 2012-02-14 08:19:26Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Sergej Pupykin # Contributor: Giacomo Rizzo pkgname=gpsd -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') @@ -21,8 +21,8 @@ options=('!libtool') install="${pkgname}.install" source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} 'gpsd' 'gpsd.conf.d') -md5sums=('4cfdcfd88e925f4d0d6c2272fc573ab5' - '90086315ed6f266748b9acb338b903a5' +md5sums=('c01353459faa68834309109d4e868460' + '8aea27e1b0c23f254f94861f7d898106' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index cabf80cc7..baa314ddc 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147780 2012-01-28 10:32:45Z andrea $ +# $Id: PKGBUILD 150178 2012-02-14 07:57:40Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdebindings-python pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="KDE bindings for Python" url="http://kde.org/" arch=('i686' 'x86_64') diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index 4d5002f2b..f44fb93ba 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149960 2012-02-11 23:31:08Z allan $ +# $Id: PKGBUILD 150210 2012-02-14 21:34:23Z juergen $ # Maintainer: juergen # Contributor: Tom Newsom pkgname=metalog -pkgver=1.0 -pkgrel=3 +pkgver=2.0 +pkgrel=1 pkgdesc="Metalog is a modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') @@ -12,21 +12,19 @@ arch=('i686' 'x86_64') depends=('pcre') provides=('logger') backup=('etc/metalog.conf' 'etc/conf.d/metalog') -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-1.tar.lzma" - 'metalog' - 'metalog.confd') -md5sums=('df4ec89f6a0df24a43f9592ee80ab6be' +source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd') +md5sums=('e948d10d780205eae17645c89aee1361' 'cdd1d34eedbfbc2d9e659bf0a0f58f56' '86bccd5a02996921e29eff8a0394d11f') build() { - cd $srcdir/$pkgname-1 + cd $srcdir/$pkgname-2 ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd $srcdir/$pkgname-1 + cd $srcdir/$pkgname-2 make DESTDIR=$pkgdir install install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD index a0510e30d..d46ff3749 100644 --- a/extra/pyqt/PKGBUILD +++ b/extra/pyqt/PKGBUILD @@ -1,13 +1,12 @@ -# $Id: PKGBUILD 145605 2011-12-23 14:48:45Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 150176 2012-02-14 07:57:37Z andrea $ +# Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai Ben pkgbase=pyqt pkgname=('pyqt' 'python2-pyqt') -pkgver=4.9 -pkgrel=2 +pkgver=4.9.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') @@ -15,14 +14,15 @@ makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon' 'python-opengl' 'qt-assistant-compat' 'qtwebkit') source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz" 'fix-qthelp-build.patch') -md5sums=('61619500d09d87b6c2a25bd3ea994504' - '356a453331a33c507b1baba4a9771764') +md5sums=('7f495dc49f71e3bfb64bf942e0d8bb3c' + '6acfe0a5a00779f946c29d5fac647ce1') build() { - cd "${srcdir}" - - patch -p0 -i "${srcdir}"/fix-qthelp-build.patch + # Build QtHelp (FS#27665) + cd "${srcdir}"/PyQt-x11-gpl-${pkgver} + patch -p1 -i "${srcdir}"/fix-qthelp-build.patch + cd "${srcdir}" cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver} cd "${srcdir}/PyQt-x11-gpl-${pkgver}" diff --git a/extra/pyqt/fix-qthelp-build.patch b/extra/pyqt/fix-qthelp-build.patch index cd565e646..6055f9f35 100644 --- a/extra/pyqt/fix-qthelp-build.patch +++ b/extra/pyqt/fix-qthelp-build.patch @@ -1,6 +1,6 @@ ---- PyQt-x11-gpl-4.9/configure.py~ 2011-12-23 14:53:07.981490550 +0100 -+++ PyQt-x11-gpl-4.9/configure.py 2011-12-23 14:52:38.384984221 +0100 -@@ -1264,7 +1264,7 @@ +--- PyQt-x11-gpl-4.9.1/configure.py~ 2012-02-13 20:16:11.418786488 +0000 ++++ PyQt-x11-gpl-4.9.1/configure.py 2012-02-13 20:16:50.561809527 +0000 +@@ -1261,7 +1261,7 @@ opengl = (mname == "QtOpenGL") qt = [mname] diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index fd047dc72..8a3f939a3 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 145600 2011-12-23 10:58:52Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino +# $Id: PKGBUILD 150174 2012-02-14 07:57:34Z andrea $ +# Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai , Ben pkgbase=sip pkgname=('sip' 'python2-sip') -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz") -md5sums=('3f61fd39d5b0c8fa9e43b59af04de924') +md5sums=('5a12ea8e8a09b879ed2b3817e30fbc84') build() { cd "${srcdir}" diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index 01142b16b..fd1e4dc15 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 146641 2012-01-15 08:38:24Z bisson $ +# $Id: PKGBUILD 150199 2012-02-14 13:39:03Z bisson $ # Maintainer: Gaetan Bisson # Contributor: damir pkgname=uim -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc='Multilingual input method library' -arch=('i686' 'x86_64') url='http://code.google.com/p/uim/' license=('custom:BSD') +arch=('i686' 'x86_64') depends=('libxft' 'libedit' 'anthy' 'm17n-lib') makedepends=('intltool' 'gettext' 'qt' 'gtk2' 'gtk3' 'gnome-panel') optdepends=('qt: immodule and helper applications' @@ -16,8 +16,8 @@ optdepends=('qt: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('4982178aca6ee1ae775fc2a9b4bbb7a66e97cbd4') +source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('1c7bb8c6c475dcbc4768bcabac540c42ccfd8185') install=install diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index d09b67951..e9a98534e 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149306 2012-02-06 18:35:19Z daniel $ +# $Id: PKGBUILD 150208 2012-02-14 20:50:29Z daniel $ # Maintainer: Daniel Isenmann # Contributor: Judd Vinet pkgname=windowmaker -pkgver=0.95.1 +pkgver=0.95.2 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) @@ -10,14 +10,13 @@ url="http://www.windowmaker.org/" license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') -source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('1b0d0aa2ac53a7a98ef80a35e507b082' +source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz wmaker.desktop) +md5sums=('ae62bad9c4dee504066e0f172b565ff0' '2fba97bebfd691836b92b8f0db79ff13') build() { - cd $srcdir/windowmaker-$pkgver + cd $srcdir/WindowMaker-$pkgver [ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ --enable-usermenu --enable-modelock --enable-xrandr @@ -25,7 +24,7 @@ build() { } package() { - cd $srcdir/windowmaker-$pkgver + cd $srcdir/WindowMaker-$pkgver make DESTDIR=$pkgdir install install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL -- cgit v1.2.3-54-g00ecf