diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:53:51 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-06 13:53:51 -0300 |
| commit | a41239c941341e3c2017c6d3644e2cce0f1badf2 (patch) | |
| tree | efc401addf8099fa96ecaff2dea962b2cdbc813b /extra/xfdesktop | |
| parent | d333dde0a4d6295e9530ab8e988efa1d654e8716 (diff) | |
| parent | 85e0e667660650d70269432a90401d4288776d9d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/frei0r-plugins/PKGBUILD
extra/cairo/PKGBUILD
extra/libxml++/PKGBUILD
Diffstat (limited to 'extra/xfdesktop')
| -rw-r--r-- | extra/xfdesktop/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/xfdesktop/avoid-duplicating-volume-icons.patch | 29 |
2 files changed, 40 insertions, 4 deletions
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 9a79b4aee..3b63c36c7 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158046 2012-05-01 19:51:23Z foutrelis $ +# $Id: PKGBUILD 170243 2012-11-05 22:45:59Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop pkgver=4.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -17,9 +17,11 @@ replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - add-backgrounds-xfce-to-search-path.patch) + add-backgrounds-xfce-to-search-path.patch + avoid-duplicating-volume-icons.patch) sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') + 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5' + 'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,6 +30,11 @@ build() { # https://bugzilla.xfce.org/show_bug.cgi?id=8799 patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch" + # Workaround for GVFS 1.14.0 which emits volume-added signals for + # pre-existing volumes. + # https://bugzilla.xfce.org/show_bug.cgi?id=9464 + patch -Np1 -i "$srcdir/avoid-duplicating-volume-icons.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfdesktop/avoid-duplicating-volume-icons.patch b/extra/xfdesktop/avoid-duplicating-volume-icons.patch new file mode 100644 index 000000000..45e18ac11 --- /dev/null +++ b/extra/xfdesktop/avoid-duplicating-volume-icons.patch @@ -0,0 +1,29 @@ +From 7b8b5cb05bd870549dee2d159e246ce58e325b7f Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evangelos@foutrelis.com> +Date: Tue, 6 Nov 2012 00:10:48 +0200 +Subject: [PATCH] Avoid duplicating volume icons + +This is a workaround for GVFS 1.14.0 which emits volume-added signals +for pre-existing volumes. +--- + src/xfdesktop-file-icon-manager.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/xfdesktop-file-icon-manager.c b/src/xfdesktop-file-icon-manager.c +index 72b6d09..e039cb8 100644 +--- a/src/xfdesktop-file-icon-manager.c ++++ b/src/xfdesktop-file-icon-manager.c +@@ -2521,6 +2521,10 @@ xfdesktop_file_icon_manager_volume_added(GVolumeMonitor *monitor, + { + XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); + ++ /* avoid duplicating volume icons -- workaround for GVFS 1.14.0 */ ++ if (g_hash_table_lookup(fmanager->priv->removable_icons, volume)) ++ return; ++ + xfdesktop_file_icon_manager_add_removable_volume(fmanager, volume); + } + +-- +1.8.0 + |