summaryrefslogtreecommitdiff
path: root/x11-toolkits/libbonoboui
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-16 14:18:35 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-04-16 14:18:35 +0000
commit4fa7f6c6cb06d0a369904023d4b90fa732055cbd (patch)
tree2061d5ba657f2652c8d74a0c051b79849daf98e9 /x11-toolkits/libbonoboui
parent- force bind with openssl port/base as configured (diff)
Looks like there was a regression in libbonoboui such that it ignores
the invoking application's datadir in favor of a hacked datadir.
Notes
Notes: svn path=/head/; revision=79084
Diffstat (limited to 'x11-toolkits/libbonoboui')
-rw-r--r--x11-toolkits/libbonoboui/Makefile1
-rw-r--r--x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c21
2 files changed, 22 insertions, 0 deletions
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 6f796d479de6..944af652ecba 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -7,6 +7,7 @@
PORTNAME= libbonoboui
PORTVERSION= 2.2.0.1
+PORTREVISION= 1
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 000000000000..9de4105683d6
--- /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);