diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-29 05:17:42 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-07-29 05:17:42 +0800 |
| commit | 4223497c3a2217b32fd32563bc2472273a221c83 (patch) | |
| tree | d87e4531f5401688dc3bd4eb2b5ec348ac31a07b /deskutils/alacarte | |
| parent | 1aeddc3a036f7290adc9d3c63ddefd43f8e66c3f (diff) | |
| download | marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar.gz marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar.bz2 marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar.lz marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar.xz marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.tar.zst marcuscom-ports-4223497c3a2217b32fd32563bc2472273a221c83.zip | |
Fix Python stack trace, but now it core dumps somewhere in gmenu.so.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6888 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils/alacarte')
| -rw-r--r-- | deskutils/alacarte/Makefile | 5 | ||||
| -rw-r--r-- | deskutils/alacarte/files/patch-Alacarte_util.py | 29 |
2 files changed, 32 insertions, 2 deletions
diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile index e3dd8b55d..5bc16db7f 100644 --- a/deskutils/alacarte/Makefile +++ b/deskutils/alacarte/Makefile @@ -3,7 +3,7 @@ # Whom: FreeBSD GNOME Team # # $FreeBSD$ -# $MCom: ports/deskutils/alacarte/Makefile,v 1.3 2006/07/27 13:45:11 marcus Exp $ +# $MCom: ports/deskutils/alacarte/Makefile,v 1.4 2006/07/28 20:55:55 mezz Exp $ PORTNAME= alacarte PORTVERSION= 0.9.90 @@ -29,7 +29,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ - ${WRKSRC}/Alacarte/DialogHandler.py + ${WRKSRC}/Alacarte/DialogHandler.py \ + ${WRKSRC}/Alacarte/util.py @${REINPLACE_CMD} -e 's|gmsgfmt|msgfmt|g' \ ${WRKSRC}/configure diff --git a/deskutils/alacarte/files/patch-Alacarte_util.py b/deskutils/alacarte/files/patch-Alacarte_util.py new file mode 100644 index 000000000..49825a343 --- /dev/null +++ b/deskutils/alacarte/files/patch-Alacarte_util.py @@ -0,0 +1,29 @@ +--- Alacarte/util.py.orig Fri Jul 28 17:10:40 2006 ++++ Alacarte/util.py Fri Jul 28 17:15:42 2006 +@@ -138,7 +138,7 @@ def getItemPath(file_id): + file_path = os.path.join(system_path, 'applications', file_id) + if os.path.isfile(file_path): + return file_path +- file_path = os.path.join('/', 'usr', 'share', 'applications', file_id) ++ file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'applications', file_id) + if os.path.isfile(file_path): + return file_path + return False +@@ -163,7 +163,7 @@ def getDirectoryPath(file_id): + file_path = os.path.join(system_path, 'desktop-directories', file_id) + if os.path.isfile(file_path): + return file_path +- file_path = os.path.join('/', 'usr', 'share', 'desktop-directories', file_id) ++ file_path = os.path.join('/', '/usr/local', 'share', 'gnome', 'desktop-directories', file_id) + if os.path.isfile(file_path): + return file_path + return False +@@ -183,7 +183,7 @@ def getSystemMenuPath(file_name): + for system_path in os.environ['XDG_CONFIG_DIRS'].split(':'): + if os.path.isfile(os.path.join(system_path, 'menus', file_name)): + return os.path.join(system_path, file_name) +- file_path = os.path.join('/', 'etc', 'xdg', 'menus', file_name) ++ file_path = os.path.join('/', '/usr/local', 'etc', 'xdg', 'menus', file_name) + if os.path.isfile(file_path): + return file_path + return False |