[118925] trunk/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Sun Apr 13 18:58:20 PDT 2014
Revision: 118925
https://trac.macports.org/changeset/118925
Author: devans at macports.org
Date: 2014-04-13 18:58:20 -0700 (Sun, 13 Apr 2014)
Log Message:
-----------
gnome-terminal: update to version 3.12.0.
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-uuid.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff
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-113174
/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-118732
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154
/users/rmstonecipher/gnome/gnome-terminal:102363-103172
Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- trunk/dports/gnome/gnome-terminal/Portfile 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2014-04-14 01:58:20 UTC (rev 118925)
@@ -4,9 +4,9 @@
PortSystem 1.0
name gnome-terminal
-version 3.10.2
+version 3.12.0
set branch [join [lrange [split ${version} .] 0 1] .]
-description Terminal component for the GNOME 2 Desktop
+description Terminal component for the GNOME 3 Desktop
long_description \
${description}
maintainers devans openmaintainer
@@ -18,8 +18,8 @@
use_xz yes
-checksums rmd160 b25d2782052cf65f7b8b4dc591762cf69e21f630 \
- sha256 e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913
+checksums rmd160 149a4da5c39370838a85a1d3fb2b487ab5adc3a3 \
+ sha256 ce690ed798a3e940f2f3a173a7946181e48d899214048d3282c671535c87cea7
depends_build port:pkgconfig \
port:intltool \
@@ -34,6 +34,7 @@
port:gsettings-desktop-schemas \
port:gtk3 \
port:vte \
+ port:appdata-tools \
port:dbus \
port:dconf \
port:xorg-libX11
@@ -41,9 +42,7 @@
depends_run port:gnome-settings-daemon \
port:yelp
-patchfiles patch-getcwd.diff \
- patch-uuid.diff \
- patch-gschema.xml.in.diff \
+patchfiles patch-uuid.diff \
no-dupfd_cloexec.patch
# update m4/intltool.m4 and autoreconf
@@ -56,12 +55,14 @@
autoreconf.args -fvi
configure.args --with-gtk=3.0 \
+ --with-nautilus-extension=no \
--disable-migration \
+ --disable-search-provider \
--disable-silent-rules \
--disable-schemas-compile
variant nautilus description {Build optional nautilus extension} {
- configure.args-append --with-nautilus-extension
+ configure.args-replace --with-nautilus-extension=no --with-nautilus-extension=yes
depends_lib-append port:nautilus
}
@@ -70,6 +71,8 @@
depends_lib-append port:gconf
}
+default_variants +nautilus
+
post-activate {
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
Modified: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch 2014-04-14 01:58:20 UTC (rev 118925)
@@ -1,13 +1,22 @@
---- 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 @@
+--- 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, 10);
+ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
+#else
-+ fd = fcntl (fds[j], F_DUPFD, 10);
++ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
} while (fd == -1 && errno == EINTR);
Deleted: trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2014-04-14 01:58:20 UTC (rev 118925)
@@ -1,51 +0,0 @@
-diff -ur src.orig/client.c src/client.c
---- src.orig/client.c 2013-07-07 03:54:02.000000000 -0700
-+++ src/client.c 2013-09-14 13:19:28.000000000 -0700
-@@ -33,6 +33,10 @@
- #include <unistd.h>
- #include <sys/wait.h>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <glib/gprintf.h>
-@@ -521,7 +525,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- data->working_directory = g_strdup (cwd);
- free (cwd);
- }
---- 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>
-
-+#ifdef __APPLE__
-+#include <sys/param.h>
-+#endif
-+
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <gio/gio.h>
-@@ -233,7 +237,11 @@
- * because we want to use the value from PWD (if it is correct).
- * See bug 502146.
- */
-+#ifdef __APPLE__
-+ cwd = getcwd (NULL, MAXPATHLEN);
-+#else
- cwd = get_current_dir_name ();
-+#endif
- working_directory = g_strdup (cwd);
- free (cwd);
-
Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-04-14 01:58:11 UTC (rev 118924)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2014-04-14 01:58:20 UTC (rev 118925)
@@ -10,11 +10,10 @@
#include <dconf.h>
#include <glib.h>
-diff -ur src.orig/terminal-profiles-list.c src/terminal-profiles-list.c
---- src.orig/terminal-profiles-list.c 2013-06-21 09:10:02.000000000 -0700
-+++ src/terminal-profiles-list.c 2013-09-14 22:42:51.000000000 -0700
-@@ -25,7 +25,7 @@
- #include "terminal-schemas.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>
@@ -34,13 +33,24 @@
#include <dconf.h>
#include "terminal-type-builtins.h"
---- configure.ac.orig 2014-02-24 14:08:39.000000000 -0800
-+++ configure.ac 2014-02-24 14:08:49.000000000 -0800
-@@ -82,7 +82,6 @@
+--- 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-02-19 11:59:55.000000000 -0800
++++ configure.ac 2014-03-14 09:33:28.000000000 -0700
+@@ -78,7 +78,6 @@
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
dconf >= $DCONF_REQUIRED
- uuid
$PLATFORM_DEPS])
- # DConf broke API without changing the pkgconfig name
+ # ****
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140413/01db5615/attachment.html>
More information about the macports-changes
mailing list