[152858] users/devans/GNOME-3/stable/dports/gnome/gnome-terminal

devans at macports.org devans at macports.org
Mon Sep 19 15:20:11 PDT 2016


Revision: 152858
          https://trac.macports.org/changeset/152858
Author:   devans at macports.org
Date:     2016-09-19 15:20:10 -0700 (Mon, 19 Sep 2016)
Log Message:
-----------
GNOME-3/stable: gnome-terminal, merge unstable to stable and update to stable version 3.22.0, now uses pcre2.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile
    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-Makefile.am.diff
    users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.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-148918
/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
   + /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-148918
/users/devans/GNOME-3/unstable/dports/gnome/gnome-terminal:116416-118154,119539-125614,132290-134556,139565-140553,141712-147073,151695-152825
/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-09-19 22:12:41 UTC (rev 152857)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile	2016-09-19 22:20:10 UTC (rev 152858)
@@ -5,7 +5,7 @@
 PortGroup           compiler_blacklist_versions 1.0
 
 name                gnome-terminal
-version             3.20.2
+version             3.22.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  f86004a85c0b291f80e845b923f4538d923458d4 \
-                    sha256  f5383060730f1de70af35e917f82d5b6a14d963ad9cfd6a0e705f90011645a23
+checksums           rmd160  3b34e232b6190adf72c357488bb5ec26a86e4fef \
+                    sha256  97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed
 
 depends_build       port:pkgconfig \
                     port:intltool \
@@ -39,6 +39,7 @@
                     port:vte \
                     port:dbus \
                     port:dconf \
+                    port:pcre2 \
                     port:xorg-libX11
 
 depends_run         port:gnome-themes-standard \
@@ -62,7 +63,6 @@
 
 configure.args      --with-gtk=3.0 \
                     --with-nautilus-extension=no \
-                    --with-pcre2=no \
                     --enable-debug \
                     --disable-migration \
                     --disable-search-provider \

Modified: 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-configure.ac.diff	2016-09-19 22:12:41 UTC (rev 152857)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac.diff	2016-09-19 22:20:10 UTC (rev 152858)
@@ -1,14 +1,14 @@
---- 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 @@
+--- configure.ac.orig	2016-08-15 11:24:21.000000000 -0700
++++ configure.ac	2016-08-19 22:29:57.000000000 -0700
+@@ -86,7 +86,6 @@
     gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
     gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
     dconf >= $DCONF_REQUIRED
 -   uuid
-    $PLATFORM_DEPS
-    $PCRE2_PKGS])
+    libpcre2-8 >= $PCRE2_REQUIRED
+    $PLATFORM_DEPS])
  
-@@ -130,7 +129,6 @@
+@@ -109,7 +108,6 @@
       gio-unix-2.0 >= $GIO_REQUIRED
       gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
       dconf >= $DCONF_REQUIRED
@@ -16,7 +16,7 @@
       $PLATFORM_DEPS])
  ])
  
-@@ -175,8 +173,7 @@
+@@ -154,8 +152,7 @@
     gio-2.0 >= $GIO_REQUIRED
     vte-$VTE_API_VERSION >= $VTE_REQUIRED
     gconf-2.0 >= $GCONF_REQUIRED

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-09-19 22:12:41 UTC (rev 152857)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-Makefile.am.diff	2016-09-19 22:20:10 UTC (rev 152858)
@@ -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
-@@ -228,8 +228,6 @@
+--- src/Makefile.am.orig	2016-08-15 11:20:29.000000000 -0700
++++ src/Makefile.am	2016-08-19 22:31:43.000000000 -0700
+@@ -243,8 +243,6 @@
  	$(AM_CFLAGS) \
  	-Wno-cast-qual \
  	-Wno-format-nonliteral \

Modified: users/devans/GNOME-3/stable/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	2016-09-19 22:12:41 UTC (rev 152857)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-src-terminal-screen.c.diff	2016-09-19 22:20:10 UTC (rev 152858)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/terminal-screen.c.orig	2016-08-09 12:37:41.000000000 -0700
++++ src/terminal-screen.c	2016-08-19 22:31:43.000000000 -0700
+@@ -1305,7 +1305,12 @@
        for (j = 0; j < n_fds; j++) {
          if (fds[j] == target_fd) {
            do {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160919/c370baa2/attachment-0001.html>


More information about the macports-changes mailing list