Revision: 148919 https://trac.macports.org/changeset/148919 Author: devans@macports.org Date: 2016-05-22 14:43:09 -0700 (Sun, 22 May 2016) Log Message: ----------- gnome-terminal: add dependency on gnutls, fix build on libstdc++ platforms by restricting version to 3.18.3 for compatibility with vte 0.43.0. Modified Paths: -------------- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile Added Paths: ----------- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac-3.18.3.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,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 /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-05-22 20:43:18 UTC (rev 148918) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/Portfile 2016-05-22 21:43:09 UTC (rev 148919) @@ -34,6 +34,7 @@ depends_lib port:desktop-file-utils \ port:gsettings-desktop-schemas \ + port:gnutls \ port:gtk3 \ port:vte \ port:dbus \ @@ -43,8 +44,7 @@ depends_run port:gnome-themes-standard \ port:yelp -patchfiles patch-configure.ac.diff \ - patch-src-Makefile.am.diff \ +patchfiles patch-src-Makefile.am.diff \ patch-src-terminal-screen.c.diff \ patch-src-server.c.diff @@ -82,6 +82,24 @@ depends_lib-append port:gconf } +platform darwin { + if {${configure.cxx_stdlib} eq "libstdc++"} { + # vte 0.43.1+ build fails on platforms supporting libstdc++ (#50492) + # gnome-terminal 3.20.0+ requires vte 0.44.0 + epoch 1 + version 3.18.3 + set branch [join [lrange [split ${version} .] 0 1] .] + master_sites gnome:sources/${name}/${branch}/ + checksums rmd160 e73ec1c44f4d0c27e3f921706b7a58305dc64af7 \ + sha256 14c2fce1c6a80a3fb0cc8666d7752228adcb60d199634ab69150de32e3c17d56 + patchfiles-append patch-configure.ac-3.18.3.diff + livecheck.type none + } else { + patchfiles-append patch-configure.ac.diff + livecheck.type gnome + } +} + post-activate { system "${prefix}/bin/update-desktop-database ${prefix}/share/applications" system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas" Added: users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac-3.18.3.diff =================================================================== --- users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac-3.18.3.diff (rev 0) +++ users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-configure.ac-3.18.3.diff 2016-05-22 21:43:09 UTC (rev 148919) @@ -0,0 +1,28 @@ +--- configure.ac.orig 2016-03-06 11:03:28.000000000 -0800 ++++ configure.ac 2016-05-22 14:18:00.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]) + + # **** +@@ -102,7 +101,6 @@ + gio-unix-2.0 >= $GIO_REQUIRED + gtk+-$GTK_API_VERSION >= $GTK_REQUIRED + dconf >= $DCONF_REQUIRED +- uuid + $PLATFORM_DEPS]) + ]) + +@@ -147,8 +145,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 +