[126177] trunk/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Sat Oct 4 18:37:45 PDT 2014
Revision: 126177
https://trac.macports.org/changeset/126177
Author: devans at macports.org
Date: 2014-10-04 18:37:45 -0700 (Sat, 04 Oct 2014)
Log Message:
-----------
gnome-terminal: update to version 3.14.0, dependencies.
Modified Paths:
--------------
trunk/dports/gnome/gnome-terminal/Portfile
trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
Added Paths:
-----------
trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
Removed Paths:
-------------
trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
Property Changed:
----------------
trunk/dports/gnome/gnome-terminal/
Property changes on: trunk/dports/gnome/gnome-terminal
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-terminal:108269-122151
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
+ /branches/mld-qt-481/dports/gnome/gnome-terminal:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gnome-terminal:108269-126096
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- trunk/dports/gnome/gnome-terminal/Portfile 2014-10-05 01:35:53 UTC (rev 126176)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2014-10-05 01:37:45 UTC (rev 126177)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-terminal
-version 3.12.3
+version 3.14.0
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 3 Desktop
long_description \
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 58455c358275524873014d91edd66ae3a7e2cb31 \
- sha256 8450da259fb485289d61fdbe5b59037be068e0dbdd5c7dd8216b60cd49d55528
+checksums rmd160 f844123ab325b1f9a59236f4b30706acdb891ed3 \
+ sha256 3680ffe52a834566f249ad85b44c32d521f34a7a6816e900942ae54a58e0413d
depends_build port:pkgconfig \
port:intltool \
@@ -29,14 +29,13 @@
port:gnome-common
depends_lib port:desktop-file-utils \
- port:gnome-icon-theme \
- port:gnome-icon-theme-symbolic \
port:gsettings-desktop-schemas \
port:gtk3 \
port:vte \
port:appdata-tools \
port:dbus \
port:dconf \
+ port:ossp-uuid \
port:xorg-libX11
depends_run port:gnome-settings-daemon \
Deleted: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-10-05 01:35:53 UTC (rev 126176)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-10-05 01:37:45 UTC (rev 126177)
@@ -1,24 +0,0 @@
---- src/terminal-screen.c.orig 2014-02-17 13:39:53.000000000 -0800
-+++ src/terminal-screen.c 2014-03-14 09:35:53.000000000 -0700
-@@ -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>
-@@ -1243,7 +1243,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, 3);
-+#else
-+ fd = fcntl (fds[j], F_DUPFD, 3);
-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
-+#endif
- } while (fd == -1 && errno == EINTR);
- if (fd == -1)
- _exit (127);
Copied: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (from rev 126096, users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch)
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch (rev 0)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-10-05 01:37:45 UTC (rev 126177)
@@ -0,0 +1,24 @@
+--- src/terminal-screen.c.orig 2014-08-17 09:47:20.000000000 -0700
++++ src/terminal-screen.c 2014-08-18 22:32:33.000000000 -0700
+@@ -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>
+@@ -1192,7 +1192,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, 3);
++#else
++ fd = fcntl (fds[j], F_DUPFD, 3);
++ fcntl(fd, F_SETFD, FD_CLOEXEC);
++#endif
+ } while (fd == -1 && errno == EINTR);
+ if (fd == -1)
+ _exit (127);
Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-10-05 01:35:53 UTC (rev 126176)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-10-05 01:37:45 UTC (rev 126177)
@@ -44,9 +44,9 @@
#include "terminal-app.h"
#include "terminal-debug.h"
---- configure.ac.orig 2014-02-19 11:59:55.000000000 -0800
-+++ configure.ac 2014-03-14 09:33:28.000000000 -0700
-@@ -78,7 +78,6 @@
+--- configure.ac.orig 2014-05-28 10:42:49.000000000 -0700
++++ configure.ac 2014-05-28 11:52:45.000000000 -0700
+@@ -75,7 +75,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141004/8d0345de/attachment-0001.html>
More information about the macports-changes
mailing list