[arch-commits] Commit in nemo/trunk (2 files)

[Balló György]

    Date: Saturday, April 9, 2016 @ 10:30:00
  Author: bgyorgy
Revision: 169805

upgpkg: nemo 2.8.7-2

Fix fallback style for GTK 3.20

Added:
  nemo/trunk/0001-Fix-fallback-style-for-GTK-3.20.patch
Modified:
  nemo/trunk/PKGBUILD

--------------------------------------------+
 0001-Fix-fallback-style-for-GTK-3.20.patch |   61 +++++++++++++++++++++++++++
 PKGBUILD                                   |   12 +++--
 2 files changed, 70 insertions(+), 3 deletions(-)

Added: 0001-Fix-fallback-style-for-GTK-3.20.patch
===================================================================
--- 0001-Fix-fallback-style-for-GTK-3.20.patch	                        (rev 0)
+++ 0001-Fix-fallback-style-for-GTK-3.20.patch	2016-04-09 08:30:00 UTC (rev 169805)
@@ -0,0 +1,61 @@
+From 665c7971d9d73b427b71707c5bb50c55145814e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 9 Apr 2016 10:01:23 +0200
+Subject: [PATCH] Fix fallback style for GTK 3.20
+
+---
+ libnemo-private/nemo-places-tree-view.c |  2 +-
+ src/nemo-style-fallback.css             | 14 ++++++++++----
+ 2 files changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/libnemo-private/nemo-places-tree-view.c b/libnemo-private/nemo-places-tree-view.c
+index b7836e1..53775dd 100644
+--- a/libnemo-private/nemo-places-tree-view.c
++++ b/libnemo-private/nemo-places-tree-view.c
+@@ -34,7 +34,7 @@ static gpointer parent_class;
+ static void
+ nemo_places_tree_view_init (NemoPlacesTreeView *tree_view)
+ {
+-
++    gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tree_view)), "places-treeview");
+ }
+ 
+ static void
+diff --git a/src/nemo-style-fallback.css b/src/nemo-style-fallback.css
+index 0e5684e..8756ded 100644
+--- a/src/nemo-style-fallback.css
++++ b/src/nemo-style-fallback.css
+@@ -1,6 +1,12 @@
++/* Background for the notebook */
++
++notebook {
++    background: white;
++}
++
+ /* For Places Sidebar diskfull indicators */
+ 
+-NemoPlacesTreeView {
++.places-treeview {
+     -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
+     -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
+     -NemoPlacesTreeView-disk-full-bar-width: 2px;
+@@ -9,13 +15,13 @@ NemoPlacesTreeView {
+     -NemoPlacesTreeView-disk-full-max-length: 70px;
+ }
+ 
+-NemoPlacesTreeView:selected {
++.places-treeview:selected {
+     -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
+     -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
+ }
+ 
+-NemoPlacesTreeView:hover {
++.places-treeview:hover {
+ }
+ 
+-NemoPlacesTreeView:selected:hover {
++.places-treeview:selected:hover {
+ }
+-- 
+2.8.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-09 08:22:05 UTC (rev 169804)
+++ PKGBUILD	2016-04-09 08:30:00 UTC (rev 169805)
@@ -4,7 +4,7 @@
 
 pkgname=nemo
 pkgver=2.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
@@ -15,9 +15,11 @@
 options=('!emptydirs')
 install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
-        "deep-count-one-filesystem.patch")
+        "deep-count-one-filesystem.patch"
+        "0001-Fix-fallback-style-for-GTK-3.20.patch")
 sha256sums=('21f290212bcfb4ac58f7bdc17e9dccfafb59d9fd52a7540a7e199e252a7c2fe4'
-            '1acd384b7e345d4e2815c51a94b4ffbb802ee376004c3db75cc871eef551cbfa')
+            '1acd384b7e345d4e2815c51a94b4ffbb802ee376004c3db75cc871eef551cbfa'
+            'd8be3f444eda33f8250c5d26241b628d1684c1fee8749d7ae90b1d2635e9a76a')
 
 prepare() {
   cd linuxmint-nemo-*
@@ -29,6 +31,10 @@
   # https://github.com/linuxmint/nemo/pull/1083
   patch -Np1 -i ../deep-count-one-filesystem.patch
 
+  # Fix fallback style for GTK 3.20
+  # https://github.com/linuxmint/nemo/pull/1138
+  patch -Np1 -i ../0001-Fix-fallback-style-for-GTK-3.20.patch
+
   # Rename 'Files' app name to avoid having the same as nautilus
   sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
 }