Enlightenment 0.16.7.1 menu generation problem

[Przemysław Iskra]

On Tue, Dec 07, 2004 at 05:57:20PM +0100, Andrzej Krzysztofowicz wrote:
> =?iso-8859-2?Q?Przemys=B3aw?= Iskra wrote:
> > 
> > P.S. Shall I send patch'es ?
> 
> Please, do it.
There they are...

I don't think that not looking to ~/.config/menus wouldn't brake 
anything (there still are many other places to put this config),
but if it will what else can we do ?


-- 
 ____  Sparky{PI] -- Przemyslaw _  ___  _  _  ..Mail,MSN  LANG...Pl..Ca..Es..En
/____) ___  ___  _ _ || Iskra  |  | _ \| |  | : GG...3228100  WWW..NotYetAvible
\____\| -_)'___| ||^'||//\\// <   |  _/| |  | : JID......sparky<at>jabberes.org
(____/||   (_-_|_||  ||\\ ||   |_ |_|  |_| _| :..sparky<at>sparky.homelinux.org
-------------- next part --------------
--- enlightenment.spec.orig	2004-12-07 18:11:38.000000000 +0100
+++ enlightenment.spec	2004-12-07 18:13:24.000000000 +0100
@@ -37,7 +37,8 @@
 BuildRequires:	libtool
 BuildRequires:	libungif-devel
 BuildRequires:	zlib-devel
-Requires:	vfmg >= 0.9.18-4
+Requires:	ImageMagick-coder-png
+Requires:	vfmg >= 0.9.18-9
 Requires:	xinitrc-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-------------- next part --------------
--- enlightenment-e_gen_menu.orig	2004-12-07 18:16:28.000000000 +0100
+++ enlightenment-e_gen_menu	2004-12-07 18:16:51.000000000 +0100
@@ -41,7 +41,7 @@
 
 rm -rf $EDirUser/menus.old
 mv -f $EDirUser/file.menu{,.oldmenu}
-ln -s menus/Applications.menu $EDirUser/file.menu
+ln -s menus/index.menu $EDirUser/file.menu
 
 if [ ! -r $EDirUser/file.menu -o \
 	$(ls $EDirUser/menus | wc -l) -lt 5 ]; then
-------------- next part --------------
--- vfmg-0.9.18/vfmg.orig	2004-12-07 19:12:25.793620512 +0100
+++ vfmg-0.9.18/vfmg	2004-12-07 19:13:33.724293480 +0100
@@ -74,7 +74,7 @@
 @tmp=split(/:+/,$ENV{'XDG_DATA_DIRS'}) if $ENV{'XDG_DATA_DIRS'};
 my @xdg_data_dirs=grep -d, $tmp, at tmp;
 
-$tmp="$ENV{'HOME'}/.config";
+#$tmp="$ENV{'HOME'}/.config";
 $tmp="$ENV{'XDG_CONFIG_HOME'}" if $ENV{'XDG_CONFIG_HOME'};
 @tmp=("/etc/xdg");
 @tmp=split(/:+/,$ENV{'XDG_CONFIG_DIRS'}) if $ENV{'XDG_CONFIG_DIRS'};
@@ -908,13 +908,13 @@
 		$icon=$menu[$no]{$entry}[1] if $o_icons;
 		$icon=scale_icon($icon,"png","-geometry 18x18") if $icon;
 		if($menu[$no]{$entry}[0]<0) {
-			$name=~s/\"/\\\"/g;
+			$name=~s/\"/\'/g;
 			print $F_OUT "\"$name\" \"$icon\" exec \"$menu[$no]{$entry}[2]\"\n";
 		} else {
 			$name=substr($name,1);
 			$name=~s|/||g;
 			my $name2=$name;
-			$name2=~s/\"/\\\"/g;
+			$name2=~s/\"/\'/g;
 			print $F_OUT "\"$name2\" \"$icon\" menu \"$dir/$name2.menu\"\n";
 			enlightenment($menu[$no]{$entry}[0],"$name","$name");
 		}
-------------- next part --------------
--- vfmg.spec.orig	2004-12-07 19:15:07.883979032 +0100
+++ vfmg.spec	2004-12-07 19:15:58.647261840 +0100
@@ -4,13 +4,14 @@
 Summary(pl):	Generator Menu opartego na VFolders
 Name:		vfmg
 Version:	0.9.18
-Release:	8
+Release:	9
 License:	GPL
 Group:		X11/Window Managers/Tools
 Vendor:		GoTaR <gotar at pld-linux.org>
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	0175143d8bd08a2a82bde106d191d418
 Patch0:		%{name}-current.patch
+Patch1:		%{name}-enlightenment_fix.patch
 URL:		http://vfmg.sourceforge.net/
 BuildRequires:	rpm-perlprov
 Requires:	applnk >= 1.9.0
@@ -49,6 +50,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT