[113931] trunk/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Mon Nov 25 18:33:45 PST 2013
Revision: 113931
https://trac.macports.org/changeset/113931
Author: devans at macports.org
Date: 2013-11-25 18:33:45 -0800 (Mon, 25 Nov 2013)
Log Message:
-----------
gnome-terminal: update to version 3.10.1.
Modified Paths:
--------------
trunk/dports/gnome/gnome-terminal/Portfile
trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff
trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- trunk/dports/gnome/gnome-terminal/Portfile 2013-11-26 02:04:12 UTC (rev 113930)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2013-11-26 02:33:45 UTC (rev 113931)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-terminal
-version 3.8.4
+version 3.10.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 2 Desktop
long_description \
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 4aa34c29bd7a48c1d1aab60e42fa2d9be782dab1 \
- sha256 5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22
+checksums rmd160 5cc99b22d69b245c555fedd5152dd1fa23543010 \
+ sha256 d267e5245232e10ef12411ed7be1d879226b66f64f7cabe9731a7bd8b28e9f27
depends_build port:pkgconfig \
port:intltool \
Modified: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2013-11-26 02:04:12 UTC (rev 113930)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2013-11-26 02:33:45 UTC (rev 113931)
@@ -1,6 +1,6 @@
---- src/terminal-screen.c.orig 2013-11-15 13:28:52.000000000 -0800
-+++ src/terminal-screen.c 2013-11-15 13:31:21.000000000 -0800
-@@ -1335,7 +1335,12 @@ terminal_screen_child_setup (FDSetupData
+--- 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 @@
for (j = 0; j < n_fds; j++) {
if (fds[j] == target_fd) {
do {
Modified: trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2013-11-26 02:04:12 UTC (rev 113930)
+++ trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2013-11-26 02:33:45 UTC (rev 113931)
@@ -24,9 +24,8 @@
data->working_directory = g_strdup (cwd);
free (cwd);
}
-diff -ur src.orig/terminal.c src/terminal.c
---- src.orig/terminal.c 2013-07-07 03:54:03.000000000 -0700
-+++ src/terminal.c 2013-09-14 13:21:23.000000000 -0700
+--- src/terminal.c.orig 2013-10-08 13:17:46.000000000 -0700
++++ src/terminal.c 2013-11-25 18:08:22.000000000 -0800
@@ -28,6 +28,10 @@
#include <time.h>
#include <unistd.h>
@@ -38,7 +37,7 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <gio/gio.h>
-@@ -230,7 +234,11 @@
+@@ -233,7 +237,11 @@
* because we want to use the value from PWD (if it is correct).
* See bug 502146.
*/
Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2013-11-26 02:04:12 UTC (rev 113930)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2013-11-26 02:33:45 UTC (rev 113931)
@@ -34,9 +34,9 @@
#include <dconf.h>
#include "terminal-type-builtins.h"
---- configure.orig 2013-09-14 22:45:52.000000000 -0700
-+++ configure 2013-09-14 22:47:39.000000000 -0700
-@@ -13048,7 +13048,6 @@
+--- configure.orig 2013-10-14 12:28:06.000000000 -0700
++++ configure 2013-11-25 18:05:42.000000000 -0800
+@@ -13128,7 +13128,6 @@
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= \$DCONF_REQUIRED
@@ -44,7 +44,7 @@
\$PLATFORM_DEPS\""; } >&5
($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
-@@ -13056,7 +13055,6 @@
+@@ -13136,7 +13135,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
@@ -52,15 +52,15 @@
$PLATFORM_DEPS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13067,7 +13065,6 @@
+@@ -13147,7 +13145,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
$PLATFORM_DEPS" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- pkg_failed=yes
-@@ -13085,7 +13082,6 @@
+@@ -13166,7 +13163,6 @@
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= \$DCONF_REQUIRED
@@ -68,7 +68,7 @@
\$PLATFORM_DEPS\""; } >&5
($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
glib-2.0 >= $GLIB_REQUIRED
-@@ -13093,7 +13089,6 @@
+@@ -13174,7 +13170,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
@@ -76,23 +76,23 @@
$PLATFORM_DEPS") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-@@ -13104,7 +13099,6 @@
+@@ -13185,7 +13180,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
$PLATFORM_DEPS" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
- pkg_failed=yes
-@@ -13131,7 +13125,6 @@
+@@ -13213,7 +13207,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
$PLATFORM_DEPS" 2>&1`
else
- TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
-@@ -13140,7 +13133,6 @@
+ TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "vte$VTE_PC_VERSION >= $VTE_REQUIRED
+@@ -13222,7 +13215,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
@@ -100,7 +100,7 @@
$PLATFORM_DEPS" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
-@@ -13152,7 +13144,6 @@
+@@ -13234,7 +13226,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
@@ -108,7 +108,7 @@
$PLATFORM_DEPS) were not met:
$TERM_PKG_ERRORS
-@@ -13493,13 +13484,13 @@
+@@ -13574,13 +13565,13 @@
vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
gconf-2.0 >= \$GCONF_REQUIRED
dconf >= \$DCONF_REQUIRED
@@ -124,16 +124,16 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
-@@ -13508,7 +13499,7 @@
+@@ -13589,7 +13580,7 @@
vte$VTE_PC_VERSION >= $VTE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid" 2>/dev/null`
+ " 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
- fi
-@@ -13524,13 +13515,13 @@
+@@ -13606,13 +13597,13 @@
vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
gconf-2.0 >= \$GCONF_REQUIRED
dconf >= \$DCONF_REQUIRED
@@ -149,23 +149,23 @@
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
-@@ -13539,7 +13530,7 @@
+@@ -13621,7 +13612,7 @@
vte$VTE_PC_VERSION >= $VTE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid" 2>/dev/null`
+ " 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
- fi
-@@ -13564,14 +13555,14 @@
+@@ -13647,14 +13638,14 @@
vte$VTE_PC_VERSION >= $VTE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid" 2>&1`
+ " 2>&1`
else
- MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
gio-2.0 >= $GIO_REQUIRED
vte$VTE_PC_VERSION >= $VTE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
@@ -175,7 +175,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$MIGRATOR_PKG_ERRORS" >&5
-@@ -13581,7 +13572,7 @@
+@@ -13664,7 +13655,7 @@
vte$VTE_PC_VERSION >= $VTE_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
dconf >= $DCONF_REQUIRED
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131125/6140a39c/attachment.html>
More information about the macports-changes
mailing list