[arch-commits] Commit in fvwm-crystal/repos (5 files)

Mon Nov 10 05:56:26 UTC 2008

Date: Monday, November 10, 2008 @ 00:56:25
  Author: eric
Revision: 18902

Merged revisions 18898 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/fvwm-crystal/trunk

........
  r18898 | eric | 2008-11-10 00:31:40 -0500 (Mon, 10 Nov 2008) | 2 lines
  
  upgpkg: fvwm-crystal 3.0.6-2
      Rebuilt for python 2.6 (close FS#12033), Removed unneeded .install file
........

Added:
  fvwm-crystal/repos/extra-i686/python2.6.patch
    (from rev 18898, fvwm-crystal/trunk/python2.6.patch)
Modified:
  fvwm-crystal/repos/extra-i686/	(properties)
  fvwm-crystal/repos/extra-i686/ChangeLog
  fvwm-crystal/repos/extra-i686/PKGBUILD
Deleted:
  fvwm-crystal/repos/extra-i686/fvwm-crystal.install

----------------------+
 ChangeLog            |    6 ++++
 PKGBUILD             |   15 +++++-----
 fvwm-crystal.install |   14 ----------
 python2.6.patch      |   68 +++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 82 insertions(+), 21 deletions(-)


Property changes on: fvwm-crystal/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /fvwm-crystal/trunk:1-4719
   + /fvwm-crystal/trunk:1-18901

Modified: extra-i686/ChangeLog
===================================================================

--- extra-i686/ChangeLog	2008-11-10 05:48:17 UTC (rev 18901)
+++ extra-i686/ChangeLog	2008-11-10 05:56:25 UTC (rev 18902)
@@ -1,3 +1,9 @@
+2008-11-09  Eric Belanger  <eric at archlinux.org>
+
+	* fvwm-crystal 3.0.6-2
+	* Rebuilt for python 2.6 (close FS#12033)
+	* Removed unneeded .install file
+
 2008-07-08  Eric Belanger  <eric at archlinux.org>
 
 	* fvwm-crystal 3.0.6-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-10 05:48:17 UTC (rev 18901)
+++ extra-i686/PKGBUILD	2008-11-10 05:56:25 UTC (rev 18902)
@@ -4,19 +4,20 @@
 
 pkgname=fvwm-crystal
 pkgver=3.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Transparent Themes for fvwm"
 arch=('i686' 'x86_64')
-url="http://fvwm-crystal.org"
+url="http://www.fvwm-crystal.org"
 license=('GPL')
 depends=('fvwm-devel' 'imagemagick' 'python' 'habak' 'trayer')
-install=fvwm-crystal.install
-source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('82e2800882abb2c822519f1aa4dc0c72')
-sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0')
+source=(http://download.gna.org/fvwm-crystal/${pkgver}/${pkgname}-${pkgver}.tar.gz python2.6.patch)
+md5sums=('82e2800882abb2c822519f1aa4dc0c72' '8e381c0233e3b6053722390e0e19b5ae')
+sha1sums=('965e521f64b8a89994f5afee25c8b1c88239bff0' '6dfa5c12a29477111de8fbc3789d06c2ec04cf5e')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}/bin
+  patch -p0 < ../../python2.6.patch || return 1
+  cd ..
   make prefix=${pkgdir}/usr install || return 1
 
   # make gdm work

Deleted: extra-i686/fvwm-crystal.install
===================================================================
--- extra-i686/fvwm-crystal.install	2008-11-10 05:48:17 UTC (rev 18901)
+++ extra-i686/fvwm-crystal.install	2008-11-10 05:56:25 UTC (rev 18902)
@@ -1,14 +0,0 @@
-post_install() {
-  echo -e "->  Use \"exec fvwm-crystal\" in ~/.xinitrc to start with startx"
-  echo -e "->  fvwm-crystal should also appear in gdm/kdm"
-  echo -e "->  OPTIONAL DEPS (your choice):"
-  echo -e "->    music:           mpd+mpc, xmms+xmms-shell+xmms-find, cdcd"
-  echo -e "->    terminals:       urxvt, aterm, mrxvt, xterm"
-  echo -e "->    file managers:   rox-filer, nautilus"
-  echo -e "->    reboot/shutdown: sudo"
-  echo -e "->    screensaver:     xscreensaver"
-}
-
-post_upgrade() {
-  post_install
-}

Copied: fvwm-crystal/repos/extra-i686/python2.6.patch (from rev 18898, fvwm-crystal/trunk/python2.6.patch)
===================================================================
--- extra-i686/python2.6.patch	                        (rev 0)
+++ extra-i686/python2.6.patch	2008-11-10 05:56:25 UTC (rev 18902)
@@ -0,0 +1,68 @@
+--- fvwm-crystal.apps.new	2008-10-24 23:48:23.000000000 +0200
++++ fvwm-crystal.apps	2008-10-24 23:54:45.000000000 +0200
+@@ -102,7 +102,7 @@
+ 	group = OptionGroup(parser, "General creation options", "Options definig what should be generated")
+ #	group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT',
+ #		help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.")
+-	group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY',
++	group.add_option('--with', action = 'append', type='string', dest='withdir', metavar='DIRECTORY',
+ 		help = 'generate entries only for defined entries (directories or files)')
+ 	group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY',
+ 		help = 'do NOT use defined entries (directories or files) for generating output.')
+@@ -206,7 +206,7 @@
+ #end of parseArgv
+ 
+ 
+-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'):
++def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,withdir=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
+ 	"""Read application databases from directories.
+ 	if checkExecs is True then use exec_field from file name to check access before adding it to database
+ 	if searchIconsIn is provided then use this path to check icons existence
+@@ -235,7 +235,7 @@
+ 					return True
+ 		return False
+ 
+-	def get_entry(root,dir,cat,sort,check,with,without,realcat):
++	def get_entry(root,dir,cat,sort,check,withdir,without,realcat):
+ 		if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK):
+ 			yield None
+ 		for entry in os.listdir(os.path.join(root,dir)):
+@@ -268,9 +268,9 @@
+ 					if not checkFileAccess(test):
+ 						continue
+ 
+-				if with and len(with)>0:
++				if withdir and len(withdir)>0:
+ 					cont=False
+-					for i,v in enumerate(with):
++					for i,v in enumerate(withdir):
+ 						if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)):
+ 							cont=True
+ 							break
+@@ -305,7 +305,7 @@
+ 					x = realcat[:]
+ 					x.extend([prio,name])
+ 					if access:
+-						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x):
++						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,withdir,without,x):
+ 							yield sub
+ 				elif os.path.isfile(file):
+ 					if sort=='name' or sort=='rname':
+@@ -327,7 +327,7 @@
+ 				db=os.path.abspath(os.path.expanduser(databases[i]))
+ 				if not os.path.isdir(db) or not os.access(db,os.R_OK):
+ 					continue
+-				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]):
++				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,withdir,without,[0,rootName]):
+ 					if not entry:
+ 						continue
+ 					if not entry[5]:
+@@ -850,7 +850,7 @@
+ if params[0].database and len(params[0].database)>0:
+ 	database=params[0].database
+ 
+-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)
++apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,withdir=params[0].withdir,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
+ 
+ ########################## DEBUG ################################
+ if params[0].verbosity > 1:


