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

[Alexandre Filgueira]

    Date: Monday, April 14, 2014 @ 02:40:19
  Author: faidoc
Revision: 109356

upgpkg: nemo 2.2.0-1

Modified:
  nemo/trunk/PKGBUILD
Deleted:
  nemo/trunk/Fix_rename_entry_position.patch
  nemo/trunk/adwaita_style.patch

---------------------------------+
 Fix_rename_entry_position.patch |   32 --------------------------------
 PKGBUILD                        |   21 ++++++---------------
 adwaita_style.patch             |   10 ----------
 3 files changed, 6 insertions(+), 57 deletions(-)

Deleted: Fix_rename_entry_position.patch
===================================================================
--- Fix_rename_entry_position.patch	2014-04-14 00:17:58 UTC (rev 109355)
+++ Fix_rename_entry_position.patch	2014-04-14 00:40:19 UTC (rev 109356)
@@ -1,32 +0,0 @@
---- a/eel/eel-canvas.c
-+++ b/eel/eel-canvas.c
-@@ -3213,11 +3213,19 @@ eel_canvas_draw (GtkWidget *widget, cair
-                 return FALSE;
- 
-         bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget));
-+
-+	if (!gtk_cairo_should_draw_window (cr, bin_window))
-+		return FALSE;
-+
-+	cairo_save (cr);
-+
-         gtk_cairo_transform_to_window (cr, widget, bin_window);
- 
-         region = eel_cairo_get_clip_region (cr);
--        if (region == NULL)
-+        if (region == NULL) {
-+		cairo_restore (cr);
-                 return FALSE;
-+	}
- 
- #ifdef VERBOSE
- 	g_print ("Draw\n");
-@@ -3249,6 +3257,8 @@ eel_canvas_draw (GtkWidget *widget, cair
- 	if (canvas->root->flags & EEL_CANVAS_ITEM_MAPPED)
- 		EEL_CANVAS_ITEM_GET_CLASS (canvas->root)->draw (canvas->root, cr, region);
- 
-+	cairo_restore (cr);
-+
- 	/* Chain up to get exposes on child widgets */
-         if (GTK_WIDGET_CLASS (canvas_parent_class)->draw)
-                 GTK_WIDGET_CLASS (canvas_parent_class)->draw (widget, cr);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-14 00:17:58 UTC (rev 109355)
+++ PKGBUILD	2014-04-14 00:40:19 UTC (rev 109356)
@@ -3,8 +3,8 @@
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=2.0.8
-pkgrel=3
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxmint/nemo"
@@ -12,27 +12,18 @@
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
          'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libxml2'
          'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
+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"
-        "Fix_rename_entry_position.patch"
-        "adwaita_style.patch")
-sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033'
-            '07e81aaeeff9ae8c6de76fe2b87b28b89323577ef425596241b96e94b4e04750'
-            '6faa6a5a7042832fb1230a5d21ebe8572c100798e724fcd72fee86dc01d69290')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
+sha256sums=('d909354fb5378804eb9abcfe04e3f4b4e482e7afbec018cacc35b3e845cce466')
 
 prepare() {
   cd linuxmint-nemo-*
 
-  # Rename files and directory : invisible field: https://bugzilla.redhat.com/show_bug.cgi?id=1045181
-  patch -Np1 -i ../Fix_rename_entry_position.patch
-
-  # Fix white text on breadcrumb with Adwaita
-  patch -Np1 -i ../adwaita_style.patch
-
   # Python2 fix
   sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
   # Fix build
   sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in

Deleted: adwaita_style.patch
===================================================================
--- adwaita_style.patch	2014-04-14 00:17:58 UTC (rev 109355)
+++ adwaita_style.patch	2014-04-14 00:40:19 UTC (rev 109356)
@@ -1,10 +0,0 @@
---- a/src/nemo-style-fallback.css
-+++ b/src/nemo-style-fallback.css
-@@ -8,7 +8,6 @@ NemoPathbarButton {
-                                      color-stop (.7, shade(alpha(@bg_color, 0.8), 0.90)),
-                                      color-stop (1, shade(alpha(@bg_color, 0.8), 0.80)));
-     border-color: #808080;
--    color: @fg_color;
-     -NemoPathbarButton-border-radius: 3px;
- }
-