[arch-commits] Commit in nautilus/trunk (3 files)
Date: Thursday, April 28, 2016 @ 15:20:00
Author: jgc
Revision: 266458
upgpkg: nautilus 3.20.1-1
Added:
nautilus/trunk/translation-de.patch
Modified:
nautilus/trunk/PKGBUILD
Deleted:
nautilus/trunk/nautilus.install
--+
PKGBUILD | 13 +
nautilus.install | 14 --
translation-de.patch | 11 +++
3 files changed, 20 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-04-28 11:36:01 UTC (rev 266457)
+++ PKGBUILD2016-04-28 13:20:00 UTC (rev 266458)
@@ -3,7 +3,7 @@
pkgbase=nautilus
pkgname=(nautilus libnautilus-extension)
-pkgver=3.20.0
+pkgver=3.20.1
pkgrel=1
pkgdesc="GNOME file manager"
arch=(i686 x86_64)
@@ -13,9 +13,15 @@
makedepends=(intltool gobject-introspection python packagekit python2)
url="http://www.gnome.org";
options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('7ca7995a4d6a77871503dc092ae816584b8d1891730e1b9eed1a1e4a16194293')
+source=(http://download.gnome.org/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
+translation-de.patch)
+sha256sums=('f2a907b994026412a7ed7c8145d4ab4f886ac87e780353b967473305a35e81e8'
+'564799623f8910208cef1e0ed583cfd049e98f9c71e15c56924f6c8452ab192b')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np0 -i ../translation-de.patch
+}
build() {
cd $pkgbase-$pkgver
@@ -32,7 +38,6 @@
package_nautilus() {
depends+=(libnautilus-extension)
groups=(gnome)
- install=nautilus.install
cd $pkgbase-$pkgver
make DESTDIR="$pkgdir" install
Deleted: nautilus.install
===
--- nautilus.install2016-04-28 11:36:01 UTC (rev 266457)
+++ nautilus.install2016-04-28 13:20:00 UTC (rev 266458)
@@ -1,14 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Added: translation-de.patch
===
--- translation-de.patch(rev 0)
+++ translation-de.patch2016-04-28 13:20:00 UTC (rev 266458)
@@ -0,0 +1,11 @@
+--- po/de.po.orig 2016-04-28 01:53:12.598068329 +0200
po/de.po 2016-04-28 01:55:06.128650077 +0200
+@@ -647,7 +647,7 @@
+ #: ../data/org.gnome.nautilus.gschema.xml.h:78
+ msgctxt "home-icon-name"
+ msgid "'Home'"
+-msgstr "Persönlicher Ordner"
++msgstr "'Persönlicher Ordner'"
+
+ #: ../data/org.gnome.nautilus.gschema.xml.h:79
+ msgid "Desktop home icon name"
[arch-commits] Commit in nautilus/trunk (3 files)
Date: Monday, May 2, 2011 @ 01:12:25
Author: heftig
Revision: 122052
upgpkg: nautilus 3.0.1.1-1
Update to 3.0.1.1. Drop the patches now upstream.
Modified:
nautilus/trunk/PKGBUILD
Deleted:
nautilus/trunk/places-sidebar.patch
nautilus/trunk/progress-ui-handler.patch
---+
PKGBUILD | 14 --
places-sidebar.patch | 36
progress-ui-handler.patch | 28
3 files changed, 4 insertions(+), 74 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-05-02 01:48:08 UTC (rev 122051)
+++ PKGBUILD2011-05-02 05:12:25 UTC (rev 122052)
@@ -2,8 +2,8 @@
# Maintainer: Jan de Groot
pkgname=nautilus
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.0.1.1
+pkgrel=1
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,17 +14,11 @@
groups=('gnome')
options=('!libtool' '!emptydirs')
install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-places-sidebar.patch progress-ui-handler.patch)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
-'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
-'5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ba53b2b8a38bcd4d6a1860421de222dc5b6b9904cceed49b2d0d90e972ee7dd6')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- #fixed for 3.0.2
- patch -Np1 -i "${srcdir}/places-sidebar.patch"
- patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nautilus \
Deleted: places-sidebar.patch
===
--- places-sidebar.patch2011-05-02 01:48:08 UTC (rev 122051)
+++ places-sidebar.patch2011-05-02 05:12:25 UTC (rev 122052)
@@ -1,36 +0,0 @@
-From cd5a1e5cf95a165c66e7a097530058864dc3a38f Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi
-Date: Thu, 28 Apr 2011 18:05:07 +
-Subject: places-sidebar: make sure to return if we click inside empty space
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648872
-diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
-index 6e49a4c..56216ab 100644
a/src/nautilus-places-sidebar.c
-+++ b/src/nautilus-places-sidebar.c
-@@ -2685,6 +2685,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkTreeView *tree_view;
-+ gboolean res;
-
- path = NULL;
-
-@@ -2708,8 +2709,12 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
- return FALSE;
- }
-
-- gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int)
event->y,
-- &path, NULL, NULL, NULL);
-+ res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x,
(int) event->y,
-+ &path, NULL, NULL, NULL);
-+
-+ if (!res) {
-+ return FALSE;
-+ }
-
- gtk_tree_model_get_iter (model, &iter, path);
-
---
-cgit v0.9
Deleted: progress-ui-handler.patch
===
--- progress-ui-handler.patch 2011-05-02 01:48:08 UTC (rev 122051)
+++ progress-ui-handler.patch 2011-05-02 05:12:25 UTC (rev 122052)
@@ -1,28 +0,0 @@
-From fdcc2f36f549a18ea6f587fb9e9bad97f0114c59 Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi
-Date: Thu, 28 Apr 2011 18:25:15 +
-Subject: progress-ui-handler: don't add progress infos to the window twice
-
-We were adding them twice in case there was already one operation
-running.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=648857
-diff --git a/src/nautilus-progress-ui-handler.c
b/src/nautilus-progress-ui-handler.c
-index 2479682..fe295b2 100644
a/src/nautilus-progress-ui-handler.c
-+++ b/src/nautilus-progress-ui-handler.c
-@@ -315,10 +315,10 @@ handle_new_progress_info (NautilusProgressUIHandler
*self,
- G_CALLBACK (progress_info_finished_cb), self);
-
- self->priv->active_infos++;
-- progress_ui_handler_add_to_window (self, info);
-
- if (self->priv->active_infos == 1) {
- /* this is the only active operation, present the window */
-+ progress_ui_handler_add_to_window (self, info);
- gtk_window_present (GTK_WINDOW (self->priv->progress_window));
- } else {
- if (gtk_widget_get_visible (self->priv->progress_window)) {
---
-cgit v0.9
[arch-commits] Commit in nautilus/trunk (3 files)
Date: Saturday, April 30, 2011 @ 11:08:05
Author: ibiru
Revision: 121317
fix crasher when clicking on empty space in sidebar, fixes duplicate entries in
progress bar while copying
Added:
nautilus/trunk/places-sidebar.patch
nautilus/trunk/progress-ui-handler.patch
Modified:
nautilus/trunk/PKGBUILD
---+
PKGBUILD | 12 +---
places-sidebar.patch | 36
progress-ui-handler.patch | 28
3 files changed, 73 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-04-30 14:59:38 UTC (rev 121316)
+++ PKGBUILD2011-04-30 15:08:05 UTC (rev 121317)
@@ -3,7 +3,7 @@
pkgname=nautilus
pkgver=3.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64')
license=('GPL')
@@ -14,11 +14,17 @@
groups=('gnome')
options=('!libtool' '!emptydirs')
install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+places-sidebar.patch progress-ui-handler.patch)
+sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8'
+'ddf020bf8c5ede07fb737b37561d0e557b105c2b96dfa56d9a9f5110ecfbc041'
+'5b6f911b1d3e0317c370c674bc52f6521bdd785647087863d33d3b60ddf00433')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ #fixed for 3.0.2
+ patch -Np1 -i "${srcdir}/places-sidebar.patch"
+ patch -Np1 -i "${srcdir}/progress-ui-handler.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nautilus \
Added: places-sidebar.patch
===
--- places-sidebar.patch(rev 0)
+++ places-sidebar.patch2011-04-30 15:08:05 UTC (rev 121317)
@@ -0,0 +1,36 @@
+From cd5a1e5cf95a165c66e7a097530058864dc3a38f Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi
+Date: Thu, 28 Apr 2011 18:05:07 +
+Subject: places-sidebar: make sure to return if we click inside empty space
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648872
+---
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 6e49a4c..56216ab 100644
+--- a/src/nautilus-places-sidebar.c
b/src/nautilus-places-sidebar.c
+@@ -2685,6 +2685,7 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+ GtkTreeView *tree_view;
++ gboolean res;
+
+ path = NULL;
+
+@@ -2708,8 +2709,12 @@ bookmarks_button_release_event_cb (GtkWidget *widget,
+ return FALSE;
+ }
+
+- gtk_tree_view_get_path_at_pos (tree_view, (int) event->x, (int)
event->y,
+- &path, NULL, NULL, NULL);
++ res = gtk_tree_view_get_path_at_pos (tree_view, (int) event->x,
(int) event->y,
++ &path, NULL, NULL, NULL);
++
++ if (!res) {
++ return FALSE;
++ }
+
+ gtk_tree_model_get_iter (model, &iter, path);
+
+--
+cgit v0.9
Added: progress-ui-handler.patch
===
--- progress-ui-handler.patch (rev 0)
+++ progress-ui-handler.patch 2011-04-30 15:08:05 UTC (rev 121317)
@@ -0,0 +1,28 @@
+From fdcc2f36f549a18ea6f587fb9e9bad97f0114c59 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi
+Date: Thu, 28 Apr 2011 18:25:15 +
+Subject: progress-ui-handler: don't add progress infos to the window twice
+
+We were adding them twice in case there was already one operation
+running.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=648857
+---
+diff --git a/src/nautilus-progress-ui-handler.c
b/src/nautilus-progress-ui-handler.c
+index 2479682..fe295b2 100644
+--- a/src/nautilus-progress-ui-handler.c
b/src/nautilus-progress-ui-handler.c
+@@ -315,10 +315,10 @@ handle_new_progress_info (NautilusProgressUIHandler
*self,
+ G_CALLBACK (progress_info_finished_cb), self);
+
+ self->priv->active_infos++;
+- progress_ui_handler_add_to_window (self, info);
+
+ if (self->priv->active_infos == 1) {
+ /* this is the only active operation, present the window */
++ progress_ui_handler_add_to_window (self, info);
+ gtk_window_present (GTK_WINDOW (self->priv->progress_window));
+ } else {
+ if (gtk_widget_get_visible (self->priv->progress_window)) {
+--
+cgit v0.9
[arch-commits] Commit in nautilus/trunk (3 files)
Date: Wednesday, February 16, 2011 @ 13:47:44
Author: heftig
Revision: 110147
upgpkg: nautilus 2.91.8-1
Update for gnome-unstable
Modified:
nautilus/trunk/PKGBUILD
nautilus/trunk/nautilus.install
Deleted:
nautilus/trunk/nautilus-condrestart.patch
+
PKGBUILD | 20 +---
nautilus-condrestart.patch | 16
nautilus.install | 18 ++
3 files changed, 15 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-02-16 18:23:11 UTC (rev 110146)
+++ PKGBUILD2011-02-16 18:47:44 UTC (rev 110147)
@@ -2,35 +2,33 @@
# Maintainer: Jan de Groot
pkgname=nautilus
-pkgver=2.32.2.1
+pkgver=2.91.8
pkgrel=1
pkgdesc="The GNOME shell and file manager"
arch=('i686' 'x86_64')
license=('GPL')
-depends=('libexif>=0.6.19' 'gnome-desktop>=2.32.1' 'exempi>=2.1.1'
'libunique>=1.1.6' 'hicolor-icon-theme' 'gvfs>=1.6.6' 'desktop-file-utils')
+depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs'
+ 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info')
makedepends=('intltool' 'gobject-introspection' 'namcap')
replaces=('gnome-volume-manager')
url="http://www.gnome.org";
groups=('gnome')
options=('!libtool' '!emptydirs')
install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
-nautilus-condrestart.patch)
-sha256sums=('802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303'
-'f825292ef26274d3044272ca9f25095391cc49d30fb0056e7ed7346a1b4d106c')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('197ca86fdb5d7d87e732ec77ac6d0e862d0cf1924034adcedc93dab88293f44d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/nautilus-condrestart.patch"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--libexecdir=/usr/lib/nautilus \
--disable-update-mimedb \
--disable-packagekit
make
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+}
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas"
--domain nautilus ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
Deleted: nautilus-condrestart.patch
===
--- nautilus-condrestart.patch 2011-02-16 18:23:11 UTC (rev 110146)
+++ nautilus-condrestart.patch 2011-02-16 18:47:44 UTC (rev 110147)
@@ -1,16 +0,0 @@
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.condrestart
nautilus-2.25.93/nautilus.desktop.in
nautilus-2.25.93/data/nautilus.desktop.in.condrestart 2009-03-12
10:49:41.449753624 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in 2009-03-12 10:49:51.814754208
-0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart
nautilus-2.25.93/nautilus.desktop.in.in
nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart 2009-03-12
10:47:41.681753834 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in.in 2009-03-12
10:49:29.663754303 -0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
Modified: nautilus.install
===
--- nautilus.install2011-02-16 18:23:11 UTC (rev 110146)
+++ nautilus.install2011-02-16 18:47:44 UTC (rev 110147)
@@ -1,26 +1,20 @@
-pkgname=nautilus
-
post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
+ usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
update-mime-database usr/share/mime > /dev/null
}
pre_upgrade() {
- pre_remove $1
+ if (( $(vercmp $2 2.90.0) < 0 )); then
+usr/sbin/gconfpkg --uninstall nautilus
+ fi
}
post_upgrade() {
- post_install $1
+ post_install
}
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
- update-mime-database usr/share/mime > /dev/null
+ post_install
}
