[arch-commits] Commit in nemo/repos (10 files)

Alexandre Filgueira faidoc at nymeria.archlinux.org
Tue Apr 1 03:36:38 UTC 2014


    Date: Tuesday, April 1, 2014 @ 05:36:38
  Author: faidoc
Revision: 108679

archrelease: copy trunk to community-i686, community-x86_64

Added:
  nemo/repos/community-i686/Fix_rename_entry_position.patch
    (from rev 108678, nemo/trunk/Fix_rename_entry_position.patch)
  nemo/repos/community-i686/PKGBUILD
    (from rev 108678, nemo/trunk/PKGBUILD)
  nemo/repos/community-i686/nemo.install
    (from rev 108678, nemo/trunk/nemo.install)
  nemo/repos/community-x86_64/Fix_rename_entry_position.patch
    (from rev 108678, nemo/trunk/Fix_rename_entry_position.patch)
  nemo/repos/community-x86_64/PKGBUILD
    (from rev 108678, nemo/trunk/PKGBUILD)
  nemo/repos/community-x86_64/nemo.install
    (from rev 108678, nemo/trunk/nemo.install)
Deleted:
  nemo/repos/community-i686/PKGBUILD
  nemo/repos/community-i686/nemo.install
  nemo/repos/community-x86_64/PKGBUILD
  nemo/repos/community-x86_64/nemo.install

--------------------------------------------------+
 /PKGBUILD                                        |  112 +++++++++++++++++++++
 /nemo.install                                    |   28 +++++
 community-i686/Fix_rename_entry_position.patch   |   32 ++++++
 community-i686/PKGBUILD                          |   51 ---------
 community-i686/nemo.install                      |   14 --
 community-x86_64/Fix_rename_entry_position.patch |   32 ++++++
 community-x86_64/PKGBUILD                        |   51 ---------
 community-x86_64/nemo.install                    |   14 --
 8 files changed, 204 insertions(+), 130 deletions(-)

Copied: nemo/repos/community-i686/Fix_rename_entry_position.patch (from rev 108678, nemo/trunk/Fix_rename_entry_position.patch)
===================================================================
--- community-i686/Fix_rename_entry_position.patch	                        (rev 0)
+++ community-i686/Fix_rename_entry_position.patch	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,32 @@
+--- 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);

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-04-01 03:35:15 UTC (rev 108678)
+++ community-i686/PKGBUILD	2014-04-01 03:36:38 UTC (rev 108679)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Ner0
-
-pkgname=nemo
-pkgver=2.0.8
-pkgrel=1
-pkgdesc="Cinnamon file manager (Nautilus fork)"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/nemo"
-license=('GPL')
-depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
-         'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
-options=('!emptydirs')
-install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
-sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033')
-
-prepare() {
-  cd linuxmint-nemo-*
-
-  # Python2 fix
-  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
-
-  # Fix build
-  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
-
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
-}
-
-build() {
-  cd linuxmint-nemo-*
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nemo \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-gtk-doc-html \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd linuxmint-nemo-*
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: nemo/repos/community-i686/PKGBUILD (from rev 108678, nemo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Ner0
+
+pkgname=nemo
+pkgver=2.0.8
+pkgrel=2
+pkgdesc="Cinnamon file manager (Nautilus fork)"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/nemo"
+license=('GPL')
+depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
+         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
+         'cinnamon-translations')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
+options=('!emptydirs')
+install=nemo.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
+        "Fix_rename_entry_position.patch")
+sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033'
+            '07e81aaeeff9ae8c6de76fe2b87b28b89323577ef425596241b96e94b4e04750')
+
+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
+
+  # Python2 fix
+  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
+
+build() {
+  cd linuxmint-nemo-*
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/nemo \
+      --disable-update-mimedb \
+      --disable-packagekit \
+      --disable-gtk-doc-html \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd linuxmint-nemo-*
+
+  make DESTDIR="$pkgdir/" install
+}

Deleted: community-i686/nemo.install
===================================================================
--- community-i686/nemo.install	2014-04-01 03:35:15 UTC (rev 108678)
+++ community-i686/nemo.install	2014-04-01 03:36:38 UTC (rev 108679)
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}

Copied: nemo/repos/community-i686/nemo.install (from rev 108678, nemo/trunk/nemo.install)
===================================================================
--- community-i686/nemo.install	                        (rev 0)
+++ community-i686/nemo.install	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,14 @@
+post_install() {
+  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}

Copied: nemo/repos/community-x86_64/Fix_rename_entry_position.patch (from rev 108678, nemo/trunk/Fix_rename_entry_position.patch)
===================================================================
--- community-x86_64/Fix_rename_entry_position.patch	                        (rev 0)
+++ community-x86_64/Fix_rename_entry_position.patch	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,32 @@
+--- 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);

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-04-01 03:35:15 UTC (rev 108678)
+++ community-x86_64/PKGBUILD	2014-04-01 03:36:38 UTC (rev 108679)
@@ -1,51 +0,0 @@
-# $Id$
-# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
-# Contributor: Ner0
-
-pkgname=nemo
-pkgver=2.0.8
-pkgrel=1
-pkgdesc="Cinnamon file manager (Nautilus fork)"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxmint/nemo"
-license=('GPL')
-depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
-         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
-         'cinnamon-translations')
-makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
-options=('!emptydirs')
-install=nemo.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
-sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033')
-
-prepare() {
-  cd linuxmint-nemo-*
-
-  # Python2 fix
-  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
-
-  # Fix build
-  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
-
-  # Rename 'Files' app name to avoid having the same as nautilus
-  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
-}
-
-build() {
-  cd linuxmint-nemo-*
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nemo \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-gtk-doc-html \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd linuxmint-nemo-*
-
-  make DESTDIR="$pkgdir/" install
-}

Copied: nemo/repos/community-x86_64/PKGBUILD (from rev 108678, nemo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira at cinnarch.com>
+# Contributor: Ner0
+
+pkgname=nemo
+pkgver=2.0.8
+pkgrel=2
+pkgdesc="Cinnamon file manager (Nautilus fork)"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxmint/nemo"
+license=('GPL')
+depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
+         'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
+         'cinnamon-translations')
+makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
+options=('!emptydirs')
+install=nemo.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver"
+        "Fix_rename_entry_position.patch")
+sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033'
+            '07e81aaeeff9ae8c6de76fe2b87b28b89323577ef425596241b96e94b4e04750')
+
+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
+
+  # Python2 fix
+  sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py
+
+  # Fix build
+  sed -i '/AC_SUBST(DISABLE_DEPRECATED_CFLAGS)/d' configure.in
+
+  # Rename 'Files' app name to avoid having the same as nautilus
+  sed -i 's/^Name\(.*\)=.*/Name\1=Nemo/' data/nemo.desktop.in.in
+}
+
+build() {
+  cd linuxmint-nemo-*
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --libexecdir=/usr/lib/nemo \
+      --disable-update-mimedb \
+      --disable-packagekit \
+      --disable-gtk-doc-html \
+      --disable-schemas-compile
+  make
+}
+
+package() {
+  cd linuxmint-nemo-*
+
+  make DESTDIR="$pkgdir/" install
+}

Deleted: community-x86_64/nemo.install
===================================================================
--- community-x86_64/nemo.install	2014-04-01 03:35:15 UTC (rev 108678)
+++ community-x86_64/nemo.install	2014-04-01 03:36:38 UTC (rev 108679)
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-post_remove() {
-  post_install "$1"
-}

Copied: nemo/repos/community-x86_64/nemo.install (from rev 108678, nemo/trunk/nemo.install)
===================================================================
--- community-x86_64/nemo.install	                        (rev 0)
+++ community-x86_64/nemo.install	2014-04-01 03:36:38 UTC (rev 108679)
@@ -0,0 +1,14 @@
+post_install() {
+  glib-compile-schemas --allow-any-name usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-mime-database usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+post_remove() {
+  post_install "$1"
+}




More information about the arch-commits mailing list