[111010] users/devans/GNOME-3/stable/dports/gnome/nautilus
devans at macports.org
devans at macports.org
Fri Sep 13 09:20:35 PDT 2013
Revision: 111010
https://trac.macports.org/changeset/111010
Author: devans at macports.org
Date: 2013-09-13 09:20:35 -0700 (Fri, 13 Sep 2013)
Log Message:
-----------
users/devans/GNOME-3/stable/dports: nautilus, update to version 3.8.2.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-global-preferences.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-configure.in.diff
users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff
users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff
users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-file.c.diff
Modified: users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2013-09-13 16:11:45 UTC (rev 111009)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/Portfile 2013-09-13 16:20:35 UTC (rev 111010)
@@ -4,7 +4,7 @@
PortSystem 1.0
name nautilus
-version 2.32.2.1
+version 3.8.2
set branch [join [lrange [split ${version} .] 0 1] .]
description The GNOME filemanager
long_description \
@@ -18,52 +18,43 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e \
- sha256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
+checksums rmd160 112b43e649b81f570a870ecf40e5b7a0a7325882 \
+ sha256 dbddfdaac52d077d46d48a2f8dbecf6d13788d8f6b5fc9aa70826a24681d8a75
depends_build port:pkgconfig \
- port:intltool \
- port:gnome-doc-utils \
- port:gtk-doc
+ port:intltool
depends_lib port:desktop-file-utils \
+ port:shared-mime-info \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gtk3 \
port:gnome-desktop \
- port:gobject-introspection \
- port:libxml2 \
- port:libunique \
- port:libexif \
port:exempi \
- port:pangox-compat
+ port:libexif \
+ port:libnotify \
+ port:libxml2 \
+ port:gsettings-desktop-schemas \
+ port:gobject-introspection \
+ port:xorg-libX11
-depends_run port:desktop-file-utils \
- port:shared-mime-info \
- port:gnome-settings-daemon
+depends_run port:gnome-settings-daemon
-patchfiles patch-configure.in.diff \
- patch-eel-Makefile.am.diff \
- patch-nautilus-emblem-utils.c.diff \
- patch-nautilus-file.c.diff
+patchfiles patch-nautilus-global-preferences.diff
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.args --mandir=${prefix}/share/man \
- --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib \
- --enable-introspection=yes \
+configure.args --enable-introspection=yes \
+ --enable-tracker=no \
+ --disable-packagekit \
--disable-silent-rules \
--disable-update-mimedb \
- --disable-schemas-install \
- --disable-packagekit
+ --disable-schemas-compile
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Deleted: users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-configure.in.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-configure.in.diff 2013-09-13 16:11:45 UTC (rev 111009)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-configure.in.diff 2013-09-13 16:20:35 UTC (rev 111010)
@@ -1,26 +0,0 @@
---- configure.in.orig 2010-12-28 07:57:51.000000000 -0800
-+++ configure.in 2013-05-06 04:58:40.000000000 -0700
-@@ -61,6 +61,7 @@
- PKG_CHECK_MODULES(ALL, [
- glib-2.0 >= glib_minver
- gnome-desktop-2.0 >= gnome_desktop_minver
-+ gmodule-2.0
- gthread-2.0
- gio-unix-2.0
- gio-2.0
-@@ -336,13 +337,13 @@
- AC_SUBST(LIBNAUTILUS_EXTENSION_LIBS)
-
- dnl core nautilus
--CORE_MODULES="glib-2.0 gnome-desktop-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
-+CORE_MODULES="glib-2.0 gnome-desktop-2.0 gmodule-2.0 gthread-2.0 gio-2.0 gio-unix-2.0 unique-1.0 gail gconf-2.0 libxml-2.0 $EXTRA_CORE_MODULES"
- CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
- AC_SUBST(CORE_CFLAGS)
- CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
- AC_SUBST(CORE_LIBS)
-
--DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
-+DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED"
- AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
-
- dnl Multimedia keys
Deleted: users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff 2013-09-13 16:11:45 UTC (rev 111009)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff 2013-09-13 16:20:35 UTC (rev 111010)
@@ -1,10 +0,0 @@
---- eel/Makefile.am.orig 2010-12-28 07:54:38.000000000 -0800
-+++ eel/Makefile.am 2013-05-06 05:02:17.000000000 -0700
-@@ -10,7 +10,6 @@
- -DDATADIR=\""$(datadir)"\" \
- -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \
- -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \
-- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(NULL)
Deleted: users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff 2013-09-13 16:11:45 UTC (rev 111009)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-emblem-utils.c.diff 2013-09-13 16:20:35 UTC (rev 111010)
@@ -1,10 +0,0 @@
---- libnautilus-private/nautilus-emblem-utils.c.orig 2008-03-29 20:40:43.000000000 +1100
-+++ libnautilus-private/nautilus-emblem-utils.c 2008-09-29 05:31:02.000000000 +1000
-@@ -24,6 +24,7 @@
-
- #include <config.h>
-
-+#include <sys/stat.h>
- #include <sys/types.h>
- #include <utime.h>
- #include <stdio.h>
Deleted: users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-file.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-file.c.diff 2013-09-13 16:11:45 UTC (rev 111009)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-file.c.diff 2013-09-13 16:20:35 UTC (rev 111010)
@@ -1,10 +0,0 @@
---- libnautilus-private/nautilus-file.c.orig 2010-03-10 05:28:38.000000000 -0800
-+++ libnautilus-private/nautilus-file.c 2010-10-20 10:03:19.000000000 -0700
-@@ -63,6 +63,7 @@
- #include <libxml/parser.h>
- #include <pwd.h>
- #include <stdlib.h>
-+#include <sys/stat.h>
- #include <sys/time.h>
- #include <time.h>
- #include <unistd.h>
Added: users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-global-preferences.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-global-preferences.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/nautilus/files/patch-nautilus-global-preferences.diff 2013-09-13 16:20:35 UTC (rev 111010)
@@ -0,0 +1,73 @@
+From 9ee0a3e0f137671884799d5f3af4c19879908e0e Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Fri, 12 Jul 2013 12:43:57 -0400
+Subject: [PATCH] nautilus-global-preferences: use 'extern' properly
+
+Variables in header files should have 'extern' on them and be defined
+from a single .c file, otherwise you get a copy of the variable every
+time you #include the header.
+
+-fcommon masks this problem, but building with -fno-common fails because
+of it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=704117
+---
+ libnautilus-private/nautilus-global-preferences.c | 11 +++++++++++
+ libnautilus-private/nautilus-global-preferences.h | 20 ++++++++++----------
+ 2 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
+index f259e6c..921e11b 100644
+--- libnautilus-private/nautilus-global-preferences.c.orig
++++ libnautilus-private/nautilus-global-preferences.c
+@@ -34,6 +34,17 @@
+ #include <eel/eel-string.h>
+ #include <glib/gi18n.h>
+
++GSettings *nautilus_preferences;
++GSettings *nautilus_icon_view_preferences;
++GSettings *nautilus_list_view_preferences;
++GSettings *nautilus_desktop_preferences;
++GSettings *nautilus_window_state;
++GSettings *gtk_filechooser_preferences;
++GSettings *gnome_lockdown_preferences;
++GSettings *gnome_background_preferences;
++GSettings *gnome_interface_preferences;
++GSettings *gnome_privacy_preferences;
++
+ /*
+ * Public functions
+ */
+diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
+index d6791b3..7f4ede5 100644
+--- libnautilus-private/nautilus-global-preferences.h.orig
++++ libnautilus-private/nautilus-global-preferences.h
+@@ -164,16 +164,16 @@ typedef enum
+ void nautilus_global_preferences_init (void);
+ char *nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void);
+
+-GSettings *nautilus_preferences;
+-GSettings *nautilus_icon_view_preferences;
+-GSettings *nautilus_list_view_preferences;
+-GSettings *nautilus_desktop_preferences;
+-GSettings *nautilus_window_state;
+-GSettings *gtk_filechooser_preferences;
+-GSettings *gnome_lockdown_preferences;
+-GSettings *gnome_background_preferences;
+-GSettings *gnome_interface_preferences;
+-GSettings *gnome_privacy_preferences;
++extern GSettings *nautilus_preferences;
++extern GSettings *nautilus_icon_view_preferences;
++extern GSettings *nautilus_list_view_preferences;
++extern GSettings *nautilus_desktop_preferences;
++extern GSettings *nautilus_window_state;
++extern GSettings *gtk_filechooser_preferences;
++extern GSettings *gnome_lockdown_preferences;
++extern GSettings *gnome_background_preferences;
++extern GSettings *gnome_interface_preferences;
++extern GSettings *gnome_privacy_preferences;
+
+ G_END_DECLS
+
+--
+1.8.3.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130913/c214b60f/attachment-0001.html>
More information about the macports-changes
mailing list