diff --git a/.gitignore b/.gitignore index ac2d5e7..f86c0ff 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ xfdesktop-4.6.2.tar.bz2 /xfdesktop-4.14.2.tar.bz2 /xfdesktop-4.14.3.tar.bz2 /xfdesktop-4.16.0.tar.bz2 +/xfdesktop-4.16.1.tar.bz2 diff --git a/3.patch b/3.patch deleted file mode 100644 index cb6b839..0000000 --- a/3.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 16f9c2b615ef891fc2d20a50f5d4ede0ead3d036 Mon Sep 17 00:00:00 2001 -From: Andre Miranda -Date: Thu, 25 Jun 2020 21:18:24 -0300 -Subject: [PATCH 1/2] Set a pixmap XID, not the XID of the root window (#62) - ---- - src/xfce-desktop.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c -index 2da0c328..59834b9c 100644 ---- a/src/xfce-desktop.c -+++ b/src/xfce-desktop.c -@@ -65,6 +65,8 @@ - #include - #include - -+#include -+ - #ifdef ENABLE_DESKTOP_ICONS - #include "xfdesktop-icon-view.h" - #include "xfdesktop-window-icon-manager.h" -@@ -316,13 +318,13 @@ set_real_root_window_surface(GdkScreen *gscreen, - cairo_surface_t *surface) - { - #ifndef DISABLE_FOR_BUG7442 -- Window xid; -+ Pixmap pixmap_id; - GdkDisplay *display; - GdkWindow *groot; - cairo_pattern_t *pattern; - - groot = gdk_screen_get_root_window(gscreen); -- xid = GDK_WINDOW_XID(groot); -+ pixmap_id = cairo_xlib_surface_get_drawable (surface); - - display = gdk_screen_get_display(gscreen); - gdk_x11_display_error_trap_push(display); -@@ -331,7 +333,7 @@ set_real_root_window_surface(GdkScreen *gscreen, - gdk_property_change(groot, - gdk_atom_intern("_XROOTPMAP_ID", FALSE), - gdk_atom_intern("PIXMAP", FALSE), 32, -- GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); -+ GDK_PROP_MODE_REPLACE, (guchar *)&pixmap_id, 1); - /* and set the root window's BG surface, because aterm is somewhat lame. */ - pattern = cairo_pattern_create_for_surface(surface); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS --- -GitLab - - -From 6ec922449bab5fceadcb8fce1a45962aaa4bf701 Mon Sep 17 00:00:00 2001 -From: Andre Miranda -Date: Thu, 25 Jun 2020 21:18:48 -0300 -Subject: [PATCH 2/2] Do not delete property not set - -Not set since f4c2a90d89961e99d422cb59bb58322195976414 ---- - src/xfce-desktop.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c -index 59834b9c..f1557d62 100644 ---- a/src/xfce-desktop.c -+++ b/src/xfce-desktop.c -@@ -1273,7 +1273,6 @@ xfce_desktop_unrealize(GtkWidget *widget) - - #ifndef DISABLE_FOR_BUG7442 - gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE)); -- gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE)); - G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gdk_window_set_background_pattern(groot, NULL); - G_GNUC_END_IGNORE_DEPRECATIONS --- -GitLab - diff --git a/sources b/sources index ab631b1..5e71725 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfdesktop-4.16.0.tar.bz2) = e62e5fb12997c3138fa36aed06388b921f5223ec09afbd22b622ef39bc421773acbf73606ffc3b38b5a01845678847cda43d193c8457608715cf750acd466129 +SHA512 (xfdesktop-4.16.1.tar.bz2) = 87e90c2946c80befc38bf724fff6a834d462c47439b727d172e766765d4e7e200a2415c271459b2e820b6d8425f7e92c928ba9a098e63473acf0e7369c122cfb diff --git a/xfdesktop.spec b/xfdesktop.spec index 01db5b0..1e11ce3 100644 --- a/xfdesktop.spec +++ b/xfdesktop.spec @@ -1,16 +1,13 @@ %global xfceversion 4.16 Name: xfdesktop -Version: 4.16.0 +Version: 4.16.1 Release: %autorelease Summary: Desktop manager for the Xfce Desktop Environment 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 -# already upstream patch to fix gkrelm crashes -Patch1: https://gitlab.xfce.org/xfce/xfdesktop/-/merge_requests/3.patch BuildRequires: make BuildRequires: gcc-c++ @@ -33,16 +30,12 @@ Requires: xfce4-panel >= %{xfceversion} Requires: redhat-menus Requires: desktop-backgrounds-compat - %description This package includes a desktop manager for the Xfce Desktop Environment. - %prep %setup -q -%patch1 -p1 - # change default background for Fedora sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.png|' common/xfdesktop-common.h @@ -52,13 +45,12 @@ sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.png|' %make_build %install - %make_install -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +find %{buildroot} -name '*.la' -exec rm -f {} ';' desktop-file-validate \ - $RPM_BUILD_ROOT/%{_datadir}/applications/xfce-backdrop-settings.desktop + %{buildroot}/%{_datadir}/applications/xfce-backdrop-settings.desktop %find_lang %{name} @@ -72,6 +64,5 @@ desktop-file-validate \ %{_datadir}/backgrounds/xfce %{_mandir}/man1/* - %changelog %autochangelog