[72550] trunk/dports/gnome/nautilus

[devans at macports.org]

Revision: 72550
          http://trac.macports.org/changeset/72550
Author:   devans at macports.org
Date:     2010-10-20 10:32:01 -0700 (Wed, 20 Oct 2010)
Log Message:
-----------
nautilus: drop GTK_DISABLE_DEPRECATED GDK_DISABLE_DEPRECATED cflags after upgrade to gtk 2.22, closes #26911.

Modified Paths:
--------------
    trunk/dports/gnome/nautilus/Portfile
    trunk/dports/gnome/nautilus/files/patch-nautilus-file.c.diff

Added Paths:
-----------
    trunk/dports/gnome/nautilus/files/patch-configure.in.diff
    trunk/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff

Modified: trunk/dports/gnome/nautilus/Portfile
===================================================================
--- trunk/dports/gnome/nautilus/Portfile	2010-10-20 14:04:10 UTC (rev 72549)
+++ trunk/dports/gnome/nautilus/Portfile	2010-10-20 17:32:01 UTC (rev 72550)
@@ -37,12 +37,17 @@
 
 use_bzip2 	yes
 
-patchfiles      patch-nautilus-emblem-utils.c.diff \
+patchfiles      patch-configure.in.diff \
+                patch-eel-Makefile.am.diff \
+                patch-nautilus-emblem-utils.c.diff \
                 patch-nautilus-file.c.diff
 
+use_autoreconf  yes
+
 configure.args  --mandir=${prefix}/share/man \
                 --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib \
+                --disable-silent-rules \
                 --disable-update-mimedb \
                 --disable-schemas-install \
                 --disable-packagekit

Added: trunk/dports/gnome/nautilus/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/nautilus/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/gnome/nautilus/files/patch-configure.in.diff	2010-10-20 17:32:01 UTC (rev 72550)
@@ -0,0 +1,11 @@
+--- configure.in.orig	2010-10-20 09:57:06.000000000 -0700
++++ configure.in	2010-10-20 09:58:02.000000000 -0700
+@@ -339,7 +339,7 @@
+ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs"
+ AC_SUBST(CORE_LIBS)
+ 
+-DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
++DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+ 
+ dnl Multimedia keys

Added: trunk/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff	                        (rev 0)
+++ trunk/dports/gnome/nautilus/files/patch-eel-Makefile.am.diff	2010-10-20 17:32:01 UTC (rev 72550)
@@ -0,0 +1,10 @@
+--- eel/Makefile.am.orig	2010-10-20 10:00:03.000000000 -0700
++++ eel/Makefile.am	2010-10-20 10:00:27.000000000 -0700
+@@ -10,7 +10,6 @@
+ 	-DSOURCE_DATADIR=\""$(top_srcdir)/data"\"	\
+ 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
+ 	-DG_DISABLE_DEPRECATED				\
+-	-DGDK_DISABLE_DEPRECATED			\
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
+ 	-DGMENU_I_KNOW_THIS_IS_UNSTABLE			\
+ 	$(NULL)

Modified: trunk/dports/gnome/nautilus/files/patch-nautilus-file.c.diff
===================================================================
--- trunk/dports/gnome/nautilus/files/patch-nautilus-file.c.diff	2010-10-20 14:04:10 UTC (rev 72549)
+++ trunk/dports/gnome/nautilus/files/patch-nautilus-file.c.diff	2010-10-20 17:32:01 UTC (rev 72550)
@@ -1,6 +1,6 @@
---- libnautilus-private/nautilus-file.c.orig	2008-06-30 23:26:39.000000000 +1000
-+++ libnautilus-private/nautilus-file.c	2008-09-29 05:39:10.000000000 +1000
-@@ -64,6 +64,7 @@
+--- 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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101020/563fb3ce/attachment.html>