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

devans at macports.org devans at macports.org
Mon May 18 23:24:10 PDT 2009


Revision: 51139
          http://trac.macports.org/changeset/51139
Author:   devans at macports.org
Date:     2009-05-18 23:24:10 -0700 (Mon, 18 May 2009)
Log Message:
-----------
gnome-terminal:

  * take maintainership openmaintainer
  * add patch that addesses #19686
  * remove obsolete/unused patch
  * simplify post activate update/install of gconf schemas

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

Added Paths:
-----------
    trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff

Removed Paths:
-------------
    trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff

Modified: trunk/dports/gnome/gnome-terminal/Portfile
===================================================================
--- 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)
@@ -5,10 +5,11 @@
 
 name		gnome-terminal
 version		2.26.2
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description	Terminal component for the GNOME 2 Desktop
 long_description        Terminal component for the GNOME 2 Desktop
-maintainers	nomaintainer
+maintainers	devans openmaintainer
 categories	gnome
 platforms	darwin
 homepage	http://www.gnome.org/
@@ -24,49 +25,20 @@
 
 use_bzip2 	yes
 
+patchfiles      patch-src-terminal.c.diff
+
 configure.python ${prefix}/bin/python2.5
+
 configure.args \
 	--mandir=${prefix}/share/man \
-	--disable-scrollkeeper
+	--disable-schemas-install \
+        --disable-scrollkeeper
 
-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
-	}
-}
-
 post-activate	{
 	system "${prefix}/bin/scrollkeeper-update"
 	system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications; true"
-	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"
+        system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
+            gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
 
 livecheck.check regex

Added: trunk/dports/gnome/gnome-terminal/files/patch-src-terminal.c.diff
===================================================================
--- 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)
@@ -0,0 +1,17 @@
+--- 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);

Deleted: trunk/dports/gnome/gnome-terminal/files/patch_terminal-screen.c.diff
===================================================================
--- 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)
@@ -1,16 +0,0 @@
---- 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,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090518/d2240c65/attachment.html>


More information about the macports-changes mailing list