diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-08 09:54:57 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-11-08 09:54:57 +0100 |
| commit | ca63f47c4736ce7a6f6b544c50cf29d2ffe563c1 (patch) | |
| tree | e3ef58d850012b4943c980af55864f0fb768bcbc /extra/xfdesktop/PKGBUILD | |
| parent | b28838efa921982fb5ab1ec277a2df13a9890983 (diff) | |
| parent | a8fff09ba6d0f8b78b43e63541b1254763d4f48e (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/apvlv/PKGBUILD
community/haddock/PKGBUILD
community/ibus-pinyin/PKGBUILD
core/libtirpc/PKGBUILD
extra/htop/PKGBUILD
extra/rhythmbox/PKGBUILD
Diffstat (limited to 'extra/xfdesktop/PKGBUILD')
| -rw-r--r-- | extra/xfdesktop/PKGBUILD | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 3b63c36c7..4558e9281 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170243 2012-11-05 22:45:59Z foutrelis $ +# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop pkgver=4.10.0 -pkgrel=4 +pkgrel=5 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -17,11 +17,9 @@ 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 - avoid-duplicating-volume-icons.patch) + add-backgrounds-xfce-to-search-path.patch) sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5' - 'f2ad30fe8fed9e2f5a65c214f03b65353527d285a4ea0ec22a1feac5c452446b') + 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,11 +28,6 @@ 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 \ |