diff --git a/xfdesktop-4.10.0-new-background-location.patch b/xfdesktop-4.10.0-new-background-location.patch deleted file mode 100644 index e7a02e0..0000000 --- a/xfdesktop-4.10.0-new-background-location.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d77079e03fd39d99455ff4f6495cbc6a5cc53308 Mon Sep 17 00:00:00 2001 -From: Nick Schermer -Date: Fri, 03 Aug 2012 19:50:37 +0000 -Subject: Search new background location in list (bug #8799). - -(cherry picked from commit 2ab345ffebe0e2d31aed9281832d71a038b82117) ---- -diff --git a/settings/main.c b/settings/main.c -index 1ebad7c..f4ded70 100644 ---- a/settings/main.c -+++ b/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/ for backwards compatibility with 4.8 */ - backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "xfce4/backdrops/"); - for(i = 0; backdrop_dirs[i]; ++i) { -@@ -696,6 +697,18 @@ 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 v0.9.0.3 diff --git a/xfdesktop-4.10.1-background-bug.patch b/xfdesktop-4.10.1-background-bug.patch deleted file mode 100644 index cd8bee9..0000000 --- a/xfdesktop-4.10.1-background-bug.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b02aef4483e615353ed11e0d3cc29621828ae502 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Wed, 6 Mar 2013 05:58:54 +0200 -Subject: [PATCH] Fix hang when no backdrop image is selected (Bug #9892) - -Checking whether backdrop->priv->image_path exists isn't enough; we'd -also have to check whether backdrop->priv->show_image is TRUE before -proceeding to apply a backdrop image. - -When backdrop->priv->show_image is FALSE, iw and ih (image width/height) -will be zero, but can later be used to compute the upper limit of a for -loop as well as other computations. - -To solve this, a new boolean variable (apply_backdrop_image) is added -and set to TRUE only if the return value of gdk_pixbuf_get_file_info() -is not NULL (meaning that the image format is recognized). - -The above logic error was introduced in commit -ebad377e5cd067cec9f2b402dff4991ddc4cc3b5. ---- - src/xfce-backdrop.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/xfce-backdrop.c b/src/xfce-backdrop.c -index 9a4d7db..f4c2221 100644 ---- a/src/xfce-backdrop.c -+++ b/src/xfce-backdrop.c -@@ -924,6 +924,8 @@ GdkPixbuf * - xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) - { - GdkPixbuf *final_image, *image = NULL, *tmp; -+ GdkPixbufFormat *format = NULL; -+ gboolean apply_backdrop_image = FALSE; - gint i, j; - gint w, h, iw = 0, ih = 0; - XfceBackdropImageStyle istyle; -@@ -933,8 +935,12 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) - - g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL); - -- if(backdrop->priv->show_image && backdrop->priv->image_path) -- gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih); -+ if(backdrop->priv->show_image && backdrop->priv->image_path) { -+ format = gdk_pixbuf_get_file_info(backdrop->priv->image_path, &iw, &ih); -+ /* make sure we have a usable backdrop image */ -+ if(format != NULL) -+ apply_backdrop_image = TRUE; -+ } - - if(backdrop->priv->width == 0 || backdrop->priv->height == 0) { - w = iw; -@@ -956,9 +962,7 @@ xfce_backdrop_get_pixbuf(XfceBackdrop *backdrop) - final_image = create_solid(&backdrop->priv->color1, w, h, FALSE, 0xff); - } - -- /*check if the file exists, -- *and if it doesn't then make the background the single colour*/ -- if(!g_file_test(backdrop->priv->image_path, G_FILE_TEST_EXISTS)) { -+ if(!apply_backdrop_image) { - if(backdrop->priv->brightness != 0) - final_image = adjust_brightness(final_image, backdrop->priv->brightness); - --- -1.8.1.5 - diff --git a/xfdesktop-4.10.3-backdrop-change-fix.patch b/xfdesktop-4.10.3-backdrop-change-fix.patch new file mode 100644 index 0000000..068bde7 --- /dev/null +++ b/xfdesktop-4.10.3-backdrop-change-fix.patch @@ -0,0 +1,52 @@ +diff -ur xfdesktop-4.10.3.org/common/xfdesktop-common.c xfdesktop-4.10.3/common/xfdesktop-common.c +--- xfdesktop-4.10.3.org/common/xfdesktop-common.c 2014-11-16 07:20:57.000000000 +0100 ++++ xfdesktop-4.10.3/common/xfdesktop-common.c 2014-12-11 08:58:23.511865532 +0100 +@@ -102,26 +102,38 @@ + items = 0; + files = g_strsplit(contents, "\n", -1); + ++ g_free(contents); /* not needed anymore */ ++ + /* Since the first line is the file identifier, we need to skip it. + * Additionally, we want to skip blank lines. */ +- for(i = 1; files[i] != NULL; i++) { +- if(g_strcmp0(files[i], "") != 0) { +- g_free(files[items]); +- files[items] = g_strdup(files[i]); +- DBG("files[items] %s", files[items]); +- items++; ++ ++ /* a file with just the header will have only one line */ ++ ++ if(files[0] != NULL) ++ { ++ g_free(files[0]); /* that's the only non-empty line we need to remove */ ++ files[0] = NULL; ++ for(i = 1; files[i] != NULL; i++) { ++ if(g_strcmp0(files[i], "") != 0) { ++ files[items]=files[i]; /* move the string to the current item slot */ ++ ++ items++; ++ } else { ++ g_free(files[i]); /* free the irrelevant empty string */ ++ } + } ++ files[items] = NULL; /* set the sentinel */ ++ ++ /* resize */ ++ ++ files = g_realloc(files, sizeof(gchar *) * (items+1)); + } +- files[items+1] = NULL; + +- files = g_realloc(files, sizeof(gchar *) * (items+1)); + + DBG("items %d", items); + if(n_items) + *n_items = items; + +- g_free(contents); +- + return files; + } + diff --git a/xfdesktop-4.9.2-fix-desktop.patch b/xfdesktop-4.9.2-fix-desktop.patch deleted file mode 100644 index f2eb369..0000000 --- a/xfdesktop-4.9.2-fix-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur xfdesktop-4.9.2.orig/settings/xfce-backdrop-settings.desktop.in xfdesktop-4.9.2/settings/xfce-backdrop-settings.desktop.in ---- xfdesktop-4.9.2.orig/settings/xfce-backdrop-settings.desktop.in 2012-04-01 03:10:12.000000000 -0600 -+++ xfdesktop-4.9.2/settings/xfce-backdrop-settings.desktop.in 2012-04-03 15:10:16.561323417 -0600 -@@ -6,7 +6,7 @@ - Icon=preferences-desktop-wallpaper - Terminal=false - Type=Application --Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; -+Categories=X-XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; - OnlyShowIn=XFCE; - StartupNotify=true - X-XfcePluggable=true diff --git a/xfdesktop.spec b/xfdesktop.spec index 4b102ad..33bf517 100644 --- a/xfdesktop.spec +++ b/xfdesktop.spec @@ -2,7 +2,7 @@ Name: xfdesktop Version: 4.10.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Desktop manager for the Xfce Desktop Environment Group: User Interface/Desktops @@ -10,11 +10,12 @@ License: GPLv2+ URL: http://www.xfce.org/ #VCS: git:git://git.xfce.org/xfce/xfdesktop Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 -# Fix desktop file -#Patch1: xfdesktop-4.9.2-fix-desktop.patch ## Downstream patches # Change default background for Fedora Patch10: xfdesktop-4.9.3-backdrop-image.patch +# Fix crashes with desktop backdrop change. +# https://bugzilla.xfce.org/show_bug.cgi?id=11346 +Patch1: xfdesktop-4.10.3-backdrop-change-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libxfce4ui-devel >= %{xfceversion} @@ -48,6 +49,7 @@ This package includes a desktop manager for the Xfce Desktop Environment. %prep %setup -q +%patch1 -p1 %patch10 -p1 -b .backdrop @@ -99,11 +101,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog -* Tue Nov 18 2014 Mukundan Ragavan - 4.10.3-2 -- Update with bug fixes and improvements +* Thu Jan 08 2015 Kevin Fenzi 4.10.3-3 +- Add patch with fix for crash in timed desktop backdrop changes. Fixes bug #1174160 -* Tue Nov 18 2014 Mukundan Ragavan - 4.10.3-1 -- Updated to version 4.10.3 +* Thu Nov 27 2014 Mukundan Ragavan - 4.10.3-2 +- bump release + +* Sun Nov 16 2014 Kevin Fenzi 4.10.3-1 +- Update to 4.10.3 with various fixes. + +* Mon Aug 18 2014 Fedora Release Engineering - 4.10.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 4.10.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild * Sun Aug 04 2013 Fedora Release Engineering - 4.10.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild