diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-11 11:53:09 +0100 |
commit | 3156702a5deccd61451be9f7d8ba0fd212a3043b (patch) | |
tree | 624620bf3c78560df2455ebe11c66073a39d7355 /community | |
parent | aa74620a7ef4a49bd466b993c4675514781bd179 (diff) | |
parent | 4640048ddd1331c9f6fc14b8921ccecdb6b1ea11 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/kmod/PKGBUILD
core/nfs-utils/PKGBUILD
extra/libdmx/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/libgnome-keyring/PKGBUILD
gnome-unstable/libgweather/PKGBUILD
gnome-unstable/libgweather/libgweather.install
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
testing/libxcb/PKGBUILD
testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
testing/libxi/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'community')
-rw-r--r-- | community/blueman/PKGBUILD | 10 | ||||
-rw-r--r-- | community/midori/PKGBUILD | 6 | ||||
-rw-r--r-- | community/scorched3d/PKGBUILD | 19 | ||||
-rw-r--r-- | community/xonotic/PKGBUILD | 4 |
4 files changed, 21 insertions, 18 deletions
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 85e171c6e..29e726254 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59799 2011-11-30 12:25:12Z spupykin $ +# $Id: PKGBUILD 67339 2012-03-09 11:49:16Z allan $ # Maintainer : Ionut Biru <ibiru@archlinux.org # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=blueman pkgver=1.23 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -33,11 +33,15 @@ build() { done sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py - [ -f Makefile ] || ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/blueman \ --with-no-runtime-deps-check make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop } diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 815e16643..de185bc66 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67138 2012-03-04 23:52:43Z pschmitz $ +# $Id: PKGBUILD 67337 2012-03-09 05:57:19Z bpiotrowski $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.3 +pkgver=0.4.4 pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-util makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('900037557b82818d79d2dd1c5a7d7fd2') +md5sums=('a6578ebfd237c0f22cce49113b95f70c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/scorched3d/PKGBUILD b/community/scorched3d/PKGBUILD index 41f5366b4..49f026c81 100644 --- a/community/scorched3d/PKGBUILD +++ b/community/scorched3d/PKGBUILD @@ -1,8 +1,10 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Seppo Porspakka <sporspak@paju.oulu.fi> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scorched3d -pkgver=43.3 +pkgver=43.3.d +_pkgver=43.3d pkgrel=1 pkgdesc="A 3d artillery combat game" arch=('i686' 'x86_64' 'mips64el') @@ -11,14 +13,14 @@ license=('GPL') depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'mesa' 'fftw' 'libjpeg>=8' 'xdg-utils') makedepends=('sharutils') install=scorched3d.install -source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${pkgver}-src.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" 'scorched3d.desktop' 'scorched3d.png.uu' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' 'scorched3d-libpng1.5.patch' 'libpng14.patch') -md5sums=('3e4aa690ddb2d7dfa26d283faf59f897' +md5sums=('9c3043282a9e7451468ff325bef3b04c' 'b951f2150004e10fdff3e6226f1a3939' '178a281333006c6a5a92919865c1d7af' '053769f77a38c252eef1d967b18e93e6' @@ -31,7 +33,7 @@ build() { # patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch # patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch - patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch + patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch # patch -Np0 -i ${srcdir}/libpng14.patch WANT_WXGTK=gtk2 @@ -52,13 +54,10 @@ package() { make DESTDIR=${pkgdir} install - # freedesktop stuff - png and desktop file ganked from debian cd ${srcdir} uudecode --output-file=scorched3d.png scorched3d.png.uu - install -D -m644 scorched3d.png \ - ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png - install -D -m644 scorched3d.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop + install -D -m644 scorched3d.png ${pkgdir}/usr/share/icons/hicolor/48x48/apps/${pkgname}.png + install -D -m644 scorched3d.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop } diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD index 659282e24..9a01eb7c3 100644 --- a/community/xonotic/PKGBUILD +++ b/community/xonotic/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> pkgname=xonotic -pkgver=0.5.0 +pkgver=0.6.0 pkgrel=1 pkgdesc="A free, fast-paced crossplatform first-person shooter" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ makedepends=('unzip' 'mesa') source=("http://dl.xonotic.org/xonotic-${pkgver}-source.zip" "xonotic-glx.desktop" "xonotic-sdl.desktop") -md5sums=('7382f195386b8e51df65e57e6be413e5' +md5sums=('47e8468054bf1346c57f3f8fdc97575e' '914c7b9163e92b35f0ab57fdb1653ac5' 'da7d812ff231c9332cd694b39757adda') |