[147324] users/devans/GNOME-3/stable/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Fri Apr 1 15:16:57 PDT 2016
Revision: 147324
https://trac.macports.org/changeset/147324
Author: devans at macports.org
Date: 2016-04-01 15:16:57 -0700 (Fri, 01 Apr 2016)
Log Message:
-----------
GNOME-3/stable: gnome-terminal, update to version 3.20.0, use system uuid rather than ossp-uuid, drop outdated patch files.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff
Removed Paths:
-------------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff
Property Changed:
----------------
users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/
Property changes on: users/devans/GNOME-3/stable/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
/trunk/dports/gnome/gnome-terminal:108265-141354
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614,132290-134556,139565-140553
/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
/trunk/dports/gnome/gnome-terminal:108265-141354
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614,132290-134556,139565-140553,141712-147073
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2016-04-01 22:11:59 UTC (rev 147323)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2016-04-01 22:16:57 UTC (rev 147324)
@@ -5,7 +5,7 @@
PortGroup compiler_blacklist_versions 1.0
name gnome-terminal
-version 3.18.3
+version 3.20.0
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 e73ec1c44f4d0c27e3f921706b7a58305dc64af7 \
- sha256 14c2fce1c6a80a3fb0cc8666d7752228adcb60d199634ab69150de32e3c17d56
+checksums rmd160 05377f1467c040f4cec7255cb1704a3e8f52dacb \
+ sha256 2fe7f6bd3ca4e93ce156f83e673b9e8c3f0155b6bc603e109edc942718eb4150
depends_build port:pkgconfig \
port:intltool \
@@ -38,15 +38,14 @@
port:vte \
port:dbus \
port:dconf \
- port:ossp-uuid \
port:xorg-libX11
depends_run port:gnome-themes-standard \
port:yelp
-patchfiles patch-uuid.diff \
- no-dupfd_cloexec.patch \
+patchfiles patch-configure.ac.diff \
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,12 +62,16 @@
configure.args --with-gtk=3.0 \
--with-nautilus-extension=no \
+ --with-pcre2=no \
--enable-debug \
--disable-migration \
--disable-search-provider \
--disable-silent-rules \
--disable-schemas-compile
+configure.cflags-append \
+ -I/usr/include/uuid
+
variant nautilus description {Build optional nautilus extension} {
configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
depends_lib-append port:nautilus
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2016-04-01 22:11:59 UTC (rev 147323)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2016-04-01 22:16:57 UTC (rev 147324)
@@ -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);
Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff (from rev 147073, users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff 2016-04-01 22:16:57 UTC (rev 147324)
@@ -0,0 +1,28 @@
+--- configure.ac.orig 2016-02-29 09:35:20.000000000 -0800
++++ configure.ac 2016-03-02 15:53:22.000000000 -0800
+@@ -107,7 +107,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS
+ $PCRE2_PKGS])
+
+@@ -130,7 +129,6 @@
+ gio-unix-2.0 >= $GIO_REQUIRED
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS])
+ ])
+
+@@ -175,8 +173,7 @@
+ gio-2.0 >= $GIO_REQUIRED
+ vte-$VTE_API_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+- dconf >= $DCONF_REQUIRED
+- uuid])
++ dconf >= $DCONF_REQUIRED])
+ AC_DEFINE([ENABLE_MIGRATION],[1],[Define to 1 to enable prefs migration from GConf to GSettings])
+ fi
+
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2016-04-01 22:11:59 UTC (rev 147323)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff 2016-04-01 22:16:57 UTC (rev 147324)
@@ -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 @@
+@@ -228,8 +228,6 @@
$(AM_CFLAGS) \
-Wno-cast-qual \
-Wno-format-nonliteral \
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff 2016-04-01 22:11:59 UTC (rev 147323)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-server.c.diff 2016-04-01 22:16:57 UTC (rev 147324)
@@ -18,7 +18,7 @@
if (setrlimit (RLIMIT_NOFILE, &l) < 0)
return FALSE;
-@@ -174,7 +176,7 @@
+@@ -167,7 +169,7 @@
}
if (!increase_rlimit_nofile ()) {
Copied: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (from rev 147073, users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff)
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2016-04-01 22:16:57 UTC (rev 147324)
@@ -0,0 +1,15 @@
+--- 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
+@@ -1333,7 +1333,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);
Deleted: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2016-04-01 22:11:59 UTC (rev 147323)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2016-04-01 22:16:57 UTC (rev 147324)
@@ -1,55 +0,0 @@
-diff -ur src.orig/terminal-prefs.c src/terminal-prefs.c
---- src.orig/terminal-prefs.c 2013-07-07 03:54:03.000000000 -0700
-+++ src/terminal-prefs.c 2013-09-14 22:42:22.000000000 -0700
-@@ -20,7 +20,7 @@
-
- #include <string.h>
-
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #include <dconf.h>
-
- #include <glib.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>
-+#include <uuid/uuid.h>
-
- /* Counts occurrences of @str in @strv */
- static guint
---- src/terminal-window.c.orig 2014-03-14 09:31:11.000000000 -0700
-+++ src/terminal-window.c 2014-03-14 09:32:14.000000000 -0700
-@@ -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"
---- 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 @@
- #include "terminal-settings-list.h"
-
- #include <string.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #include <dconf.h>
-
- #define G_SETTINGS_ENABLE_BACKEND
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160401/972b13bc/attachment-0001.html>
More information about the macports-changes
mailing list