[141345] trunk/dports/gnome/gnome-terminal

12 Dec 2015

Revision: 141345
          https://trac.macports.org/changeset/141345
Author:   devans@macports.org
Date:     2015-10-15 19:43:27 -0700 (Thu, 15 Oct 2015)
Log Message:
-----------
gnome-terminal: update to version 3.18.1.

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-src-Makefile.am.diff
    trunk/dports/gnome/gnome-terminal/files/patch-src-server.c.diff
    trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff

Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================

--- trunk/dports/gnome/gnome-terminal/Portfile	2015-10-16 02:42:35 UTC (rev 141344)
+++ trunk/dports/gnome/gnome-terminal/Portfile	2015-10-16 02:43:27 UTC (rev 141345)
@@ -5,7 +5,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                gnome-terminal
-version             3.18.0
+version             3.18.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  6d189444eab11d283f113e7560d8be011f86e710 \
-                    sha256  776642502b57b7a6b5f099291b660c0b4a4ff2b3024d15a2f5b33c4286c9dce6
+checksums           rmd160  27a65f0f03ffde5169605a7bd6419859d03c32b4 \
+                    sha256  6eecc81f38c8019d9f49b8950cd814da88d84a8d98c9da98a57be06a1b9f4119
 
 depends_build       port:pkgconfig \
                     port:intltool \

Modified: trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	2015-10-16 02:42:35 UTC (rev 141344)
+++ trunk/dports/gnome/gnome-terminal/files/no-dupfd_cloexec.patch	2015-10-16 02:43:27 UTC (rev 141345)
@@ -1,5 +1,5 @@
---- 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
+--- 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>
@@ -7,9 +7,9 @@
 -#include <uuid.h>
 +#include <uuid/uuid.h>
  
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -1199,7 +1199,12 @@
+ #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 {

Modified: trunk/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff	2015-10-16 02:42:35 UTC (rev 141344)
+++ trunk/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff	2015-10-16 02:43:27 UTC (rev 141345)
@@ -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
-@@ -199,8 +199,6 @@
+@@ -200,8 +200,6 @@
  	$(AM_CFLAGS) \
  	-Wno-cast-qual \
  	-Wno-format-nonliteral \

Modified: trunk/dports/gnome/gnome-terminal/files/patch-src-server.c.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-src-server.c.diff	2015-10-16 02:42:35 UTC (rev 141344)
+++ trunk/dports/gnome/gnome-terminal/files/patch-src-server.c.diff	2015-10-16 02:43:27 UTC (rev 141345)
@@ -9,7 +9,7 @@
  
  #include <glib.h>
  #include <glib/gi18n.h>
-@@ -91,7 +93,7 @@
+@@ -93,7 +95,7 @@
    if (pthread_atfork (NULL, NULL, atfork_child_restore_rlimit_nofile) != 0)
      return FALSE;
  
@@ -18,7 +18,7 @@
    if (setrlimit (RLIMIT_NOFILE, &l) < 0)
      return FALSE;
  
-@@ -163,7 +165,7 @@
+@@ -174,7 +176,7 @@
    }
  
    if (!increase_rlimit_nofile ()) {

Modified: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff	2015-10-16 02:42:35 UTC (rev 141344)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff	2015-10-16 02:43:27 UTC (rev 141345)
@@ -21,18 +21,6 @@
  
  /* Counts occurrences of @str in @strv */
  static guint
-diff -ur src.orig/terminal-settings-list.c src/terminal-settings-list.c
---- src.orig/terminal-settings-list.c	2013-05-07 11:50:03.000000000 -0700
-+++ src/terminal-settings-list.c	2013-09-14 22:43:25.000000000 -0700
-@@ -20,7 +20,7 @@
- #include "terminal-settings-list.h"
- 
- #include <string.h>
--#include <uuid.h>
-+#include <uuid/uuid.h>
- #include <dconf.h>
- 
- #include "terminal-type-builtins.h"
 --- 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 @@
@@ -46,7 +34,7 @@
  #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
-@@ -75,7 +75,6 @@
+@@ -80,7 +80,6 @@
     gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
     gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
     dconf >= $DCONF_REQUIRED
@@ -54,3 +42,14 @@
     $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

    

devans＠macports.org

tags

participants (1)