diff --git a/xfdesktop-4.10.3-backdrop-change-fix.patch b/xfdesktop-4.10.3-backdrop-change-fix.patch deleted file mode 100644 index 068bde7..0000000 --- a/xfdesktop-4.10.3-backdrop-change-fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -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.3-backdrop-image.patch b/xfdesktop-4.9.3-backdrop-image.patch deleted file mode 100644 index e7456dd..0000000 --- a/xfdesktop-4.9.3-backdrop-image.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur xfdesktop-4.9.3.orig/common/xfdesktop-common.h xfdesktop-4.9.3/common/xfdesktop-common.h ---- xfdesktop-4.9.3.orig/common/xfdesktop-common.h 2012-04-14 02:00:51.000000000 -0600 -+++ xfdesktop-4.9.3/common/xfdesktop-common.h 2012-04-14 14:12:58.292166992 -0600 -@@ -32,7 +32,7 @@ - #include - - #define XFDESKTOP_CHANNEL "xfce4-desktop" --#define DEFAULT_BACKDROP DATADIR "/backgrounds/xfce/xfce-blue.jpg" -+#define DEFAULT_BACKDROP DATADIR "/backgrounds/images/default.png" - #define DEFAULT_BACKDROP_LIST "xfce4/desktop/backdrop.list" - #define DEFAULT_ICON_FONT_SIZE 12 - #define DEFAULT_ICON_SIZE 32 diff --git a/xfdesktop.spec b/xfdesktop.spec index b5a3129..2dfc662 100644 --- a/xfdesktop.spec +++ b/xfdesktop.spec @@ -2,7 +2,7 @@ Name: xfdesktop Version: 4.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Desktop manager for the Xfce Desktop Environment License: GPLv2+ @@ -10,7 +10,7 @@ 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 -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: gettext @@ -40,7 +40,7 @@ This package includes a desktop manager for the Xfce Desktop Environment. %setup -q # change default background for Fedora -sed -i 's|/backgrounds/xfce/xfce-stripes.png|/backgrounds/images/default.png|' common/xfdesktop-common.h +sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.png|' common/xfdesktop-common.h %build %configure @@ -70,6 +70,9 @@ desktop-file-validate \ %changelog +* Fri Feb 26 2021 Mukundan Ragavan - 4.16.0-3 +- Apply fedora default background correctly + * Thu Jan 28 2021 Fedora Release Engineering - 4.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild