View | Details | Raw Unified | Return to bug 145577
Collapse All | Expand All

(-)fvwm-crystal/Makefile (+1 lines)
Lines 76-81 Link Here
76
post-patch:
76
post-patch:
77
	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
77
	@${REINPLACE_CMD} -e 's|cp -r -d|cp -r|; s|cp -d|cp|' \
78
		${WRKSRC}/${MAKEFILE}
78
		${WRKSRC}/${MAKEFILE}
79
	patch ./work/fvwm-crystal-3.0.6/bin/fvwm-crystal.apps < files/fvwm-crystal.apps.diff
79
.for i in addons/* bin/* fvwm/scripts/speed_value
80
.for i in addons/* bin/* fvwm/scripts/speed_value
80
	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${i}
81
	@${REINPLACE_CMD} -e 's|/bin/bash|${PREFIX}/bin/bash|g' ${WRKSRC}/${i}
81
	@${FIND} ${WRKSRC} -name '*.bak' -delete
82
	@${FIND} ${WRKSRC} -name '*.bak' -delete
(-)fvwm-crystal/files/fvwm-crystal.apps.diff (+74 lines)
Line 0 Link Here
1
--- fvwm-crystal.apps_old	2008-06-23 23:42:54.000000000 +0300
2
+++ fvwm-crystal.apps_new	2010-03-22 14:07:57.000000000 +0200
3
@@ -102,7 +102,7 @@
4
 	group = OptionGroup(parser, "General creation options", "Options definig what should be generated")
5
 #	group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT',
6
 #		help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.")
7
-	group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY',
8
+	group.add_option('--with', action = 'append', type='string', dest='xwith', metavar='DIRECTORY',
9
 		help = 'generate entries only for defined entries (directories or files)')
10
 	group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY',
11
 		help = 'do NOT use defined entries (directories or files) for generating output.')
12
@@ -206,12 +206,12 @@
13
 #end of parseArgv
14
 
15
 
16
-def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
17
+def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,xwith=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
18
 	"""Read application databases from directories.
19
 	if checkExecs is True then use exec_field from file name to check access before adding it to database
20
 	if searchIconsIn is provided then use this path to check icons existence
21
 	sortOrder defines sorting order for entries
22
-	with is a list of entries (relative to the database root) that should be read
23
+	xwith is a list of entries (relative to the database root) that should be read
24
 	without is a list of entries (relative to the database root or absolute targets for symlinks) that should be left out
25
 	"""
26
 
27
@@ -235,7 +235,7 @@
28
 					return True
29
 		return False
30
 
31
-	def get_entry(root,dir,cat,sort,check,with,without,realcat):
32
+	def get_entry(root,dir,cat,sort,check,xwith,without,realcat):
33
 		if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK):
34
 			yield None
35
 		for entry in os.listdir(os.path.join(root,dir)):
36
@@ -268,9 +268,9 @@
37
 					if not checkFileAccess(test):
38
 						continue
39
 
40
-				if with and len(with)>0:
41
+				if xwith and len(xwith)>0:
42
 					cont=False
43
-					for i,v in enumerate(with):
44
+					for i,v in enumerate(xwith):
45
 						if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)):
46
 							cont=True
47
 							break
48
@@ -305,7 +305,7 @@
49
 					x = realcat[:]
50
 					x.extend([prio,name])
51
 					if access:
52
-						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x):
53
+						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,xwith,without,x):
54
 							yield sub
55
 				elif os.path.isfile(file):
56
 					if sort=='name' or sort=='rname':
57
@@ -327,7 +327,7 @@
58
 				db=os.path.abspath(os.path.expanduser(databases[i]))
59
 				if not os.path.isdir(db) or not os.access(db,os.R_OK):
60
 					continue
61
-				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]):
62
+				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,xwith,without,[0,rootName]):
63
 					if not entry:
64
 						continue
65
 					if not entry[5]:
66
@@ -850,7 +850,7 @@
67
 if params[0].database and len(params[0].database)>0:
68
 	database=params[0].database
69
 
70
-apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with=params[0].with,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
71
+apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,xwith=params[0].xwith,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
72
 
73
 ########################## DEBUG ################################
74
 if params[0].verbosity > 1:

Return to bug 145577