SHA256
1
0
forked from pool/nemo

Accepting request 430568 from X11:Cinnamon:Factory

OBS-URL: https://build.opensuse.org/request/show/430568
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nemo?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2016-09-30 13:32:51 +00:00 committed by Git OBS Bridge
commit 3fc51e9f2a
3 changed files with 51 additions and 0 deletions

View File

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

View File

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

View File

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