[113309] trunk/dports/gnome/gnome-terminal
devans at macports.org
devans at macports.org
Wed Nov 13 05:51:56 PST 2013
Revision: 113309
https://trac.macports.org/changeset/113309
Author: devans at macports.org
Date: 2013-11-13 05:51:56 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
gnome-terminal: merge version 3.8.4 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/gnome-terminal/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff
trunk/dports/gnome/gnome-terminal/files/patch-gschema.xml.in.diff
trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-terminal/files/missing-links.patch
Property Changed:
----------------
trunk/dports/gnome/gnome-terminal/
Property changes on: trunk/dports/gnome/gnome-terminal
___________________________________________________________________
Added: 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
Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- trunk/dports/gnome/gnome-terminal/Portfile 2013-11-13 13:39:39 UTC (rev 113308)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2013-11-13 13:51:56 UTC (rev 113309)
@@ -4,7 +4,7 @@
PortSystem 1.0
name gnome-terminal
-version 2.32.1
+version 3.8.4
set branch [join [lrange [split ${version} .] 0 1] .]
description Terminal component for the GNOME 2 Desktop
long_description \
@@ -16,71 +16,51 @@
homepage http://www.gnome.org/
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 d381b468113bae89505436a931238e22f3f7794c \
- sha256 7f41e4b185a2cf65ff417b89e429fc3b625c5e3f042ee1763bda6490fa4676fb
+checksums rmd160 4aa34c29bd7a48c1d1aab60e42fa2d9be782dab1 \
+ sha256 5c1a1db9b4c5eb5780137bed5ed6a05afd82053bd5b2ad41180d4617c56a3f22
depends_build port:pkgconfig \
- port:gnome-common \
port:intltool \
- port:gnome-doc-utils
+ port:itstool \
+ port:libxml2
depends_lib port:desktop-file-utils \
- port:gtk2 \
- port:gconf \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gsettings-desktop-schemas \
+ port:gtk3 \
port:vte \
- port:xorg-libsm \
- port:xorg-libice
+ port:dbus \
+ port:dconf \
+ port:xorg-libX11
depends_run port:gnome-settings-daemon \
port:yelp
-#
-# gnome-terminal does not directly depend on libgnome itself
-# but references the gconf key /desktop/gnome/interface/monospace_font_name
-# the schema for which is provided by libgnome
-# hence this unusual run time dependency (#27235)
-#
+patchfiles patch-getcwd.diff \
+ patch-uuid.diff \
+ patch-gschema.xml.in.diff
-depends_run port:libgnome
-
-patchfiles missing-links.patch
-
-use_autoreconf yes
-autoreconf.args -fvi
-
-configure.args --with-gtk=2.0 \
+configure.args --with-gtk=3.0 \
+ --disable-migration \
--disable-silent-rules \
- --disable-schemas-install \
- --disable-scrollkeeper
+ --disable-schemas-compile
-#
-# while there is an attempt at a quartz version of this port
-# it has not been maintained upstream for some time and
-# the quartz build is massively broken at this time due to:
-#
-# * explicit use of X11 API in terminal.c even though configured to use quartz
-# * use of obsolete Carbon/QuickDraw API in eggsmclient-osx.c
-#
-# if +quartz is asserted disable X11 dependencies to avoid polluting a clean quartz environment
-# but terminate with error before build phase, #32059
-#
+variant nautilus description {Build optional nautilus extension} {
+ configure.args-append --with-nautilus-extension
+ depends_lib-append port:nautilus
+}
-variant quartz {
- depends_lib-delete port:xorg-libsm
- pre-build {
- ui_error "${name} does not currently support +quartz builds."
- ui_error "Please try again without the +quartz variant."
- return -code error "+quartz build broken."
- }
+variant migration description {Enable prefs migration from GConf to GSettings} {
+ configure.args-delete --disable-migration
+ depends_lib-append port:gconf
}
post-activate {
- system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Deleted: trunk/dports/gnome/gnome-terminal/files/missing-links.patch
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/missing-links.patch 2013-11-13 13:39:39 UTC (rev 113308)
+++ trunk/dports/gnome/gnome-terminal/files/missing-links.patch 2013-11-13 13:51:56 UTC (rev 113309)
@@ -1,11 +0,0 @@
---- configure.ac.orig 2010-11-13 04:24:43.000000000 -0800
-+++ configure.ac 2013-05-13 13:57:40.000000000 -0700
-@@ -92,7 +92,7 @@
- [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])],
- [],
- [case "$GDK_TARGET" in
-- x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
-+ x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
- win32|quartz) with_smclient=$GDK_TARGET ;;
- *) with_smclient=no ;;
- esac])
Copied: trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-getcwd.diff)
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff (rev 0)
+++ trunk/dports/gnome/gnome-terminal/files/patch-getcwd.diff 2013-11-13 13:51:56 UTC (rev 113309)
@@ -0,0 +1,52 @@
+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);
+ }
+diff -ur src.orig/terminal.c src/terminal.c
+--- src.orig/terminal.c 2013-07-07 03:54:03.000000000 -0700
++++ src/terminal.c 2013-09-14 13:21:23.000000000 -0700
+@@ -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>
+@@ -230,7 +234,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);
+
Copied: trunk/dports/gnome/gnome-terminal/files/patch-gschema.xml.in.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-gschema.xml.in.diff)
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-gschema.xml.in.diff (rev 0)
+++ trunk/dports/gnome/gnome-terminal/files/patch-gschema.xml.in.diff 2013-11-13 13:51:56 UTC (rev 113309)
@@ -0,0 +1,11 @@
+--- src/org.gnome.Terminal.gschema.xml.in.orig 2013-09-14 23:31:09.000000000 -0700
++++ src/org.gnome.Terminal.gschema.xml.in 2013-09-14 23:33:06.000000000 -0700
+@@ -248,7 +248,7 @@
+ <_summary>The code sequence the Delete key generates</_summary>
+ </key>
+ <key name="use-theme-colors" type="b">
+- <default>true</default>
++ <default>false</default>
+ <_summary>Whether to use the colors from the theme for the terminal widget</_summary>
+ </key>
+ <key name="use-system-font" type="b">
Copied: trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff (from rev 113174, users/devans/GNOME-3/stable/dports/gnome/gnome-terminal/files/patch-uuid.diff)
===================================================================
--- trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff (rev 0)
+++ trunk/dports/gnome/gnome-terminal/files/patch-uuid.diff 2013-11-13 13:51:56 UTC (rev 113309)
@@ -0,0 +1,186 @@
+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>
+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"
+
+ #include <string.h>
+-#include <uuid.h>
++#include <uuid/uuid.h>
+
+ /* 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"
+--- configure.orig 2013-09-14 22:45:52.000000000 -0700
++++ configure 2013-09-14 22:47:39.000000000 -0700
+@@ -13048,7 +13048,6 @@
+ gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
+ gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= \$DCONF_REQUIRED
+- uuid
+ \$PLATFORM_DEPS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ glib-2.0 >= $GLIB_REQUIRED
+@@ -13056,7 +13055,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -13067,7 +13065,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -13085,7 +13082,6 @@
+ gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
+ gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= \$DCONF_REQUIRED
+- uuid
+ \$PLATFORM_DEPS\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ glib-2.0 >= $GLIB_REQUIRED
+@@ -13093,7 +13089,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+@@ -13104,7 +13099,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS" 2>/dev/null`
+ else
+ pkg_failed=yes
+@@ -13131,7 +13125,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS" 2>&1`
+ else
+ TERM_PKG_ERRORS=`$PKG_CONFIG --print-errors "vte$VTE_PC_VERSION >= $VTE_REQUIRED
+@@ -13140,7 +13133,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+@@ -13152,7 +13144,6 @@
+ gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid
+ $PLATFORM_DEPS) were not met:
+
+ $TERM_PKG_ERRORS
+@@ -13493,13 +13484,13 @@
+ vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ dconf >= \$DCONF_REQUIRED
+- uuid\""; } >&5
++ \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "
+ gio-2.0 >= $GIO_REQUIRED
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid") 2>&5
++ ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+@@ -13508,7 +13499,7 @@
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid" 2>/dev/null`
++ " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13524,13 +13515,13 @@
+ vte\$VTE_PC_VERSION >= \$VTE_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ dconf >= \$DCONF_REQUIRED
+- uuid\""; } >&5
++ \""; } >&5
+ ($PKG_CONFIG --exists --print-errors "
+ gio-2.0 >= $GIO_REQUIRED
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid") 2>&5
++ ") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+@@ -13539,7 +13530,7 @@
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid" 2>/dev/null`
++ " 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13564,14 +13555,14 @@
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid" 2>&1`
++ " 2>&1`
+ else
+ MIGRATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "
+ gio-2.0 >= $GIO_REQUIRED
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid" 2>&1`
++ " 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MIGRATOR_PKG_ERRORS" >&5
+@@ -13581,7 +13572,7 @@
+ vte$VTE_PC_VERSION >= $VTE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ dconf >= $DCONF_REQUIRED
+- uuid) were not met:
++ ) were not met:
+
+ $MIGRATOR_PKG_ERRORS
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/eafc2b25/attachment-0001.html>
More information about the macports-changes
mailing list