[arch-commits] Commit in nemo/trunk (4 files)
Date: Monday, April 25, 2016 @ 04:42:53
Author: faidoc
Revision: 171759
upgpkg: nemo 3.0.0-1
Modified:
nemo/trunk/PKGBUILD
Deleted:
nemo/trunk/0001-Fix-fallback-style-for-GTK-3.20.patch
nemo/trunk/deep-count-one-filesystem.patch
nemo/trunk/nemo-gtk-3.20-style-classes.patch
+
0001-Fix-fallback-style-for-GTK-3.20.patch | 55
PKGBUILD | 27 --
deep-count-one-filesystem.patch| 120 ---
nemo-gtk-3.20-style-classes.patch | 44 -
4 files changed, 4 insertions(+), 242 deletions(-)
Deleted: 0001-Fix-fallback-style-for-GTK-3.20.patch
===
--- 0001-Fix-fallback-style-for-GTK-3.20.patch 2016-04-25 02:38:06 UTC (rev
171758)
+++ 0001-Fix-fallback-style-for-GTK-3.20.patch 2016-04-25 02:42:53 UTC (rev
171759)
@@ -1,55 +0,0 @@
-From 81ac4e3e7ebc618c6c05e4a1b158a98402e72e0f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?=
-Date: Sun, 10 Apr 2016 17:38:02 +0200
-Subject: [PATCH] Fix fallback style for GTK 3.20
-
- libnemo-private/nemo-places-tree-view.c | 2 +-
- src/nemo-style-fallback.css | 8
- 2 files changed, 5 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..ba64a52 100644
a/src/nemo-style-fallback.css
-+++ b/src/nemo-style-fallback.css
-@@ -1,6 +1,6 @@
- /* 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 +9,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-25 02:38:06 UTC (rev 171758)
+++ PKGBUILD2016-04-25 02:42:53 UTC (rev 171759)
@@ -3,8 +3,8 @@
# Contributor: Ner0
pkgname=nemo
-pkgver=2.8.7
-pkgrel=4
+pkgver=3.0.0
+pkgrel=1
pkgdesc="Cinnamon file manager (Nautilus fork)"
arch=('i686' 'x86_64')
url="https://github.com/linuxmint/nemo";
@@ -14,14 +14,8 @@
makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common'
'python2-gobject' 'python2-polib')
options=('!emptydirs')
install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver";
-"deep-count-one-filesystem.patch"
-"0001-Fix-fallback-style-for-GTK-3.20.patch"
- "nemo-gtk-3.20-style-classes.patch")
-sha256sums=('21f290212bcfb4ac58f7bdc17e9dccfafb59d9fd52a7540a7e199e252a7c2fe4'
-'1acd384b7e345d4e2815c51a94b4ffbb802ee376004c3db75cc871eef551cbfa'
-'cb5aa9ec771afd5380cee08e1dd17ef35b6d6502ab8c778d85e88350a30ddfc5'
-'b93d549c17ea1e30b52a7ea0a8c8b0262d0b827e96414843bdaaddce01e73bec')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver";)
+sha256sums=('25da69bfb2a5864e643095c85b875bbfb97520a899671a77aeae0c812444366c')
prepare() {
cd linuxmint-nemo-*
@@ -29,19 +23,6 @@
# Python2 fix
find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
- # directory: limit deep scount (folder contents and size) to one filesystem
(FS#47480)
- # 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 ../nemo-gtk-3.20-style-classes.patch
-
-
- # Fix fallback style for GTK 3.20
- # https://github.com/linuxmint/nemo/pull/1131
- 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
}
Deleted: deep-count-one-filesystem.patch
===
--- deep-count-one-filesystem.
[arch-commits] Commit in nemo/trunk (4 files)
Date: Wednesday, April 17, 2013 @ 16:15:37
Author: bgyorgy
Revision: 88430
upgpkg: nemo 1.7.3-1
Update to version 1.7.3, add compatibility patches for GNOME 3.8
Added:
nemo/trunk/remove-desktop-background.patch
nemo/trunk/tracker-0.16.patch
Modified:
nemo/trunk/PKGBUILD
Deleted:
nemo/trunk/use-terminal-config.patch
-+
PKGBUILD| 26 -
remove-desktop-background.patch | 964 ++
tracker-0.16.patch | 33 +
use-terminal-config.patch | 45 -
4 files changed, 1011 insertions(+), 57 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-04-17 13:34:15 UTC (rev 88429)
+++ PKGBUILD2013-04-17 14:15:37 UTC (rev 88430)
@@ -3,7 +3,7 @@
# Contributor: Ner0
pkgname=nemo
-pkgver=1.7.2
+pkgver=1.7.3
pkgrel=1
pkgdesc="Cinnamon file manager (Nautilus fork)"
arch=('i686' 'x86_64')
@@ -13,22 +13,27 @@
'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql')
makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
optdepends=('gksu: Open as Root')
-provides=('nemo-fm')
-replaces=('nemo-fm')
-conflicts=('nemo-fm')
options=('!emptydirs' '!libtool')
install=nemo.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver";
-"use-terminal-config.patch")
-md5sums=('809cf58f472a9e5de628a763d441b246'
- '6cca080cc8fe3df7e725c0f8cd5fa485')
+"tracker-0.16.patch"
+"remove-desktop-background.patch")
+md5sums=('04c021da543e2562b712107c2be9a8c2'
+ '9e170cc74eee901634b3367b06a209c6'
+ '700b595dfcf06e39f9dc3bdb7c81e086')
build() {
cd linuxmint-nemo-*
- # Read the default terminal app from GSettings
- patch -Np1 -i ../use-terminal-config.patch
+ # Python2 fix
+ sed -i 's/bin\/python/bin\/python2/g'
files/usr/share/nemo/actions/myaction.py
+ # https://github.com/linuxmint/nemo/pull/258
+ patch -Np1 -i ../tracker-0.16.patch
+
+ # https://github.com/linuxmint/nemo/pull/263
+ patch -Np1 -i ../remove-desktop-background.patch
+
./autogen.sh --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nemo \
@@ -43,7 +48,4 @@
cd linuxmint-nemo-*
make DESTDIR="$pkgdir/" install
-
- # Python2 fix
- sed -i 's/bin\/python/bin\/python2/g'
"${pkgdir}/usr/share/nemo/actions/myaction.py"
}
Added: remove-desktop-background.patch
===
--- remove-desktop-background.patch (rev 0)
+++ remove-desktop-background.patch 2013-04-17 14:15:37 UTC (rev 88430)
@@ -0,0 +1,964 @@
+From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001
+From: Michael Webster
+Date: Mon, 15 Apr 2013 18:44:35 -0400
+Subject: [PATCH 1/4] 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 {
+
