diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-23 15:47:38 +0200 |
| commit | 9b5c97532f512463af83f0daac1e9db22c3307c2 (patch) | |
| tree | 582f514a154dea23be340cca8abe44a0bf95f132 /extra | |
| parent | f8ec57e91051f85129d837252605854c888567d0 (diff) | |
| parent | 3c19af9355ba86a5b99d6e5a57ecaa68a7ea6e8e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/cegui/PKGBUILD
community-staging/darktable/PKGBUILD
community-staging/freewrl/PKGBUILD
community-staging/gource/PKGBUILD
community-staging/openimageio/PKGBUILD
community-staging/rss-glx/PKGBUILD
community-staging/spring/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community/astromenace/PKGBUILD
extra/di/PKGBUILD
staging/opencv/PKGBUILD
testing/cairo/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/gtkmm3/PKGBUILD
testing/seahorse/PKGBUILD
testing/systemd/PKGBUILD
testing/systemd/systemd.install
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/di/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/git/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/libkgapi/PKGBUILD | 11 |
3 files changed, 15 insertions, 14 deletions
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index 37cd0d056..d9246cdb8 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 143044 2011-11-21 22:39:45Z eric $ +# $Id: PKGBUILD 169510 2012-10-22 19:36:13Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.31 -pkgrel=1.1 +pkgver=4.32 +pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64' 'mips64el') url="http://www.gentoo.com/di/" license=('ZLIB') depends=('glibc') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -sha1sums=('2a7212e03286b68ebb4783ae8937999145165c79') +sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's|error|//error|' C/di.h + sed -i '11i\#include <string.h>' C/di.h make } diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 7eed76f46..72c136bbe 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169122 2012-10-18 14:05:32Z dan $ +# $Id: PKGBUILD 169498 2012-10-22 12:48:27Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.7.12.4 +pkgver=1.8.0 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -109,8 +109,8 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('5f3f0feb59d96f8106e0a56112bc73db' - '9370b44fa97843c5f8adaaaf29b7a4d3' +md5sums=('12f4d20f34ae37086d86dd3b9d037bba' + '66f0a839d933c7d573fb40cb051b5e66' '8e2648910fd5dd4f1c41d3c7fa9e9156' '2e42bf97779a1c6411d89043334c9e78' '042524f942785772d7bd52a1f02fe5ae' diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD index fd418a3c2..8f5c3c90b 100644 --- a/extra/libkgapi/PKGBUILD +++ b/extra/libkgapi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165471 2012-08-20 13:27:31Z andrea $ +# $Id: PKGBUILD 169492 2012-10-22 07:20:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkgapi -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 pkgdesc="A KDE-based library for accessing various Google services via their public API" url='https://projects.kde.org/projects/extragear/libs/libkgapi' @@ -12,11 +12,10 @@ depends=('kdepimlibs' 'qjson') makedepends=('cmake' 'automoc4' 'boost') replaces=('akonadi-google' 'libkgoogle') conflicts=('akonadi-google' 'libkgoogle') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7da940eb4ed9bdb909d29e93ef6bce67') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('99e61ad50edd51f679170db3b997736b') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +25,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } |