diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-04-30 00:47:21 +0000 |
| commit | 798e9bed2a389dce8a970e15b68176fd49f442db (patch) | |
| tree | 9dc5597aab073298ec381964f72cd853b3dd366c /x11/libgnome/files | |
| parent | 48b92584b0722f7f6ca412e6cfe16f1381e043cc (diff) | |
Notes
Diffstat (limited to 'x11/libgnome/files')
| -rw-r--r-- | x11/libgnome/files/patch-ag | 4 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-program.c | 25 | ||||
| -rw-r--r-- | x11/libgnome/files/pkg-deinstall.in | 2 |
3 files changed, 6 insertions, 25 deletions
diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 2caedc380d59..ceb23de357f2 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -1,7 +1,3 @@ - -$FreeBSD$ - $MCom: ports/x11/libgnome/files/patch-ag,v 1.18 2005/07/04 00:15:01 marcus Exp $ - --- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1 +++ libgnome/gnome-util.c 2002/03/19 17:21:31 @@ -67,11 +67,11 @@ diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index 9dd33f9c2838..70ecbfd8fce0 100644 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -1,6 +1,6 @@ ---- libgnome/gnome-program.c.orig Mon May 31 16:37:02 2004 -+++ libgnome/gnome-program.c Mon May 31 16:37:05 2004 -@@ -895,17 +895,17 @@ +--- libgnome/gnome-program.c.orig Tue Apr 4 06:55:12 2006 ++++ libgnome/gnome-program.c Mon Apr 10 21:07:02 2006 +@@ -936,17 +936,17 @@ gnome_program_locate_file (GnomeProgram attr_rel = ""; break; case GNOME_FILE_DOMAIN_DATADIR: @@ -21,7 +21,7 @@ attr_name = GNOME_PARAM_GNOME_DATADIR; attr_rel = "/pixmaps"; break; -@@ -917,7 +917,7 @@ +@@ -958,7 +958,7 @@ gnome_program_locate_file (GnomeProgram case GNOME_FILE_DOMAIN_HELP: prefix_rel = "/share/gnome/help"; attr_name = GNOME_PARAM_GNOME_DATADIR; @@ -30,7 +30,7 @@ break; case GNOME_FILE_DOMAIN_APP_LIBDIR: prefix_rel = "/lib"; -@@ -926,19 +926,19 @@ +@@ -967,19 +967,19 @@ gnome_program_locate_file (GnomeProgram search_path = FALSE; break; case GNOME_FILE_DOMAIN_APP_DATADIR: @@ -53,18 +53,3 @@ attr_name = GNOME_PARAM_APP_DATADIR; attr_rel = "/pixmaps"; search_path = FALSE; -@@ -959,12 +959,12 @@ - - attr_name = GNOME_PARAM_APP_DATADIR; - -- len = strlen ("/gnome/help/") + -+ len = strlen ("/help/") + - strlen (program->_priv->app_id) + 1; - attr_rel = g_alloca (len); - if (attr_rel == NULL /* bad things */) - return NULL; -- g_snprintf (attr_rel, len, "/gnome/help/%s", program->_priv->app_id); -+ g_snprintf (attr_rel, len, "/help/%s", program->_priv->app_id); - - search_path = FALSE; - break; diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index adb5cef39218..7377058cd835 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,7 +1,7 @@ #!/bin/sh # # $FreeBSD$ -# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.2 2005/07/04 00:15:01 marcus Exp $ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.4 2005/11/16 00:04:58 ahze Exp $ # # Restore gconf keys of gnomevfs2. |