Date: Monday, April 30, 2012 @ 13:35:56 Author: foutrelis Revision: 157988
upgpkg: xfdesktop 4.10.0-2 Fix FS#29666: Xfce4 wallpaper is mising since change the default for other Added: xfdesktop/trunk/add-backgrounds-xfce-to-search-path.patch Modified: xfdesktop/trunk/PKGBUILD -------------------------------------------+ PKGBUILD | 12 +++++++-- add-backgrounds-xfce-to-search-path.patch | 36 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-30 16:15:04 UTC (rev 157987) +++ PKGBUILD 2012-04-30 17:35:56 UTC (rev 157988) @@ -4,7 +4,7 @@ pkgname=xfdesktop pkgver=4.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -17,12 +17,18 @@ replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) -sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b') +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" + # 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 \ --sysconfdir=/etc \ Added: add-backgrounds-xfce-to-search-path.patch =================================================================== --- add-backgrounds-xfce-to-search-path.patch (rev 0) +++ add-backgrounds-xfce-to-search-path.patch 2012-04-30 17:35:56 UTC (rev 157988) @@ -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); +--