[145884] users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Fri Feb 19 11:55:33 PST 2016
Revision: 145884
https://trac.macports.org/changeset/145884
Author: devans at macports.org
Date: 2016-02-19 11:55:33 -0800 (Fri, 19 Feb 2016)
Log Message:
-----------
GNOME-3/unstable: gnome-terminal, update to version 3.19.90, use system uuid, disable pcre2, not supported by vte 0.43.90+.
Modified Paths:
--------------
users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile
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/patch-uuid.diff
Modified: users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile
===================================================================
--- users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/Portfile 2016-02-19 19:55:33 UTC (rev 145884)
@@ -5,8 +5,7 @@
PortGroup compiler_blacklist_versions 1.0
name gnome-terminal
-version 3.19.1
-revision 1
+version 3.19.90
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 3 Desktop
long_description ${description}
@@ -19,8 +18,8 @@
use_xz yes
-checksums rmd160 2d34fe6d34bde219f40d9867d2eb80e2af9e3036 \
- sha256 d8163333e9255fea53f66e38268edd0927e18042b2f95bf94e8cf82602451122
+checksums rmd160 dafe1542eb3aa1a6bd1ac5b4455f3c9d3cd20f2a \
+ sha256 c2be96fc8bdc9a52872d5f4eeb3fa230f3f3cbecf71f253465b20d209a0193fa
depends_build port:pkgconfig \
port:intltool \
@@ -39,15 +38,12 @@
port:vte \
port:dbus \
port:dconf \
- port:ossp-uuid \
- port:pcre2 \
port:xorg-libX11
depends_run port:gnome-themes-standard \
port:yelp
-patchfiles patch-uuid.diff \
- patch-src-Makefile.am.diff \
+patchfiles patch-src-Makefile.am.diff \
patch-src-terminal-screen.c.diff \
patch-src-server.c.diff
@@ -65,13 +61,16 @@
configure.args --with-gtk=3.0 \
--with-nautilus-extension=no \
- --with-pcre2=yes \
+ --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
Modified: 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 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff 2016-02-19 19:55:33 UTC (rev 145884)
@@ -9,7 +9,7 @@
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
#include <sys/sysctl.h>
-@@ -1271,7 +1271,12 @@
+@@ -1331,7 +1331,12 @@
for (j = 0; j < n_fds; j++) {
if (fds[j] == target_fd) {
do {
@@ -22,12 +22,3 @@
} while (fd == -1 && errno == EINTR);
if (fd == -1)
_exit (127);
-@@ -1972,8 +1977,6 @@
- }
- }
- }
--
-- return NULL;
- }
-
- /**
Deleted: 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 2016-02-19 19:29:35 UTC (rev 145883)
+++ users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal/files/patch-uuid.diff 2016-02-19 19:55:33 UTC (rev 145884)
@@ -1,72 +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"
---- 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
---- 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/20160219/815bf60d/attachment.html>
More information about the macports-changes
mailing list