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

2016-11-07 Thread Alexandre Filgueira 
Date: Monday, November 7, 2016 @ 23:07:56
  Author: faidoc
Revision: 195105

upgpkg: nemo 3.2.0-1

Modified:
  nemo/trunk/PKGBUILD
Deleted:
  nemo/trunk/Fix-GTK-3.21.3-desktop-redraw-issue.patch

---+
 Fix-GTK-3.21.3-desktop-redraw-issue.patch |   62 
 PKGBUILD  |   14 +-
 2 files changed, 4 insertions(+), 72 deletions(-)

Deleted: Fix-GTK-3.21.3-desktop-redraw-issue.patch
===
--- Fix-GTK-3.21.3-desktop-redraw-issue.patch   2016-11-07 23:05:21 UTC (rev 
195104)
+++ Fix-GTK-3.21.3-desktop-redraw-issue.patch   2016-11-07 23:07:56 UTC (rev 
195105)
@@ -1,62 +0,0 @@
-From 4e5a1037de0dc24e44a58e239e281b4c2d5740af Mon Sep 17 00:00:00 2001
-From: leigh123linux 
-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
===
--- PKGBUILD2016-11-07 23:05:21 UTC (rev 195104)
+++ PKGBUILD2016-11-07 23:07:56 UTC (rev 195105)
@@ -3,8 +3,8 @@
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=3.0.6
-pkgrel=2
+pkgver=3.2.0
+pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo;
@@ -14,18 +14,12 @@
 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;
-"Fix-GTK-3.21.3-desktop-redraw-issue.patch")
-sha256sums=('77d5c47a6657dfbaf66c9f80978ce8650595753138d27bd2adaebbe0e46c3e23'
-'ff2fe4fbf6edbdc51e0c6cef08b3b10ae612718d71701c59b28738ad168387eb')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver;)
+sha256sums=('69d4acbde7f01193374cc07894970136b9975475c35a69f0a6ec4203cd5af2c6')
 
 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
 }

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

2016-10-12 Thread Balló György 
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 
+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
===
--- PKGBUILD2016-10-12 11:39:48 UTC (rev 192052)
+++ PKGBUILD2016-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"
 }

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

2016-04-09 Thread 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?= 
+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
===
--- PKGBUILD2016-04-09 08:22:05 UTC (rev 169804)
+++ PKGBUILD2016-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
 }

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

2013-10-05 Thread Alexandre Filgueira 
Date: Sunday, October 6, 2013 @ 00:01:27
  Author: faidoc
Revision: 98095

upgpkg: nemo 2.0.0-1

Deleted:
  nemo/trunk/remove-desktop-background.patch
  nemo/trunk/tracker-0.16.patch

-+
 remove-desktop-background.patch | 1050 --
 tracker-0.16.patch  |   33 -
 2 files changed, 1083 deletions(-)

Deleted: remove-desktop-background.patch
===
--- remove-desktop-background.patch 2013-10-05 22:00:59 UTC (rev 98094)
+++ remove-desktop-background.patch 2013-10-05 22:01:27 UTC (rev 98095)
@@ -1,1050 +0,0 @@
-From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
-From: Michael Webster miketwebs...@gmail.com
-Date: Mon, 15 Apr 2013 18:44:35 -0400
-Subject: [PATCH 1/6] Don't render the background.  Need to fix selected icon
- style
-

- src/nemo-desktop-icon-view.c | 18 +++---
- src/nemo-desktop-window.c| 15 ++-
- 2 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c
-index b903c5b..37cd8cb 100644
 a/src/nemo-desktop-icon-view.c
-+++ b/src/nemo-desktop-icon-view.c
-@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails
- static void
- real_begin_loading (NemoView *object)
- {
--  NemoIconContainer *icon_container;
--  NemoDesktopIconView *view;
--
--  view = NEMO_DESKTOP_ICON_VIEW (object);
--
--  icon_container = get_icon_container (view);
--  if (view-details-background == NULL) {
--  view-details-background = nemo_desktop_background_new 
(icon_container);
--  }
--
-   NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)-begin_loading 
(object);
- }
- 
-@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails
- nemo_view_update_menus,
- icon_view);
- 
--  if (icon_view-details-background != NULL) {
--  g_object_unref (icon_view-details-background);
--  icon_view-details-background = NULL;
--  }
--
-   G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)-dispose (object);
- }
- 
-@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails
- G_CALLBACK (nemo_view_update_menus),
- desktop_icon_view);
- 
-+GdkRGBA transparent = { 0, 0, 0, 0 };
-+gtk_widget_override_background_color (GTK_WIDGET (icon_container), 
GTK_STATE_FLAG_NORMAL, transparent);
-+
- have_cinnamon_settings = g_find_program_in_path (cinnamon-settings) != 
NULL;
- }
- 
-diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c
-index 9c80c62..2d5c4e8 100644
 a/src/nemo-desktop-window.c
-+++ b/src/nemo-desktop-window.c
-@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails {
-   g_signal_connect_swapped (nemo_preferences, changed:: 
NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR,
- G_CALLBACK 
(nemo_desktop_window_update_directory),
- window);
-+
- }
- 
- static void
-@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails {
-   /* Chain up to realize our children */
-   GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)-map (widget);
-   gdk_window_lower (gtk_widget_get_window (widget));
-+
-+GdkWindow *window;
-+GdkRGBA transparent = { 0, 0, 0, 0 };
-+
-+window = gtk_widget_get_window (widget);
-+gdk_window_set_background_rgba (window, transparent);
- }
- 
- static void
-@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails {
- {
-   NemoDesktopWindow *window;
-   NemoDesktopWindowDetails *details;
-+GdkVisual *visual;
- 
-   window = NEMO_DESKTOP_WINDOW (widget);
-   details = window-details;
-@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails {
-   /* Make sure we get keyboard events */
-   gtk_widget_set_events (widget, gtk_widget_get_events (widget) 
- | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
--
-+
-+visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
-+if (visual) {
-+gtk_widget_set_visual (widget, visual);
-+}
-+
-   /* Do the work of realizing. */
-   GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)-realize (widget);
- 
--- 
-1.8.1.6
-
-
-From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001
-From: Michael Webster miketwebs...@gmail.com
-Date: Mon, 15 Apr 2013 20:03:03 -0400
-Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes
- a transparent background and just uses the existing rendered background from
- muffin/g-s-d
-

- libnemo-private/Makefile.am   |   2 -
- libnemo-private/nemo-desktop-background.c | 578 --
- libnemo-private/nemo-desktop-background.h |  65 
- src/nemo-desktop-icon-view.c  |  26 +-
- 4