Revision: 116528 https://trac.macports.org/changeset/116528 Author: devans@macports.org Date: 2014-01-27 08:45:48 -0800 (Mon, 27 Jan 2014) Log Message: ----------- GNOME-3/unstable/dports: gnome-terminal, update patches to fix build. Modified Paths: -------------- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-01-27 16:42:33 UTC (rev 116527) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-01-27 16:45:48 UTC (rev 116528) @@ -1,13 +1,22 @@ ---- src/terminal-screen.c.orig 2013-10-14 12:26:50.000000000 -0700 -+++ src/terminal-screen.c 2013-11-25 18:08:22.000000000 -0800 -@@ -1338,7 +1338,12 @@ +--- src/terminal-screen.c.orig 2014-01-24 16:01:58.000000000 -0800 ++++ src/terminal-screen.c 2014-01-24 16:03:09.000000000 -0800 +@@ -27,7 +27,7 @@ + #include <unistd.h> + #include <sys/wait.h> + #include <fcntl.h> +-#include <uuid.h> ++#include <uuid/uuid.h> + + #include <glib.h> + #include <glib/gi18n.h> +@@ -1220,7 +1220,12 @@ for (j = 0; j < n_fds; j++) { if (fds[j] == target_fd) { do { +#ifdef F_DUPFD_CLOEXEC - fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 10); + fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3); +#else -+ fd = fcntl (fds[j], F_DUPFD, 10); ++ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3); + fcntl(fd, F_SETFD, FD_CLOEXEC); +#endif } while (fd == -1 && errno == EINTR); Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-01-27 16:42:33 UTC (rev 116527) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-01-27 16:45:48 UTC (rev 116528) @@ -1,6 +1,5 @@ -diff -ur src.orig/client.c src/client.c ---- src.orig/client.c 2013-07-07 03:54:02.000000000 -0700 -+++ src/client.c 2013-09-14 13:19:28.000000000 -0700 +--- src/client.c.orig 2013-11-20 14:44:25.000000000 -0800 ++++ src/client.c 2014-01-24 15:32:28.000000000 -0800 @@ -33,6 +33,10 @@ #include <unistd.h> #include <sys/wait.h> @@ -12,7 +11,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <glib/gprintf.h> -@@ -521,7 +525,11 @@ +@@ -524,7 +528,11 @@ * because we want to use the value from PWD (if it is correct). * See bug 502146. */ @@ -24,8 +23,8 @@ data->working_directory = g_strdup (cwd); free (cwd); } ---- src/terminal.c.orig 2013-10-08 13:17:46.000000000 -0700 -+++ src/terminal.c 2013-11-25 18:08:22.000000000 -0800 +--- src/terminal.c.orig 2014-01-24 15:50:25.000000000 -0800 ++++ src/terminal.c 2014-01-24 15:53:08.000000000 -0800 @@ -28,6 +28,10 @@ #include <time.h> #include <unistd.h> @@ -41,11 +40,11 @@ * because we want to use the value from PWD (if it is correct). * See bug 502146. */ -+#ifdef __APPLE__ ++#ifdef __APPLE__ + cwd = getcwd (NULL, MAXPATHLEN); -+#else ++#else cwd = get_current_dir_name (); -+#endif ++#endif working_directory = g_strdup (cwd); free (cwd); Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff =================================================================== --- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-01-27 16:42:33 UTC (rev 116527) +++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-01-27 16:45:48 UTC (rev 116528) @@ -10,11 +10,10 @@ #include <dconf.h> #include <glib.h> -diff -ur src.orig/terminal-profiles-list.c src/terminal-profiles-list.c ---- src.orig/terminal-profiles-list.c 2013-06-21 09:10:02.000000000 -0700 -+++ src/terminal-profiles-list.c 2013-09-14 22:42:51.000000000 -0700 -@@ -25,7 +25,7 @@ - #include "terminal-schemas.h" +--- src/terminal-profiles-list.c.orig 2013-11-20 14:44:26.000000000 -0800 ++++ src/terminal-profiles-list.c 2014-01-24 15:34:04.000000000 -0800 +@@ -26,7 +26,7 @@ + #include "terminal-libgsystem.h" #include <string.h> -#include <uuid.h> @@ -34,9 +33,9 @@ #include <dconf.h> #include "terminal-type-builtins.h" ---- configure.orig 2013-10-14 12:28:06.000000000 -0700 -+++ configure 2013-11-25 18:05:42.000000000 -0800 -@@ -13128,7 +13128,6 @@ +--- configure.orig 2013-11-20 14:44:41.000000000 -0800 ++++ configure 2014-01-24 15:37:08.000000000 -0800 +@@ -13120,7 +13120,6 @@ gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= \$DCONF_REQUIRED @@ -44,7 +43,7 @@ \$PLATFORM_DEPS\""; } >&5 ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED glib-2.0 >= $GLIB_REQUIRED -@@ -13136,7 +13135,6 @@ +@@ -13128,7 +13127,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -52,7 +51,7 @@ $PLATFORM_DEPS") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -13147,7 +13145,6 @@ +@@ -13139,7 +13137,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -60,7 +59,7 @@ $PLATFORM_DEPS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else -@@ -13166,7 +13163,6 @@ +@@ -13158,7 +13155,6 @@ gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= \$DCONF_REQUIRED @@ -68,7 +67,7 @@ \$PLATFORM_DEPS\""; } >&5 ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED glib-2.0 >= $GLIB_REQUIRED -@@ -13174,7 +13170,6 @@ +@@ -13166,7 +13162,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -76,7 +75,7 @@ $PLATFORM_DEPS") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -13185,7 +13180,6 @@ +@@ -13177,7 +13172,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -84,7 +83,7 @@ $PLATFORM_DEPS" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else -@@ -13213,7 +13207,6 @@ +@@ -13205,7 +13199,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -92,7 +91,7 @@ $PLATFORM_DEPS" 2>&1` else TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED -@@ -13222,7 +13215,6 @@ +@@ -13214,7 +13207,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -100,7 +99,7 @@ $PLATFORM_DEPS" 2>&1` fi # Put the nasty error message in config.log where it belongs -@@ -13234,7 +13226,6 @@ +@@ -13226,7 +13218,6 @@ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED dconf >= $DCONF_REQUIRED @@ -108,7 +107,7 @@ $PLATFORM_DEPS) were not met: $TERM_PKG_ERRORS -@@ -13574,13 +13565,13 @@ +@@ -13566,13 +13557,13 @@ vte\$VTE_PC_VERSION >= \$VTE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED dconf >= \$DCONF_REQUIRED @@ -124,7 +123,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -@@ -13589,7 +13580,7 @@ +@@ -13581,7 +13572,7 @@ vte$VTE_PC_VERSION >= $VTE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED dconf >= $DCONF_REQUIRED @@ -133,7 +132,7 @@ test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -13606,13 +13597,13 @@ +@@ -13598,13 +13589,13 @@ vte\$VTE_PC_VERSION >= \$VTE_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED dconf >= \$DCONF_REQUIRED @@ -149,7 +148,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -@@ -13621,7 +13612,7 @@ +@@ -13613,7 +13604,7 @@ vte$VTE_PC_VERSION >= $VTE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED dconf >= $DCONF_REQUIRED @@ -158,7 +157,7 @@ test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes -@@ -13647,14 +13638,14 @@ +@@ -13639,14 +13630,14 @@ vte$VTE_PC_VERSION >= $VTE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED dconf >= $DCONF_REQUIRED @@ -175,7 +174,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$MIGRATOR_PKG_ERRORS" >&5 -@@ -13664,7 +13655,7 @@ +@@ -13656,7 +13647,7 @@ vte$VTE_PC_VERSION >= $VTE_REQUIRED gconf-2.0 >= $GCONF_REQUIRED dconf >= $DCONF_REQUIRED @@ -184,3 +183,14 @@ $MIGRATOR_PKG_ERRORS +--- src/terminal-window.c.orig 2014-01-24 16:02:20.000000000 -0800 ++++ src/terminal-window.c 2014-01-24 16:05:40.000000000 -0800 +@@ -29,7 +29,7 @@ + #ifdef GDK_WINDOWING_X11 + #include <gdk/gdkx.h> + #endif +-#include <uuid.h> ++#include <uuid/uuid.h> + + #include "terminal-app.h" + #include "terminal-debug.h"