[141856] users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Sat Dec 12 03:17:56 PST 2015
Revision: 141856
https://trac.macports.org/changeset/141856
Author: devans at macports.org
Date: 2015-10-29 13:34:38 -0700 (Thu, 29 Oct 2015)
Log Message:
-----------
GNOME-3/unstable: gnome-terminal, update to version 3.19.1, configuration.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff
Added Paths:
-----------
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
Removed Paths:
-------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2015-10-29 20:34:38 UTC (rev 141856)
@@ -5,7 +5,7 @@
PortGroup compiler_blacklist_versions 1.0
name gnome-terminal
-version 3.18.1
+version 3.19.1
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 3 Desktop
long_description ${description}
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 27a65f0f03ffde5169605a7bd6419859d03c32b4 \
- sha256 6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119
+checksums rmd160 2d34fe6d34bde219f40d9867d2eb80e2af9e3036 \
+ sha256 d8163333e9255fea53f66e38268edd0927e18042b2f95bf94e8cf82602451122
depends_build port:pkgconfig \
port:intltool \
@@ -45,8 +45,8 @@
port:yelp
patchfiles patch-uuid.diff \
- no-dupfd_cloexec.patch \
patch-src-Makefile.am.diff \
+ patch-src-terminal-screen.c.diff \
patch-src-server.c.diff
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
@@ -63,6 +63,7 @@
configure.args --with-gtk=3.0 \
--with-nautilus-extension=no \
+ --with-pcre2=no \
--enable-debug \
--disable-migration \
--disable-search-provider \
Deleted: 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 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2015-10-29 20:34:38 UTC (rev 141856)
@@ -1,24 +0,0 @@
---- src/terminal-screen.c.orig 2015-10-12 09:24:11.000000000 -0700
-+++ src/terminal-screen.c 2015-10-13 14:10:01.000000000 -0700
-@@ -27,7 +27,7 @@
- #include <unistd.h>
- #include <sys/wait.h>
- #include <fcntl.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
-
- #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
- #include <sys/sysctl.h>
-@@ -1214,7 +1214,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: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2015-10-29 20:34:38 UTC (rev 141856)
@@ -1,6 +1,6 @@
--- src/Makefile.am.orig 2015-02-09 11:27:29.000000000 -0800
+++ src/Makefile.am 2015-02-19 18:09:35.000000000 -0800
-@@ -200,8 +200,6 @@
+@@ -201,8 +201,6 @@
$(AM_CFLAGS) \
-Wno-cast-qual \
-Wno-format-nonliteral \
Added: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (rev 0)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2015-10-29 20:34:38 UTC (rev 141856)
@@ -0,0 +1,33 @@
+--- src/terminal-screen.c.orig 2015-10-27 17:31:24.000000000 -0700
++++ src/terminal-screen.c 2015-10-29 13:09:11.000000000 -0700
+@@ -31,7 +31,7 @@
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
+ #include <sys/sysctl.h>
+@@ -1271,7 +1271,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);
+@@ -1972,8 +1977,6 @@
+ }
+ }
+ }
+-
+- return NULL;
+ }
+
+ /**
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 2015-10-29 20:33:15 UTC (rev 141855)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2015-10-29 20:34:38 UTC (rev 141856)
@@ -32,16 +32,6 @@
#include "terminal-app.h"
#include "terminal-debug.h"
---- configure.ac.orig 2014-05-28 10:42:49.000000000 -0700
-+++ configure.ac 2014-05-28 11:52:45.000000000 -0700
-@@ -80,7 +80,6 @@
- gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
- dconf >= $DCONF_REQUIRED
-- uuid
- $PLATFORM_DEPS])
-
- # ****
--- src/terminal-settings-list.c.orig 2015-09-21 12:44:45.000000000 -0700
+++ src/terminal-settings-list.c 2015-10-13 14:10:01.000000000 -0700
@@ -20,7 +20,7 @@
@@ -53,3 +43,30 @@
#include <dconf.h>
#define G_SETTINGS_ENABLE_BACKEND
+--- configure.ac.orig 2015-10-27 17:31:24.000000000 -0700
++++ configure.ac 2015-10-29 12:54:55.000000000 -0700
+@@ -106,7 +106,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS
+ $PCRE2_PKGS])
+
+@@ -129,7 +128,6 @@
+ gio-unix-2.0 >= $GIO_REQUIRED
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS])
+ ])
+
+@@ -175,7 +173,7 @@
+ vte-$VTE_API_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid])
++ ])
+ AC_DEFINE([ENABLE_MIGRATION],[1],[Define to 1 to enable prefs migration from GConf to GSettings])
+ fi
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/5a80e2de/attachment.html>
More information about the macports-changes
mailing list