summaryrefslogtreecommitdiffstats
path: root/x11/libgnome/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-13 05:58:42 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-04-13 05:58:42 +0800
commitf2be7702c4a3b241e2b8c3678883db36f293fef9 (patch)
tree845f061bcbc4e87389076f865d417b227aa0568d /x11/libgnome/files
parent40dae0803c32e237bd50ac5ae8c62865678680b3 (diff)
downloadmarcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar.gz
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar.bz2
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar.lz
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar.xz
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.tar.zst
marcuscom-ports-f2be7702c4a3b241e2b8c3678883db36f293fef9.zip
Update to 2.14.1. Thanks to Rodney Dawes <dobey@novell.com> for the clue
on how to fix the translation problem. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6061 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/libgnome/files')
-rw-r--r--x11/libgnome/files/patch-libgnome_gnome-program.c25
-rw-r--r--x11/libgnome/files/patch-po_POTFILES.in7
2 files changed, 12 insertions, 20 deletions
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
index 9dd33f9c2..70ecbfd8f 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/patch-po_POTFILES.in b/x11/libgnome/files/patch-po_POTFILES.in
new file mode 100644
index 000000000..4dbb5f459
--- /dev/null
+++ b/x11/libgnome/files/patch-po_POTFILES.in
@@ -0,0 +1,7 @@
+--- po/POTFILES.in.orig Wed Apr 12 17:54:03 2006
++++ po/POTFILES.in Wed Apr 12 17:54:09 2006
+@@ -27,4 +27,3 @@ schemas/desktop_gnome_peripherals_mouse.
+ schemas/desktop_gnome_sound.schemas.in
+ schemas/desktop_gnome_thumbnailers.schemas.in
+ schemas/desktop_gnome_typing_break.schemas.in
+-