December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit pmtools
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package pmtools checked in at Tue Dec 12 02:28:07 CET 2006. -------- --- pmtools/pmtools.changes 2006-09-25 19:29:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/pmtools/pmtools.changes 2006-12-11 17:16:56.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 11 15:50:16 CET 2006 - trenn(a)suse.de + +- updated to pmtools 20061006. +- Added ExclusiveArch statement for x86_64 i386 ia64 architectures + +------------------------------------------------------------------- Old: ---- pmtools-20060606.tar.bz2 New: ---- pmtools-20061026.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pmtools.spec ++++++ --- /var/tmp/diff_new_pack.bxEqVF/_old 2006-12-12 02:27:56.000000000 +0100 +++ /var/tmp/diff_new_pack.bxEqVF/_new 2006-12-12 02:27:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package pmtools (Version 20060606) +# spec file for package pmtools (Version 20061026) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,10 +12,10 @@ Name: pmtools URL: http://www.intel.com/technology/iapc/acpi/downloads.htm -Version: 20060606 -Release: 7 +Version: 20061026 +Release: 1 %define acpica acpica-unix-20060912 -License: GPL +License: GNU General Public License (GPL) Group: Development/Tools/Other Autoreqprov: on Summary: ACPI Debugging Tools @@ -28,6 +28,7 @@ Source2: dmidecode-2.8.tar.bz2 Source3: %{acpica}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: %ix86 ia64 x86_64 %description This is a set of tools to display your BIOS ACPI tables. @@ -91,6 +92,9 @@ /%{_mandir}/man8/* %changelog -n pmtools +* Mon Dec 11 2006 - trenn(a)suse.de +- updated to pmtools 20061006. +- Added ExclusiveArch statement for x86_64 i386 ia64 architectures * Mon Sep 25 2006 - trenn(a)suse.de - update to acpica-unix-20060912 * Mon Jul 17 2006 - trenn(a)suse.de @@ -131,9 +135,9 @@ - also compile madt.c with optflags. * Thu Sep 22 2005 - trenn(a)suse.de - make pmtools gcc 4.1 safe: -- added -fno-strict-aliasing in acpica CFLAGS -- add override keyword to all CFLAGS initialisations in all Makefiles -- moved #include(s) some lines up + - added -fno-strict-aliasing in acpica CFLAGS + - add override keyword to all CFLAGS initialisations in all Makefiles + - moved #include(s) some lines up * Thu Sep 08 2005 - trenn(a)suse.de - updated acpica to version 20050902 (was not available sooner) * Fri Sep 02 2005 - trenn(a)suse.de ++++++ pmtools-20060606.tar.bz2 -> pmtools-20061026.tar.bz2 ++++++ ++++ 1978 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 imlib2
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package imlib2 checked in at Tue Dec 12 02:27:51 CET 2006. -------- --- imlib2/imlib2.changes 2006-11-14 08:50:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/imlib2/imlib2.changes 2006-12-11 21:31:33.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 11 21:30:51 CET 2006 - jw(a)suse.de + +- uninitialized variable bug + patched and sent upstream. + +------------------------------------------------------------------- New: ---- happy-abuild.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ imlib2.spec ++++++ --- /var/tmp/diff_new_pack.5cMOOm/_old 2006-12-12 02:27:18.000000000 +0100 +++ /var/tmp/diff_new_pack.5cMOOm/_new 2006-12-12 02:27:18.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: freetype2-devel giflib-devel libpng-devel libtiff-devel xorg-x11 xorg-x11-devel Summary: Imlib 2, the Successor to Imlib Version: 1.3.0 -Release: 1 +Release: 2 License: BSD License and BSD-like Group: Development/Libraries/X11 Source: %name-%version.tar.gz @@ -23,6 +23,7 @@ Patch2: imlib2-1.2.1-more-fixes.patch Patch3: imlib2-loader_jpeg.patch Patch4: imlib2-tiffix.patch +Patch5: happy-abuild.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.enlightenment.org/Libraries/Imlib2/ Provides: imlib2-loader_jpeg imlib2-loader_png imlib2-loader_argb imlib2-loader_tiff imlib2-loader_gif imlib2-loader_zlib imlib2-loader_bz2 imlib2-loader_pnm imlib2-loader_bmp imlib2-loader_xpm imlib2-loader_tga @@ -103,6 +104,7 @@ %patch2 -p0 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %if %suse_version > 1000 @@ -176,6 +178,9 @@ %attr(755,root,root) %{_libdir}/imlib2/loaders %changelog -n imlib2 +* Mon Dec 11 2006 - jw(a)suse.de +- uninitialized variable bug + patched and sent upstream. * Tue Nov 14 2006 - meissner(a)suse.de - Removed the incorrect loader_jpeg hunk of fix for #214313. #220671 ++++++ happy-abuild.diff ++++++ --- imlib2-1.3.0/src/modules/loaders/loader_bmp.c.orig 2006-09-06 13:34:49.000000000 +0200 +++ imlib2-1.3.0/src/modules/loaders/loader_bmp.c 2006-12-11 20:50:15.926001000 +0100 @@ -533,6 +533,7 @@ unsigned char *buffer_end_minus_1 = buffer_end - 1; x = 0; y = 0; + g = 1; // Better say 1 than uninitialized; what is this good for anyway? jw(a)suse.de for (i = 0; i < imgsize && buffer_ptr < buffer_end_minus_1 && g; i++) { byte1 = buffer_ptr[0]; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 frozen-bubble
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package frozen-bubble checked in at Tue Dec 12 02:27:13 CET 2006. -------- --- frozen-bubble/frozen-bubble.changes 2006-12-06 14:41:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/frozen-bubble/frozen-bubble.changes 2006-12-12 00:18:49.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 00:18:37 CET 2006 - dmueller(a)suse.de + +- add missing require for .desktop file + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frozen-bubble.spec ++++++ --- /var/tmp/diff_new_pack.tAma4E/_old 2006-12-12 02:26:35.000000000 +0100 +++ /var/tmp/diff_new_pack.tAma4E/_new 2006-12-12 02:26:35.000000000 +0100 @@ -22,9 +22,10 @@ Group: Amusements/Games/Action/Arcade Requires: perl = %{perl_version} Requires: SDL_perl +Requires: CheckHardware Autoreqprov: on Version: 2.1.0 -Release: 2 +Release: 3 Summary: Puzzle with Bubbles Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop @@ -97,6 +98,8 @@ /usr/share/pixmaps/%name.png %changelog -n frozen-bubble +* Tue Dec 12 2006 - dmueller(a)suse.de +- add missing require for .desktop file * Wed Dec 06 2006 - dmueller(a)suse.de - don't build as root * Sat Nov 25 2006 - wstephenson(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 opensuse-updater
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package opensuse-updater checked in at Mon Dec 11 21:01:12 CET 2006. -------- --- KDE/opensuse-updater/opensuse-updater.changes 2006-12-04 14:46:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/opensuse-updater/opensuse-updater.changes 2006-12-11 17:05:44.000000000 +0100 @@ -2,3 +2 @@ -Mon Dec 4 14:46:33 CET 2006 - dmueller(a)suse.de - -- don't build as root +Mon Dec 11 16:55:56 CET 2006 - dmacvicar(a)suse.de @@ -5,0 +4,3 @@ +- fix yast paths (#224566 - reopened) +- add basic infrastructure for cleanup at exit, not done yet +- r494 @@ -13 +14 @@ -- r490 +- r492 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensuse-updater.spec ++++++ --- /var/tmp/diff_new_pack.89PY1t/_old 2006-12-11 21:01:04.000000000 +0100 +++ /var/tmp/diff_new_pack.89PY1t/_new 2006-12-11 21:01:04.000000000 +0100 @@ -8,7 +8,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: opensuse-updater BuildRequires: kdelibs3-devel update-desktop-files @@ -16,7 +15,7 @@ Group: System/Management Summary: KDE updater applet for OpenSUSE Version: 0.4 -Release: 32 +Release: 33 URL: http://en.opensuse.org/KDE_Updater_Applet BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: opensuseupdater-%{version}.tar.bz2 @@ -72,14 +71,16 @@ /opt/kde3/share/config.kcfg/opensuseupdater_settings.kcfg %changelog -n opensuse-updater -* Mon Dec 04 2006 - dmueller(a)suse.de -- don't build as root +* Mon Dec 11 2006 - dmacvicar(a)suse.de +- fix yast paths (#224566 - reopened) +- add basic infrastructure for cleanup at exit, not done yet +- r494 * Thu Nov 30 2006 - dmacvicar(a)suse.de - Use xfg-su copy to launch yast (#224566) - disable selection of updates for backends which don't support it (ie: zypp) - fix iconname in specfile -- r490 +- r492 * Mon Nov 27 2006 - dmacvicar(a)suse.de - enable install button when updates are available (#218182) - provide icon in various sizes, they doesn't look bad scaled now. ++++++ opensuseupdater-0.4.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/Updater.h new/opensuseupdater-0.4/updater/Updater.h --- old/opensuseupdater-0.4/updater/Updater.h 2006-11-27 13:00:04.000000000 +0100 +++ new/opensuseupdater-0.4/updater/Updater.h 2006-12-11 16:32:25.000000000 +0100 @@ -64,7 +64,12 @@ Used by GUI to retrieve updater capabilities **/ virtual UpdaterCapabilities capabilities() = 0; - + + /** + * this is called when the updater is going to quit so the + * backend can do cleanup + */ + virtual void shutdown() = 0; signals: /** This is a signal sent to the MainWindow class. It tells the applet whether the backend is ready @@ -167,8 +172,7 @@ @param item the QListViewItem currently selected. @param point where to show the menu. **/ - virtual void updateMenu(QListViewItem *item, const QPoint &point) = 0; - + virtual void updateMenu(QListViewItem *item, const QPoint &point) = 0; }; #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/UpdaterApplication.cpp new/opensuseupdater-0.4/updater/UpdaterApplication.cpp --- old/opensuseupdater-0.4/updater/UpdaterApplication.cpp 2006-11-27 13:04:15.000000000 +0100 +++ new/opensuseupdater-0.4/updater/UpdaterApplication.cpp 2006-12-11 16:41:39.000000000 +0100 @@ -96,7 +96,11 @@ } -UpdaterApplication::~UpdaterApplication() { +UpdaterApplication::~UpdaterApplication() +{ + if ( updater ) + updater->shutdown(); + delete main; delete updater; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/UpdaterApplication.h new/opensuseupdater-0.4/updater/UpdaterApplication.h --- old/opensuseupdater-0.4/updater/UpdaterApplication.h 2006-10-11 16:19:39.000000000 +0200 +++ new/opensuseupdater-0.4/updater/UpdaterApplication.h 2006-12-11 16:28:14.000000000 +0100 @@ -46,6 +46,9 @@ UpdaterApplication(); ~UpdaterApplication(); + + signals: + void shutdown(); private: MainWindow *main; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/zmd/ZmdUpdater.cpp new/opensuseupdater-0.4/updater/zmd/ZmdUpdater.cpp --- old/opensuseupdater-0.4/updater/zmd/ZmdUpdater.cpp 2006-11-15 17:37:59.000000000 +0100 +++ new/opensuseupdater-0.4/updater/zmd/ZmdUpdater.cpp 2006-12-11 16:33:52.000000000 +0100 @@ -89,6 +89,11 @@ return caps; } +void ZmdUpdater::shutdown() +{ + +} + /******************************************************************** Slots recieving signals from the mainwindow diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/zmd/ZmdUpdater.h new/opensuseupdater-0.4/updater/zmd/ZmdUpdater.h --- old/opensuseupdater-0.4/updater/zmd/ZmdUpdater.h 2006-11-15 14:33:35.000000000 +0100 +++ new/opensuseupdater-0.4/updater/zmd/ZmdUpdater.h 2006-12-11 16:34:09.000000000 +0100 @@ -68,7 +68,7 @@ ZmdUpdater(); virtual UpdaterCapabilities capabilities(); - + virtual void shutdown(); private slots: //Slots implemented from Updater abstract class diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp --- old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp 2006-11-30 16:22:51.000000000 +0100 +++ new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.cpp 2006-12-11 16:33:34.000000000 +0100 @@ -217,6 +217,10 @@ } +void ZYppUpdater::shutdown() +{ + +} void ZYppUpdater::doCheckForUpdates() { @@ -326,7 +330,7 @@ } _you_process = new KProcess; - *_you_process << "opensuseupdater-su" << "-c" << "yast2 online_update"; + *_you_process << "opensuseupdater-su" << "-c" << "/sbin/yast2 online_update"; connect( _you_process, SIGNAL( processExited( KProcess * ) ), SLOT( slotYOUProcessExited( KProcess * ) ) ); @@ -341,7 +345,7 @@ void ZYppUpdater::configureUpdater() { KProcess *inst_source = new KProcess; - *inst_source << "opensuseupdater-su" << "-c" << "yast2 inst_source"; + *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source"; connect( inst_source, SIGNAL( processExited( KProcess * ) ), SLOT( slotInstSourceProcessExited( KProcess * ) ) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h --- old/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h 2006-11-14 17:54:09.000000000 +0100 +++ new/opensuseupdater-0.4/updater/zypp/ZYppUpdater.h 2006-12-11 16:37:02.000000000 +0100 @@ -69,7 +69,8 @@ ZYppUpdater(); virtual UpdaterCapabilities capabilities(); - + virtual void shutdown(); + // QXmlDefaultHandler implementation virtual bool startDocument(); virtual bool endDocument(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gwget
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package gwget checked in at Mon Dec 11 21:00:57 CET 2006. -------- --- GNOME/gwget/gwget.changes 2006-10-18 11:52:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/gwget/gwget.changes 2006-12-11 17:12:16.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 11 17:08:43 CET 2006 - lmichnovic(a)suse.cz + +- update to version 0.98.2 + * support of epiphany 2.15 and 2.16 + * libnootify 0.4 support + * use dbus in epiphany extension + - obsoletes all patches: cvs.patch, epi216.patch + +------------------------------------------------------------------- Old: ---- gwget-0.98.1.tar.bz2 gwget-cvs.patch gwget-epi216.patch New: ---- gwget-0.98.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwget.spec ++++++ --- /var/tmp/diff_new_pack.AyLPXF/_old 2006-12-11 21:00:48.000000000 +0100 +++ /var/tmp/diff_new_pack.AyLPXF/_new 2006-12-11 21:00:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gwget (Version 0.98.1) +# spec file for package gwget (Version 0.98.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,20 +14,18 @@ BuildRequires: epiphany epiphany-devel gnome-vfs2-devel gnutls-devel indent intltool libgnomeprintui-devel libidl-devel libwnck-devel mDNSResponder-devel perl-XML-Parser update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: Productivity/Networking/Web/Utilities Requires: wget Autoreqprov: on -Version: 0.98.1 -Release: 17 +Version: 0.98.2 +Release: 1 %define _name gwget Summary: Front-End for wget Written in GTK+ URL: http://gnome.org/projects/gwget/ PreReq: filesystem gconf2 Source: %{_name}-%{version}.tar.bz2 Source1: %{_name}.desktop -Patch: %{_name}-cvs.patch -Patch1: %{_name}-epi216.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,8 +40,6 @@ %prep %setup -n %{_name}-%{version} -%patch -p1 -%patch1 cp %{S:1} . %build @@ -87,7 +83,7 @@ %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README TODO THANKS /opt/gnome/bin/* -/opt/gnome/%_lib/bonobo/servers +#/opt/gnome/%_lib/bonobo/servers /opt/gnome/share/gwget #/opt/gnome/share/idl/* /opt/gnome/share/pixmaps/%{_name}* @@ -98,6 +94,12 @@ %{sysconfdir}/gconf/schemas/gwget.schemas %changelog -n gwget +* Mon Dec 11 2006 - lmichnovic(a)suse.cz +- update to version 0.98.2 + * support of epiphany 2.15 and 2.16 + * libnootify 0.4 support + * use dbus in epiphany extension + - obsoletes all patches: cvs.patch, epi216.patch * Wed Oct 18 2006 - lmichnovic(a)suse.cz - updated to cvs (cvs.patch) - fix uninitialized variable [#211774] * Sun Sep 17 2006 - ro(a)suse.de @@ -111,8 +113,8 @@ - fixed changed directory of gnome-vfs-mime.h (gnomevfs_path.patch) * Tue Jun 13 2006 - lmichnovic(a)suse.cz - Upgrade to version 0.98.1 which obsoletes undefined.patch -- detects epiphany 2.14 -- and many other fixes in code + - detects epiphany 2.14 + - and many other fixes in code - gnomevfs_function_name.patch solves renamed function detecting MIME type which is not implemented yet * Wed Jan 25 2006 - mls(a)suse.de ++++++ gwget-0.98.1.tar.bz2 -> gwget-0.98.2.tar.bz2 ++++++ ++++ 24774 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libxml2
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package libxml2 checked in at Mon Dec 11 20:46:27 CET 2006. -------- --- libxml2/libxml2-python.changes 2006-11-28 12:21:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/libxml2/libxml2-python.changes 2006-12-11 14:56:55.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 14:56:21 CET 2006 - ke(a)suse.de + +- 2.6.27. + +------------------------------------------------------------------- --- libxml2/libxml2-test.changes 2006-05-16 14:11:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxml2/libxml2-test.changes 2006-12-11 14:56:45.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 14:56:35 CET 2006 - ke(a)suse.de + +- 2.6.27 + +------------------------------------------------------------------- --- libxml2/libxml2.changes 2006-10-17 16:11:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/libxml2/libxml2.changes 2006-12-11 14:57:04.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 11 14:50:27 CET 2006 - ke(a)suse.de + +- 2.6.27; many improvements and bug fixes. For details, see the NEWS + file. +- Remove libxml2-xpath-1.318.patch (obsolete). + +------------------------------------------------------------------- Old: ---- libxml2-2.6.22-python-linkflags.patch libxml2-2.6.26.tar.bz2 libxml2-xpath-1.318.patch New: ---- libxml2-2.6.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libxml2-python.spec ++++++ --- /var/tmp/diff_new_pack.9Dn3If/_old 2006-12-11 20:45:32.000000000 +0100 +++ /var/tmp/diff_new_pack.9Dn3If/_new 2006-12-11 20:45:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libxml2-python (Version 2.6.26) +# spec file for package libxml2-python (Version 2.6.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,10 +18,10 @@ Group: Development/Libraries/Python Autoreqprov: on Summary: Python Bindings for libxml2 -Version: 2.6.26 -Release: 29 +Version: 2.6.27 +Release: 1 Source: libxml2-%{version}.tar.bz2 -Patch: libxml2-2.6.22-python-linkflags.patch +# Patch: libxml2-2.6.22-python-linkflags.patch # Patch1: libxml2-python-whitespace.diff %{py_requires} Requires: libxml2 = %{version} @@ -51,7 +51,7 @@ %prep %setup -q -n libxml2-%{version} -%patch -p1 +# %patch -p1 # %patch1 -p1 %build @@ -95,6 +95,8 @@ %doc python/tests/*.py %changelog -n libxml2-python +* Mon Dec 11 2006 - ke(a)suse.de +- 2.6.27. * Tue Nov 28 2006 - ke(a)suse.de - Do not install static Python module; reported by Andreas Hanke [#223696]. ++++++ libxml2-test.spec ++++++ --- /var/tmp/diff_new_pack.9Dn3If/_old 2006-12-11 20:45:32.000000000 +0100 +++ /var/tmp/diff_new_pack.9Dn3If/_new 2006-12-11 20:45:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libxml2-test (Version 2.6.26) +# spec file for package libxml2-test (Version 2.6.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,13 +19,11 @@ Group: System/Libraries Autoreqprov: on Summary: Test Cases for libxml2 -Version: 2.6.26 -Release: 25 +Version: 2.6.27 +Release: 1 Source: libxml2-%{version}.tar.bz2 # Source: ftp://ftp.xmlsoft.org/%{name}-%{version}.tar.bz2 # Source: ftp://fr.rpmfind.net/pub/libxml/libxml2-%{version}.tar.bz2 -Patch: libxml2-2.6.22-python-linkflags.patch -Patch1: libxml2-xpath-1.318.patch NoSource: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://xmlsoft.org @@ -42,8 +40,6 @@ %define INSTALL_SCRIPT install -m755 %prep %setup -q -n libxml2-%{version} -%patch -p1 -%patch1 -p1 %build autoreconf --force --install @@ -68,6 +64,8 @@ %doc TODO %changelog -n libxml2-test +* Mon Dec 11 2006 - ke(a)suse.de +- 2.6.27 * Tue May 16 2006 - ke(a)suse.de - Update 2.6.24. * Wed Jan 25 2006 - mls(a)suse.de ++++++ libxml2.spec ++++++ --- /var/tmp/diff_new_pack.9Dn3If/_old 2006-12-11 20:45:32.000000000 +0100 +++ /var/tmp/diff_new_pack.9Dn3If/_new 2006-12-11 20:45:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libxml2 (Version 2.6.26) +# spec file for package libxml2 (Version 2.6.27) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,14 +19,14 @@ Group: System/Libraries Autoreqprov: on Summary: A Library to Manipulate XML Files -Version: 2.6.26 -Release: 26 +Version: 2.6.27 +Release: 1 Source: %{name}-%{version}.tar.bz2 # ftp://ftp.xmlsoft.org/ .gz only # Source: ftp://fr.rpmfind.net/pub/libxml/libxml2-%{version}.tar.bz2 # Source: ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/libxml2/2.6/%{name}-%{… #for 2.6.26 -Patch1: libxml2-xpath-1.318.patch +#Patch1: libxml2-xpath-1.318.patch Patch2: libxml2-printf.patch Patch3: libxml2-gcc4.patch Patch10: hppa.diff @@ -98,7 +98,7 @@ %define INSTALL_SCRIPT install -m755 %prep %setup -q -%patch1 -p1 +#%patch1 -p1 %patch2 -p2 %patch3 -p1 %patch10 -p 0 @@ -185,6 +185,10 @@ %{_datadir}/aclocal/libxml.m4 %changelog -n libxml2 +* Mon Dec 11 2006 - ke(a)suse.de +- 2.6.27; many improvements and bug fixes. For details, see the NEWS + file. +- Remove libxml2-xpath-1.318.patch (obsolete). * Tue Oct 17 2006 - ke(a)suse.de - Move manpage to devel subpackage; reported by Andreas Hanke [# 212441]. ++++++ libxml2-2.6.26.tar.bz2 -> libxml2-2.6.27.tar.bz2 ++++++ ++++ 25767 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdk-pixbuf
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package gdk-pixbuf checked in at Mon Dec 11 20:45:55 CET 2006. -------- --- GNOME/gdk-pixbuf/gdk-pixbuf.changes 2006-01-27 01:30:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/gdk-pixbuf/gdk-pixbuf.changes 2006-12-11 17:31:26.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 17:31:03 CET 2006 - meissner(a)suse.de + +- mark assembler code up as needing noexec stack. + +------------------------------------------------------------------- New: ---- gdk-pixbuf-noexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdk-pixbuf.spec ++++++ --- /var/tmp/diff_new_pack.dRoltP/_old 2006-12-11 20:44:37.000000000 +0100 +++ /var/tmp/diff_new_pack.dRoltP/_new 2006-12-11 20:44:37.000000000 +0100 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -16,9 +16,9 @@ %define sysconfdir /etc%{prefix} Summary: A Library for Fast Pixel Manipulation Version: 0.22.0 -Release: 79 +Release: 116 Group: System/Libraries -License: GPL +License: GNU General Public License (GPL) URL: http://www.gnome.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/0.22/gdk-pixbuf-%{version}… Patch: %{name}-%{version}.patch @@ -29,6 +29,7 @@ Patch5: gdk-pixbuf-xpmintoverflow.diff Patch6: gdk-pixbuf-loop.diff Patch7: gdk-pixbuf-CVE-2004-0753-bmp-loop.patch +Patch8: gdk-pixbuf-noexec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: gdk_pix Provides: gdk_pix @@ -121,6 +122,7 @@ cd .. %patch5 -p1 %patch6 -p1 +%patch8 -p1 %build autoreconf --force --install @@ -173,6 +175,8 @@ %{prefix}/share/gnome/html/* %changelog -n gdk-pixbuf +* Mon Dec 11 2006 - meissner(a)suse.de +- mark assembler code up as needing noexec stack. * Fri Jan 27 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Jan 25 2006 - meissner(a)suse.de ++++++ gdk-pixbuf-noexec.patch ++++++ --- gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S.xx 2006-12-11 17:29:23.000000000 +0100 +++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S 2006-12-11 17:29:41.000000000 +0100 @@ -1,5 +1,7 @@ .file "composite_line_22_4a4_mmx.S" .version "01.01" + .section .note.GNU-stack,"",@progbits + .previous gcc2_compiled.: .text .align 16 --- gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S.xx 2006-12-11 17:29:23.000000000 +0100 +++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/composite_line_color_22_4a4_mmx.S 2006-12-11 17:29:46.000000000 +0100 @@ -1,5 +1,7 @@ .file "composite_line_color_22_4a4_mmx.S" .version "01.01" +.section .note.GNU-stack,"",@progbits +.previous gcc2_compiled.: .text .align 16 --- gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S.xx 2006-12-11 17:29:23.000000000 +0100 +++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/have_mmx.S 2006-12-11 17:29:51.000000000 +0100 @@ -1,5 +1,7 @@ .file "have_mmx.S" .version "01.01" +.section .note.GNU-stack,"",@progbits +.previous gcc2_compiled.: .text .align 16 --- gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S.xx 2006-12-11 17:29:23.000000000 +0100 +++ gdk-pixbuf-0.22.0/gdk-pixbuf/pixops/scale_line_22_33_mmx.S 2006-12-11 17:29:55.000000000 +0100 @@ -1,5 +1,7 @@ .file "scale_line_22_33_mmx.S" .version "01.01" +.section .note.GNU-stack,"",@progbits +.previous gcc2_compiled.: .text .align 16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 dx
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package dx checked in at Mon Dec 11 20:44:32 CET 2006. -------- --- dx/dx.changes 2006-09-25 19:12:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/dx/dx.changes 2006-12-11 16:52:19.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 16:51:00 CET 2006 - lmichnovic(a)suse.cz + +- fixed non deterministic evaluation of code (increment.patch) + +------------------------------------------------------------------- New: ---- dx-4.4.4-increment.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dx.spec ++++++ --- /var/tmp/diff_new_pack.w487sZ/_old 2006-12-11 20:44:20.000000000 +0100 +++ /var/tmp/diff_new_pack.w487sZ/_new 2006-12-11 20:44:20.000000000 +0100 @@ -14,7 +14,7 @@ %define samplesversion 4.4.0 BuildRequires: freeglut-devel freetype2-devel gcc-c++ libdrm-devel libpng-devel libtiff-devel openmotif openmotif-devel tcsh update-desktop-files Version: 4.4.4 -Release: 1 +Release: 20 Summary: IBM Open Visualization Data Explorer License: IBM Public License Group: Productivity/Graphics/Visualization/Other @@ -30,6 +30,7 @@ Patch3: dx-%{version}-uninitialized_var.patch Patch4: dx-%{version}-implicit_decl.patch Patch5: dx-%{version}-return_value.patch +Patch6: dx-%{version}-increment.patch Patch20: dxsamples-%{samplesversion}-java.patch Patch21: dxsamples-%{samplesversion}-DESTDIR.patch Patch22: dxsamples-%{samplesversion}-rights.patch @@ -91,6 +92,7 @@ %patch3 %patch4 %patch5 +%patch6 # cd ../dxsamples-%{samplesversion} %patch20 @@ -170,10 +172,12 @@ /opt/dx/samples/ %changelog -n dx +* Mon Dec 11 2006 - lmichnovic(a)suse.cz +- fixed non deterministic evaluation of code (increment.patch) * Mon Sep 25 2006 - lmichnovic(a)suse.cz - update dx to version 4.4.4 * Many bug fixes, few features. -- obsoletes matrix.patch + - obsoletes matrix.patch * Mon Jun 26 2006 - lmichnovic(a)suse.cz - fixed wrong computation of a matrix (matrix.patch) [#188294] * Fri May 19 2006 - lmichnovic(a)suse.cz ++++++ dx-4.4.4-increment.patch ++++++ --- src/uipp/prompter/GARMainWindow.C +++ src/uipp/prompter/GARMainWindow.C @@ -4910,8 +4910,10 @@ text_str = XmTextGetString(w); ASSERT(STRLEN(text_str) + cbs->text->length < 4096); ptr = 0; - for(i = 0; i < cbs->startPos; i++) - tmp[ptr] = text_str[ptr++]; + for(i = 0; i < cbs->startPos; i++){ + tmp[ptr] = text_str[ptr]; + ptr++; + } for(i = 0; i < cbs->text->length; i++) tmp[ptr++] = cbs->text->ptr[i]; for(i = (int)cbs->startPos; i < STRLEN(text_str); i++) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 cups-drivers
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package cups-drivers checked in at Mon Dec 11 20:44:16 CET 2006. -------- --- cups-drivers/cups-drivers.changes 2006-11-27 17:43:39.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups-drivers/cups-drivers.changes 2006-12-11 18:35:10.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 18:34:26 CET 2006 - kssingvo(a)suse.de + +- added splix driver: samsung spl driver for unix + +------------------------------------------------------------------- New: ---- splix-1.0.1-beta2.tar.bz2 splix-1.0.1_beta2-install.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-drivers.spec ++++++ --- /var/tmp/diff_new_pack.bGlkAg/_old 2006-12-11 20:44:01.000000000 +0100 +++ /var/tmp/diff_new_pack.bGlkAg/_new 2006-12-11 20:44:01.000000000 +0100 @@ -16,7 +16,7 @@ Group: Hardware/Printing Summary: Drivers for the Common UNIX Printing System Version: 1.2.7 -Release: 5 +Release: 7 Provides: cups_drv Requires: ghostscript-library >= 7.05, foomatic-filters PreReq: sysvinit, sh-utils @@ -29,19 +29,22 @@ %define DBDate 20061018 %define foomaticver cvs %define gutenprintver 5.0.0 +%define splixver 1.0.1-beta2 #URL: http://www.linuxprinting.org/download/foomatic/ Source0: http://www.linuxprinting.org/download/foomatic/foomatic-db-engine-%{foomati… Source1: http://www.linuxprinting.org/download/foomatic/foomatic-filters-%{foomaticv… Source2: http://www.linuxprinting.org/download/foomatic/foomatic-db-%{foomaticver}-%… # make sure that gimp-print version NEVER differs from ghostscript-library Source3: gutenprint-%{gutenprintver}.tar.bz2 +Source4: splix-1.0.1-beta2.tar.bz2 Source100: foomatic-driver.known Source101: foomatic-driver.unsupported Patch0: cups-drivers-1.2.2-A4.patch Patch1: cups-drivers-1.2.2-samsunggdi.patch Patch2: cups-drivers-1.1.23-stcolor.patch -Patch100: gutenprint-5.0.0-A4.patch -Patch101: gutenprint-5.0.0-sysfs.patch +Patch300: gutenprint-5.0.0-A4.patch +Patch301: gutenprint-5.0.0-sysfs.patch +Patch400: splix-1.0.1_beta2-install.patch %description This package contains free printer driver descriptions for CUPS. It @@ -101,13 +104,20 @@ mv foomatic-db-%{foomaticver}-%{DBDate} foomatic-db %setup -q -T -D -a 3 -n %{name} mv gutenprint-%{gutenprintver} gutenprint +%setup -q -T -D -a 4 -n %{name} +mv splix-%{splixver} splix %patch0 -p1 %patch1 -p1 %patch2 -p1 # pushd gutenprint -%patch100 -p1 -%patch101 -p1 +%patch300 -p1 +%patch301 -p1 +popd +# +# +pushd splix +%patch400 -p1 popd # # ------- %Build --------------------------------------------------------- @@ -267,6 +277,12 @@ done cd .. # +##### SPLIX +# +cd splix +make CXXFLAGS="$RPM_OPT_FLAGS -I../include "`cups-config --cflags` +cd .. +# # ------- %Install ------------------------------------------------------- %install @@ -365,6 +381,13 @@ gzip "$PPDFILE" done set -x +# +##### SPLIX +# +cd splix +make CUPSFILTER="$RPM_BUILD_ROOT"%{_libdir}/cups/filter \ + CUPSPPD="$RPM_BUILD_ROOT"/usr/share/cups/model install +cd .. %clean test -n "$RPM_BUILD_ROOT" && @@ -398,6 +421,7 @@ %dir /usr/share/cups/model %dir /usr/share/cups/model/[A-Z]* /usr/share/cups/model/[A-Z]*/*.ppd* +%{_libdir}/cups/filter/rastertospl2 %files -n gutenprint %defattr(-,root,root) @@ -406,7 +430,7 @@ %{_bindir}/escputil %{_bindir}/ijsgutenprint.5.0 %{_libdir}/cups/backend -%{_libdir}/cups/filter/* +%{_libdir}/cups/filter/[cr]* %{_sbindir}/cups-genppd* %dir /usr/share/cups %dir /usr/share/cups/model @@ -432,6 +456,8 @@ %{_libdir}/pkgconfig/gutenprint* %changelog -n cups-drivers +* Mon Dec 11 2006 - kssingvo(a)suse.de +- added splix driver: samsung spl driver for unix * Mon Nov 27 2006 - kssingvo(a)suse.de - another fix for gutenprint: A4 on some epson printers broken * Mon Nov 20 2006 - kssingvo(a)suse.de ++++++ splix-1.0.1_beta2-install.patch ++++++ --- splix-1.0.1-beta2/ppd/Makefile.orig 2006-11-11 18:10:14.000000000 +0100 +++ splix-1.0.1-beta2/ppd/Makefile 2006-12-11 18:07:50.000000000 +0100 @@ -37,12 +37,9 @@ .PHONY: install: - install -d -m 755 ${CUPSPPD}/samsung + install -d -m 755 ${CUPSPPD}/Samsung for filename in ${DRIVERS}; do \ - install -m 644 $$filename.${DRIVERSEXT} ${CUPSPPD}/samsung;\ - for lang in ${LANGUAGES}; do \ - install -m 644 $$filename$$lang.${DRIVERSEXT} ${CUPSPPD}/samsung;\ - done; \ + install -m 644 $$filename.${DRIVERSEXT} ${CUPSPPD}/Samsung;\ done \ .PHONY: clean distclean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kdelibs3
by root＠suse.de 11 Dec '06

11 Dec '06

Hello community, here is the log from the commit of package kdelibs3 checked in at Mon Dec 11 20:44:01 CET 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-11-24 11:39:37.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs3/kdelibs3.changes 2006-12-11 16:20:25.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 11 16:19:56 CET 2006 - dmueller(a)suse.de + +- fix print dialog size in nondefault configuration (#227465) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.i2E5SL/_old 2006-12-11 20:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.i2E5SL/_new 2006-12-11 20:43:33.000000000 +0100 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.5 -Release: 43 +Release: 45 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.i2E5SL/_old 2006-12-11 20:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.i2E5SL/_new 2006-12-11 20:43:33.000000000 +0100 @@ -21,7 +21,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.5 -Release: 43 +Release: 45 Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons Provides: kdelibs3_base = 3.3 @@ -758,6 +758,8 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Mon Dec 11 2006 - dmueller(a)suse.de +- fix print dialog size in nondefault configuration (#227465) * Fri Nov 24 2006 - dmueller(a)suse.de - fix ktip icon hack breaking translations (#221177) * Thu Nov 23 2006 - dmueller(a)suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.i2E5SL/_old 2006-12-11 20:43:33.000000000 +0100 +++ /var/tmp/diff_new_pack.i2E5SL/_new 2006-12-11 20:43:33.000000000 +0100 @@ -16,7 +16,7 @@ License: BSD License and BSD-like, Other License(s), see package Group: System/GUI/KDE Version: 3.5.5 -Release: 45 +Release: 47 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ cups-only-accepts-localhost-ipp.diff ++++++ --- /var/tmp/diff_new_pack.i2E5SL/_old 2006-12-11 20:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.i2E5SL/_new 2006-12-11 20:43:34.000000000 +0100 @@ -62,56 +62,16 @@ req.addURI(IPP_TAG_OPERATION,"printer-uri",uri); req.addKeyword(IPP_TAG_OPERATION,"requested-attributes",QString::fromLatin1("printer-name")); if (req.doRequest("/printers/")) ---- kdeprint/cups/kmcupsmanager.cpp -+++ kdeprint/cups/kmcupsmanager.cpp -@@ -60,9 +60,9 @@ - - #define ppdi18n(s) i18n(QString::fromLocal8Bit(s).utf8()) - --void extractMaticData(QString& buf, const QString& filename); --QString printerURI(KMPrinter *p, bool useExistingURI = false); --QString downloadDriver(KMPrinter *p); -+static void extractMaticData(QString& buf, const QString& filename); -+static QString printerURI(KMPrinter *p, bool useExistingURI = false); -+static QString downloadDriver(KMPrinter *p); - - static int trials = 5; - -@@ -912,7 +912,9 @@ +--- kdeprint/cups/kmcupsmanager.cpp (revision 606690) ++++ kdeprint/cups/kmcupsmanager.cpp (working copy) +@@ -912,7 +912,9 @@ QString KMCupsManager::stateInformation( { return QString("%1: %2") .arg(i18n("Server")) - .arg(CupsInfos::self()->hostaddr()); + .arg(CupsInfos::self()->host()[0] != '/' ? -+ QString("%1:%2").arg(CupsInfos::self()->host(), CupsInfos::self()->port()) ++ QString("%1:%2").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()) + : CupsInfos::self()->host()); } void KMCupsManager::checkUpdatePossibleInternal() -@@ -1012,7 +1014,7 @@ - - //***************************************************************************************************** - --void extractMaticData(QString& buf, const QString& filename) -+static void extractMaticData(QString& buf, const QString& filename) - { - QFile f(filename); - if (f.exists() && f.open(IO_ReadOnly)) -@@ -1028,7 +1030,7 @@ - } - } - --QString printerURI(KMPrinter *p, bool use) -+static QString printerURI(KMPrinter *p, bool use) - { - QString uri; - if (use && !p->uri().isEmpty()) -@@ -1038,7 +1040,7 @@ - return uri; - } - --QString downloadDriver(KMPrinter *p) -+static QString downloadDriver(KMPrinter *p) - { - QString driverfile, prname = p->printerName(); - bool changed(false); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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