[33924] trunk/dports/gnome

gui_dos at macports.org gui_dos at macports.org
Thu Feb 7 08:50:26 PST 2008


Revision: 33924
          http://trac.macosforge.org/projects/macports/changeset/33924
Author:   gui_dos at macports.org
Date:     2008-02-07 08:49:55 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
devhelp:
 * Update to 0.19
 * Mozilla replaced by firefox-x11 as Gecko engine
 * MacPorts' python2.5 detected by configure
 * Undo http://svn.gnome.org/viewvc/devhelp/trunk/src/dh-main.c?r1=880&r2=902
 * Same ugly workaround as for yelp since the binary is linked with @executable_path/libgtkembedmoz.dylib

gnome-user-docs: version bump to 2.20.1

Modified Paths:
--------------
    trunk/dports/gnome/devhelp/Portfile
    trunk/dports/gnome/gnome-user-docs/Portfile

Added Paths:
-----------
    trunk/dports/gnome/devhelp/files/
    trunk/dports/gnome/devhelp/files/patch-src-dh-main-c.diff

Modified: trunk/dports/gnome/devhelp/Portfile
===================================================================
--- trunk/dports/gnome/devhelp/Portfile	2008-02-07 15:50:01 UTC (rev 33923)
+++ trunk/dports/gnome/devhelp/Portfile	2008-02-07 16:49:55 UTC (rev 33924)
@@ -1,9 +1,9 @@
 # $Id$
 
 PortSystem 1.0
+
 name		devhelp
-version		0.9.2
-revision	2
+version		0.19
 description	DevHelp is to be an API documentation browser for GNOME.
 long_description	DevHelp's primary goal is to be an API documentation \
 			browser for GNOME.
@@ -11,12 +11,31 @@
 categories	gnome 
 platforms	darwin 
 homepage	http://www.imendio.com/projects/devhelp/
-master_sites    gnome:sources/devhelp/0.9/
+master_sites    gnome:sources/devhelp/0.19/
 use_bzip2	yes
-checksums	md5 af4a26d243e5fecbb95db1b901ba47d4
-depends_lib	lib:libgtkhtml-2:libgtkhtml bin:mozilla:mozilla
+checksums	md5 66c9fb480e123c96eb1efdbad56b2d90
+depends_lib	port:firefox-x11 \
+		port:libwnck \
+		port:gconf \
+		port:python25
+configure.python ${prefix}/bin/python2.5
 configure.cppflags-append "-L${prefix}/lib"
-configure.cflags-append "-no-cpp-precomp -flat_namespace -undefined suppress" 
-post-destroot   {                 
-                reinplace "s|export LD_LIBRARY_PATH|export DYLD_FALLBACK_LIBRARY_PATH=\$DYLD_FALLBACK_LIBRARY_PATH:${prefix}/lib/mozilla-1.7.3/|g" ${destroot}${prefix}/bin/devhelp
-}
+configure.cflags-append "-no-cpp-precomp -flat_namespace -undefined suppress"
+
+# Undo http://svn.gnome.org/viewvc/devhelp/trunk/src/dh-main.c?r1=880&r2=902
+patchfiles      patch-src-dh-main-c.diff
+
+# Same ugly workaround as for yelp since the binary is linked
+# with @executable_path/libgtkembedmoz.dylib
+post-destroot {
+        # In order to call gecko, devhelp must be installed in the same directory as FireFox.
+        # Move it and put a symlink in the bin directory
+        if { [catch {set ff [registry_active "firefox-x11"]} result]} {
+                ui_err "FireFox is not active: $result"
+        } else {
+                set ffver [lindex $ff 0 1]
+                xinstall -d ${destroot}${prefix}/lib/firefox-${ffver}
+                move ${destroot}${prefix}/bin/devhelp ${destroot}${prefix}/lib/firefox-${ffver}
+                ln -s ${prefix}/lib/firefox-${ffver}/devhelp ${destroot}${prefix}/bin
+        }
+} 

Added: trunk/dports/gnome/devhelp/files/patch-src-dh-main-c.diff
===================================================================
--- trunk/dports/gnome/devhelp/files/patch-src-dh-main-c.diff	                        (rev 0)
+++ trunk/dports/gnome/devhelp/files/patch-src-dh-main-c.diff	2008-02-07 16:49:55 UTC (rev 33924)
@@ -0,0 +1,25 @@
+--- src/dh-main.c.orig	2007-12-19 19:40:58.000000000 +0100
++++ src/dh-main.c	2007-04-18 22:16:42.000000000 +0200
+@@ -84,8 +76,6 @@
+ 	gboolean                option_quit = FALSE;
+ 	gboolean                option_focus_search = FALSE;
+ 	gboolean                option_version = FALSE;
+-	gchar                  *display;
+-	gchar                  *connection_name;
+ 	BaconMessageConnection *message_conn;
+ 	DhBase                 *base;
+ 	GtkWidget              *window;
+@@ -151,12 +141,7 @@
+ 	g_set_application_name (_("Devhelp"));
+ 	gtk_window_set_default_icon_name ("devhelp");
+ 
+-	display = gdk_get_display ();
+-	connection_name = g_strdup_printf ("Devhelp-%s", display);
+-	message_conn = bacon_message_connection_new (connection_name);
+-	g_free (display);
+-	g_free (connection_name);
+-
++	message_conn = bacon_message_connection_new ("Devhelp");
+ 	if (!bacon_message_connection_get_is_server (message_conn)) {
+ 		if (option_quit) {
+ 			bacon_message_connection_send (message_conn, COMMAND_QUIT);

Modified: trunk/dports/gnome/gnome-user-docs/Portfile
===================================================================
--- trunk/dports/gnome/gnome-user-docs/Portfile	2008-02-07 15:50:01 UTC (rev 33923)
+++ trunk/dports/gnome/gnome-user-docs/Portfile	2008-02-07 16:49:55 UTC (rev 33924)
@@ -1,7 +1,7 @@
 # $Id$
 PortSystem 1.0
 name		gnome-user-docs
-version		2.18.2
+version		2.20.1
 description	End-user documentation for GNOME2
 long_description        This package contains documents which will be \
 			packaged together and shipped as gnome-user-docs \
@@ -12,9 +12,9 @@
 platforms	darwin 
 homepage	http://www.gnome.org/
 master_sites    gnome:sources/gnome-user-docs/[strsed ${version} {/\.[0-9]*$//}]/
-checksums	md5 4d3b5c8bd3cc8008f2a44d98efaa2502 \
-		sha1 077fdaf2f24e739ebc9504436168dcbf15df3407 \
-		rmd160 94196bf4753054ed5d58a50f31be7d013aecd912
+checksums	md5 d6bba44acaed20117769ec8dce378f71 \
+		sha1 4c22c4e1076be68cc0686cc750889d06c0711e9c \
+		rmd160 96077dedf849c651b8a44c27c65246a08bef3ab4
 depends_lib	lib:gnome-session:gnome-session
 depends_build	port:gnome-doc-utils
 use_bzip2 	yes

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080207/db914ff6/attachment.html


More information about the macports-changes mailing list