From f344957e3d74900559d40ee1756287e40e09964596db903c6261a0f0d6b1edc6 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Tue, 27 Sep 2016 12:39:56 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=95 --- nemo-fix-desktop-redraw.patch | 42 +++++++++++++++++++++++++++++++++++ nemo.changes | 6 +++++ nemo.spec | 3 +++ 3 files changed, 51 insertions(+) create mode 100644 nemo-fix-desktop-redraw.patch diff --git a/nemo-fix-desktop-redraw.patch b/nemo-fix-desktop-redraw.patch new file mode 100644 index 0000000..42a3474 --- /dev/null +++ b/nemo-fix-desktop-redraw.patch @@ -0,0 +1,42 @@ +--- a/libnemo-private/nemo-icon-container.c ++++ b/libnemo-private/nemo-icon-container.c +@@ -4249,11 +4249,13 @@ realize (GtkWidget *widget) + + container = NEMO_ICON_CONTAINER (widget); + ++#if !GTK_CHECK_VERSION(3, 21, 0) + /* Ensure that the desktop window is native so the background + set on it is drawn by X. */ + if (container->details->is_desktop) { + gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget))); + } ++#endif + + /* Set up DnD. */ + nemo_icon_dnd_init (container); +--- a/src/nemo-desktop-icon-view.c ++++ b/src/nemo-desktop-icon-view.c +@@ -155,6 +155,10 @@ nemo_desktop_icon_view_class_init (NemoD + vclass->update_menus = real_update_menus; + vclass->get_view_id = real_get_id; + ++#if GTK_CHECK_VERSION(3, 21, 0) ++ GtkWidgetClass *wclass = GTK_WIDGET_CLASS (class); ++ gtk_widget_class_set_css_name (wclass, "nemo-desktop-icon-view"); ++#endif + g_type_class_add_private (class, sizeof (NemoDesktopIconViewDetails)); + } + +--- a/src/nemo-style-application.css ++++ b/src/nemo-style-application.css +@@ -1,5 +1,10 @@ + /* Desktop text stuff */ + ++.nemo-window.nemo-desktop-window notebook, ++.nemo-window.nemo-desktop-window paned { ++ background-color: transparent; ++} ++ + .nemo-canvas-item { + border-radius: 3px; + } diff --git a/nemo.changes b/nemo.changes index 3c1f7a0..20dbd54 100644 --- a/nemo.changes +++ b/nemo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 12:38:17 UTC 2016 - sor.alexei@meowr.ru + +- Add nemo-fix-desktop-redraw.patch from upstream commit 4e5a103: + fix a GTK+ 3.21.3+ desktop (boo#1001431, gh#linuxmint/nemo#1231). + ------------------------------------------------------------------- Thu Jun 23 18:43:19 UTC 2016 - sor.alexei@meowr.ru diff --git a/nemo.spec b/nemo.spec index 62e2068..0b96698 100644 --- a/nemo.spec +++ b/nemo.spec @@ -31,6 +31,8 @@ Source: https://github.com/linuxmint/%{name}/archive/%{version}/%{name}- Patch1: %{name}-implicit-pointer-decl.patch # PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte@opensuse.org -- Fix OBS gcc checks. Patch2: %{name}-void-return-no-return.patch +# PATCH-FIX-UPSTREAM nemo-fix-desktop-redraw.patch boo#1001431 gh#linuxmint/nemo#1231 -- Fix a GTK+ 3.21.3+ desktop redraw issue (commit 4e5a103). +Patch3: %{name}-fix-desktop-redraw.patch BuildRequires: cinnamon-translations BuildRequires: fdupes BuildRequires: gnome-common @@ -109,6 +111,7 @@ This package provides the GObject Introspection bindings for Nemo. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build NOCONFIGURE=1 gnome-autogen.sh