diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
| commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
| tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/gnome-vfs/PKGBUILD | |
| parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
| parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'extra/gnome-vfs/PKGBUILD')
| -rw-r--r-- | extra/gnome-vfs/PKGBUILD | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD index 7a081928e..9bffe9dec 100644 --- a/extra/gnome-vfs/PKGBUILD +++ b/extra/gnome-vfs/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 92007 2010-09-28 16:42:58Z ibiru $ +# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-vfs pkgver=2.24.4 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Virtual File System" arch=(i686 x86_64 'mips64el') license=('LGPL') -depends=('fam' 'gconf>=2.32.0' 'hal>=0.5.13' 'bzip2' 'avahi>=0.6.27' 'smbclient>=3.5.5' 'gnome-mime-data>=2.18.0-2' 'heimdal>=1.3.3' 'gnutls>=2.8.6') +depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common') options=('!libtool' '!emptydirs' '!makeflags') conflicts=(gnome-vfs-samba) @@ -16,17 +16,12 @@ replaces=(gnome-vfs-samba gnome-vfs-extras) url="http://www.gnome.org" install=gnome-vfs.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2 - hal-show-volume-names.patch gnutls-config.patch) sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa' - 'b38b86d6c966dcf64f9140d800aebe8a14845bb8ce7c045f52d4df483cacd23b' '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #Archlinux patch (b.g.o #321498) - patch -Np1 -i "${srcdir}/hal-show-volume-names.patch" - #Fix build with new gnutls patch -Np1 -i "${srcdir}/gnutls-config.patch" libtoolize --force @@ -37,13 +32,13 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-vfs-2.0 \ - --enable-samba --enable-hal \ + --enable-samba --disable-hal \ --enable-avahi --disable-howl \ --disable-openssl --enable-gnutls make make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -d -m755 "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${startdir}/pkg/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } |