summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 23:00:12 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2005-09-06 23:00:12 +0800
commitb16e3072d2b010ae603c852db64ccc2b52e11fc3 (patch)
tree168628af0f34683ff29e11d9739afc32460d2c90
parent34fb067227f9fb8d7539929f6e019aff235e99a9 (diff)
downloadmarcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar.gz
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar.bz2
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar.lz
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar.xz
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.tar.zst
marcuscom-ports-b16e3072d2b010ae603c852db64ccc2b52e11fc3.zip
Fix the menu editor by hacking the XDG_DATA_DIRS value in the editor.
I actually feel pretty silly since I looked for this code in gnome-menus and gnome-panel, but never thought to check the editor itself. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4741 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-menus/Makefile5
-rw-r--r--x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py11
2 files changed, 15 insertions, 1 deletions
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 749be6d1b..5230b5ac9 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-menus/Makefile,v 1.17 2005/08/19 19:50:42 mezz Exp $
+# $MCom: ports/x11/gnome-menus/Makefile,v 1.18 2005/08/22 14:12:45 kwm Exp $
#
PORTNAME= gnome-menus
PORTVERSION= 2.11.92
+PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11
@@ -33,6 +34,8 @@ post-patch:
${WRKSRC}/layout/settings.menu
@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+ @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \
+ ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py
post-install:
@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
new file mode 100644
index 000000000..4a233cb4b
--- /dev/null
+++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py
@@ -0,0 +1,11 @@
+--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Tue Sep 6 10:53:47 2005
++++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 10:56:02 2005
+@@ -29,7 +29,7 @@
+ if os.environ.has_key ("XDG_CONFIG_DIRS"):
+ conf_dirs = os.environ["XDG_CONFIG_DIRS"]
+ if not conf_dirs:
+- conf_dirs = "/etc/xdg"
++ conf_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"
+
+ for conf_dir in conf_dirs.split (":"):
+ menu_file_path = os.path.join (conf_dir, "menus", menu_file)