Hello community,
here is the log from the commit of package kio-locate
checked in at Mon May 29 01:09:21 CEST 2006.
--------
--- KDE/kio-locate/kio-locate.changes 2006-05-24 10:38:32.000000000 +0200
+++ kio-locate/kio-locate.changes 2006-05-28 13:38:23.000000000 +0200
@@ -1,0 +2,9 @@
+Sun May 28 13:37:54 CEST 2006 - stbinner@suse.de
+
+- update to version 0.4.5
+ * Search hits with non-ascii characters in the file name always
+ showed up with invalid size/owner/group information
+ * kio-locate should now compile with gcc-4.1_beta
+ * Updated to bksys 1.5.1.
+
+-------------------------------------------------------------------
Old:
----
kio-locate_0.4.4.diff
kio-locate_0.4.4.tar.gz
New:
----
kio-locate_0.4.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio-locate.spec ++++++
--- /var/tmp/diff_new_pack.7Cqso6/_old 2006-05-29 01:09:09.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cqso6/_new 2006-05-29 01:09:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kio-locate (Version 0.4.4)
+# spec file for package kio-locate (Version 0.4.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,13 +19,12 @@
License: GPL
Group: Productivity/Other
Autoreqprov: on
-Version: 0.4.4
-Release: 16
+Version: 0.4.5
+Release: 1
Summary: KDE I/O Slave for the locate Command
Source: kio-locate_%version.tar.gz
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`) findutils-locate
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch: kio-locate_%version.diff
Patch1: fix-bksys-libsuffix.diff
%description
@@ -45,7 +44,6 @@
%prep
%setup -q
-%patch0
%patch1
. /etc/opt/kde3/common_options
@@ -68,7 +66,6 @@
%defattr(-,root,root)
/opt/kde3/%_lib/kde3/kio_locate.*
/opt/kde3/share/doc/HTML/en/kio-locate
-/opt/kde3/share/locale/*
/opt/kde3/share/services/locate.protocol
/opt/kde3/share/services/locater.protocol
/opt/kde3/share/services/rlocate.protocol
@@ -76,6 +73,12 @@
/opt/kde3/share/services/searchproviders/locate.desktop
%changelog -n kio-locate
+* Sun May 28 2006 - stbinner@suse.de
+- update to version 0.4.5
+ * Search hits with non-ascii characters in the file name always
+ showed up with invalid size/owner/group information
+ * kio-locate should now compile with gcc-4.1_beta
+ * Updated to bksys 1.5.1.
* Wed May 24 2006 - adrian@suse.de
- fix build for < 10.1
* Sun Feb 19 2006 - dmueller@suse.de
++++++ kio-locate_0.4.4.tar.gz -> kio-locate_0.4.5.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/ChangeLog new/kio-locate-0.4.5/ChangeLog
--- old/kio-locate-0.4.4/ChangeLog 2005-10-19 17:52:12.000000000 +0200
+++ new/kio-locate-0.4.5/ChangeLog 2006-02-05 17:02:49.000000000 +0100
@@ -1,3 +1,12 @@
+kio-locate (0.4.5) 2006-02-05 -- Armin Straub
+
+ * Search hits with non-ascii characters in the file name always showed up
+ with invalid size/owner/group information (fixed by Johan Billing).
+ * kio-locate should now compile with gcc-4.1_beta (fixed by Jan Jitse
+ Venselaar).
+ * Updated to bksys 1.5.1.
+
+
kio-locate (0.4.4) 2005-10-19 -- Armin Straub
+ Warn if locate (or whatever is selected) is not installed (suggested
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/SConstruct new/kio-locate-0.4.5/SConstruct
--- old/kio-locate-0.4.4/SConstruct 2005-09-13 12:45:47.000000000 +0200
+++ new/kio-locate-0.4.5/SConstruct 2006-02-05 17:09:11.000000000 +0100
@@ -60,7 +60,7 @@
#myenv['i_am_a_documentation_writer']=1
# This shouldn't be needed, but it works around a (possible) bug in bksys 1.5.2.rc1.
-myenv['_BUILDDIR_']='build'
+# myenv['_BUILDDIR_']='build'
## Use docfolder for each documentation directory
## The parameters of docfolder are: documentation dir, language code, app name
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/TODO new/kio-locate-0.4.5/TODO
--- old/kio-locate-0.4.4/TODO 2005-10-19 17:52:12.000000000 +0200
+++ new/kio-locate-0.4.5/TODO 2006-02-05 16:49:32.000000000 +0100
@@ -3,6 +3,9 @@
Mid Term
+ Add kio-locate to kde-extragear.
+ Translations needed. Contact Håvard Dahle for Norwegian translation.
++ Support searches on remote servers via ssh. A possible search could
+ then look like "locate://username@server:port pattern". (Suggested
+ by Ferdinand Gassauer)
Ideas
+ Some kind of first start screen?
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/VERSION new/kio-locate-0.4.5/VERSION
--- old/kio-locate-0.4.4/VERSION 2005-10-19 18:02:35.000000000 +0200
+++ new/kio-locate-0.4.5/VERSION 2006-02-05 16:49:32.000000000 +0100
@@ -1 +1 @@
-0.4.4
+0.4.5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/admin/generic.py new/kio-locate-0.4.5/admin/generic.py
--- old/kio-locate-0.4.4/admin/generic.py 2005-09-13 12:45:47.000000000 +0200
+++ new/kio-locate-0.4.5/admin/generic.py 2006-02-05 17:02:49.000000000 +0100
@@ -141,41 +141,35 @@
else: env['USE_THE_FORCE_LUKE'].append(self)
def joinpath(self, val):
- if len(self.dirprefix)<3: return val
dir=self.dirprefix
+
thing=self.orenv.make_list(val)
files=[]
bdir="./"
if self.orenv.has_key('_BUILDDIR_'): bdir=self.orenv['_BUILDDIR_']
- for v in thing: files.append( self.orenv.join(bdir, dir, v) )
+
+ for v in thing:
+ files.append( self.orenv.join(bdir, dir, v) )
+
+ #for f in files: print f
+ #print "\n"
return files
# a list of paths, with absolute and relative ones
def fixpath(self, val):
- def reldir(dir):
- ndir = SCons.Node.FS.default_fs.Dir(dir).srcnode().abspath
- rootdir = SCons.Node.FS.default_fs.Dir('#').abspath
- return ndir.replace(rootdir, '').lstrip('/')
-
dir=self.dirprefix
- if not len(dir)>2: dir=reldir('.')
thing=self.orenv.make_list(val)
ret=[]
bdir="./"
if self.orenv.has_key('_BUILDDIR_'): bdir=self.orenv['_BUILDDIR_']
for v in thing:
- #if v[:2] == "./" or v[:3] == "../":
- # ret.append( self.orenv.join('#', bdir, dir, v) )
- #elif v[:1] == "#" or v[:1] == "/":
- # ret.append( v )
- #else:
- # ret.append( self.orenv.join('#', bdir, dir, v) )
- if v[:1] == "#" or v[:1] == "/":
- ret.append(v)
+ if v[:2] == "./" or v[:3] == "../":
+ ret.append( self.orenv.join(bdir, dir, v) )
+ elif v[:1] == "#" or v[:1] == "/":
+ ret.append( v )
else:
- ret.append( self.orenv.join('#', bdir, dir, v) )
-
+ ret.append( self.orenv.join(bdir, dir, v) )
return ret
def lockworkdir(self):
@@ -191,11 +185,30 @@
os.chdir(self.not_orig_os_dir)
self.workdir_lock=None
+ def lockchdir(self):
+ if not self.chdir: return
+ if self.chdir_lock: return
+ self.chdir_lock=1
+ SConfFS=SCons.Node.FS.default_fs
+ self.old_fs_dir=SConfFS.getcwd()
+ self.old_os_dir=os.getcwd()
+ SConfFS.chdir( SConfFS.Dir('#/'+self.chdir), change_os_dir=1)
+
+ def unlockchdir(self):
+ if not self.chdir: return
+ if not self.chdir_lock: return
+ SCons.Node.FS.default_fs.chdir(self.old_fs_dir, change_os_dir=0)
+ os.chdir(self.old_os_dir)
+ self.chdir_lock=None
+
def execute(self):
if self.executed: return
+ self.lockchdir()
+
if self.orenv.has_key('DUMPCONFIG'):
- self.xml()
+ print self.xml()
+ self.unlockchdir()
self.executed=1
return
@@ -224,7 +237,7 @@
sal=SCons.Util.splitext(l)
if len(sal)>1:
if sal[1] in lext: self.p_local_shlibs.append(self.fixpath(sal[0]+'.so')[0])
- elif sal[1] in sext: self.p_local_staticlibs.append(self.fixpath(sal[0]+'.a')[0])
+ elif sal[1] in sext: self.p_local_staticlibs.append(sal[0]+'.a')
else: self.p_global_shlibs.append(l)
if len(self.p_global_shlibs)>0: self.env.AppendUnique(LIBS=self.p_global_shlibs)
@@ -254,6 +267,7 @@
if len(self.p_local_staticlibs)>0:
if ret: self.env.Depends( ret, self.p_local_staticlibs )
+ self.unlockchdir()
self.executed=1
## Copy function that honors symlinks
@@ -288,17 +302,6 @@
def exists(env):
return true
-# record a dump of the environment
-bks_dump='<?xml version="1.0" encoding="UTF-8"?>\n<bksys version="1">\n'
-def add_dump(nenv, str):
- global bks_dump
- if str: bks_dump+=str
-def get_dump(nenv):
- if not nenv.has_key('DUMPCONFIG'):
- nenv.pprint('RED','WARNING: trying to get a dump while DUMPCONFIG is not set - this will not work')
- global bks_dump
- return bks_dump+"</bksys>\n"
-
def generate(env):
## Bksys requires scons 0.96
env.EnsureSConsVersion(0, 96)
@@ -308,8 +311,6 @@
SConsEnvironment.join = join
SConsEnvironment.dist = dist
SConsEnvironment.getreldir = getreldir
- SConsEnvironment.add_dump = add_dump
- SConsEnvironment.get_dump = get_dump
env['HELP']=0
if '--help' in sys.argv or '-h' in sys.argv or 'help' in sys.argv: env['HELP']=1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kio-locate-0.4.4/admin/kde.py new/kio-locate-0.4.5/admin/kde.py
--- old/kio-locate-0.4.4/admin/kde.py 2005-09-13 12:45:47.000000000 +0200
+++ new/kio-locate-0.4.5/admin/kde.py 2006-02-05 17:02:49.000000000 +0100
@@ -34,8 +34,6 @@
lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )
if 'fastmoc' in _flags:
lenv['BKSYS_FASTMOC']=1
- if 'dump' in _flags:
- lenv['DUMPCONFIG']=1
if not 'nohelp' in _flags:
if lenv['_CONFIGURE'] or lenv['HELP']: lenv.Exit(0)
if not 'nosmart' or not lenv.has_key('nosmart_includes'):
@@ -285,20 +283,10 @@
import SCons.Util
import SCons.Node
- def reldir(dir):
- ndir = SCons.Node.FS.default_fs.Dir(dir).srcnode().abspath
- rootdir = SCons.Node.FS.default_fs.Dir('#').abspath
- return ndir.replace(rootdir, '').lstrip('/')
-
- def relfile(file):
- nfile = SCons.Node.FS.default_fs.File(file).srcnode().abspath
- rootdir = SCons.Node.FS.default_fs.Dir('#').abspath
- return nfile.replace(rootdir, '').lstrip('/')
-
CLVar = SCons.Util.CLVar
splitext = SCons.Util.splitext
Builder = SCons.Builder.Builder
-
+
# Detect the environment - replaces ./configure implicitely and store the options into a cache
from SCons.Options import Options
cachefile=env['CACHEDIR']+'kde.cache.py'
@@ -347,7 +335,7 @@
## set default variables, one can override them in sconscript files
env.Append(CXXFLAGS = ['-I'+env['KDEINCLUDEPATH'], '-I'+env['QTINCLUDEPATH'] ],
LIBPATH = [env['KDELIBPATH'], env['QTLIBPATH'] ])
-
+
env['QT_AUTOSCAN'] = 1
env['QT_DEBUG'] = 0
@@ -392,8 +380,9 @@
bs = env.join(str(target[0].get_dir()),bs)
# .h file is already there
target.append( bs+'.cpp' )
-
+
content=source[0].srcnode().get_contents()
+ #print content
kcfgfilename=""
kcfgFileDeclRx = re.compile("[fF]ile\s*=\s*(.+)\s*")
@@ -408,7 +397,7 @@
env['BUILDERS']['Kcfg']=Builder(action=env.Action(kcfg_buildit, kcfg_stringit),
emitter=kcfgEmitter, suffix='.h', src_suffix='.kcfgc')
-
+
## MOC processing
env['BUILDERS']['Moc']=Builder(action='$QT_MOC -o $TARGET $SOURCE',suffix='.moc',src_suffix='.h')
env['BUILDERS']['Moccpp']=Builder(action='$QT_MOC -o $TARGET $SOURCE',suffix='_moc.cpp',src_suffix='.h')
@@ -423,8 +412,7 @@
env['BUILDERS']['Stub']=Builder(action= 'dcopidl2cpp --c++-suffix cpp --no-signals --no-skel $SOURCE',
suffix='_stub.cpp', src_suffix='.kidl')
## DOCUMENTATION
- env['BUILDERS']['Meinproc']=Builder(action='cd $TARGET.dir && $MEINPROC --check --cache $TARGET.name $SOURCE.name',
- suffix='.cache.bz2')
+ env['BUILDERS']['Meinproc']=Builder(action='cd $TARGET.dir && $MEINPROC --check --cache $TARGET.name $SOURCE.name',suffix='.cache.bz2')
## TRANSLATIONS
env['BUILDERS']['Transfiles']=Builder(action='$MSGFMT $SOURCE -o $TARGET',suffix='.gmo',src_suffix='.po')
@@ -439,13 +427,10 @@
stub_ext = [".stub", ".STUB"]
def KDEfiles(lenv, target, source):
- """ Returns a list of files for scons (handles kde tricks like .skel)
+ """ Returns a list of files for scons (handles kde tricks like .skel)
It also makes custom checks against double includes like : ['file.ui', 'file.cpp']
(file.cpp is already included because of file.ui) """
- # ITA
- #print "kdefiles"
-
q_object_search = re.compile(r'[^A-Za-z0-9]Q_OBJECT[^A-Za-z0-9]')
def scan_moc(cppfile):
addfile=None
@@ -489,7 +474,6 @@
# For each file, check wether it is a dcop file or not, and create the complete list of sources
for file in source_:
-
sfile=SCons.Node.FS.default_fs.File(str(file)) # why str(file) ? because ordinal not in range issues
bs = SCons.Util.splitext(file)[0]
ext = SCons.Util.splitext(file)[1]
@@ -510,7 +494,7 @@
src.append(file)
if not env.has_key('NOMOCFILE'):
ret = scan_moc(sfile)
- if ret: src.append( sfile.dir.File(ret) )
+ if ret: src.append( ret )
elif ext in ui_ext:
lenv.Uic(file)
src.append(bs+'.cpp')
@@ -523,7 +507,7 @@
src.append(file)
for base in kidl: lenv.Kidl(base+'.h')
-
+
# Now check against typical newbie errors
for file in ui_files:
for ofile in other_files:
@@ -535,8 +519,6 @@
if ofile == file:
env.pprint('RED',"WARNING: You have included %s.kcfg and another file of the same prefix"%file)
print "Files generated by kconfig_compiler (settings.h, settings.cpp) must not be included"
- # ITA
- #print "end kdefiles"
return src
@@ -544,12 +526,10 @@
configuration for re-use from an IDE """
def KDEinstall(lenv, restype, subdir, files, perms=None):
if env.has_key('DUMPCONFIG'):
- ret= "
participants (1)
-
root@suse.de