diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
commit | f0a7e44c0037beb1c6cf1c2e25d8de1a9e9393c8 (patch) | |
tree | 6dda6d4856970e43904fc1e89cbeeb7157ea9ade /extra | |
parent | 78538de96d5d6d9516ae18b68d4c62654eea5278 (diff) | |
parent | 6ca29e0c62691c1f3120dda0f6b59dbb86cc9295 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cppcheck/PKGBUILD
Diffstat (limited to 'extra')
-rw-r--r-- | extra/fvwm/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/kdeplasma-applets-networkmanagement/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/latex2rtf/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/qscintilla/PKGBUILD | 6 |
4 files changed, 21 insertions, 18 deletions
diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index 9619a07a2..07b588a9c 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119852 2011-04-16 03:57:41Z eric $ +# $Id: PKGBUILD 119981 2011-04-18 00:06:29Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm -pkgver=2.6.0 +pkgver=2.6.1 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') @@ -11,9 +11,9 @@ license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'readline' 'librsvg') conflicts=('fvwm-devel') source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop) -md5sums=('e4b4b065b2185be9071a9a55ac49b39a' +md5sums=('fbbbed1bb41fa0878b17ee209947602d' 'e52a6ef25a936dcf3ad0e58f2e9ed0ea') -sha1sums=('7c6ed1075c3faa1cd13c2ebc31f720d971564f5e' +sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36' 'e0924164329e7eb14e0d6137d8ff18cf6230191c') build() { diff --git a/extra/kdeplasma-applets-networkmanagement/PKGBUILD b/extra/kdeplasma-applets-networkmanagement/PKGBUILD index 3ac949f11..2f12a6395 100644 --- a/extra/kdeplasma-applets-networkmanagement/PKGBUILD +++ b/extra/kdeplasma-applets-networkmanagement/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Jakub Schmidtke <sjakub-at-gmail.com> pkgname=kdeplasma-applets-networkmanagement -pkgver=git20110405 -_commit=947e4de8b211b7c29ead108a2c3618a4af9dafe1 +pkgver=git20110418 +_commit=070512212cf01f05a43e4a6fff340994a9bfc290 pkgrel=1 pkgdesc="KDE control panel and widget network connections" arch=('i686' 'x86_64' 'mips64el') @@ -14,11 +14,11 @@ depends=('kdebase-workspace' 'networkmanager') makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') install=${pkgname}.install -source=("${pkgname}-${_commit}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") -md5sums=('17315e3dc3604ee59cf7b5777806f1b7') +source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") +md5sums=('fec76f032b94e06bb2fb7b53d00c944c') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../networkmanagement \ diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD index 9838d2653..e80c4c714 100644 --- a/extra/latex2rtf/PKGBUILD +++ b/extra/latex2rtf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66768 2010-02-01 11:56:05Z giovanni $ -# Maintainer: Jason Chu <jason@archlinux.org> +# $Id: PKGBUILD 119963 2011-04-17 22:11:07Z remy $ +# Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=latex2rtf -pkgver=2.0.0 +pkgver=2.1.0 pkgrel=1 pkgdesc="LaTeX to RTF converter" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,15 @@ url="http://latex2rtf.sourceforge.net/" license=('GPL') depends=('glibc' 'imagemagick' 'ghostscript') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('39611b6dbb5ce78b48c7695f3fcafb88') +sha1sums=('31e6280312b56c2c38cf6a3fddff21a9910c7d6f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr +} - make PREFIX=/usr || return 1 - make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install || return 1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png } diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD index 266222340..fa2b2aaa8 100644 --- a/extra/qscintilla/PKGBUILD +++ b/extra/qscintilla/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117371 2011-03-31 21:19:18Z andrea $ +# $Id: PKGBUILD 119950 2011-04-17 11:43:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=qscintilla pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 license=('GPL') arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro" makedepends=('python-qt') source=("http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-${pkgver}.tar.gz" 'configure.py-objdir-support.diff') -md5sums=('c4677b837c16bcb9d806ff04d5a727b8' +md5sums=('dd7edef5ff674d307057a3c12dbd8fce' '8cf9c06252e2f11ab00e62848e322fd3') |