diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-27 16:17:51 +0200 |
| commit | 0ee0392ee9301df31f6e3c601214bb250112fa75 (patch) | |
| tree | 3d91576bf751a8a45ddad77e0a37c2d8fd4fa91f /extra/vinagre | |
| parent | a3ba265c32b1de731745e1abc812f5d21bcd6aaf (diff) | |
| parent | 5233daa5825f00ccf0722ef9733ea6b3bbd44bc8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dwdiff/PKGBUILD
community/ejabberd/PKGBUILD
community/gnome-settings-daemon-updates/PKGBUILD
community/gpicview/PKGBUILD
community/libgexiv2/PKGBUILD
community/mapnik/PKGBUILD
community/mplayer2/PKGBUILD
community/open-vm-tools/PKGBUILD
community/vdrift/PKGBUILD
community/xboard/PKGBUILD
core/openssh/PKGBUILD
extra/boost/PKGBUILD
extra/dconf/PKGBUILD
extra/elfutils/PKGBUILD
extra/gconf/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-disk-utility/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-power-manager/PKGBUILD
extra/gnome-themes-standard/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/gtk3/PKGBUILD
extra/gvfs/PKGBUILD
extra/icu/PKGBUILD
extra/libgsf/PKGBUILD
extra/libimobiledevice/PKGBUILD
extra/libplist/PKGBUILD
extra/libreoffice/PKGBUILD
extra/libwebkit/PKGBUILD
extra/mutter/PKGBUILD
extra/pango/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/telepathy-kde-accounts-kcm/PKGBUILD
extra/telepathy-kde-approver/PKGBUILD
extra/telepathy-kde-auth-handler/PKGBUILD
extra/telepathy-kde-contact-list/PKGBUILD
extra/telepathy-kde-filetransfer-handler/PKGBUILD
extra/telepathy-kde-integration-module/PKGBUILD
extra/telepathy-kde-send-file/PKGBUILD
extra/telepathy-kde-text-ui/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/virtuoso/PKGBUILD
extra/yelp/PKGBUILD
libre/unarchiver/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-pango/PKGBUILD
testing/binutils/PKGBUILD
Diffstat (limited to 'extra/vinagre')
| -rw-r--r-- | extra/vinagre/PKGBUILD | 23 | ||||
| -rw-r--r-- | extra/vinagre/vinagre.install | 10 |
2 files changed, 12 insertions, 21 deletions
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index 5f141bb08..f4c46ae7f 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 142898 2011-11-17 18:35:12Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Maintainer: Allan McRae <mcrae_allan@hotmail.com> +# $Id: PKGBUILD 156998 2012-04-23 09:10:54Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.2.2 +pkgver=3.4.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64' 'mips64el') @@ -14,24 +15,20 @@ install=vinagre.install depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') optdepends=('openssh: SSH plugin' 'rdesktop: RDP plugin') -makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh') +makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1533cc447177f8d6c9cfe45d61b05904efbf66c86b86b4c332e972ff965d76bd') +sha256sums=('5b79bbdafe57e1ceaeddfc1091a9f02aa6e3a54e55ffd2517be512d35e89654f') build() { - cd "$srcdir/$pkgname-$pkgver" - - #building with as-needed breaks rdp - #https://bugzilla.gnome.org/show_bug.cgi?id=653558 - export LDFLAGS="$LDFLAGS,--no-as-needed" - ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/vinagre/vinagre.install b/extra/vinagre/vinagre.install index 68158ac80..4998e6e8b 100644 --- a/extra/vinagre/vinagre.install +++ b/extra/vinagre/vinagre.install @@ -1,16 +1,10 @@ post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + glib-compile-schemas /usr/share/glib-2.0/schemas update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor update-mime-database usr/share/mime > /dev/null } -pre_upgrade() { - if (( $(vercmp $2 2.91.91-2) < 0 )); then - usr/sbin/gconfpkg --uninstall vinagre - fi -} - post_upgrade() { post_install } |