<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[51139] trunk/dports/gnome/gnome-terminal</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/51139">51139</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2009-05-18 23:24:10 -0700 (Mon, 18 May 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnome-terminal:
* take maintainership openmaintainer
* add patch that addesses #19686
* remove obsolete/unused patch
* simplify post activate update/install of gconf schemas</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalPortfile">trunk/dports/gnome/gnome-terminal/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalfilespatchsrcterminalcdiff">trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegnometerminalfilespatch_terminalscreencdiff">trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegnometerminalPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gnome-terminal/Portfile (51138 => 51139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/Portfile 2009-05-19 06:01:34 UTC (rev 51138)
+++ trunk/dports/gnome/gnome-terminal/Portfile 2009-05-19 06:24:10 UTC (rev 51139)
</span><span class="lines">@@ -5,10 +5,11 @@
</span><span class="cx">
</span><span class="cx"> name gnome-terminal
</span><span class="cx"> version 2.26.2
</span><ins>+revision 1
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description Terminal component for the GNOME 2 Desktop
</span><span class="cx"> long_description Terminal component for the GNOME 2 Desktop
</span><del>-maintainers nomaintainer
</del><ins>+maintainers devans openmaintainer
</ins><span class="cx"> categories gnome
</span><span class="cx"> platforms darwin
</span><span class="cx"> homepage http://www.gnome.org/
</span><span class="lines">@@ -24,49 +25,20 @@
</span><span class="cx">
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><ins>+patchfiles patch-src-terminal.c.diff
+
</ins><span class="cx"> configure.python ${prefix}/bin/python2.5
</span><ins>+
</ins><span class="cx"> configure.args \
</span><span class="cx"> --mandir=${prefix}/share/man \
</span><del>- --disable-scrollkeeper
</del><ins>+ --disable-schemas-install \
+ --disable-scrollkeeper
</ins><span class="cx">
</span><del>-set storagedir ${prefix}/etc/macports/gconf
-set storagefile $storagedir/${name}
-
-post-destroot {
- # schema installation procedure from #14729 (pending gnome portgroup)
- # Find all .schemas file in the destroot
- fs-traverse schema ${destroot}${prefix}/etc/gconf/schemas {
- if { [ file isfile $schema ] } {
- lappend schemafiles $schema
- }
- }
-
- # And put them in etc/macports/gconf/$name
- if { [ llength $schemafiles ] > 0 } {
- file mkdir ${destroot}${storagedir}
- set fh [open ${destroot}${storagefile} w]
- foreach file $schemafiles {
- puts $fh [exec basename $file]
- }
- close $fh
- }
-}
-
</del><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/scrollkeeper-update"
</span><span class="cx"> system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
</span><del>- if { [file exists ${storagefile} ] } {
- set fh [open ${storagefile} r]
- while { ! [eof $fh] } {
- lappend schemafiles [gets $fh]
- }
- close $fh
- }
-
- set schemastring [join $schemafiles " "]
-
- system "cd ${prefix}/etc/gconf/schemas && \
- GCONF_CONFIG_SOURCE=`${prefix}/bin/gconftool-2 --get-default-source` ${prefix}/bin/gconftool-2 --makefile-install-rule $schemastring"
</del><ins>+ system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+ gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.check regex
</span></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilespatchsrcterminalcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff (0 => 51139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff 2009-05-19 06:24:10 UTC (rev 51139)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- src/terminal.c.orig 2009-05-18 22:30:24.000000000 -0700
++++ src/terminal.c 2009-05-18 22:31:14.000000000 -0700
+@@ -448,12 +448,13 @@
+ * session bus running), we'd crash later on. Tell the user about it
+ * now, and exit. See bug #561663.
+ */
++/*
+ if (!gconf_ping_daemon ())
+ {
+ g_printerr ("Failed to contact the GConf daemon; exiting.\n");
+ exit (1);
+ }
+-
++*/
+ gtk_window_set_default_icon_name (GNOME_TERMINAL_ICON_NAME);
+
+ gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);
</ins></span></pre></div>
<a id="trunkdportsgnomegnometerminalfilespatch_terminalscreencdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff (51138 => 51139)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff 2009-05-19 06:01:34 UTC (rev 51138)
+++ trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff 2009-05-19 06:24:10 UTC (rev 51139)
</span><span class="lines">@@ -1,16 +0,0 @@
</span><del>---- src/terminal-screen.c.org Wed Apr 7 12:25:31 2004
-+++ src/terminal-screen.c Wed Apr 7 12:25:54 2004
-@@ -1013,7 +1013,12 @@
- return TRUE;
- }
-
--extern char **environ;
-+#ifdef __APPLE__
-+# include <crt_externs.h>
-+# define environ (*_NSGetEnviron())
-+#elif
-+ extern char **environ;
-+#endif
-
- static char**
- get_child_environment (GtkWidget *term,
</del></span></pre>
</div>
</div>
</body>
</html>