cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to nautilus-2.32.0.

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2010-09-30 07:46:04 +00:00
parent 9bbff6e482
commit 3573d3ac24
5 changed files with 21 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/gnome/nautilus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.68 2010/09/26 13:40:12 naddy Exp $
# $OpenBSD: Makefile,v 1.69 2010/09/30 07:46:04 ajacoutot Exp $
COMMENT= GNOME shell and file manager
@ -15,8 +15,7 @@ COMMENT= GNOME shell and file manager
# x11/gnome/tracker
GNOME_PROJECT= nautilus
GNOME_VERSION= 2.30.1
REVISION= 2
GNOME_VERSION= 2.32.0
SHARED_LIBS += nautilus-extension 2.0 # .2.0
@ -60,6 +59,8 @@ AUTOCONF_VERSION= 2.63
CONFIGURE_STYLE= autoconf gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--disable-gtk-doc \
--disable-introspection \
--disable-update-mimedb \
--disable-packagekit
# XXX build error when textproc/exempi is installed

10
x11/gnome/nautilus/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/nautilus-2.30.1.tar.bz2) = 4b2lX5xs0iNWHaBm28ToYw==
RMD160 (gnome/nautilus-2.30.1.tar.bz2) = KF4LnQAHJbEQE+1vjpjbWVc7g9w=
SHA1 (gnome/nautilus-2.30.1.tar.bz2) = Iyr6XX2XdxRmdkWt/x+VKYntwYU=
SHA256 (gnome/nautilus-2.30.1.tar.bz2) = g98ZWRxNDTWf5n0Ws/c/ceaiqlun1HdzknbHVi8iEUQ=
SIZE (gnome/nautilus-2.30.1.tar.bz2) = 6156330
MD5 (gnome/nautilus-2.32.0.tar.bz2) = 0A8HNc6tX6D+3D5v8RgxsQ==
RMD160 (gnome/nautilus-2.32.0.tar.bz2) = sQYQxGTel/0xBAZM+CaiBMvhCe4=
SHA1 (gnome/nautilus-2.32.0.tar.bz2) = DefU/Gl1SnNMsb1xzyNDvUdvrqg=
SHA256 (gnome/nautilus-2.32.0.tar.bz2) = B5y0vIxa/AEqzFSxf5G3Zz3NPjkWIkEpsVqB6rVT8ZI=
SIZE (gnome/nautilus-2.32.0.tar.bz2) = 6173234

54
x11/gnome/nautilus/patches/patch-src_file-manager_fm-directory-view_c
View File

@ -1,54 +0,0 @@
$OpenBSD: patch-src_file-manager_fm-directory-view_c,v 1.1 2010/05/18 14:37:02 ajacoutot Exp $
Merged from upstream git.
--- src/file-manager/fm-directory-view.c.orig Mon Apr 26 09:50:42 2010
+++ src/file-manager/fm-directory-view.c Tue May 18 16:08:32 2010
@@ -7782,10 +7782,6 @@ file_should_show_foreach (NautilusFile *file,
*show_eject = TRUE;
}
- if (nautilus_file_can_unmount (file)) {
- *show_unmount = TRUE;
- }
-
if (nautilus_file_can_mount (file)) {
*show_mount = TRUE;
@@ -7805,6 +7801,12 @@ file_should_show_foreach (NautilusFile *file,
*show_stop = TRUE;
}
+ /* Dot not show both Unmount and Eject/Safe Removal; too confusing to
+ * have too many menu entries */
+ if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
+ *show_unmount = TRUE;
+ }
+
if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {
*show_poll = TRUE;
}
@@ -7852,10 +7854,6 @@ file_should_show_self (NautilusFile *file,
*show_eject = TRUE;
}
- if (nautilus_file_can_unmount (file)) {
- *show_unmount = TRUE;
- }
-
if (nautilus_file_can_mount (file)) {
*show_mount = TRUE;
}
@@ -7872,6 +7870,12 @@ file_should_show_self (NautilusFile *file,
if (nautilus_file_can_stop (file)) {
*show_stop = TRUE;
+ }
+
+ /* Dot not show both Unmount and Eject/Safe Removal; too confusing to
+ * have too many menu entries */
+ if (nautilus_file_can_unmount (file) && !*show_eject && !*show_stop) {
+ *show_unmount = TRUE;
}
if (nautilus_file_can_poll_for_media (file) && !nautilus_file_is_media_check_automatic (file)) {

25
x11/gnome/nautilus/patches/patch-src_nautilus-places-sidebar_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_nautilus-places-sidebar_c,v 1.1 2010/05/18 14:37:02 ajacoutot Exp $
Merged from upstream git.
--- src/nautilus-places-sidebar.c.orig Wed Mar 10 14:28:38 2010
+++ src/nautilus-places-sidebar.c Tue May 18 16:08:36 2010
@@ -1317,7 +1317,7 @@ check_unmount_and_eject (GMount *mount,
}
if (mount != NULL) {
*show_eject |= g_mount_can_eject (mount);
- *show_unmount = g_mount_can_unmount (mount);
+ *show_unmount = g_mount_can_unmount (mount) && !*show_eject;
}
}
@@ -1349,6 +1349,9 @@ check_visibility (GMount *mount,
*show_start = g_drive_can_start (drive) || g_drive_can_start_degraded (drive);
*show_stop = g_drive_can_stop (drive);
+
+ if (*show_stop)
+ *show_unmount = FALSE;
}
if (volume != NULL) {

20
x11/gnome/nautilus/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2010/04/26 15:11:58 jasper Exp $
@comment $OpenBSD: PLIST,v 1.31 2010/09/30 07:46:04 ajacoutot Exp $
@bin bin/nautilus
@bin bin/nautilus-autorun-software
@bin bin/nautilus-connect-server
@ -32,9 +32,6 @@ share/applications/nautilus-home.desktop
share/applications/nautilus.desktop
share/applications/network-scheme.desktop
share/gtk-doc/html/libnautilus-extension/
share/gtk-doc/html/libnautilus-extension/NautilusColumn.html
share/gtk-doc/html/libnautilus-extension/NautilusMenuItem.html
share/gtk-doc/html/libnautilus-extension/NautilusPropertyPage.html
share/gtk-doc/html/libnautilus-extension/ch01.html
share/gtk-doc/html/libnautilus-extension/home.png
share/gtk-doc/html/libnautilus-extension/index.html
@ -42,12 +39,15 @@ share/gtk-doc/html/libnautilus-extension/index.sgml
share/gtk-doc/html/libnautilus-extension/ix01.html
share/gtk-doc/html/libnautilus-extension/left.png
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column-provider.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-column.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-extension-types.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-file-info.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-info-provider.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-location-widget-provider.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu-provider.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-menu.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page-provider.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension-nautilus-property-page.html
share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp
share/gtk-doc/html/libnautilus-extension/libnautilus-extension.devhelp2
share/gtk-doc/html/libnautilus-extension/pt01.html
@ -70,8 +70,6 @@ share/icons/hicolor/32x32/apps/nautilus.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/nautilus.svg
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/nautilus.mo
share/locale/am/LC_MESSAGES/nautilus.mo
share/locale/ar/LC_MESSAGES/nautilus.mo
@ -111,9 +109,15 @@ share/locale/fr/LC_MESSAGES/nautilus.mo
share/locale/fur/
share/locale/fur/LC_MESSAGES/
share/locale/fur/LC_MESSAGES/nautilus.mo
share/locale/fy/
share/locale/fy/LC_MESSAGES/
share/locale/fy/LC_MESSAGES/nautilus.mo
share/locale/ga/LC_MESSAGES/nautilus.mo
share/locale/gl/LC_MESSAGES/nautilus.mo
share/locale/gu/LC_MESSAGES/nautilus.mo
share/locale/gv/
share/locale/gv/LC_MESSAGES/
share/locale/gv/LC_MESSAGES/nautilus.mo
share/locale/ha/
share/locale/ha/LC_MESSAGES/
share/locale/ha/LC_MESSAGES/nautilus.mo
@ -121,8 +125,6 @@ share/locale/he/LC_MESSAGES/nautilus.mo
share/locale/hi/LC_MESSAGES/nautilus.mo
share/locale/hr/LC_MESSAGES/nautilus.mo
share/locale/hu/LC_MESSAGES/nautilus.mo
share/locale/hy/
share/locale/hy/LC_MESSAGES/
share/locale/hy/LC_MESSAGES/nautilus.mo
share/locale/id/LC_MESSAGES/nautilus.mo
share/locale/ig/
@ -135,6 +137,7 @@ share/locale/is/LC_MESSAGES/nautilus.mo
share/locale/it/LC_MESSAGES/nautilus.mo
share/locale/ja/LC_MESSAGES/nautilus.mo
share/locale/ka/LC_MESSAGES/nautilus.mo
share/locale/kk/LC_MESSAGES/nautilus.mo
share/locale/km/
share/locale/km/LC_MESSAGES/
share/locale/km/LC_MESSAGES/nautilus.mo
@ -193,6 +196,7 @@ share/locale/tk/
share/locale/tk/LC_MESSAGES/
share/locale/tk/LC_MESSAGES/nautilus.mo
share/locale/tr/LC_MESSAGES/nautilus.mo
share/locale/ug/LC_MESSAGES/nautilus.mo
share/locale/uk/LC_MESSAGES/nautilus.mo
share/locale/uz/
share/locale/uz/LC_MESSAGES/