March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit hdparm for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package hdparm for openSUSE:Factory checked in at Tue Mar 24 21:04:46 CET 2009. -------- --- hdparm/hdparm.changes 2009-03-02 09:40:42.000000000 +0100 +++ hdparm/hdparm.changes 2009-03-23 08:44:44.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 23 08:18:39 CET 2009 - mseben(a)suse.cz + +- update to version 9.13 + * fix O_DIRECT (--direct) for arch's other than x86 + * strip leading/trailing spaces from -i model/fwrev/serno strings + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- hdparm-9.12-nostrip.patch hdparm-9.12.tar.bz2 New: ---- hdparm-9.13-nostrip.patch hdparm-9.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdparm.spec ++++++ --- /var/tmp/diff_new_pack.D13687/_old 2009-03-24 21:04:23.000000000 +0100 +++ /var/tmp/diff_new_pack.D13687/_new 2009-03-24 21:04:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package hdparm (Version 9.12) +# spec file for package hdparm (Version 9.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ PreReq: %insserv_prereq %fillup_prereq coreutils Provides: base:/sbin/hdparm AutoReqProv: on -Version: 9.12 +Version: 9.13 Release: 1 Summary: A Program to Get and Set Hard Disk Parameters Source: %{name}-%{version}.tar.bz2 @@ -116,6 +116,10 @@ /var/adm/fillup-templates/sysconfig.ide %changelog +* Mon Mar 23 2009 mseben(a)suse.cz +- update to version 9.13 + * fix O_DIRECT (--direct) for arch's other than x86 + * strip leading/trailing spaces from -i model/fwrev/serno strings * Mon Mar 02 2009 mseben(a)suse.cz - update to version 9.12 * added logical/physical sector size reporting ++++++ hdparm-9.12-nostrip.patch -> hdparm-9.13-nostrip.patch ++++++ ++++++ hdparm-9.12.tar.bz2 -> hdparm-9.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/Changelog new/hdparm-9.13/Changelog --- old/hdparm-9.12/Changelog 2009-02-26 19:10:14.000000000 +0100 +++ new/hdparm-9.13/Changelog 2009-03-21 14:08:03.000000000 +0100 @@ -1,3 +1,6 @@ +hdparm-9.13 + - fix O_DIRECT (--direct) for arch's other than x86 + - strip leading/trailing spaces from -i model/fwrev/serno strings hdparm-9.12 - added logical/physical sector size reporting - updated -I output with SATA-2.6 additions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/debian/changelog new/hdparm-9.13/debian/changelog --- old/hdparm-9.12/debian/changelog 2008-11-02 23:03:53.000000000 +0100 +++ new/hdparm-9.13/debian/changelog 1970-01-01 01:00:00.000000000 +0100 @@ -1,575 +0,0 @@ -hdparm (8.9-2) unstable; urgency=low - - * Remove stale stop links (closes: #497903) - - -- Stephen Gran <sgran(a)debian.org> Fri, 05 Sep 2008 11:23:20 +0100 - -hdparm (8.9-1) unstable; urgency=low - - * New upstream version - * Update standars version to 3.8.0 (no changes) - - -- Stephen Gran <sgran(a)debian.org> Tue, 17 Jun 2008 19:08:10 +0100 - -hdparm (8.8-1) unstable; urgency=low - - * New upstream version - - Document that security-* switches are standalone (closes: #422341) - - -- Stephen Gran <sgran(a)debian.org> Wed, 11 Jun 2008 23:36:59 +0100 - -hdparm (8.7-1) unstable; urgency=low - - * New upstream release - * Fixed incorrect LSB header Default-Stop (closes: #476110) - - -- Stephen Gran <sgran(a)debian.org> Tue, 03 Jun 2008 00:36:06 +0100 - -hdparm (8.6-1) unstable; urgency=low - - * New upstream version - * Udev rule can also match for sata devices (closes: #471401) - - -- Stephen Gran <sgran(a)debian.org> Tue, 18 Mar 2008 01:06:37 +0000 - -hdparm (8.3-1) unstable; urgency=low - - * New upstream release - * easier config of spindown time (closes: #462766) - * Update Standards-Version (no changes) - - -- Stephen Gran <sgran(a)debian.org> Tue, 19 Feb 2008 22:39:32 +0000 - -hdparm (7.7-1) unstable; urgency=low - - * New upstream version - - -- Stephen Gran <sgran(a)debian.org> Sat, 11 Aug 2007 12:35:12 +0100 - -hdparm (7.6-1) unstable; urgency=low - - * New upstream version - * Update conffile handling in preinst - - -- Stephen Gran <sgran(a)debian.org> Sun, 15 Jul 2007 15:50:24 +0100 - -hdparm (7.5-1) unstable; urgency=low - - * New upstream version - - -- Stephen Gran <sgran(a)debian.org> Wed, 06 Jun 2007 21:13:36 +0100 - -hdparm (7.3-1) unstable; urgency=low - - * New upstream version - - partial fix for #423186, rest patched, so (closes: #423186) - * Stop installing useless stop links in rc0 and rc6 (closes: #422795) - - -- Stephen Gran <sgran(a)debian.org> Thu, 31 May 2007 02:34:11 +0100 - -hdparm (7.1-2) unstable; urgency=low - - * Don't ship a binary in contrib/ (even though upstream puts it in the - tarball) - - -- Stephen Gran <sgran(a)debian.org> Sun, 29 Apr 2007 03:33:05 +0100 - -hdparm (7.1-1) unstable; urgency=low - - * New upstream version - * Add debian/patches/40_hdparm_no_strip.dpatch to keep build system from - stripping hdparm binary before dh_strip can get to it. - - -- Stephen Gran <sgran(a)debian.org> Sun, 29 Apr 2007 03:02:39 +0100 - -hdparm (6.9-2) unstable; urgency=low - - * Typo fix in manpage (closes: #396809) - * Better explain get/set options (closes: #397792) - - -- Stephen Gran <sgran(a)debian.org> Sat, 17 Feb 2007 03:30:06 +0000 - -hdparm (6.9-1) unstable; urgency=low - - * New upstream version - * Add new -s option to init script, conf file, and manpage - - -- Stephen Gran <sgran(a)debian.org> Wed, 25 Oct 2006 16:24:22 +0100 - -hdparm (6.8-1) unstable; urgency=low - - * New upstream version - - -- Stephen Gran <sgran(a)debian.org> Mon, 16 Oct 2006 18:14:36 +0100 - -hdparm (6.7-1) unstable; urgency=low - - * New upstream version - * Fix override disparity for -dbg package - * Versioned Build-Dep on dpkg-dev since it now uses ${binary:Version} - - -- Stephen Gran <sgran(a)debian.org> Thu, 5 Oct 2006 22:37:59 +0100 - -hdparm (6.6-5) unstable; urgency=low - - * Make -C actually try a second time (closes: #390079) - - -- Stephen Gran <sgran(a)debian.org> Sat, 30 Sep 2006 15:08:01 +0100 - -hdparm (6.6-4) unstable; urgency=low - - * hdparm-dbg should Depend on hdparm, how about? - - -- Stephen Gran <sgran(a)debian.org> Thu, 28 Sep 2006 11:06:31 +0100 - -hdparm (6.6-3) unstable; urgency=low - - * s/mountvirtfs/mountdevsubfs/ in init script (closes: #386340) - * Some init dependency tuning - * Apply patch from Norbert Buchmuller <norbi.spam(a)nix.hu> to make it safer - to run hdparm on a degraded software raid array (closes: #366333) - * Split out the old unformatted changelog entries to quiet lintian - - -- Stephen Gran <sgran(a)debian.org> Tue, 19 Sep 2006 00:44:08 +0100 - -hdparm (6.6-2) unstable; urgency=low - - * Add -dbg package - This requires incrementing the versioned dep on debhelper - * Increment Standards-Version to 3.7.2 (no changes) - - -- Stephen Gran <sgran(a)debian.org> Thu, 18 May 2006 23:59:56 +0100 - -hdparm (6.6-1) unstable; urgency=low - - * New upstream release - * man page fixups for -a (closes: #362670) - * Change to using comparison (==) rather than assignment (=) operators in - hdparm's udev rules. - * Stop printing nulls (closes: #363132) - * Add APM/ACPI discussion to README.Debian (closes: #327442) - - -- Stephen Gran <sgran(a)debian.org> Tue, 18 Apr 2006 13:28:33 +0100 - -hdparm (6.3-3) unstable; urgency=low - - * Init script fixup: s/_/-/ (closes: #340685) - - -- Stephen Gran <sgran(a)debian.org> Fri, 25 Nov 2005 09:15:46 +0000 - -hdparm (6.3-2) unstable; urgency=low - - * Brown paper bag release - add dpatch to B-D (closes:#340595) - - -- Stephen Gran <sgran(a)debian.org> Thu, 24 Nov 2005 13:21:52 +0000 - -hdparm (6.3-1) unstable; urgency=low - - * New Upstream Version (closes: #340171) - * Init dependency information added (closes: #335309) - * Add support for new user-master option to init script, and document same - * Switch to dpatch, and start adding tiny patches there - - -- Stephen Gran <sgran(a)debian.org> Mon, 21 Nov 2005 23:44:43 +0000 - -hdparm (6.1-7) unstable; urgency=low - - * Make eval_value fail if unknown value passed to it (closes: #329443) - * Get rid of deprecated dev.d/ file (closes: #329450) - * Add /etc/udev/rules.d/ to package (closes: #329731) - - -- Stephen Gran <sgran(a)debian.org> Sat, 24 Sep 2005 01:03:51 +0100 - -hdparm (6.1-6) unstable; urgency=low - - * Migrate from dev.d to udev/hdparm.rules (closes: #329026) - * remerge manpage patch for -M (closes: #325237) - - -- Stephen Gran <sgran(a)debian.org> Mon, 19 Sep 2005 08:19:27 +0100 - -hdparm (6.1-5) unstable; urgency=low - - * Change udev script name to end in .dev (hmm, really should have - investigated that more) (closes: #322636) - - -- Stephen Gran <sgran(a)debian.org> Fri, 12 Aug 2005 08:56:00 -0400 - -hdparm (6.1-4) unstable; urgency=low - - * Grr, I _would_ have had a working solution, if only I actually installed - all the files. - - -- Stephen Gran <sgran(a)debian.org> Thu, 11 Aug 2005 09:57:28 -0400 - -hdparm (6.1-3) unstable; urgency=low - - * Finally, I think I have a working udev method (much thanks to Ubuntu for - doing rather a lot of the work getting it there) - (closes: #274109, #312949) - * security-freeze support for init script (closes: #317675) - * hdparm.conf manpage written and included (closes: #319928) - - -- Stephen Gran <sgran(a)debian.org> Wed, 10 Aug 2005 15:26:36 -0400 - -hdparm (6.1-2) unstable; urgency=low - - * Typo fixups in /etc/default/hdparm (closes: #310517) - - -- Stephen Gran <sgran(a)debian.org> Tue, 24 May 2005 10:08:42 -0400 - -hdparm (6.1-1) unstable; urgency=low - - * New upstream version - - -- Stephen Gran <sgran(a)debian.org> Mon, 18 Apr 2005 14:40:21 -0400 - -hdparm (6.0-1) unstable; urgency=low - - * New upstream version - - Includes WIN_SECURITY_FREEZE_LOCK (closes: #302774) - * Allow multiple disks to be set up at once in /etc/default/hdparm - (closes: #296368) - - -- Stephen Gran <sgran(a)debian.org> Sat, 16 Apr 2005 12:36:14 -0400 - -hdparm (5.9-4) unstable; urgency=low - - * Allow overriding of (rather simple minded) built-in safety checks - in init script (closes: #299330) - * Patch to output sectors instead of bytes on kernels that support - BLKGETSIZE64 (closes: #299109) - * Reorganize README.Debian, and better document the init script (hopefully) - * Add documentation to init script and conf file, and make indenting more - readable in init script (closes: #299440) - - -- Stephen Gran <sgran(a)debian.org> Mon, 14 Mar 2005 06:05:55 -0500 - -hdparm (5.9-3) unstable; urgency=low - - * Don't skip drives in hdparm.init if $ROOTFS is unset (closes: #296364) - - -- Stephen Gran <sgran(a)debian.org> Mon, 21 Feb 2005 22:11:40 -0500 - -hdparm (5.9-2) unstable; urgency=low - - * Readability fixup in hdparm.init (closes: #294761) (thanks Thomas Hood - <jdthood(a)aglu.demon.nl>) - * Test for existance of device before running hdparm on it. This doesn't - really fix the problem of things like udev creating the device files so - slowly, but it allows the init script to run to completion, instead of - bailing due to set -e (closes: #249446) - * Set up the infrastructure for a 2 stage call at boot time. Unfortunately, - the admin will have to do a little work themselves to configure this, but - doing it automagically appears impossible in all situations, so I will not - push it much further. (closes: #250232, #290629) - - -- Stephen Gran <sgran(a)debian.org> Thu, 17 Feb 2005 22:00:33 -0500 - -hdparm (5.9-1) unstable; urgency=low - - * New upstream version - - fixes -W switch (closes: #293378) - - -- Stephen Gran <sgran(a)debian.org> Fri, 4 Feb 2005 08:56:57 -0500 - -hdparm (5.8-1) unstable; urgency=low - - * New Upstream version - - -h output now goes to stdout rather than stderr - (closes: #270510) - * Mention config file in manpage (closes: #272641) - - -- Stephen Gran <sgran(a)debian.org> Fri, 26 Nov 2004 11:57:13 -0500 - -hdparm (5.7-1) unstable; urgency=low - - * New upstream release - - fixes endian problems (segfault with -i) (closes: #268725) - * Stop shipping empty rcS.d (why did I do that?) (closes: #270377) - - -- Stephen Gran <sgran(a)debian.org> Sun, 12 Sep 2004 14:00:36 -0400 - -hdparm (5.6-0.1) unstable; urgency=medium - - * Non-maintainer upload. - * New upstream release, blessed by Stephen Gran, original maintainer. This - new version allows to set up parameters on IDE disks supported by the new - libata kernel interface, that sees them as SCSI disks. hdparm prior to 5.6 - refuse to set up parameters on SCSI disks (closes: #266903). - - -- David Martínez Moreno <ender(a)debian.org> Fri, 20 Aug 2004 16:05:19 +0200 - -hdparm (5.5-7) unstable; urgency=low - - * Get rid of .commands in source - - -- Stephen Gran <sgran(a)debian.org> Tue, 17 Aug 2004 12:14:24 -0400 - -hdparm (5.5-6) unstable; urgency=low - - * The God, I hate when I do that release - * Revert some changes that are destined for an unfinished feature, and would - just break things now. - - -- Stephen Gran <sgran(a)debian.org> Tue, 17 Aug 2004 12:08:41 -0400 - -hdparm (5.5-5) unstable; urgency=low - - * New conf file option -p (Thanks Sebastian Kuzminsky <seb(a)kernel.org>) - * conf file also now allows for straight command line syntax - read - comments in hdparm.conf for details - * Add watch file - * Add udeb (closes: #265969) (Thanks Colin Watson <cjwatson(a)debian.org> for - patch) - - -- Stephen Gran <sgran(a)debian.org> Sun, 15 Aug 2004 22:48:29 -0400 - -hdparm (5.5-4) unstable; urgency=low - - * Patch from "Mario 'BitKoenig' Holbe" <Mario.Holbe(a)RZ.TU-Ilmenau.DE> for - better logic on checking RAID status. (closes: #249944) - - -- Stephen Gran <sgran(a)debian.org> Wed, 19 May 2004 20:22:47 -0400 - -hdparm (5.5-3) unstable; urgency=low - - * Add support for nohdparm boot option, to disable init script - I think this addresses the last of the problems with #247170, so I am - going to say (closes: #247170) - * Fix typo in hdparm.conf (closes: #248934) - - -- Stephen Gran <sgran(a)debian.org> Sun, 16 May 2004 14:24:45 -0400 - -hdparm (5.5-2) unstable; urgency=low - - * Merge in some manpage fixups, hopefully increasing clarity. - * The start link is run too early for people who need modules for their - controller loaded in order to use DMA. Added a note to README.Debian - explaining what people can do in these circumstances, but leave the link - alone. It's safer for the start script to fail than to have silent data - corruption by running it too late by default. (closes: #233188) - - -- Stephen Gran <sgran(a)debian.org> Wed, 3 Mar 2004 15:16:08 -0500 - -hdparm (5.5-1) unstable; urgency=low - - * New upstream version (closes: #232613) - * Add warning about examples in conf file - some are for devfs, and some - are not. I thought this was clear enough, but I guess not. - (closes: #231641) - * Fix up typo in /etc/apm.d/20hdparm (closes: #231822) - - -- Stephen Gran <sgran(a)debian.org> Sat, 14 Feb 2004 00:18:07 -0500 - -hdparm (5.4-10) unstable; urgency=low - - * The "I'm actually putting the changes in this version" release. - * Bump up version dependency on debhelper to 4.1.17 for dh_installinit's - --no-start option. Thanks to Thomas Hood for noticing I forgot to - actually include this. (closes: #230496) - * Actually include the fixed manpage this time. (closes: #230331) - - -- Stephen Gran <sgran(a)debian.org> Sat, 31 Jan 2004 15:55:47 -0500 - -hdparm (5.4-9) unstable; urgency=low - - * Added support for -K and -k (keep settings over reset) - thanks Shaul Karl - <shaulk(a)actcom.net.il> for patches. (closes: #229022) - * Hopefully explained -M (acoustic management feature a little more clearly - in manpage, and added pointer to READM.acoustic (closes: #230331) - * Work a little smarter, instead of a little harder, thanks to Thomas - Hood. Let dh_installinit do The Right Thing, and use --no-start option, - so it doesn't add the invoke-rc.d lines in postinst and prerm. - - -- Stephen Gran <sgran(a)debian.org> Fri, 30 Jan 2004 13:29:54 -0500 - -hdparm (5.4-8) unstable; urgency=low - - * Added note to README.Debian to warn about the use of the init script with - MD arrays (thanks David Harris for bringing this to my attention). Added - pointer to README.Debian to hdparm.conf as well, reminding people to be - aware of known issues before enabling the initscript. - * Finally wrapped my head around invoke-rc.d a little better (thanks to all - those on debian-devel who helped me out here). Explicitly adding a K link - in all run levels will prevent invoke-rc.d from rerunning the script on - upgrade, where only having an S link in rcS.d apparently did not do the - expected. That should take care of that nagging detail that I thought had - actually been fixed in -7, and really deal with all the parts of #224961. - * Allow for setting APM functions (-B) in init script. (closes: #226124) - * Fix bug in /etc/apm/20hdparm that made script exit without doing anything, - since test $variable || exit 0 tested non-declared variable. - - -- Stephen Gran <sgran(a)debian.org> Fri, 30 Jan 2004 13:16:26 -0500 - -hdparm (5.4-7) unstable; urgency=low - - * Move running of /etc/init.d script earlier to avoid possible disk - corrution with 2.6 kernels. Also apply patch from Bruce Perens (thanks - Bruce) (closes: #224961) - - -- Stephen Gran <sgran(a)debian.org> Wed, 24 Dec 2003 08:37:20 -0500 - -hdparm (5.4-6) unstable; urgency=low - - * moved /etc/default/hdparm to /etc/hdparm.conf, because this is actually - policy compliant. It turns out (mea culpa) default/ files need to be - shell scripts, which this is not. Thanks for noticing this, joeyh. - (closes: #222133) - * Fixed manpage typo in section -M. Thanks, Adrian. (closes: #222557) - - -- Stephen Gran <sgran(a)debian.org> Fri, 5 Dec 2003 14:28:07 -0500 - -hdparm (5.4-5) unstable; urgency=low - - * Changed parsing of -c to accept multiple values instead of it being a - boolean option (closes: #219641) - * Make initscript parsing of /etc/default/ file more flexible - now allows - parsing of lines that contain whitespace in addition to a newline. Also - now has large note at top describing currently allowed syntax. - (closes: #219138) - - -- Stephen Gran <sgran(a)debian.org> Mon, 10 Nov 2003 23:10:01 -0500 - -hdparm (5.4-4) unstable; urgency=low - - * Add acoustic management support to /etc/init.d/hdparm script (and - /etc/default/hdparm) (closes: #217634) - - -- Stephen Gran <sgran(a)debian.org> Sun, 26 Oct 2003 10:44:06 -0500 - -hdparm (5.4-3) unstable; urgency=low - - * New maintainer (closes: #217098) - * Fix description of -A in manpage (closes: #212257) - * Build uses cdbs now, which supports building unstripped (closes: #190867) - * Change reference to boot time script to reflect actual file - (closes: #157919) - * /etc/apm/20hdparm now handles multiple drives (closes: #149558) - * /etc/init.d/hdparm and /etc/default/hdparm now included. - Many thanks to Shaul Karl <shaul@rakefet> and Joerg Sommer - <joerg(a)alea.gnuu.de> for suggestions and samples. - (closes: #87451, #169406, #175506, #198516) - - -- Stephen Gran <sgran(a)debian.org> Thu, 23 Oct 2003 14:00:37 -0400 - -hdparm (5.4-2) unstable; urgency=low - - * Added cdbs to Build-Depends. - - -- Christopher L Cheney <ccheney(a)debian.org> Mon, 4 Aug 2003 23:00:00 -0500 - -hdparm (5.4-1) unstable; urgency=low - - * New upstream release. - * Move contrib scripts. (Closes: #122644) - * Suggest apmd. (Closes: #137434) - * Include upstream documentation. (Closes: #155171) - * Bumped debhelper version. (Closes: #190866) - - -- Christopher L Cheney <ccheney(a)debian.org> Mon, 4 Aug 2003 22:00:00 -0500 - -hdparm (5.3-0.1) unstable; urgency=low - - * NMU with permission of maintainer. - * New upstream release. (closes: #135708) - * This should build on s390/hppa/ia64 again (closes: #155725, #185704) - - -- Andrew Suffield <asuffield(a)debian.org> Wed, 9 Apr 2003 21:40:35 +0100 - -hdparm (5.2-1) unstable; urgency=low - - * New upstream. - - -- Christopher L Cheney <ccheney(a)debian.org> Wed, 31 Jul 2002 14:35:00 -0500 - -hdparm (4.5-1.2) unstable; urgency=low - - * NMU - * Change "Conflicts: apmd" to "Replaces: apmd", to comply with section - 7.5 of policy. This should eliminate upgrade problems. - - -- Chris Hanson <cph(a)debian.org> Thu, 14 Mar 2002 00:26:38 -0500 - -hdparm (4.5-1.1) unstable; urgency=low - - * NMU with permission of maintainer. - * Move "/etc/apm/event.d/20hdparm" from the apmd package to the hdparm - package. - - -- Chris Hanson <cph(a)debian.org> Thu, 7 Mar 2002 23:06:39 -0500 - -hdparm (4.5-1) unstable; urgency=high - - * New Upstream. (Closes: #101531) - * New Maintainer. - * Included contrib scripts. (Closes: #92620) - - -- Christopher L Cheney <ccheney(a)debian.org> Wed, 28 Nov 2001 14:10:00 -0600 - -hdparm (3.9a-1) unstable woody; urgency=low - - * New upstream version (patch). Closes #85351, #77979, #58265 - * Hack around compilation issues. Closes #80897, #84520 - * Back out manpage patch. Closes #67060 - * Add upstream changelog. Closes #80126 - * Change doc for -q. Closes #37594 - - -- Steve Dunham <dunham(a)debian.org> Wed, 14 Feb 2001 16:35:12 -0800 - -hdparm (3.9-1) unstable; urgency=low - - * New upstream version - - -- Steve Dunham <dunham(a)debian.org> Tue, 16 May 2000 08:30:32 -0700 - -hdparm (3.6-2) unstable; urgency=low - - * Patch to unregister interfaces for thinkpads - * Closes: #54715 - - -- Steve Dunham <dunham(a)debian.org> Tue, 25 Jan 2000 10:10:20 -0800 - -hdparm (3.6-1) unstable; urgency=low - - * New upstream version - * Fix problem with no media on CDs - * Add comment about -q option - * Closes: #30866, #39511 - - -- Steve Dunham <dunham(a)debian.org> Fri, 29 Oct 1999 23:38:58 -0700 - -hdparm (3.5-1) unstable; urgency=low - - * New upstream version (#30010,#26368) - - -- Steve Dunham <dunham(a)debian.org> Fri, 27 Nov 1998 11:49:03 -0500 - -hdparm (3.3-3) unstable; urgency=low - - * Switch to debhelper (#17219) - - -- Steve Dunham <dunham(a)debian.org> Fri, 14 Aug 1998 00:15:38 -0400 - -hdparm (3.3-2) unstable; urgency=low - - * Fixed problem with automake - - -- Steve Dunham <dunham(a)cps.msu.edu> Mon, 21 Jul 1997 18:31:41 -0400 - -hdparm (3.3-1) unstable; urgency=low - - * New upstream version - upstream changes: - - add -C, -y, and -Y flags for IDE power management - - force BLKFLSBUF after -T or -t -- kmg(a)barco.com - - fix minor -T/-t mixup in manpage -- hankedr(a)mail.auburn.edu - - - -- Steve Dunham <dunham(a)cps.msu.edu> Sun, 8 Jun 1997 13:18:10 -0400 - -hdparm (3.1-2) unstable; urgency=low - - * Fixed Architecture: field - - * Upgrade to 3.1. Change to "Package format of the month"(TM) - - -- Steve Dunham <dunham(a)gdl.msu.edu> Thu, 10 Oct 1996 19:51:22 -0800 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/debian/changelog.old new/hdparm-9.13/debian/changelog.old --- old/hdparm-9.12/debian/changelog.old 2008-11-02 23:10:26.000000000 +0100 +++ new/hdparm-9.13/debian/changelog.old 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -old changelog - -23-December-1994 Bruce Perens <Bruce(a)Pixar.com> - Added Debian GNU/Linux package maintenance system files, and configured - for Debian. - -22-June-1995 Guy R. Thomas <gthomas(a)native-ed.bc.ca> - Took over maintenance of package. New Debian revision. - -22-June-1995 Guy R. Thomas <gthomas(a)native-ed.bc.ca> - Upgraded to current version. ( May 31, 1995 ) - -25-June-1996 Steve Dunham <dunham(a)gdl.msu.edu> - Upgraded to current version. - -Local variables: -mode: debian-changelog -End: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/fwdownload.c new/hdparm-9.13/fwdownload.c --- old/hdparm-9.12/fwdownload.c 2008-12-10 01:09:16.000000000 +0100 +++ new/hdparm-9.13/fwdownload.c 2009-03-21 14:47:36.000000000 +0100 @@ -162,8 +162,8 @@ if (offset >= st.st_size) { // transfer complete? err = 0; } else { - fprintf(stderr, "Error: drive completed transfer at %d/%u bytes\n", - offset, (unsigned int)st.st_size); + fprintf(stderr, "Error: drive completed transfer at %llu/%llu bytes\n", + (unsigned long long)offset, (unsigned long long)st.st_size); err = EIO; } } else if (err == -1 && !eof_okay) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/hdparm.8 new/hdparm-9.13/hdparm.8 --- old/hdparm-9.12/hdparm.8 2009-02-12 14:56:36.000000000 +0100 +++ new/hdparm-9.13/hdparm.8 2009-03-21 14:20:46.000000000 +0100 @@ -1,4 +1,4 @@ -.TH HDPARM 8 "February 2009" "Version 9.12" +.TH HDPARM 8 "March 2009" "Version 9.13" .SH NAME hdparm \- get/set SATA/IDE device parameters @@ -187,7 +187,8 @@ referenced from sector 0 of the physical device (*not* the partition or filesystem). This information can then be used for a variety of purposes, -including determining appropriate sectors to deliberately corrupt +such as examining the degree of fragmenation of larger files, or +determining appropriate sectors to deliberately corrupt during fault-injection testing procedures. .TP .I --fibmap-sector @@ -213,6 +214,8 @@ or, if the drive supports it, transfer protocol 3 (segmented download). This command is .B EXTREMELY DANGEROUS +and +.B HAS NEVER BEEN PROVEN TO WORK and will probably destroy both the drive and all data on it. .B DO NOT USE THIS COMMAND. .TP @@ -229,18 +232,18 @@ Display terse usage information (help). .TP .I -i -Display the identification info that was obtained from the drive at -.I boot time, -if available. -This is a feature of modern IDE drives, -and may not be supported by older devices. +Display the identification info which the kernel drivers (IDE, libata) +have stored from boot/configuration time. This may differ from the +current information obtainable directly from the drive itself +with the +.B -I +flag. The data returned may or may not be current, depending on activity since booting the system. -However, the current multiple sector mode count is always shown. For a more detailed interpretation of the identification info, refer to -.I AT Attachment Interface for Disk Drives -(ANSI ASC X3T9.2 working draft, revision 4a, April 19/93). +.I AT Attachment Interface for Disk Drives, +ANSI ASC X3T9.2 working draft, revision 4a, April 19/93, and later editions. .TP .I -I Request identification info directly from the drive, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/hdparm.c new/hdparm-9.13/hdparm.c --- old/hdparm-9.12/hdparm.c 2009-02-26 19:10:22.000000000 +0100 +++ new/hdparm-9.13/hdparm.c 2009-03-21 14:08:12.000000000 +0100 @@ -1,9 +1,10 @@ /* hdparm.c - Command line interface to get/set hard disk parameters */ /* - by Mark Lord (C) 1994-2008 -- freely distributable */ #include <unistd.h> -#include <string.h> #include <stdlib.h> #include <stdio.h> +#define __USE_GNU /* for O_DIRECT */ +#include <string.h> #include <fcntl.h> #include <errno.h> #include <ctype.h> @@ -25,7 +26,7 @@ extern const char *minor_str[]; -#define VERSION "v9.12" +#define VERSION "v9.13" #ifndef O_DIRECT #define O_DIRECT 040000 /* direct disk access, not easily obtained from headers */ @@ -368,14 +369,26 @@ return nsects; } +static char *strip (char *s) +{ + char *e; + + while (*s == ' ') ++s; + for (e = s; *e && *++e != ' ';); + *e = '\0'; + return s; +} + static void dump_identity (__u16 *idw) { int i; char pmodes[64] = {0,}, dmodes[128]={0,}, umodes[128]={0,}; + char *model = strip(strndup((char *)&idw[27], 40)); + char *fwrev = strip(strndup((char *)&idw[23], 8)); + char *serno = strip(strndup((char *)&idw[10], 20)); __u8 tPIO; - printf("\n Model=%.40s, FwRev=%.8s, SerialNo=%.20s", - (char *)&idw[27], (char *)&idw[23], (char *)&idw[10]); + printf("\n Model=%.40s, FwRev=%.8s, SerialNo=%.20s", model, fwrev, serno); printf("\n Config={"); for (i = 0; i <= 15; i++) { if (idw[0] & (1<<i)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/hdparm.h new/hdparm-9.13/hdparm.h --- old/hdparm-9.12/hdparm.h 2009-01-29 20:31:51.000000000 +0100 +++ new/hdparm-9.13/hdparm.h 2009-03-21 14:13:36.000000000 +0100 @@ -1,5 +1,6 @@ /* Some prototypes for extern functions. */ +//#undef __KERNEL_STRICT_NAMES #include <linux/types.h> #if !defined(__GNUC__) && !defined(__attribute__) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/hdparm.lsm new/hdparm-9.13/hdparm.lsm --- old/hdparm-9.12/hdparm.lsm 2009-02-26 19:13:10.000000000 +0100 +++ new/hdparm-9.13/hdparm.lsm 2009-03-21 14:55:59.000000000 +0100 @@ -1,8 +1,9 @@ Begin4 Title: hdparm -Version: 9.12 -Entered-date: 2009-02-26 +Version: 9.13 +Entered-date: 2009-03-21 Description: hdparm - get/set hard disk parameters for Linux SATA/IDE drives. + v9.13 Fix --direct for arch's other than x86 (eg. arm); strip -i strings v9.12 Lots of -I updates, -C updates; -B now reports current APM setting v9.11 Fixed -I for ATAPI; added --prefer-ata12 for some USB enclosures v9.10 Fixes for CF card detection/reporting @@ -86,7 +87,7 @@ Maintained-by: mlord(a)pobox.com (Mark Lord) Primary-site: http://sourceforge.net/projects/hdparm/ Alternate-site: http://www.ibiblio.org/pub/Linux/system/hardware - 96K hdparm-9.12.tar.gz + 90K hdparm-9.13.tar.gz 4K hdparm.lsm Platforms: Linux, kernels 2.2 through 2.6 Copying-policy: BSD License diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/identify.c new/hdparm-9.13/identify.c --- old/hdparm-9.12/identify.c 2009-02-26 19:09:58.000000000 +0100 +++ new/hdparm-9.13/identify.c 2009-03-21 14:31:44.000000000 +0100 @@ -1,4 +1,5 @@ /* identify.c - by Mark Lord (C) 2000-2007 -- freely distributable */ + #include <stdio.h> #include <stdlib.h> #include <errno.h> @@ -10,7 +11,6 @@ #define __USE_XOPEN #endif -#include <unistd.h> #include "hdparm.h" /* device types */ @@ -113,8 +113,6 @@ #define VALID 0xc000 #define VALID_VAL 0x4000 /* many words are considered invalid if they are either all-0 or all-1 */ -#define NOVAL_0 0x0000 -#define NOVAL_1 0xffff /* word 0: gen_config */ #define NOT_ATA 0x8000 @@ -238,7 +236,7 @@ #define DEPTH_BITS 0x001f /* bits used for queue depth */ /* words 80-81: version numbers */ -/* NOVAL_0 or NOVAL_1 means device does not report version */ +/* 0x0000 or 0xffff means device does not report version */ /* word 81: minor version number */ #define MINOR_MAX 0x22 @@ -450,7 +448,7 @@ #define ERASE_BITS 0x00ff /* word 92: master password revision */ -/* NOVAL_0 or NOVAL_1 means no support for master password revision */ +/* 0x0000 or 0xffff means no support for master password revision */ /* word 93: hw reset result */ #define CBLID 0x2000 /* CBLID status */ @@ -507,7 +505,33 @@ #define SIG_VAL 0x00A5 /* signature value */ __u8 mode_loop(__u16 mode_sup, __u16 mode_sel, int cc, __u8 *have_mode); -void print_ascii(__u16 *p, __u8 length); + +static void print_ascii(__u16 *p, unsigned int length) { + __u8 ii; + char cl; + + /* find first non-space & print it */ + for (ii = 0; ii< length; ii++) { + if(((char) 0x00ff&((*p)>>8)) != ' ') break; + if((cl = (char) 0x00ff&(*p)) != ' ') { + if(cl != '\0') printf("%c",cl); + p++; ii++; + break; + } + p++; + } + /* print the rest */ + for (; ii < length; ii++) { + __u8 c; + /* some older devices have NULLs */ + c = (*p) >> 8; + if (c) putchar(c); + c = (*p); + if (c) putchar(c); + p++; + } + printf("\n"); +} // Given a known-supported ATA major revision, // return the lowest possible supported ATA revision. @@ -726,7 +750,7 @@ /* looks like when they up-issue the std, they obsolete one; * thus, only the newest 4 issues need be supported. * (That's what "kk" and "min_std" are all about) */ - if(val[MAJOR] && (val[MAJOR] != NOVAL_1)) { + if(val[MAJOR] && (val[MAJOR] != 0xffff)) { printf("\n\tSupported: "); jj = val[MAJOR] << 1; kk = min_ata_std(like_std); @@ -793,7 +817,7 @@ kk = 1; printf("\n\tUsed: ATAPI for CD-ROMs, SFF-8020i, r2.5"); } - if(val[CDR_MAJOR] && (val[CDR_MAJOR] != NOVAL_1)) { + if(val[CDR_MAJOR] && (val[CDR_MAJOR] != 0xffff)) { kk = 1; printf("\n\tSupported: CD-ROM ATAPI"); jj = val[CDR_MAJOR] >> 1; @@ -910,8 +934,8 @@ /* device cache/buffer size, if reported (obsolete field, but usually valid regardless) */ printf("\tcache/buffer size = "); - if (val[20] <= 3 && val[21] && val[21] != 0xffff) { - printf("%u KBytes", val[21] / 2); + if (val[20] <= 3 && val[BUF_SIZE] && val[BUF_SIZE] != 0xffff) { + printf("%u KBytes", val[BUF_SIZE] / 2); if (val[20]) printf(" (type=%s)", BuffType[val[20]]); } else { @@ -980,7 +1004,7 @@ printf("\n"); } jj = 0; - if((min_std == 1) && (val[BUF_SIZE] && (val[BUF_SIZE] != NOVAL_1))) { + if((min_std == 1) && (val[BUF_SIZE] && (val[BUF_SIZE] != 0xffff))) { printf("\tBuffer size: %.1fkB",(float)val[BUF_SIZE]/2); jj = 1; } @@ -1168,7 +1192,7 @@ if((eqpt != CDROM) && (like_std > 3) && (val[SECU_STATUS] || val[ERASE_TIME] || val[ENH_ERASE_TIME])) { printf("Security: \n"); - if(val[PSWD_CODE] && (val[PSWD_CODE] != NOVAL_1)) + if(val[PSWD_CODE] && (val[PSWD_CODE] != 0xffff)) printf("\tMaster password revision code = %u\n",val[PSWD_CODE]); jj = val[SECU_STATUS]; if(jj) { @@ -1327,33 +1351,6 @@ return err_dma; } -void print_ascii(__u16 *p, __u8 length) { - __u8 ii; - char cl; - - /* find first non-space & print it */ - for (ii = 0; ii< length; ii++) { - if(((char) 0x00ff&((*p)>>8)) != ' ') break; - if((cl = (char) 0x00ff&(*p)) != ' ') { - if(cl != '\0') printf("%c",cl); - p++; ii++; - break; - } - p++; - } - /* print the rest */ - for (; ii < length; ii++) { - __u8 c; - /* some older devices have NULLs */ - c = (*p) >> 8; - if (c) putchar(c); - c = (*p); - if (c) putchar(c); - p++; - } - printf("\n"); -} - void dco_identify_print (__u16 *dco) { __u64 lba; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hdparm-9.12/TODO new/hdparm-9.13/TODO --- old/hdparm-9.12/TODO 2008-02-17 20:19:48.000000000 +0100 +++ new/hdparm-9.13/TODO 2009-03-21 14:45:02.000000000 +0100 @@ -3,9 +3,7 @@ - Make parameter parsing/etc.. LBA48 safe everywhere (instead of merely u32). -- Implement the QDMA functions using /sys/ - -- More ATA8 updates for IDENTIFY data. +- ATA9 updates for IDENTIFY data. - Add "wipe-drive" functionality via SCT WRITE_SAME (or manual). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-webkitpart for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kde4-webkitpart for openSUSE:Factory checked in at Tue Mar 24 20:57:18 CET 2009. -------- --- KDE/kde4-webkitpart/kde4-webkitpart.changes 2009-02-19 11:30:34.000000000 +0100 +++ kde4-webkitpart/kde4-webkitpart.changes 2009-03-23 09:48:51.000000000 +0100 @@ -1,0 +2,9 @@ +Sat Mar 21 10:47:45 CET 2009 - beineri(a)opensuse.org + +- update to SVN 943033: + * Ctrl-click should also open link in new tab + * Add copy link location and save link to link context menu + * Save page / frame functionality + * Print frame functionality + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webkitpart-preference.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-webkitpart.spec ++++++ --- /var/tmp/diff_new_pack.nk2381/_old 2009-03-24 20:56:47.000000000 +0100 +++ /var/tmp/diff_new_pack.nk2381/_new 2009-03-24 20:56:47.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kde4-webkitpart (Version 4.2.0.svn928260) +# spec file for package kde4-webkitpart (Version 4.2.1.svn943033) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,11 +23,10 @@ License: LGPL v2.0 or later; LGPL v2.1 or later Group: System/GUI/KDE Summary: WebKit render engine for Konqueror -Version: 4.2.0.svn928260 +Version: 4.2.1.svn943033 Release: 1 Source0: libs.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch: webkitpart-preference.diff %kde4_runtime_requires %description @@ -43,6 +42,7 @@ License: LGPL v2.0 or later; LGPL v2.1 or later Group: System/GUI/KDE Summary: WebKit render engine for Konqueror +Requires: kde4-webkitpart = %version %description devel A HTML kparts component based on WebKit @@ -55,7 +55,6 @@ %prep %setup -q -n libs -#%patch %build %cmake_kde4 -d build @@ -76,11 +75,8 @@ %files %defattr(-,root,root) %_kde4_modules/webkitkdepart.so -%_libdir/libkdewebkit.so %_libdir/libkdewebkit.so.* -%_libdir/libkdenetwork.so %_libdir/libkdenetwork.so.* -%_libdir/libwebkitkde.so %_libdir/libwebkitkde.so.* %_kde_share_dir/apps/webkitpart %_kde_share_dir/services/webkitpart.desktop @@ -88,6 +84,9 @@ %files devel %defattr(-,root,root) +%_libdir/libkdewebkit.so +%_libdir/libkdenetwork.so +%_libdir/libwebkitkde.so /usr/include/KDE/KdeNetwork /usr/include/KDE/KdeWebKit /usr/include/kdenetwork @@ -99,6 +98,12 @@ %_kde_share_dir/apps/cmake/modules/FindWebKitPart.cmake %changelog +* Sat Mar 21 2009 beineri(a)opensuse.org +- update to SVN 943033: + * Ctrl-click should also open link in new tab + * Add copy link location and save link to link context menu + * Save page / frame functionality + * Print frame functionality * Thu Feb 19 2009 stbinner(a)suse.de - update to SVN 928260 * Wed Jan 07 2009 stbinner(a)suse.de ++++++ libs.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdenetwork/knetworkaccessmanager.cpp new/libs/webkitkde/kdenetwork/knetworkaccessmanager.cpp --- old/libs/webkitkde/kdenetwork/knetworkaccessmanager.cpp 2008-12-07 20:42:30.000000000 +0100 +++ new/libs/webkitkde/kdenetwork/knetworkaccessmanager.cpp 2009-03-23 09:39:26.000000000 +0100 @@ -85,16 +85,10 @@ return 0; } - KNetworkReply *reply = new KNetworkReply(req, kioJob, this); + KNetworkReply *reply = new KNetworkReply(op, req, kioJob, this); kioJob->addMetaData(metaDataForRequest(req)); - connect(kioJob, SIGNAL(data(KIO::Job *, const QByteArray &)), - reply, SLOT(appendData(KIO::Job *, const QByteArray &))); - connect(kioJob, SIGNAL(result(KJob *)), reply, SLOT(jobDone(KJob *))); - connect(kioJob, SIGNAL(mimetype(KIO::Job *, const QString&)), - reply, SLOT(setMimeType(KIO::Job *, const QString&))); - return reply; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdenetwork/knetworkreply.cpp new/libs/webkitkde/kdenetwork/knetworkreply.cpp --- old/libs/webkitkde/kdenetwork/knetworkreply.cpp 2009-01-19 08:48:47.000000000 +0100 +++ new/libs/webkitkde/kdenetwork/knetworkreply.cpp 2009-03-23 09:39:26.000000000 +0100 @@ -26,6 +26,7 @@ #include <KDebug> #include <KIO/Job> #include <KLocale> +#include <QSslConfiguration> #include <QTimer> @@ -41,17 +42,33 @@ bool m_metaDataRead; }; -KNetworkReply::KNetworkReply(const QNetworkRequest &request, KIO::Job *kioJob, QObject *parent) +KNetworkReply::KNetworkReply(const QNetworkAccessManager::Operation &op, const QNetworkRequest &request, KIO::Job *kioJob, QObject *parent) : QNetworkReply(parent), d(new KNetworkReply::KNetworkReplyPrivate()) { d->m_kioJob = kioJob; setRequest(request); setOpenMode(QIODevice::ReadOnly); + setUrl(request.url()); + setOperation(op); + + if (!request.sslConfiguration().isNull()) { + setSslConfiguration(request.sslConfiguration()); + kDebug() << "QSslConfiguration not supported (currently)."; + } if (!kioJob) { // a blocked request setError(QNetworkReply::OperationCanceledError, i18n("Blocked request.")); QTimer::singleShot(0, this, SIGNAL(finished())); + } else { + connect(kioJob, SIGNAL(redirection(KIO::Job*, const KUrl&)), SLOT(slotRedirection(KIO::Job*, const KUrl&))); + connect(kioJob, SIGNAL(permanentRedirection(KIO::Job*, const KUrl&, const KUrl&)), SLOT(slotPermanentRedirection(KIO::Job*, const KUrl&, const KUrl&))); + connect(kioJob, SIGNAL(percent(KJob*, unsigned long)), SLOT(slotPercent(KJob*, unsigned long))); + connect(kioJob, SIGNAL(data(KIO::Job *, const QByteArray &)), + SLOT(appendData(KIO::Job *, const QByteArray &))); + connect(kioJob, SIGNAL(result(KJob *)), SLOT(jobDone(KJob *))); + connect(kioJob, SIGNAL(mimetype(KIO::Job *, const QString&)), + SLOT(setMimeType(KIO::Job *, const QString&))); } } @@ -90,6 +107,10 @@ // kDebug(); if (!d->m_metaDataRead) { + const QString responseCode = kioJob->queryMetaData("responsecode"); + if (!responseCode.isEmpty()) + setAttribute(QNetworkRequest::HttpStatusCodeAttribute, responseCode.toInt()); + const QString headers = kioJob->queryMetaData("HTTP-Headers"); if (!headers.isEmpty()) { QStringList headerList = headers.split('\n'); @@ -122,48 +143,75 @@ { case 0: setError(QNetworkReply::NoError, errorString()); + kDebug() << "0 -> QNetworkReply::NoError"; break; case KIO::ERR_COULD_NOT_CONNECT: setError(QNetworkReply::ConnectionRefusedError, errorString()); + kDebug() << "KIO::ERR_COULD_NOT_CONNECT -> KIO::ERR_COULD_NOT_CONNECT"; break; case KIO::ERR_UNKNOWN_HOST: setError(QNetworkReply::HostNotFoundError, errorString()); + kDebug() << "KIO::ERR_UNKNOWN_HOST -> QNetworkReply::HostNotFoundError"; break; case KIO::ERR_SERVER_TIMEOUT: setError(QNetworkReply::TimeoutError, errorString()); + kDebug() << "KIO::ERR_SERVER_TIMEOUT -> QNetworkReply::TimeoutError"; break; case KIO::ERR_USER_CANCELED: case KIO::ERR_ABORTED: setError(QNetworkReply::OperationCanceledError, errorString()); + kDebug() << "KIO::ERR_ABORTED -> QNetworkReply::OperationCanceledError"; break; case KIO::ERR_UNKNOWN_PROXY_HOST: setError(QNetworkReply::ProxyNotFoundError, errorString()); + kDebug() << "KIO::UNKNOWN_PROXY_HOST -> QNetworkReply::ProxyNotFoundError"; break; case KIO::ERR_ACCESS_DENIED: setError(QNetworkReply::ContentAccessDenied, errorString()); + kDebug() << "KIO::ERR_ACCESS_DENIED -> QNetworkReply::ContentAccessDenied"; break; case KIO::ERR_WRITE_ACCESS_DENIED: setError(QNetworkReply::ContentOperationNotPermittedError, errorString()); + kDebug() << "KIO::ERR_WRITE_ACCESS_DENIED -> QNetworkReply::ContentOperationNotPermittedError"; break; case KIO::ERR_NO_CONTENT: case KIO::ERR_DOES_NOT_EXIST: setError(QNetworkReply::ContentNotFoundError, errorString()); + kDebug() << "KIO::ERR_DOES_NOT_EXIST -> QNetworkReply::ContentNotFoundError"; break; case KIO::ERR_COULD_NOT_AUTHENTICATE: setError(QNetworkReply::AuthenticationRequiredError, errorString()); + kDebug() << kJob->error(); break; case KIO::ERR_UNSUPPORTED_PROTOCOL: case KIO::ERR_NO_SOURCE_PROTOCOL: setError(QNetworkReply::ProtocolUnknownError, errorString()); + kDebug() << kJob->error(); break; case KIO::ERR_UNSUPPORTED_ACTION: setError(QNetworkReply::ProtocolInvalidOperationError, errorString()); + kDebug() << kJob->error(); break; default: setError(QNetworkReply::UnknownNetworkError, errorString()); + kDebug() << kJob->error(); } emit finished(); } +void KNetworkReply::slotRedirection(KIO::Job* job, const KUrl& url) +{ + job->kill(); + d->m_kioJob=0; + setAttribute(QNetworkRequest::RedirectionTargetAttribute, url); + emit finished(); +} + +void KNetworkReply::slotPercent(KJob *job, unsigned long percent) +{ + qulonglong kiloBytes = job->totalAmount(KJob::Bytes) / 2046; + emit downloadProgress(kiloBytes / ((double)percent / 100), kiloBytes); +} + #include "knetworkreply.moc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdenetwork/knetworkreply.h new/libs/webkitkde/kdenetwork/knetworkreply.h --- old/libs/webkitkde/kdenetwork/knetworkreply.h 2009-01-19 08:48:47.000000000 +0100 +++ new/libs/webkitkde/kdenetwork/knetworkreply.h 2009-03-23 09:39:26.000000000 +0100 @@ -32,12 +32,13 @@ class Job; } class KJob; +class KUrl; class KDE_EXPORT KNetworkReply : public QNetworkReply { Q_OBJECT public: - KNetworkReply(const QNetworkRequest &request, KIO::Job *kioJob, QObject *parent); + KNetworkReply(const QNetworkAccessManager::Operation &op, const QNetworkRequest &request, KIO::Job *kioJob, QObject *parent); virtual ~KNetworkReply(); virtual qint64 bytesAvailable() const; virtual void abort(); @@ -49,6 +50,14 @@ protected: virtual qint64 readData(char *data, qint64 maxSize); + +private Q_SLOTS: + void slotRedirection(KIO::Job *job, const KUrl &url); + void slotPercent(KJob *job, unsigned long percent); + inline void slotPermanentRedirection(KIO::Job *job, const KUrl &fromUrl, const KUrl &toUrl) { + Q_UNUSED(fromUrl); + slotRedirection(job, toUrl); + } private: class KNetworkReplyPrivate; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebpage.cpp new/libs/webkitkde/kdewebkit/kwebpage.cpp --- old/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-02-19 09:11:07.000000000 +0100 +++ new/libs/webkitkde/kdewebkit/kwebpage.cpp 2009-03-23 09:39:25.000000000 +0100 @@ -54,7 +54,7 @@ virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0) { if (WebKitSettings::self()->isAdFilterEnabled() && WebKitSettings::self()->isAdFiltered(req.url().toString())) { - return new KNetworkReply(req, 0, this); + return new KNetworkReply(KNetworkAccessManager::Operation(), req, 0, this); } return KNetworkAccessManager::createRequest(op, req, outgoingData); } @@ -63,11 +63,7 @@ class KWebPage::KWebPagePrivate { public: - KWebPagePrivate() - : unsupportedContent(false) - {} - - bool unsupportedContent; + KWebPagePrivate() {} }; KWebPage::KWebPage(QObject *parent) @@ -180,9 +176,6 @@ void KWebPage::slotHandleUnsupportedContent(QNetworkReply *reply) { - if (customUnsupportedContent()) { - return customUnsupportedContent(reply); - } const KUrl url(reply->request().url()); kDebug() << "title:" << url; kDebug() << "error:" << reply->errorString(); @@ -247,7 +240,8 @@ } if (downloadViaKIO) { - const QString destUrl = KFileDialog::getOpenFileName(url.fileName(), QString(), view()); + const QString destUrl = KFileDialog::getSaveFileName(url.fileName(), QString(), view()); + if (destUrl.isEmpty()) return; KIO::Job *job = KIO::file_copy(url, KUrl(destUrl), -1, KIO::Overwrite); //job->setMetaData(metadata); //TODO: add metadata from request job->addMetaData("MaxCacheSize", "0"); // Don't store in http cache. @@ -269,13 +263,3 @@ return 0; } -void KWebPage::setCustomUnsupportedContent(bool forward) -{ - d->unsupportedContent = forward; -} - -bool KWebPage::customUnsupportedContent() const -{ - return d->unsupportedContent; -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebpage.h new/libs/webkitkde/kdewebkit/kwebpage.h --- old/libs/webkitkde/kdewebkit/kwebpage.h 2008-12-21 13:05:27.000000000 +0100 +++ new/libs/webkitkde/kdewebkit/kwebpage.h 2009-03-23 09:39:25.000000000 +0100 @@ -25,6 +25,7 @@ #define KWEBPAGE_H #include <kdemacros.h> +#include <KUrl> #include <QtWebKit/QWebPage> @@ -36,11 +37,6 @@ public: KWebPage(QObject *parent); ~KWebPage(); - void setCustomUnsupportedContent(bool forward); - bool customUnsupportedContent() const; - -Q_SIGNALS: - void customUnsupportedContent(QNetworkReply *reply); protected: virtual KWebPage *createWindow(WebWindowType type); @@ -54,8 +50,8 @@ QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues); protected Q_SLOTS: - void slotHandleUnsupportedContent(QNetworkReply *reply); - void slotDownloadRequested(const QNetworkRequest &request); + virtual void slotHandleUnsupportedContent(QNetworkReply *reply); + virtual void slotDownloadRequested(const QNetworkRequest &request); private: class KWebPagePrivate; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebview.cpp new/libs/webkitkde/kdewebkit/kwebview.cpp --- old/libs/webkitkde/kdewebkit/kwebview.cpp 2008-12-21 13:05:27.000000000 +0100 +++ new/libs/webkitkde/kdewebkit/kwebview.cpp 2009-03-23 09:39:25.000000000 +0100 @@ -113,8 +113,9 @@ { const QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos()); const QUrl url = result.linkUrl(); - if (!url.isEmpty() && (d->pressedButtons & Qt::MidButton)) { - kDebug() << "middle clicked url" << url; + if (!url.isEmpty() && ((d->pressedButtons & Qt::MidButton) || + ((d->pressedButtons & Qt::LeftButton) && (d->keyboardModifiers & Qt::ControlModifier)))) { + kDebug() << "middle clicked or ctrl-clicked url" << url; emit openUrlInNewTab(url); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/kwebview.h new/libs/webkitkde/kdewebkit/kwebview.h --- old/libs/webkitkde/kdewebkit/kwebview.h 2008-09-20 01:36:05.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/kwebview.h 2009-03-23 09:39:25.000000000 +0100 @@ -59,10 +59,10 @@ void mouseReleaseEvent(QMouseEvent *event); protected Q_SLOTS: - void slotFindNextClicked(); - void slotFindPreviousClicked(); - void slotSearchChanged(const QString &); - void resultSearch(KWebPage::FindFlags flags); + virtual void slotFindNextClicked(); + virtual void slotFindPreviousClicked(); + virtual void slotSearchChanged(const QString &); + virtual void resultSearch(KWebPage::FindFlags flags); private: class KWebViewPrivate; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp new/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp --- old/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp 2008-10-11 14:13:02.000000000 +0200 +++ new/libs/webkitkde/kdewebkit/settings/webkitsettings.cpp 2009-03-23 09:39:25.000000000 +0100 @@ -653,8 +653,11 @@ QWebSettings::globalSettings()->setFontFamily(QWebSettings::SansSerifFont, sansSerifFontName()); QWebSettings::globalSettings()->setFontFamily(QWebSettings::CursiveFont, cursiveFontName()); QWebSettings::globalSettings()->setFontFamily(QWebSettings::FantasyFont, fantasyFontName()); - QWebSettings::globalSettings()->setFontSize(QWebSettings::MinimumFontSize, minFontSize()); - QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFontSize, mediumFontSize()); + + // These numbers were generated by trial and error. I started with 1.5, and that fixed most pages, but + // it made Google and KDE.org right, and Wikipedia a bit too big. 1.45 seems to work okay. + QWebSettings::globalSettings()->setFontSize(QWebSettings::MinimumFontSize, minFontSize() * 1.45); + QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFontSize, mediumFontSize() * 1.45); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/Messages.sh new/libs/webkitkde/Messages.sh --- old/libs/webkitkde/Messages.sh 2008-11-26 08:58:56.000000000 +0100 +++ new/libs/webkitkde/Messages.sh 2009-03-23 09:39:26.000000000 +0100 @@ -1,5 +1,4 @@ #! /usr/bin/env bash -$EXTRACTRC */*.ui >> rc.cpp || exit 11 -$EXTRACTRC */*.rc >> rc.cpp || exit 12 -$XGETTEXT */*.cpp -o $podir/webkitkde.pot +$EXTRACTRC `find . -name '*.rc' -or -name '*.ui'` >> rc.cpp || exit 11 +$XGETTEXT `find . -name '*.cpp'` -o $podir/webkitkde.pot rm -f rc.cpp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.cpp new/libs/webkitkde/part/webkitpart.cpp --- old/libs/webkitkde/part/webkitpart.cpp 2009-01-26 00:46:40.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.cpp 2009-03-23 09:39:24.000000000 +0100 @@ -25,6 +25,7 @@ #include "webkitpart.h" #include "webview.h" +#include "webpage.h" #include <KDE/KParts/GenericFactory> #include <KDE/KParts/Plugin> @@ -101,7 +102,18 @@ void WebKitPart::initAction() { - KAction *action = new KAction(KIcon("format-font-size-more"), i18n("Enlarge Font"), this); + KAction *action = actionCollection()->addAction(KStandardAction::SaveAs, "saveDocument", + m_browserExtension, SLOT(slotSaveDocument())); + + action = new KAction(i18n("Save &Frame As..."), this); + actionCollection()->addAction("saveFrame", action); + connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(slotSaveFrame())); + + action = new KAction(KIcon("document-print-frame"), i18n("Print Frame..."), this); + actionCollection()->addAction("printFrame", action); + connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(printFrame())); + + action = new KAction(KIcon("format-font-size-more"), i18n("Enlarge Font"), this); actionCollection()->addAction("incFontSizes", action); action->setShortcut(KShortcut("CTRL++; CTRL+=")); connect(action, SIGNAL(triggered(bool)), m_browserExtension, SLOT(zoomIn())); @@ -225,6 +237,16 @@ part->view()->page()->triggerAction(KWebPage::Paste); } +void WebKitBrowserExtension::slotSaveDocument() +{ + qobject_cast<WebPage*>(part->view()->page())->saveUrl(part->view()->url()); +} + +void WebKitBrowserExtension::slotSaveFrame() +{ + qobject_cast<WebPage*>(part->view()->page())->saveUrl(part->view()->page()->currentFrame()->url()); +} + void WebKitBrowserExtension::print() { QPrintPreviewDialog dlg(part->view()); @@ -233,6 +255,14 @@ dlg.exec(); } +void WebKitBrowserExtension::printFrame() +{ + QPrintPreviewDialog dlg(part->view()); + connect(&dlg, SIGNAL(paintRequested(QPrinter *)), + part->view()->page()->currentFrame(), SLOT(print(QPrinter *))); + dlg.exec(); +} + void WebKitBrowserExtension::updateEditActions() { KWebPage *page = part->view()->page(); @@ -270,22 +300,22 @@ #if QT_VERSION < 0x040500 part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() * 2); #else - part->view()->setZoomFactor(part->view()->zoomFactor() * 2); + part->view()->setZoomFactor(part->view()->zoomFactor() * 1.25); #endif } void WebKitBrowserExtension::zoomOut() { #if QT_VERSION < 0x040500 - part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() / 2); + part->view()->setTextSizeMultiplier(part->view()->textSizeMultiplier() * 2); #else - part->view()->setZoomFactor(part->view()->zoomFactor() / 2); + part->view()->setZoomFactor(part->view()->zoomFactor() * 0.8); #endif } void WebKitBrowserExtension::slotSelectAll() { -#if QT_VERSION >= 0x040600 +#if QT_VERSION >= 0x040500 part->view()->page()->triggerAction(KWebPage::SelectAll); #endif } @@ -354,6 +384,25 @@ QApplication::clipboard()->setMimeData(mimeData, QClipboard::Selection); } +void WebKitBrowserExtension::slotCopyLinkLocation() +{ + KUrl safeURL(part->view()->contextMenuResult().linkUrl()); + safeURL.setPass(QString()); + // Set it in both the mouse selection and in the clipboard + QMimeData* mimeData = new QMimeData; + safeURL.populateMimeData(mimeData); + QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard); + + mimeData = new QMimeData; + safeURL.populateMimeData(mimeData); + QApplication::clipboard()->setMimeData(mimeData, QClipboard::Selection); +} + +void WebKitBrowserExtension::slotSaveLinkAs() +{ + qobject_cast<WebPage*>(part->view()->page())->saveUrl(part->view()->contextMenuResult().linkUrl()); +} + void WebKitBrowserExtension::slotViewDocumentSource() { //TODO test http requests diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.desktop new/libs/webkitkde/part/webkitpart.desktop --- old/libs/webkitkde/part/webkitpart.desktop 2009-02-13 14:09:40.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.desktop 2009-03-23 09:39:24.000000000 +0100 @@ -3,10 +3,12 @@ Comment=Embeddable HTML component Comment[de]=Einbettungsfähige HTML-Komponente Comment[es]=Componente de HTML empotrable +Comment[et]=Põimitav HTML-komponent Comment[fr]=Composant HTML intégrable Comment[ga]=Comhpháirt Inleabaithe HTML -Comment[gl]=Componente HTML integrábel +Comment[gl]=Compoñente HTML integrábel Comment[km]=សមាសធាតុ HTML ដែលអាចបង្កប់បាន +Comment[lt]=Įdedamas HTML komponentas Comment[nds]=Inbettbor HTML-Komponent Comment[nl]=Inbedbare HTML-component Comment[pa]=ਇੰਬੈੱਡਡ HTML ਭਾਗ @@ -14,6 +16,7 @@ Comment[pt_BR]=Componente HTML que pode ser embutido Comment[ro]=Componentă HTML înglobată Comment[sv]=Inbäddningsbar HTML-komponent +Comment[th]=องค์ประกอบ HTML ที่สามารถฝังได้ Comment[tr]=Gömülebilir HTML bileşeni Comment[uk]=Вмонтований HTML-компонент Comment[x-test]=xxEmbeddable HTML componentxx diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.h new/libs/webkitkde/part/webkitpart.h --- old/libs/webkitkde/part/webkitpart.h 2009-01-18 11:06:51.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.h 2009-03-23 09:39:24.000000000 +0100 @@ -74,7 +74,10 @@ void cut(); void copy(); void paste(); + void slotSaveDocument(); + void slotSaveFrame(); void print(); + void printFrame(); void searchProvider(); void zoomIn(); @@ -89,6 +92,9 @@ void slotSendImage(); void slotCopyImage(); + void slotCopyLinkLocation(); + void slotSaveLinkAs(); + void slotViewDocumentSource(); private Q_SLOTS: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webkitpart.rc new/libs/webkitkde/part/webkitpart.rc --- old/libs/webkitkde/part/webkitpart.rc 2009-01-25 18:32:52.000000000 +0100 +++ new/libs/webkitkde/part/webkitpart.rc 2009-03-23 09:39:24.000000000 +0100 @@ -1,12 +1,18 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="webkitpart" version="3"> +<kpartgui name="webkitpart" version="5"> <MenuBar> - <Menu name="edit"><text>&Edit</text> + <Menu name="file"> + <Action name="saveDocument" /> + <Action name="saveFrame" /> + <Separator /> + <Action name="printFrame" group="print" /> + </Menu> + <Menu name="edit"> <Action name="selectAll" /> <Separator /> <Action name="find" /> </Menu> - <Menu name="view"><text>&View</text> + <Menu name="view"> <Action name="incFontSizes" /> <Action name="decFontSizes" /> <Action name="viewDocumentSource" /> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webpage.cpp new/libs/webkitkde/part/webpage.cpp --- old/libs/webkitkde/part/webpage.cpp 2008-12-21 13:05:27.000000000 +0100 +++ new/libs/webkitkde/part/webpage.cpp 2009-03-23 09:39:24.000000000 +0100 @@ -56,9 +56,6 @@ this, SLOT(slotWindowCloseRequested())); connect(this, SIGNAL(statusBarMessage(const QString &)), this, SLOT(slotStatusBarMessage(const QString &))); - - setCustomUnsupportedContent(true); - connect(this, SIGNAL(customUnsupportedContent(QNetworkReply *)), this, SLOT(slotHandleUnsupportedContent(QNetworkReply *))); } bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, @@ -161,3 +158,7 @@ emit m_part->browserExtension()->openUrlRequest(url, args, KParts::BrowserArguments()); } +void WebPage::saveUrl(const KUrl &url) +{ + slotDownloadRequested(QNetworkRequest(url)); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webpage.h new/libs/webkitkde/part/webpage.h --- old/libs/webkitkde/part/webpage.h 2008-12-08 02:10:43.000000000 +0100 +++ new/libs/webkitkde/part/webpage.h 2009-03-23 09:39:24.000000000 +0100 @@ -36,6 +36,8 @@ public: WebPage(WebKitPart *wpart, QWidget *parent); + void saveUrl(const KUrl &url); + protected: virtual bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libs/webkitkde/part/webview.cpp new/libs/webkitkde/part/webview.cpp --- old/libs/webkitkde/part/webview.cpp 2008-10-03 03:39:21.000000000 +0200 +++ new/libs/webkitkde/part/webview.cpp 2009-03-23 09:39:24.000000000 +0100 @@ -151,6 +151,10 @@ } if (d->result.linkUrl().isEmpty()) { + QAction *separatorAction = new QAction(this); + separatorAction->setSeparator(true); + partActions.append(separatorAction); + QAction* action = d->part->actionCollection()->action("viewDocumentSource"); partActions.append(action); } @@ -188,9 +192,27 @@ void WebView::linkActionPopupMenu(KParts::BrowserExtension::ActionGroupMap &linkGroupMap) { - // TODO: Add something to this. - QList<QAction *>linkActions; Q_ASSERT(!d->result.linkUrl().isEmpty()); + + const KUrl url(d->result.linkUrl()); + + QList<QAction *>linkActions; + if (url.protocol() == "mailto") { + KAction *action = new KAction(i18n("&Copy Email Address"), this); + d->actionCollection->addAction("copylinklocation", action); + connect(action, SIGNAL(triggered(bool)), d->part->browserExtension(), SLOT(slotCopyLinkLocation())); + linkActions.append(action); + } else { + KAction *action = new KAction(i18n("&Save Link As..."), this); + d->actionCollection->addAction("savelinkas", action); + connect(action, SIGNAL(triggered(bool)), d->part->browserExtension(), SLOT(slotSaveLinkAs())); + linkActions.append(action); + + action = new KAction(i18n("&Copy Link Address"), this); + d->actionCollection->addAction("copylinklocation", action); + connect(action, SIGNAL(triggered(bool)), d->part->browserExtension(), SLOT(slotCopyLinkLocation())); + linkActions.append(action); + } linkGroupMap.insert("linkactions", linkActions); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4 for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at Tue Mar 24 20:56:38 CET 2009. -------- --- KDE/kdebase4/kdebase4.changes 2009-02-27 01:41:06.000000000 +0100 +++ kdebase4/kdebase4.changes 2009-03-22 08:22:32.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 16 20:13:23 CET 2009 - coolo(a)suse.de + +- update 4_2_BRANCH.diff + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.L25822/_old 2009-03-24 20:49:41.000000000 +0100 +++ /var/tmp/diff_new_pack.L25822/_new 2009-03-24 20:49:41.000000000 +0100 @@ -33,7 +33,7 @@ Summary: The Base KDE Apps Url: http://www.kde.org/ Version: 4.2.1 -Release: 1 +Release: 2 Source0: kdebase-%version.tar.bz2 Source1: _upstream Source2: rpmlintrc @@ -482,6 +482,8 @@ /usr/share/kde4/services/plasma-applet-folderview.desktop %changelog +* Mon Mar 16 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff * Fri Feb 27 2009 dmueller(a)suse.de - update to 4.2.1 * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php ++++++ 4_2_BRANCH.diff ++++++ ++++ 1088 lines (skipped) ++++ between KDE/kdebase4/4_2_BRANCH.diff ++++ and kdebase4/4_2_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rsync for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package rsync for openSUSE:Factory checked in at Tue Mar 24 20:49:31 CET 2009. -------- --- rsync/rsync.changes 2009-02-19 15:05:33.000000000 +0100 +++ rsync/rsync.changes 2009-03-24 11:19:34.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Mar 24 11:16:57 CET 2009 - puzel(a)suse.cz + +- add rsync-3.0.5-doc-fix.patch (bnc#487591) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rsync-3.0.5-doc-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rsync.spec ++++++ --- /var/tmp/diff_new_pack.x22444/_old 2009-03-24 20:47:33.000000000 +0100 +++ /var/tmp/diff_new_pack.x22444/_new 2009-03-24 20:47:33.000000000 +0100 @@ -32,7 +32,7 @@ PreReq: %fillup_prereq %insserv_prereq sed grep AutoReqProv: on Version: 3.0.5 -Release: 1 +Release: 2 Summary: Replacement for RCP/mirror that has Many More Features Source: %{name}-%{version}.tar.bz2 Source1: %{name}-patches-%{version}.tar.bz2 @@ -43,6 +43,8 @@ Source6: rsyncd.secrets Source7: rsync-server.firewall Patch3: system-zlib.diff +#PATCH-FIX-UPSTREAM rsync-3.0.5-doc-fix.patch bnc487591 petr.uzel(a)suse.cz -- based on upstream changes to rsync.yo +Patch4: rsync-3.0.5-doc-fix.patch Url: http://rsync.samba.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define with_system_zlib 0 @@ -74,6 +76,7 @@ patch -p1 < patches/acls.diff patch -p1 < patches/xattrs.diff patch -p1 < patches/slp.diff +%patch4 -p1 %build autoheader @@ -136,6 +139,8 @@ %doc COPYING NEWS README tech_report.ps tech_report.tex %changelog +* Tue Mar 24 2009 puzel(a)suse.cz +- add rsync-3.0.5-doc-fix.patch (bnc#487591) * Thu Feb 19 2009 puzel(a)suse.cz - update to 3.0.5 - initialize xattr data in a couple spots in the hlink code, which avoids a ++++++ rsync-3.0.5-doc-fix.patch ++++++ Index: rsync-3.0.5/rsync.1 =================================================================== --- rsync-3.0.5.orig/rsync.1 2008-12-29 03:03:37.000000000 +0100 +++ rsync-3.0.5/rsync.1 2009-03-24 11:12:00.000000000 +0100 @@ -442,8 +442,8 @@ \-\-remove\-source\-files sender removes synchronized files (non-dir) \-\-del an alias for \-\-delete\-during \-\-delete delete extraneous files from dest dirs - \-\-delete\-before receiver deletes before transfer (default) - \-\-delete\-during receiver deletes during xfer, not before + \-\-delete\-before receiver deletes before xfer, not during + \-\-delete\-during receiver deletes during transfer (default) \-\-delete\-delay find deletions during, delete after \-\-delete\-after receiver deletes after transfer, not before \-\-delete\-excluded also delete excluded files from dest dirs ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit openobex for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package openobex for openSUSE:Factory checked in at Tue Mar 24 20:47:27 CET 2009. -------- --- openobex/openobex.changes 2009-02-23 04:48:21.000000000 +0100 +++ openobex/openobex.changes 2009-03-23 16:57:44.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Mar 23 16:57:35 CET 2009 - crrodriguez(a)suse.de + +- fix pkgconfig file + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- openobex-1.3-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openobex.spec ++++++ --- /var/tmp/diff_new_pack.e21692/_old 2009-03-24 20:47:08.000000000 +0100 +++ /var/tmp/diff_new_pack.e21692/_new 2009-03-24 20:47:08.000000000 +0100 @@ -23,12 +23,13 @@ License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/Other Version: 1.3 -Release: 158 +Release: 159 Summary: Open Source Implementation of the Object Exchange (OBEX) Protocol Url: http://openobex.sourceforge.net/ Source: %{name}-%{version}.tar.bz2 Patch: openobex-svn.patch Patch1: openobex-libusb-check.patch +Patch2: openobex-1.3-pkgconfig.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -135,6 +136,7 @@ %setup -q %patch -p1 %patch1 +%patch2 %build autoreconf -f -i -v @@ -192,6 +194,8 @@ %{_libdir}/pkgconfig/openobex-glib.pc %changelog +* Mon Mar 23 2009 crrodriguez(a)suse.de +- fix pkgconfig file * Mon Feb 23 2009 crrodriguez(a)suse.de - remove static libraries and "la" files - fix -devel package deps ++++++ openobex-1.3-pkgconfig.patch ++++++ Index: openobex.pc.in =================================================================== --- openobex.pc.in.orig 2009-03-23 16:03:41.000000000 +0100 +++ openobex.pc.in 2009-03-23 16:47:29.000000000 +0100 @@ -6,6 +6,6 @@ includedir=@includedir@ Name: OpenOBEX Description: Free implementation of the Object Exchange protocol Version: @VERSION@ -Requires.private: @REQUIRES@ +#Requires.private: @REQUIRES@ Libs: -L${libdir} -lopenobex Cflags: -I${includedir} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xemacs for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package xemacs for openSUSE:Factory checked in at Tue Mar 24 20:46:54 CET 2009. -------- --- xemacs/xemacs.changes 2009-01-20 12:48:17.000000000 +0100 +++ xemacs/xemacs.changes 2009-02-23 14:34:09.000000000 +0100 @@ -1,0 +2,18 @@ +Mon Feb 23 12:26:40 CET 2009 - maiku.fabian(a)gmail.com + +- add menus-always-utf8.patch to make the menus work in UTF-8 + locales with Xft. The patch is not yet perfect, it doesn't yet + work for the non-Xft case. +- disable the hack in site-start.el to support extra Unicode + characters. Something similar has been implemented upstream + and this hack now causes problems when trying to attach some PDF + files in Gnus. +- mark /etc/skel/.xemacs/init.el as %config. +- remove checks for obsolte suse versions. +- set font resources for Xft in /usr/share/X11/app-defaults/XEmacs: + XEmacs*Tabs.fcFontName: sans-serif + XEmacs*menubar.fcFontName: sans-serif + XEmacs*modeline.attributeFont: sans-serif + XEmacs*default.attributeFont: sans-serif + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xemacs-21.4.8-app-defaults.patch New: ---- menus-always-utf8.patch xemacs-app-defaults.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xemacs.spec ++++++ --- /var/tmp/diff_new_pack.EG4979/_old 2009-03-24 20:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.EG4979/_new 2009-03-24 20:36:23.000000000 +0100 @@ -44,7 +44,7 @@ Conflicts: gnuserv AutoReqProv: on Version: 21.5.28.20080401 -Release: 60 +Release: 61 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -77,7 +77,7 @@ Source7: skel.init.el Patch0: xemacs.patch # keep in sync with the similar patch to the app-defaults in the main xemacs-packages package: -Patch3: xemacs-21.4.8-app-defaults.patch +Patch3: xemacs-app-defaults.patch Patch5: xemacs-21.4.4-font-menu.patch Patch13: xemacs-ia64.dif Patch14: ndbm.patch @@ -101,6 +101,7 @@ Patch47: xaw3d-config.patch Patch48: fix-window-configuration-problem.patch Patch49: xemacs-configure.patch +Patch50: menus-always-utf8.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch Patch432404: bnc432404-bytecomp.diff @@ -171,7 +172,7 @@ %prep %setup -q -n xemacs-%{version} -%patch3 -p0 -b .appdef +%patch3 -p1 #%patch5 -p1 -b .fontmenu # appears to be not needed anymore %patch13 -p1 %patch14 -p1 @@ -197,6 +198,7 @@ %patch47 %patch48 -p1 %patch49 +%patch50 -p1 %patch292811 -p1 %patch301352 -p1 %patch432404 -p1 @@ -209,11 +211,7 @@ %define enable_pdump 1 %endif %define enable_dump_in_exec 0 -%if %suse_version > 1010 %define enable_xft 0%{?opensuse_bs} -%else -%define enable_xft 0 -%endif find . -name CVS -type d | xargs rm -rf find . -name .cvsignore -type f | xargs rm -f chmod -R u+w * @@ -318,7 +316,7 @@ --enable-pdump=no \ %endif %if %enable_xft - --with-xft=emacs,tabs,gauges \ + --with-xft=emacs,menubars,tabs,gauges \ %endif " # @@ -351,6 +349,8 @@ # # Mule # +MULE="--enable-mule \ + --with-xim=xlib \ # --with-xfs Compile with XFontSet support for bilingual menubar. # Can't use this option with --with-xim=motif or xlib. # And should have --with-menubars=lucid. @@ -359,10 +359,9 @@ # and Romanian texts in the menus. It DOES work with # --with-xim=xlib, the above comment from './configure --help' # seems to be incorrect in that respect.) -# -MULE="--enable-mule \ - --with-xim=xlib \ +%if ! %enable_xft --with-xfs \ +%endif " # # Compilation @@ -508,9 +507,7 @@ %post %run_permissions %verifyscript -%if %suse_version > 920 %verify_permissions -e %{xbindir}/xemacs -e /var/lib/xemacs/lock -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -518,11 +515,9 @@ %files -f xe-list-el-without-elc_xe-list-elc-without-el_xe-list-elc-with-el %defattr(-,root,root) %dir /etc/skel/.xemacs -/etc/skel/.xemacs/init.el +%config /etc/skel/.xemacs/init.el /usr/share/applications/xemacs.desktop -%if %suse_version > 920 /usr/share/pixmaps/xemacs.png -%endif %{xbindir}/ellcc %{xbindir}/gnuattach %{xbindir}/gnuclient @@ -603,6 +598,21 @@ %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Mon Feb 23 2009 maiku.fabian(a)gmail.com +- add menus-always-utf8.patch to make the menus work in UTF-8 + locales with Xft. The patch is not yet perfect, it doesn't yet + work for the non-Xft case. +- disable the hack in site-start.el to support extra Unicode + characters. Something similar has been implemented upstream + and this hack now causes problems when trying to attach some PDF + files in Gnus. +- mark /etc/skel/.xemacs/init.el as %%config. +- remove checks for obsolte suse versions. +- set font resources for Xft in /usr/share/X11/app-defaults/XEmacs: + XEmacs*Tabs.fcFontName: sans-serif + XEmacs*menubar.fcFontName: sans-serif + XEmacs*modeline.attributeFont: sans-serif + XEmacs*default.attributeFont: sans-serif * Tue Jan 20 2009 mfabian(a)suse.de - bnc#461244: change menu font set in app-defaults to use only -*-helvetica-*. This avoids matching the huge Chinese ++++++ menus-always-utf8.patch ++++++ diff -ru xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c xemacs-21.5.28.20080401/lwlib/xlwmenu.c --- xemacs-21.5.28.20080401.orig//lwlib/xlwmenu.c 2008-04-01 19:40:35.000000000 +0200 +++ xemacs-21.5.28.20080401/lwlib/xlwmenu.c 2009-01-21 18:01:16.000000000 +0100 @@ -332,12 +332,12 @@ #else # ifdef USE_XFONTSET XRectangle ri, rl; - XmbTextExtents (mw->menu.font_set, s, strlen (s), &ri, &rl); + Xutf8TextExtents (mw->menu.font_set, s, strlen (s), &ri, &rl); return rl.width; # else #ifdef USE_XFT_MENUBARS XGlyphInfo glyphinfo; - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, strlen (s), &glyphinfo); return glyphinfo.xOff; #else @@ -424,11 +424,11 @@ return width; #else # ifdef USE_XFONTSET - XmbTextExtents (mw->menu.font_set, newchars, j, &ri, &rl); + Xutf8TextExtents (mw->menu.font_set, newchars, j, &ri, &rl); return rl.width; # else /* ! USE_XFONTSET */ #ifdef USE_XFT_MENUBARS - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, + XftTextExtentsUtf8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, j, &glyphinfo); return glyphinfo.xOff; #else @@ -758,7 +758,7 @@ { static XGlyphInfo glyphinfo; - XftTextExtents8 (dpy, + XftTextExtentsUtf8 (dpy, xft_font, (FcChar8 *) run, len, &glyphinfo); return glyphinfo.xOff; @@ -805,12 +805,12 @@ x_xft_text_width (display, renderFont, string, strlen (string)), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ - XftDrawString8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, + XftDrawStringUtf8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, (FcChar8 *) string, strlen (string)); XftDrawDestroy (xftDraw); # else # ifdef USE_XFONTSET - XmbDrawString (XtDisplay (mw), window, mw->menu.font_set, gc, + Xutf8DrawString (XtDisplay (mw), window, mw->menu.font_set, gc, x, y + mw->menu.font_ascent, string, strlen (string)); # else XDrawString (XtDisplay (mw), window, gc, @@ -866,10 +866,10 @@ if (end <= start) return 0; - XmbDrawString ( + Xutf8DrawString ( XtDisplay (mw), window, mw->menu.font_set, gc, x, y + mw->menu.font_ascent, &string[start], end - start); - XmbTextExtents ( + Xutf8TextExtents ( mw->menu.font_set, &string[start], end - start, &ri, &rl); return rl.width; # else @@ -892,12 +892,12 @@ renderFont, &string[start], end - start), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ - XftDrawString8 (xftDraw, color, renderFont, + XftDrawStringUtf8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, (FcChar8 *) &string[start], end - start); - XftTextExtents8 (display, renderFont, (FcChar8 *) &string[start], - end - start, &glyphinfo); + XftTextExtentsUtf8 (display, renderFont, (FcChar8 *) &string[start], + end - start, &glyphinfo); /* #### should use parent frame's .xftDraw */ XftDrawDestroy (xftDraw); xemacs-21.5.28.20080401/lwlibだけに発見: xlwmenu.c.~1~ ++++++ site-start.el ++++++ --- /var/tmp/diff_new_pack.EG4979/_old 2009-03-24 20:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.EG4979/_new 2009-03-24 20:36:24.000000000 +0100 @@ -377,49 +377,56 @@ ;; it prevents data loss if files containing these characters are read ;; and saved again. -(make-charset 'suse-private - "Private character set for SUSE" - '(dimension 2 - chars 96 - columns 1 - final ?R ;; Change this--see docs for make-charset - long-name "Private charset for some Unicode char support." - short-name - "Suse-Private")) - -(defun suse-list-unsupported-codepoints-range (range) - (interactive) - (let ((unsupported nil) - (i (car range)) - (j (cadr range))) - (while (<= i j) - (if (not (unicode-to-char i)) - (push i unsupported)) - (setq i (1+ i))) - unsupported)) - -(defun suse-fill-charset (charset codepoint-list) - (interactive) - (let ((n 0)) - (dolist (codepoint codepoint-list) - (let ((i (mod n 96)) - (j (/ n 96))) - (if (< j 95) - (set-unicode-conversion (make-char charset (+ i #x20) (+ j #x20)) codepoint) - (message "charset %s is full" charset)) - (setq n (1+ n)))))) - -(suse-fill-charset - 'suse-private - (nconc - (suse-list-unsupported-codepoints-range '(#x0100 #x06FF)) - (suse-list-unsupported-codepoints-range '(#x0900 #x11FF)) - (suse-list-unsupported-codepoints-range '(#x1E00 #x27FF)) - (suse-list-unsupported-codepoints-range '(#x3000 #x33FF)) - (suse-list-unsupported-codepoints-range '(#xE800 #xE8FF)) - (suse-list-unsupported-codepoints-range '(#xF000 #xF0FF)) - (suse-list-unsupported-codepoints-range '(#xFB00 #xFFFF)) - )) +;; This hack is not needed anymore, something similar has been +;; implemented upstream. +;; Keeping this hack enabled causes problems, for example it often +;; causes error messages when trying to attach .pdf files in Gnus. +;; Therefore I comment it out. +;; Mon Feb 23 12:20:01 2009 <mike.fabian(a)gmx.de> + +;; (make-charset 'suse-private +;; "Private character set for SUSE" +;; '(dimension 2 +;; chars 96 +;; columns 1 +;; final ?R ;; Change this--see docs for make-charset +;; long-name "Private charset for some Unicode char support." +;; short-name +;; "Suse-Private")) +;; +;; (defun suse-list-unsupported-codepoints-range (range) +;; (interactive) +;; (let ((unsupported nil) +;; (i (car range)) +;; (j (cadr range))) +;; (while (<= i j) +;; (if (not (unicode-to-char i)) +;; (push i unsupported)) +;; (setq i (1+ i))) +;; unsupported)) +;; +;; (defun suse-fill-charset (charset codepoint-list) +;; (interactive) +;; (let ((n 0)) +;; (dolist (codepoint codepoint-list) +;; (let ((i (mod n 96)) +;; (j (/ n 96))) +;; (if (< j 95) +;; (set-unicode-conversion (make-char charset (+ i #x20) (+ j #x20)) codepoint) +;; (message "charset %s is full" charset)) +;; (setq n (1+ n)))))) +;; +;; (suse-fill-charset +;; 'suse-private +;; (nconc +;; (suse-list-unsupported-codepoints-range '(#x0100 #x06FF)) +;; (suse-list-unsupported-codepoints-range '(#x0900 #x11FF)) +;; (suse-list-unsupported-codepoints-range '(#x1E00 #x27FF)) +;; (suse-list-unsupported-codepoints-range '(#x3000 #x33FF)) +;; (suse-list-unsupported-codepoints-range '(#xE800 #xE8FF)) +;; (suse-list-unsupported-codepoints-range '(#xF000 #xF0FF)) +;; (suse-list-unsupported-codepoints-range '(#xFB00 #xFFFF)) +;; )) (if (and (boundp 'xft-version) (eq window-system 'x)) (load "suse-xft-init.el" t t)) ++++++ xemacs-21.4.8-app-defaults.patch -> xemacs-app-defaults.patch ++++++ --- xemacs/xemacs-21.4.8-app-defaults.patch 2009-01-20 12:44:47.000000000 +0100 +++ xemacs/xemacs-app-defaults.patch 2009-02-23 15:08:06.000000000 +0100 @@ -1,10 +1,18 @@ ---- etc/Emacs.ad.appdef 2002-10-31 15:05:40.000000000 +0000 -+++ etc/Emacs.ad 2002-12-12 14:25:43.000000000 +0000 -@@ -41,6 +41,10 @@ +diff -ru xemacs-21.5.28.20080401.orig//etc/Emacs.ad xemacs-21.5.28.20080401/etc/Emacs.ad +--- xemacs-21.5.28.20080401.orig//etc/Emacs.ad 2008-04-01 19:40:34.000000000 +0200 ++++ xemacs-21.5.28.20080401/etc/Emacs.ad 2009-02-23 14:10:15.000000000 +0100 +@@ -41,6 +41,17 @@ ! Note that by default, the pointer foreground and background are the same ! as the default face. +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ++! Fonts for Xft: ++XEmacs*Tabs.fcFontName: sans-serif ++XEmacs*menubar.fcFontName: sans-serif ++XEmacs*modeline.attributeFont: sans-serif ++XEmacs*default.attributeFont: sans-serif ++ ++!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +!! FontSet for menus when you use --with-xfs or --with-xim=xlib. +XEmacs*fontSet: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1,-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-server for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Tue Mar 24 20:34:29 CET 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-03-10 16:09:55.000000000 +0100 +++ xorg-x11-server/xorg-x11-server.changes 2009-03-23 17:07:06.092360740 +0100 @@ -1,0 +2,8 @@ +Mon Mar 23 17:05:26 CET 2009 - sndirsch(a)suse.de + +- fixed-SYNC-extension-trigger-BlockHandler-test.diff (bnc #472046) + * Reworked ComputeBracketValues(): + * Reworked previous patch to IdleTimeBlockHandler() (commit 1f4fb022) + (Egbert Eich) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.m25569/_old 2009-03-24 20:29:31.000000000 +0100 +++ /var/tmp/diff_new_pack.m25569/_new 2009-03-24 20:29:31.000000000 +0100 @@ -32,7 +32,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 32 +Release: 33 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -108,6 +108,7 @@ Patch129: bug474071-fix1.diff Patch130: radeonhd.diff Patch131: commit-cadf65a.diff +Patch132: fixed-SYNC-extension-trigger-BlockHandler-test.diff %description This package contains the X.Org Server. @@ -225,6 +226,7 @@ %patch130 -p1 cp $RPM_SOURCE_DIR/radeonhd.h hw/xfree86/common %patch131 -p1 +%patch132 -p1 %build pushd xorg-docs-* @@ -548,6 +550,11 @@ %endif %changelog +* Mon Mar 23 2009 sndirsch(a)suse.de +- fixed-SYNC-extension-trigger-BlockHandler-test.diff (bnc #472046) + * Reworked ComputeBracketValues(): + * Reworked previous patch to IdleTimeBlockHandler() (commit 1f4fb022) + (Egbert Eich) * Tue Mar 10 2009 sndirsch(a)suse.de - commit-cadf65a.diff * randr: Nuke broken set_origin shortcut. Shortcut is impossible ++++++ fixed-SYNC-extension-trigger-BlockHandler-test.diff ++++++ >From 6dbae4f4841ddfb70d6f2a973431f34d2b3cc4c0 Mon Sep 17 00:00:00 2001 From: Egbert Eich <eich(a)freedesktop.org> Date: Mon, 23 Mar 2009 12:58:28 +0100 Subject: [PATCH] Fixed SYNC extension trigger BlockHandler test. * Reworked ComputeBracketValues(): + Removed 'startOver' flag: we always seem to want to start over, there doesn't seem to be a reason why we should keep the old bracket values, moreover when this flag was set the semantics of setting the bracket values for the selected sync counter were flawed anyhow: the bracket whose value hadn't changed (if the other one did) was simply deleted. + Rewrote the bracket value calculation for Postitive/NegativeTransition: the calulation didn't cover all possible cases and was flawed anyhow. * Reworked previous patch to IdleTimeBlockHandler() (commit: 1f4fb022) + Simplified code. + Modified heuristics: pIdleTimeValueLess does not exclude pIdleTimeValueGreater: if no wakeup is scheduled for the former one check if there is one for the latter. + If no immediate wakeup is scheduled at all find schedule a wakeup for the next time an idle counter might trigger, do not wait for the latest idle counter to trigger. This fixes a problem introduced with commit 1f4fb022 where an idle counter expires unnoticed. --- xorg-server-1.6.0/Xext/sync.c.orig 2009-02-25 20:12:10.000000000 +0100 +++ xorg-server-1.6.0/Xext/sync.c 2009-03-23 17:17:13.000000000 +0100 @@ -222,8 +222,7 @@ SyncCreateCounter( ); static void SyncComputeBracketValues( - SyncCounter * /* pCounter */, - Bool /* startOver */ + SyncCounter * /* pCounter */ ); static void @@ -333,7 +332,7 @@ SyncDeleteTriggerFromCounter(pTrigger) } if (IsSystemCounter(pTrigger->pCounter)) - SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pTrigger->pCounter); } @@ -361,7 +360,7 @@ SyncAddTriggerToCounter(pTrigger) pTrigger->pCounter->pTriglist = pCur; if (IsSystemCounter(pTrigger->pCounter)) - SyncComputeBracketValues(pTrigger->pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pTrigger->pCounter); return Success; } @@ -531,7 +530,7 @@ SyncInitTrigger(client, pTrigger, counte } else if (IsSystemCounter(pCounter)) { - SyncComputeBracketValues(pCounter, /*startOver*/ TRUE); + SyncComputeBracketValues(pCounter); } return Success; @@ -829,13 +828,14 @@ SyncChangeCounter(pCounter, newval) for (ptl = pCounter->pTriglist; ptl; ptl = pnext) { pnext = ptl->next; - if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval)) + if ((*ptl->pTrigger->CheckTrigger)(ptl->pTrigger, oldval)) { (*ptl->pTrigger->TriggerFired)(ptl->pTrigger); + } } if (IsSystemCounter(pCounter)) { - SyncComputeBracketValues(pCounter, /* startOver */ FALSE); + SyncComputeBracketValues(pCounter); } } @@ -1117,9 +1117,8 @@ SyncDestroySystemCounter(pSysCounter) } static void -SyncComputeBracketValues(pCounter, startOver) +SyncComputeBracketValues(pCounter) SyncCounter *pCounter; - Bool startOver; { SyncTriggerList *pCur; SyncTrigger *pTrigger; @@ -1136,60 +1135,51 @@ SyncComputeBracketValues(pCounter, start if (ct == XSyncCounterNeverChanges) return; - if (startOver) - { - XSyncMaxValue(&psci->bracket_greater); - XSyncMinValue(&psci->bracket_less); - } + XSyncMaxValue(&psci->bracket_greater); + XSyncMinValue(&psci->bracket_less); + for (pCur = pCounter->pTriglist; pCur; pCur = pCur->next) { pTrigger = pCur->pTrigger; - - if (pTrigger->test_type == XSyncPositiveComparison && - ct != XSyncCounterNeverIncreases) - { - if (XSyncValueLessThan(pCounter->value, pTrigger->test_value) && - XSyncValueLessThan(pTrigger->test_value, - psci->bracket_greater)) - { - psci->bracket_greater = pTrigger->test_value; - pnewgtval = &psci->bracket_greater; - } - } - else if (pTrigger->test_type == XSyncNegativeComparison && - ct != XSyncCounterNeverDecreases) - { - if (XSyncValueGreaterThan(pCounter->value, pTrigger->test_value) && - XSyncValueGreaterThan(pTrigger->test_value, - psci->bracket_less)) - { - psci->bracket_less = pTrigger->test_value; - pnewltval = &psci->bracket_less; - } - } - else if ( (pTrigger->test_type == XSyncPositiveTransition && - ct != XSyncCounterNeverIncreases) - || - (pTrigger->test_type == XSyncNegativeTransition && - ct != XSyncCounterNeverDecreases) + + if ( ( (pTrigger->test_type == XSyncPositiveComparison) + && ( XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value) + || (ct != XSyncCounterNeverIncreases + && XSyncValueLessThan(pCounter->value, pTrigger->test_value)) + ) + ) + || ((pTrigger->test_type == XSyncPositiveTransition) + && ( ( ct != XSyncCounterNeverDecreases + && XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)) + || ( ct != XSyncCounterNeverIncreases + && XSyncValueLessThan(pCounter->value, pTrigger->test_value)) + ) ) - { - if (XSyncValueLessThan(pCounter->value, pTrigger->test_value)) - { - if (XSyncValueLessThan(pTrigger->test_value, - psci->bracket_greater)) - { - psci->bracket_greater = pTrigger->test_value; - pnewgtval = &psci->bracket_greater; - } - else - if (XSyncValueGreaterThan(pTrigger->test_value, - psci->bracket_less)) - { - psci->bracket_less = pTrigger->test_value; - pnewltval = &psci->bracket_less; + ) { + if (XSyncValueLessThan(pTrigger->test_value, + psci->bracket_greater)) { + psci->bracket_greater = pTrigger->test_value; + pnewgtval = &psci->bracket_greater; } + } else if ( ( (pTrigger->test_type == XSyncNegativeComparison) + && ( XSyncValueLessOrEqual(pCounter->value, pTrigger->test_value) + || (ct != XSyncCounterNeverDecreases + && XSyncValueGreaterThan(pCounter->value, pTrigger->test_value)) + ) + ) + || ((pTrigger->test_type == XSyncNegativeTransition) + && ( ( ct != XSyncCounterNeverDecreases + && XSyncValueGreaterOrEqual(pCounter->value, pTrigger->test_value)) + || ( ct != XSyncCounterNeverIncreases + && XSyncValueLessThan(pCounter->value, pTrigger->test_value)) + ) + ) + ) { + if (XSyncValueGreaterThan(pTrigger->test_value, + psci->bracket_less)) { + psci->bracket_less = pTrigger->test_value; + pnewltval = &psci->bracket_less; } } } /* end for each trigger */ @@ -2545,11 +2535,17 @@ IdleTimeQueryValue (pointer pCounter, CA } static void -IdleTimeBlockHandler(pointer env, struct timeval **wt, pointer LastSelectMask) -{ - XSyncValue idle, old_idle; - SyncTriggerList *list = IdleTimeCounter->pTriglist; - SyncTrigger *trig; +IdleTimeBlockHandler (pointer env, + struct timeval **wt, + pointer LastSelectMask) +{ + XSyncValue idle, old_idle; + SyncTriggerList *list = IdleTimeCounter->pTriglist; + SyncTrigger *trig; + unsigned long timeout = -1; + XSyncValue value; + Bool overflow; + if (!pIdleTimeValueLess && !pIdleTimeValueGreater) return; @@ -2567,46 +2563,57 @@ IdleTimeBlockHandler(pointer env, struct * want level or edge trigger. Check the trigger list against the * current idle time, and if any succeed, bomb out of select() * immediately so we can reschedule. + * NOTE: we need to check trigger because the idle timer can go + * both ways (XSyncCounterUnrestricted) so that we need to set + * pIdleTimeValueLess in ComputeBracketValues() in the edge + * triggered case even if the idle timer is already less. */ - - for (list = IdleTimeCounter->pTriglist; list; list = list->next) { + for (list = IdleTimeCounter->pTriglist; list; list = list->next) { trig = list->pTrigger; if (trig->CheckTrigger(trig, old_idle)) { - AdjustWaitForDelay(wt, 0); - break; + AdjustWaitForDelay(wt, 0); + IdleTimeCounter->value = old_idle; /* pop */ + return; } } } - else if (pIdleTimeValueGreater) + if (pIdleTimeValueGreater) { - /* - * There's a threshold in the positive direction. If we've been - * idle less than it, schedule a wakeup for sometime in the future. - * If we've been idle more than it, and someone wants to know about - * that level-triggered, schedule an immediate wakeup. - */ - unsigned long timeout = -1; - - if (XSyncValueLessThan (idle, *pIdleTimeValueGreater)) { - XSyncValue value; - Bool overflow; + /* + * There's a threshold in the positive direction. + * If we've been idle more than it, and someone wants to know about + * that level-triggered, schedule an immediate wakeup. + * NOTE: we need to check trigger because the idle timer can go + * both ways (XSyncCounterUnrestricted) so that we need to set + * pIdleTimeValueGreater in ComputeBracketValues() in the edge + * triggered case even if the idle timer is already greater. + */ - XSyncValueSubtract (&value, *pIdleTimeValueGreater, - idle, &overflow); - timeout = min(timeout, XSyncValueLow32 (value)); - } else { + if (XSyncValueGreaterOrEqual (idle, *pIdleTimeValueGreater)) { for (list = IdleTimeCounter->pTriglist; list; list = list->next) { - trig = list->pTrigger; + trig = list->pTrigger; if (trig->CheckTrigger(trig, old_idle)) { - timeout = min(timeout, 0); - break; + AdjustWaitForDelay (wt, 0); + IdleTimeCounter->value = old_idle; /* pop */ + return; } } } - - AdjustWaitForDelay (wt, timeout); } + /* + * If we don't have to wake up immediately we schedule a wakeup for the + * next time a trigger expires. + */ + for (list = IdleTimeCounter->pTriglist; list; list = list->next) { + trig = list->pTrigger; + if (XSyncValueLessThan (idle, trig->test_value)) { + XSyncValueSubtract (&value, trig->test_value, + idle, &overflow); + timeout = min(timeout,XSyncValueLow32 (value)); + } + } + AdjustWaitForDelay (wt, timeout); IdleTimeCounter->value = old_idle; /* pop */ } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Tue Mar 24 20:29:19 CET 2009. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2009-03-05 16:12:52.000000000 +0100 +++ kdebase4-runtime/kdebase4-runtime.changes 2009-03-15 20:18:45.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Mar 15 20:18:20 CET 2009 - coolo(a)suse.de + +- update 4_2_BRANCH.diff - mainly translations + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.W23580/_old 2009-03-24 20:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.W23580/_new 2009-03-24 20:28:42.000000000 +0100 @@ -35,7 +35,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.2.1 -Release: 1 +Release: 2 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -386,6 +386,8 @@ %verify(not mode) %attr(2755,root,nogroup) /usr/%_lib/kde4/libexec/kdesud %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff - mainly translations * Fri Feb 27 2009 dmueller(a)suse.de - update to 4.2.1 * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.W23580/_old 2009-03-24 20:28:42.000000000 +0100 +++ /var/tmp/diff_new_pack.W23580/_new 2009-03-24 20:28:42.000000000 +0100 @@ -27,7 +27,7 @@ Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 4.2.1 -Release: 1 +Release: 2 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -125,6 +125,8 @@ /usr/share/icons/oxygen %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff - mainly translations * Fri Feb 27 2009 dmueller(a)suse.de - update to 4.2.1 * see http://kde.org/announcements/changelogs/changelog4_2_0to4_2_1.php ++++++ 4_2_BRANCH.diff ++++++ ++++ 8254 lines (skipped) ++++ between KDE/kdebase4-runtime/4_2_BRANCH.diff ++++ and kdebase4-runtime/4_2_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Tue Mar 24 20:28:09 CET 2009. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-03-09 00:19:40.000000000 +0100 +++ kdebase4-workspace/kdebase4-wallpapers.changes 2009-03-24 20:27:28.845540000 +0100 @@ -1,0 +2,5 @@ +Sun Mar 15 20:15:32 CET 2009 - coolo(a)suse.de + +- update 4_2_BRANCH.diff - several kickoff fixes + +------------------------------------------------------------------- kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.W20990/_old 2009-03-24 20:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.W20990/_new 2009-03-24 20:27:37.000000000 +0100 @@ -29,7 +29,7 @@ Summary: KDE 4 Wallpapers Url: http://www.kde.org/ Version: 4.2.1 -Release: 3 +Release: 4 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -67,6 +67,8 @@ /usr/share/wallpapers %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo(a)suse.de - add spec file to build python applet engine * Thu Mar 05 2009 coolo(a)suse.de ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.W20990/_old 2009-03-24 20:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.W20990/_new 2009-03-24 20:27:37.000000000 +0100 @@ -38,7 +38,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.2.1 -Release: 3 +Release: 4 Source0: kdebase-workspace-%version.tar.bz2 Source1: rediff-plasma.sh Source2: titlebar_decor.png @@ -837,6 +837,8 @@ /usr/share/kde4/services/kded/kwrited.desktop %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo(a)suse.de - add spec file to build python applet engine * Thu Mar 05 2009 coolo(a)suse.de ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.W20990/_old 2009-03-24 20:27:37.000000000 +0100 +++ /var/tmp/diff_new_pack.W20990/_new 2009-03-24 20:27:37.000000000 +0100 @@ -26,16 +26,17 @@ %endif License: GPL v2 or later Group: System/GUI/KDE -Summary: KDE 4 Wallpapers +Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.2.1 -Release: 2 +Release: 3 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} %description -This package contains the wallpapers of KDE 4. +Python bindings for Plasma, the KDE 4 desktop shell. These bindings +allow Plasmoids written in Python @@ -67,6 +68,8 @@ %_kde_share_dir/services/plasma-*.desktop %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update 4_2_BRANCH.diff - several kickoff fixes * Fri Mar 06 2009 coolo(a)suse.de - add spec file to build python applet engine * Thu Mar 05 2009 coolo(a)suse.de ++++++ 4_2_BRANCH.diff ++++++ ++++ 10948 lines (skipped) ++++ between KDE/kdebase4-workspace/4_2_BRANCH.diff ++++ and kdebase4-workspace/4_2_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepimlibs4 for openSUSE:Factory
by root＠Hilbert.suse.de 24 Mar '09

24 Mar '09

Hello community, here is the log from the commit of package kdepimlibs4 for openSUSE:Factory checked in at Tue Mar 24 20:26:43 CET 2009. -------- --- KDE/kdepimlibs4/kdepimlibs4.changes 2009-03-05 12:22:23.000000000 +0100 +++ kdepimlibs4/kdepimlibs4.changes 2009-03-15 20:21:21.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Mar 15 20:21:03 CET 2009 - coolo(a)suse.de + +- update branch diff - some akonadi fixes + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepimlibs4.spec ++++++ --- /var/tmp/diff_new_pack.l17679/_old 2009-03-24 20:26:16.000000000 +0100 +++ /var/tmp/diff_new_pack.l17679/_new 2009-03-24 20:26:16.000000000 +0100 @@ -24,7 +24,7 @@ Summary: KDE PIM Libraries Url: http://www.kde.org Version: 4.2.1 -Release: 2 +Release: 3 Source0: kdepimlibs-%version.tar.bz2 Source1: _upstream Patch0: 4_2_BRANCH.diff @@ -195,6 +195,8 @@ %_kde_share_dir/config.kcfg/mailtransport.kcfg %changelog +* Sun Mar 15 2009 coolo(a)suse.de +- update branch diff - some akonadi fixes * Thu Mar 05 2009 coolo(a)suse.de - fix file list * Fri Feb 27 2009 dmueller(a)suse.de ++++++ 4_2_BRANCH.diff ++++++ ++++ 1883 lines (skipped) ++++ between KDE/kdepimlibs4/4_2_BRANCH.diff ++++ and kdepimlibs4/4_2_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0