Date: Wednesday, October 12, 2016 @ 12:42:34 Author: bgyorgy Revision: 192053
upgpkg: nemo 3.0.6-2 Fix GTK 3.21.3 desktop redraw issue (FS#51340); remove D-Bus activation file to avoid conflict with nautilus-desktop Added: nemo/trunk/Fix-GTK-3.21.3-desktop-redraw-issue.patch Modified: nemo/trunk/PKGBUILD -------------------------------------------+ Fix-GTK-3.21.3-desktop-redraw-issue.patch | 62 ++++++++++++++++++++++++++++ PKGBUILD | 15 +++++- 2 files changed, 74 insertions(+), 3 deletions(-) Added: Fix-GTK-3.21.3-desktop-redraw-issue.patch =================================================================== --- Fix-GTK-3.21.3-desktop-redraw-issue.patch (rev 0) +++ Fix-GTK-3.21.3-desktop-redraw-issue.patch 2016-10-12 12:42:34 UTC (rev 192053) @@ -0,0 +1,62 @@ +From 4e5a1037de0dc24e44a58e239e281b4c2d5740af Mon Sep 17 00:00:00 2001 +From: leigh123linux <leigh123li...@googlemail.com> +Date: Sat, 23 Jul 2016 18:05:14 +0100 +Subject: [PATCH] Fix GTK 3.21.3 desktop redraw issue (#1231) + +--- + libnemo-private/nemo-icon-container.c | 2 ++ + src/nemo-desktop-icon-view.c | 4 ++++ + src/nemo-style-application.css | 5 +++++ + 3 files changed, 11 insertions(+) + +diff --git a/libnemo-private/nemo-icon-container.c b/libnemo-private/nemo-icon-container.c +index 002351f..a26ed2c 100644 +--- 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); +diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c +index ad025d3..be310b5 100644 +--- a/src/nemo-desktop-icon-view.c ++++ b/src/nemo-desktop-icon-view.c +@@ -155,6 +155,10 @@ nemo_desktop_icon_view_class_init (NemoDesktopIconViewClass *class) + 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)); + } + +diff --git a/src/nemo-style-application.css b/src/nemo-style-application.css +index f6a781a..aa682b3 100644 +--- 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; + } +-- +2.9.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-10-12 11:39:48 UTC (rev 192052) +++ PKGBUILD 2016-10-12 12:42:34 UTC (rev 192053) @@ -4,7 +4,7 @@ pkgname=nemo pkgver=3.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -14,12 +14,18 @@ makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common' 'python-gobject' 'python-polib' 'python2-gobject') options=('!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver") -sha256sums=('77d5c47a6657dfbaf66c9f80978ce8650595753138d27bd2adaebbe0e46c3e23') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" + "Fix-GTK-3.21.3-desktop-redraw-issue.patch") +sha256sums=('77d5c47a6657dfbaf66c9f80978ce8650595753138d27bd2adaebbe0e46c3e23' + 'ff2fe4fbf6edbdc51e0c6cef08b3b10ae612718d71701c59b28738ad168387eb') prepare() { cd linuxmint-nemo-* + # Fix GTK 3.21.3 desktop redraw issue + # https://github.com/linuxmint/nemo/issues/1231 + patch -Np1 -i ../Fix-GTK-3.21.3-desktop-redraw-issue.patch + # Rename 'Files' app name to avoid having the same as nautilus sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in } @@ -45,4 +51,7 @@ cd linuxmint-nemo-* make DESTDIR="$pkgdir" install + + # Remove D-Bus activation file to avoid conflict with nautilus-desktop + rm "$pkgdir/usr/share/dbus-1/services/org.nemo.freedesktop.FileManager1.service" }