From defe74c9cba07c321ad2869d8f6872e64a167324 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 2 May 2012 00:01:22 +0000 Subject: Wed May 2 00:01:22 UTC 2012 --- extra/xfdesktop/PKGBUILD | 24 +++++++-------- .../add-backgrounds-xfce-to-search-path.patch | 36 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch (limited to 'extra/xfdesktop') diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index a3d15bb41..8feb2e04c 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,42 +1,42 @@ -# $Id: PKGBUILD 150819 2012-02-23 06:32:41Z foutrelis $ +# $Id: PKGBUILD 157989 2012-04-30 17:36:28Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfdesktop -pkgver=4.8.3 +pkgver=4.10.0 pkgrel=2 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') -depends=('libxfce4ui' 'thunar>=1.2.0' 'garcon' 'hicolor-icon-theme' 'libwnck') +depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck') makedepends=('intltool' 'xfce4-panel') optdepends=('xfce4-panel: panel menu plugin') conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2 - implement-paste-on-desktop.patch) -sha256sums=('e58460f52ae96c389402f6db62c46db61cd51cdb550a42bd97c0ab2a5b62f424' - 'f26a75fe27c198cd40fad139310e984f4eaac0dfa2cae0d7f32498a8f58322b2') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + add-backgrounds-xfce-to-search-path.patch) +sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' + 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') build() { cd "$srcdir/$pkgname-$pkgver" - # Fix FS#27866: Paste menu entry in context menu is deactivated - # Upstream report/patch: https://bugzilla.xfce.org/show_bug.cgi?id=3804 - patch -Np1 -i "$srcdir/implement-paste-on-desktop.patch" + # Add backgrounds/xfce/ to the single image list in the settings app + # https://bugzilla.xfce.org/show_bug.cgi?id=8799 + patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch" - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-static \ --enable-gio-unix \ --enable-thunarx \ - --enable-exo \ --enable-notifications \ --disable-debug make diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch new file mode 100644 index 000000000..c48aeac33 --- /dev/null +++ b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch @@ -0,0 +1,36 @@ +@@ -, +, @@ + settings app. (Bug #8799) +--- + settings/main.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +--- a/settings/main.c ++++ a/settings/main.c +@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) + xfconf_channel_set_string(panel->channel, prop_image, image_file); + xfconf_channel_set_string(panel->channel, prop_last, image_file); + ++ /* Add all backdrops in xfce4/backdrops/ */ + backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, + "xfce4/backdrops/"); + for(i = 0; backdrop_dirs[i]; ++i) { +@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) + if(tmp) + image_file_iter = tmp; + } ++ g_strfreev(backdrop_dirs); ++ ++ /* Add all backdrops in backgrounds/xfce/ */ ++ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, ++ "backgrounds/xfce/"); ++ for(i = 0; backdrop_dirs[i]; ++i) { ++ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], ++ image_file); ++ if(tmp) ++ image_file_iter = tmp; ++ } ++ g_strfreev(backdrop_dirs); ++ + + if(!image_file_iter) + image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file); +-- -- cgit v1.2.3-54-g00ecf