Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Mukundan Ragavan
688f7d1582 Apply fedora default background correctly 2021-07-31 12:46:26 -04:00
Troy Dawson
19c3b80b2b remove package.cfg per new epel-playground policy 2020-09-24 16:06:24 +00:00
Mukundan Ragavan
ec5ef7ec54 Drop requires on backgrounds-compat for EPEL 2019-12-18 22:06:41 -05:00
Mukundan Ragavan
1a44e54bc3 Xfce 4.14 on EPEL8 2019-12-10 22:28:15 -05:00
Gwyn Ciesla
87070d163f "Adding package.cfg file" 2019-11-25 16:36:54 -06:00
5 changed files with 35 additions and 71 deletions

3
.gitignore vendored
View file

@ -21,3 +21,6 @@ xfdesktop-4.6.2.tar.bz2
/xfdesktop-4.13.5.tar.bz2
/xfdesktop-4.13.6.tar.bz2
/xfdesktop-4.14.1.tar.bz2
/xfdesktop-4.14.2.tar.bz2
/xfdesktop-4.14.3.tar.bz2
/xfdesktop-4.16.0.tar.bz2

View file

@ -1 +1 @@
SHA512 (xfdesktop-4.14.1.tar.bz2) = 05e8e79efe9683d46e69375eb5c3f1d923b5e875bc7dbb8f9405338e44ae0c48172af119c5e7b141595c38b8de00c58c21f7b7d218737f5ddc2428fd7aa4bc6c
SHA512 (xfdesktop-4.16.0.tar.bz2) = e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129

View file

@ -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;
}

View file

@ -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 <X11/Xlib.h>
#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

View file

@ -1,8 +1,8 @@
%global xfceversion 4.14
%global xfceversion 4.16
Name: xfdesktop
Version: 4.14.1
Release: 2%{?dist}
Version: 4.16.0
Release: 3%{?dist}
Summary: Desktop manager for the Xfce Desktop Environment
License: GPLv2+
@ -10,6 +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: gcc-c++
BuildRequires: libxfce4ui-devel >= %{xfceversion}
BuildRequires: gettext
@ -28,7 +29,6 @@ BuildRequires: libICE-devel
Requires: xfwm4 >= %{xfceversion}
Requires: xfce4-panel >= %{xfceversion}
Requires: redhat-menus
Requires: desktop-backgrounds-compat
%description
@ -39,7 +39,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
@ -59,7 +59,7 @@ desktop-file-validate \
%files -f %{name}.lang
%license COPYING
%doc README TODO ChangeLog NEWS AUTHORS
%doc TODO ChangeLog NEWS AUTHORS
%{_bindir}/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/*/*/*
@ -69,6 +69,31 @@ desktop-file-validate \
%changelog
* Fri Feb 26 2021 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.16.0-3
- Apply fedora default background correctly
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 23 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.16.0-1
- Update to 4.16.0
* Mon Nov 02 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.14.3-1
- Update to 4.14.3
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.2-4
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Jan 14 2020 Mukundan Ragavan <nonamedotc@fedoraproject.org> - 4.14.2-1
- Update to 4.14.2
* Thu Sep 12 2019 Kevin Fenzi <kevin@scrye.com> - 4.14.1-2
- Fix the default background. Upstream changed default, we need to adjust our change.