diff options
| author | marcus <marcus@FreeBSD.org> | 2003-12-09 22:29:01 +0000 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-12-09 22:29:01 +0000 |
| commit | 8fd2afc7eb2483bad5524c58207d11076ecac31b (patch) | |
| tree | 03268b076673b4900b2f21dffcfc1e2e47eb39b1 /x11 | |
| parent | cf2811554e736a939085036e703f383de252ce25 (diff) | |
| download | FreeBSD-ports-8fd2afc7eb2483bad5524c58207d11076ecac31b.zip FreeBSD-ports-8fd2afc7eb2483bad5524c58207d11076ecac31b.tar.gz | |
Fix help file detection in certain cases (especially newer apps that use
the screen-egg code).
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libgnome/Makefile | 2 | ||||
| -rw-r--r-- | x11/libgnome/files/patch-libgnome_gnome-program.c | 25 |
2 files changed, 6 insertions, 21 deletions
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index aa8d382..5d83cf8 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgnome PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index eddd1f2..c480676 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 Fri Mar 22 11:02:45 2002 -+++ libgnome/gnome-program.c Mon May 20 18:28:24 2002 -@@ -882,12 +882,12 @@ +--- libgnome/gnome-program.c.orig Wed Jul 23 05:35:30 2003 ++++ libgnome/gnome-program.c Tue Dec 9 17:25:38 2003 +@@ -899,12 +899,12 @@ attr_rel = ""; break; case GNOME_FILE_DOMAIN_SOUND: @@ -15,7 +15,7 @@ attr_name = GNOME_PARAM_GNOME_DATADIR; attr_rel = "/pixmaps"; break; -@@ -899,7 +899,7 @@ +@@ -916,7 +916,7 @@ case GNOME_FILE_DOMAIN_HELP: prefix_rel = "/share/gnome/help"; attr_name = GNOME_PARAM_GNOME_DATADIR; @@ -24,7 +24,7 @@ break; case GNOME_FILE_DOMAIN_APP_LIBDIR: prefix_rel = "/lib"; -@@ -914,13 +914,13 @@ +@@ -931,13 +931,13 @@ search_path = FALSE; break; case GNOME_FILE_DOMAIN_APP_SOUND: @@ -40,18 +40,3 @@ attr_name = GNOME_PARAM_APP_DATADIR; attr_rel = "/pixmaps"; search_path = FALSE; -@@ -941,12 +941,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; |
