From 1355fa976b165e6f5681e0aa30ad24481e48a7ac Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 16 Apr 2003 15:40:42 +0000 Subject: Trust the application's datadir over a hacked prefix. Obtained from: FreeBSD CVS git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@663 df743ca5-7f9a-e211-a948-0013205c9059 --- x11-toolkits/libbonoboui/Makefile | 2 +- .../libbonoboui/files/patch-bonobo_bonobo-ui-util.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 422dc4c3f..42057677e 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbonoboui PORTVERSION= 2.2.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c new file mode 100644 index 000000000..9de410568 --- /dev/null +++ b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c @@ -0,0 +1,21 @@ +--- bonobo/bonobo-ui-util.c.orig Fri Feb 28 10:40:12 2003 ++++ bonobo/bonobo-ui-util.c Wed Apr 16 10:13:23 2003 +@@ -558,14 +558,11 @@ + else + prefix = NULL; + +- if (prefix) ++ datadir = NULL; ++ g_object_get (G_OBJECT (gnome_program_get ()), ++ GNOME_PARAM_APP_DATADIR, &datadir, NULL); ++ if (!datadir && prefix) + datadir = g_strdup_printf ("%s/share", prefix); +- +- else { +- datadir = NULL; +- g_object_get (G_OBJECT (gnome_program_get ()), +- GNOME_PARAM_APP_DATADIR, &datadir, NULL); +- } + + if (!datadir) /* desparate fallback */ + datadir = g_strdup (BONOBO_DATADIR); -- cgit v1.2.3