diff options
| author | root <root@rshg054.dnsready.net> | 2013-03-05 00:04:04 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-03-05 00:04:04 -0800 |
| commit | 582035722561a5ecbadc13abc26331353d810567 (patch) | |
| tree | 5675deeca2920b9049898c22334a3d5972259547 /extra/xfdesktop | |
| parent | 6b7f3479bf5f3c96f92b3962af6cbf74d627e474 (diff) | |
Tue Mar 5 00:04:04 PST 2013
Diffstat (limited to 'extra/xfdesktop')
| -rw-r--r-- | extra/xfdesktop/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch | 36 |
2 files changed, 5 insertions, 47 deletions
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 463787925..1b999453e 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $ +# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop -pkgver=4.10.0 -pkgrel=5 +pkgver=4.10.1 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -16,18 +16,12 @@ conflicts=('xfce4-menueditor') 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) -sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad') 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 \ diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch deleted file mode 100644 index c48aeac33..000000000 --- a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -@@ -, +, @@ - 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); --- |