- openSUSE Commits

commit yast2-trans-cs
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package yast2-trans-cs checked in at Sat Apr 15 11:43:53 CEST 2006. -------- --- yast2-trans-cs/yast2-trans-cs.changes 2006-04-12 12:37:56.000000000 +0200 +++ NOARCH/yast2-trans-cs/yast2-trans-cs.changes 2006-04-13 17:48:40.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 13 17:47:33 2006 - ke(a)suse.de + +- Update to version 2.13.18. + +------------------------------------------------------------------------ Old: ---- yast2-trans-cs-2.13.17.tar.bz2 New: ---- yast2-trans-cs-2.13.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans-cs.spec ++++++ --- /var/tmp/diff_new_pack.52UBWf/_old 2006-04-15 11:43:44.000000000 +0200 +++ /var/tmp/diff_new_pack.52UBWf/_new 2006-04-15 11:43:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-trans-cs (Version 2.13.17) +# spec file for package yast2-trans-cs (Version 2.13.18) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-trans-cs -Version: 2.13.17 +Version: 2.13.18 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-trans-cs-2.13.17.tar.bz2 +Source0: yast2-trans-cs-2.13.18.tar.bz2 prefix: /usr Provides: locale(yast2:cs) BuildRequires: pkgconfig yast2-devtools @@ -33,7 +33,7 @@ %prep -%setup -n yast2-trans-cs-2.13.17 +%setup -n yast2-trans-cs-2.13.18 %build autoreconf --force --install @@ -65,6 +65,8 @@ /usr/share/YaST2/locale %changelog -n yast2-trans-cs +* Thu Apr 13 2006 - ke(a)suse.de +- Update to version 2.13.18. * Wed Apr 12 2006 - ke(a)suse.de - Update to version 2.13.17. * Tue Apr 11 2006 - ke(a)suse.de ++++++ yast2-trans-cs-2.13.17.tar.bz2 -> yast2-trans-cs-2.13.18.tar.bz2 ++++++ ++++ 21950 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit qt3
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package qt3 checked in at Sat Apr 15 11:43:34 CEST 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-04-13 15:41:11.000000000 +0200 +++ STABLE/qt3/qt3-devel-doc.changes 2006-04-15 11:43:01.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 14 01:46:36 CEST 2006 - dmueller(a)suse.de + +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change Old: ---- linguist3.desktop linguist3.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -18,7 +18,7 @@ Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.5 -Release: 51 +Release: 53 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -34,8 +34,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -263,6 +261,9 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Fri Apr 14 2006 - dmueller(a)suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller(a)suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GPL, QPL Version: 3.3.5 -Release: 51 +Release: 53 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -29,8 +29,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -385,11 +383,10 @@ %suse_update_desktop_file -i designer Qt Development GUIDesigner %suse_update_desktop_file -i linguist Qt Development Translation mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/ perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png -rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/{designer,linguist}.png +rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png ##### these files are not getting installed by "make install" ... bug ? # # @@ -491,7 +488,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist3.png +/usr/share/pixmaps/linguist.png %files -n qt3-examples %defattr(-,root,root) @@ -504,6 +501,9 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Fri Apr 14 2006 - dmueller(a)suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller(a)suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.5 -Release: 51 +Release: 53 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -28,8 +28,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -272,6 +270,9 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Fri Apr 14 2006 - dmueller(a)suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller(a)suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.XQUYmU/_old 2006-04-15 11:43:15.000000000 +0200 +++ /var/tmp/diff_new_pack.XQUYmU/_new 2006-04-15 11:43:15.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.5 -Release: 51 +Release: 53 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -30,8 +30,6 @@ Source3: qtrc Source4: assistant3.png Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop Source10: qt3.sh Source11: qt3.csh Source12: qt3-%version-translations.tar.bz2 @@ -398,6 +396,9 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Fri Apr 14 2006 - dmueller(a)suse.de +- drop linguist3.png/desktop as its unused and install + linguist.desktop instead (fixes build failure). * Mon Apr 10 2006 - dmueller(a)suse.de - strip installed static libraries - fix file conflict with Qt4 packages ++++++ qt3-devel-doc.spec.in ++++++ --- KDE/qt3/qt3-devel-doc.spec.in 2006-03-13 17:01:59.000000000 +0100 +++ STABLE/qt3/qt3-devel-doc.spec.in 2006-04-14 10:45:27.000000000 +0200 @@ -27,172 +27,6 @@ %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN -Source0: qt%{x11_free}%rversion.tar.bz2 -Source1: build_script.sh -Source2: qtconfig3.desktop -Source3: asian-qtrc -Source4: assistant3.png -Source6: assistant3.desktop -Source7: linguist3.png -Source8: linguist3.desktop -Source10: qt3.sh -Source11: qt3.csh -Source12: qt3-%version-translations.tar.bz2 -Source100: qtkdeintegration_x11.cpp -Source101: qtkdeintegration_x11_p.h -Patch1: aliasing.diff -Patch2: head.diff -Patch4: qt3-never-strip.diff -Patch5: external-libs.diff -Patch6: 0001-dnd_optimization.patch -Patch7: 0002-dnd_active_window_fix.patch -Patch8: 0007-qpixmap_constants.patch -Patch11: 0038-dragobject-dont-prefer-unknown.patch -Patch12: qtrc-path.diff -Patch13: xcursors-cache-fix.patch -Patch14: lib64-plugin-support.diff -Patch15: pluginmanager-fix.diff -Patch18: no-rpath.dif -Patch19: shut-up.diff -Patch20: rubberband.diff -Patch21: fix-GL-loading.diff -Patch23: fix-accessible.diff -# From http://www.freedesktop.org/wiki/Software_2fImmoduleQtDownload -Patch25: qt-x11-immodule-unified-qt3.3.3-20041203.diff -Patch26: fix-x11-immodule.diff -Patch27: xpm-handling-fixes.diff -Patch28: fix-key-release-event-with-imm.diff -Patch29: 0047-fix-kmenu-width.diff -Patch30: 0051-qtoolbar_77047.patch -Patch31: limit-image-size.diff -Patch34: 0005-qpixmap_mitshm.patch -Patch35: qt-transparency.patch -Patch36: fix-chinese-font-detection.diff -Patch936: fix-chinese-font-detection_old.diff -Patch37: 0055-qtextedit_zoom.patch -Patch38: 0048-qclipboard_hack_80072.patch -Patch39: fix-qtranslator-crash.diff -Patch40: 0059-qpopup_has_mouse.patch -Patch41: 0060-qpopup_ignore_mousepos.patch -Patch42: add_qexport_visibility.patch -Patch43: 0056-khotkeys_input_84434.patch -Patch50: enable-designer-plugins.diff -Patch53: fix-xinerama-dialog-placement.diff -Patch54: kmenu-search-fix.diff -Patch55: qt3-fix-cast.diff -Patch56: fonts-speedup.patch -Patch100: qt.patch -Patch101: qt3-arm-gcc4.patch -Patch103: disable-inputmethod-for-passords.patch -Patch104: qt-x11-immodule-capitalization-fix.diff -Patch105: 0065-fix_werror_with_gcc4.patch -Patch106: fix-qlistview-takeitem-crashes.diff -Patch107: qt3-khmer-script.patch -Patch108: fix-im-crash-on-exit.diff -Patch109: fix-immodule-buffer-overflow.diff -Patch110: qt-x11-immodule-qtextedit-fix.diff -Patch111: qt-x11-immodule-focus-handling.diff -Patch112: qt-x11-immodule-fix-inputcontext-crash.diff -Patch113: fix-assistant-path.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Qt is a program library for developing applications with graphical user -interfaces. It allows you to rapidly develop professional programs. The -Qt library is available not only for Linux but for a great number of -Unices and even for Windows. Thus it is possible to write programs that -may be easily ported to those platforms. - -You need a license for using Qt with a non-GPL application, which can -be acquired from sales(a)trolltech.com. - -See /usr/share/doc/packages/qt3 for details about the new features of -the current Qt library! - - - -Authors: --------- - Troll Tech AS, Norway - -%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial -%prep -%setup -q -n qt%{x11_free}%rversion -%patch1 -%patch2 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch11 -%patch12 -%patch13 -if [ "%_lib" = "lib64" ]; then -%patch14 -fi -%patch15 -%patch18 -%patch19 -%if %suse_version > 920 -%patch20 -%endif -%patch23 -%patch25 -%patch26 -%patch27 -%patch28 -%patch29 -%patch30 -%patch31 -%patch34 -%patch35 -%if %suse_version > 1000 -%patch56 -%patch36 -%else -%patch936 -%endif -%patch37 -%patch38 -%patch39 -%patch40 -%patch41 -%patch42 -%patch43 -%patch100 -%patch53 -%patch54 -%patch55 -%patch101 -%patch103 -p1 -%patch104 -%patch105 -%patch106 -%patch107 -%patch108 -%patch109 -%patch110 -%patch111 -%patch112 -%patch113 -ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ -ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ -ln -sf $PWD/src/kernel/qinputcontext.h include/ -ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/ -ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ -if [ %_lib = "lib" ]; then -sed 's,/lib64/,/lib/,' %PATCH21 | patch -p0 -else -%patch21 -fi -# copy qt kde integration files -cp %SOURCE100 %SOURCE101 src/kernel/ -cp %SOURCE101 include/private/ -cd translations -rm -v *.qm -tar xvjf %SOURCE12 -cd .. # COMMON-END %description ++++++ qt3-extensions.spec.in ++++++ --- KDE/qt3/qt3-extensions.spec.in 2006-04-11 17:57:32.000000000 +0200 +++ STABLE/qt3/qt3-extensions.spec.in 2006-04-14 10:46:25.000000000 +0200 @@ -157,11 +157,10 @@ %suse_update_desktop_file -i designer Qt Development GUIDesigner %suse_update_desktop_file -i linguist Qt Development Translation mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps -install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/ perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png -rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/{designer,linguist}.png +rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png ##### these files are not getting installed by "make install" ... bug ? # @@ -265,7 +264,7 @@ /usr/lib/qt3/%_lib/libeditor.* /usr/share/applications/* /usr/share/pixmaps/designer3.png -/usr/share/pixmaps/linguist3.png +/usr/share/pixmaps/linguist.png %files -n qt3-examples %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-online-update
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package yast2-online-update checked in at Sat Apr 15 11:43:21 CEST 2006. -------- --- yast2-online-update/yast2-online-update.changes 2006-04-12 13:12:46.000000000 +0200 +++ NOARCH/yast2-online-update/yast2-online-update.changes 2006-04-14 14:32:37.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Apr 14 14:21:24 CEST 2006 - jsuchome(a)suse.cz + +- install packagemanager related patches first, than restart yast + (#165540) +- skipped installation if no patch is selected (#163253) +- 2.13.25 + +------------------------------------------------------------------- +Fri Apr 14 13:14:12 CEST 2006 - visnov(a)suse.cz + +- initialize target before sources (#165849) +- 2.13.24 + +------------------------------------------------------------------- Old: ---- yast2-online-update-2.13.23.tar.bz2 New: ---- yast2-online-update-2.13.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-online-update.spec ++++++ --- /var/tmp/diff_new_pack.Z1tlF0/_old 2006-04-15 11:42:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Z1tlF0/_new 2006-04-15 11:42:59.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-online-update (Version 2.13.23) +# spec file for package yast2-online-update (Version 2.13.25) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-online-update -Version: 2.13.23 +Version: 2.13.25 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-online-update-2.13.23.tar.bz2 +Source0: yast2-online-update-2.13.25.tar.bz2 prefix: /usr BuildRequires: gcc-c++ libxcrypt-devel perl-XML-Writer pkg-config update-desktop-files yast2-bootloader yast2-devtools yast2-packager PreReq: grep sed @@ -45,7 +45,7 @@ gs(a)suse.de %prep -%setup -n yast2-online-update-2.13.23 +%setup -n yast2-online-update-2.13.25 %build %{prefix}/bin/y2tool y2autoconf @@ -114,6 +114,14 @@ %{prefix}/share/applications/YaST2/cd_update.desktop %changelog -n yast2-online-update +* Fri Apr 14 2006 - jsuchome(a)suse.cz +- install packagemanager related patches first, than restart yast + (#165540) +- skipped installation if no patch is selected (#163253) +- 2.13.25 +* Fri Apr 14 2006 - visnov(a)suse.cz +- initialize target before sources (#165849) +- 2.13.24 * Wed Apr 12 2006 - jsuchome(a)suse.cz - run online update in manual mode if requested in control file (#165503) - 2.13.23 ++++++ yast2-online-update-2.13.23.tar.bz2 -> yast2-online-update-2.13.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.23/VERSION new/yast2-online-update-2.13.25/VERSION --- old/yast2-online-update-2.13.23/VERSION 2006-04-12 11:34:33.000000000 +0200 +++ new/yast2-online-update-2.13.25/VERSION 2006-04-14 14:23:13.000000000 +0200 @@ -1 +1 @@ -2.13.23 +2.13.25 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.23/src/inst_you.ycp new/yast2-online-update-2.13.25/src/inst_you.ycp --- old/yast2-online-update-2.13.23/src/inst_you.ycp 2006-04-12 10:19:04.000000000 +0200 +++ new/yast2-online-update-2.13.25/src/inst_you.ycp 2006-04-14 11:58:43.000000000 +0200 @@ -7,14 +7,16 @@ textdomain "online-update"; - import "Mode"; - import "Internet"; - import "Wizard"; + import "Directory"; + import "FileUtils"; import "GetInstArgs"; - import "Popup"; + import "Internet"; + import "Mode"; + import "OnlineUpdateCallbacks"; import "PackageCallbacksInit"; + import "Popup"; import "ProductFeatures"; - import "OnlineUpdateCallbacks"; + import "Wizard"; /* Called backwards */ if(GetInstArgs::going_back()) @@ -126,21 +128,96 @@ // compute ResStatus::EstablishField Pkg::PkgEstablish (); - // select all Needed patches for installation - Pkg::ResolvablePreselectPatches (); - y2milestone("All available patches: %1", Pkg::ResolvableProperties("", `patch, "")); + string saved_path = Directory::vardir + "/selected_patches.ycp"; + integer selected = 0; + + // check if there exists saved selection of patches to be installed + if (FileUtils::Exists (saved_path)) + { + list<string> patches = (list<string>) SCR::Read(.target.ycp,saved_path); + if (patches == nil) + patches = []; + foreach (string pname, patches, { + if (Pkg::ResolvableInstall (pname, `patch)) + selected = selected + 1; + }); + SCR::Execute (.target.remove, saved_path); + y2milestone ("Previously selected patches: %1", selected); + } + // if not, select the patches affecting pkg management + else + { + selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); + y2milestone ("Preselected patches for pkg management: %1", selected); + } + + // if no patch is selected, pre-select all security and recommended + if (selected < 1) + { + selected = Pkg::ResolvablePreselectPatches (`all); + y2milestone ("All preselected patches: %1", selected); + } - boolean ok = Pkg::PkgSolve (false); - if (!ok || ProductFeatures::GetBooleanFeature ("globals", "manual_online_update") || Hack ("ui")) + // run package selector to allow user interaction + if (!Pkg::PkgSolve (false) || + ProductFeatures::GetBooleanFeature("globals", "manual_online_update") || + Hack ("ui")) { UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) ); - symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) ); + symbol ret_sel = (symbol)UI::RunPkgSelection(`id(`selector) ); UI::CloseDialog(); + if (ret_sel == `cancel) + return `next; } + list<string> normal_patches = []; + boolean reboot_needed = false; + foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { + if (patch["status"]:`none == `selected) + { + y2milestone ("selected patch: %1", patch); + if (patch["affects_pkg_manager"]:false) + { + if (patch["reboot_needed"]:false) + ret = `reboot; + else if (ret != `reboot) + ret = `restart_yast; + } + else + { + normal_patches = add (normal_patches, patch["name"]:""); + // for this patch reboot would be needed, but still it is not + // clear if the patch will be installed in this run -> save info + if (patch["reboot_needed"]:false) + reboot_needed = true; + } + } + }); + + // unselect non-affects_pkg_manager patches and save them to file + // for later usage + if (ret != `auto && size (normal_patches) > 0) + { + foreach (string pname, normal_patches, { + Pkg::ResolvableNeutral (pname, `patch); + }); + SCR::Write (.target.ycp, saved_path, normal_patches); + } + // no packagemanager patch selected ... + if (ret == `auto) + { + // ... but there is a patch with "reboot_needed" flag (=probably kernel) + if (reboot_needed) + ret = `reboot; + // ... and nothing to install -> skip the installation at all + else if (normal_patches == []) + return `next; + } + + // install the patches - OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); + OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); WFM::call( "online_update_install" ); @@ -154,7 +231,8 @@ // of course it covers updated (one removed, another added) foreach (string p, yast2_packages, { if (! contains (new_yast2_packages, p)) - ret = `restart_yast; +// ret = `restart_yast; + y2internal ("yast package updated, current ret is %1", ret); }); list<string> new_kernel_packages = filter (string p, packages, { return substring (p, 0, 6) == "kernel"; @@ -163,10 +241,10 @@ // check for added kernels, covers updates foreach (string p, new_kernel_packages, { if (! contains (kernel_packages, p)) - ret = `reboot; +// ret = `reboot; + y2internal ("kernel updated, current ret is %1", ret); }); y2milestone ("Checking result: %1", ret); - // FIXME: In future, use the attribute from metadata if (ret == `reboot) { // message popup diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.23/src/online_update.ycp new/yast2-online-update-2.13.25/src/online_update.ycp --- old/yast2-online-update-2.13.23/src/online_update.ycp 2006-03-31 08:53:38.000000000 +0200 +++ new/yast2-online-update-2.13.25/src/online_update.ycp 2006-04-14 13:19:24.000000000 +0200 @@ -134,6 +134,9 @@ UI::CloseDialog (); return 1; } + + // initialize target to import all trusted keys (#165849) + Pkg::TargetInit( "/", false ); OnlineUpdateCallbacks::RefreshAllSources(); OnlineUpdateCallbacks::RegisterOnlineUpdateCallbacks(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-online-update-2.13.23/src/online_update_select.ycp new/yast2-online-update-2.13.25/src/online_update_select.ycp --- old/yast2-online-update-2.13.23/src/online_update_select.ycp 2006-03-31 08:53:38.000000000 +0200 +++ new/yast2-online-update-2.13.25/src/online_update_select.ycp 2006-04-14 13:40:51.000000000 +0200 @@ -9,14 +9,45 @@ textdomain "online-update"; + import "Directory"; + import "FileUtils"; import "Wizard"; Pkg::SourceStartManager (true); - Pkg::TargetInit ("/",false); + // target already initialized in online_update.ycp Pkg::PkgEstablish(); - Pkg::ResolvablePreselectPatches(); + integer selected = 0; + string saved_path = Directory::vardir + "/selected_patches.ycp"; + + // check if there exists saved selection of patches to be installed + if (FileUtils::Exists (saved_path)) + { + list<string> patches = (list<string>) SCR::Read(.target.ycp,saved_path); + if (patches == nil) + patches = []; + foreach (string pname, patches, { + if (Pkg::ResolvableInstall (pname, `patch)) + selected = selected + 1; + }); + SCR::Execute (.target.remove, saved_path); + y2milestone ("Previously selected patches: %1", selected); + } + // if not, select the patches affecting pkg management + else + { + selected = Pkg::ResolvablePreselectPatches (`affects_pkg_manager); + y2milestone ("Preselected patches for pkg management: %1", selected); + } + + // if no patch is selected, pre-select all security and recommended + if (selected < 1) + { + selected = Pkg::ResolvablePreselectPatches (`all); + y2milestone ("All preselected patches: %1", selected); + } + UI::OpenDialog(`opt(`defaultsize), `PackageSelector(`id(`selector), `opt(`youMode)) ); symbol ret = (symbol)UI::RunPkgSelection(`id(`selector) ); @@ -26,6 +57,33 @@ y2debug( "RunPkgSelection returned '%1'", ret ); + boolean restart_yast = false; + list<string> normal_patches = []; + foreach (map patch, Pkg::ResolvableProperties("", `patch, ""), { + if (patch["status"]:`none == `selected) + { + if (patch["affects_pkg_manager"]:false) + restart_yast = true; + else + normal_patches = add (normal_patches, patch["name"]:""); + } + }); + + // unselect non-affects_pkg_manager patches and save them to file + // for later usage + if (restart_yast && size (normal_patches) > 0) + { + foreach (string pname, normal_patches, { + Pkg::ResolvableNeutral (pname, `patch); + }); + SCR::Write (.target.ycp, saved_path, normal_patches); + } + // no patch selected + if (!restart_yast && normal_patches == []) + { + ret = `cancel; + } + if ( ret == `cancel ) return `abort; else return `next; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp-zmd-backend
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Sat Apr 15 11:42:54 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-13 16:17:59.000000000 +0200 +++ STABLE/libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-04-14 16:52:07.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 14 16:51:35 CEST 2006 - visnov(a)suse.de + +- adapt KeyRing callbacks to new libzypp +- rev 3097 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.Ei3Jc3/_old 2006-04-15 11:42:38.000000000 +0200 +++ /var/tmp/diff_new_pack.Ei3Jc3/_new 2006-04-15 11:42:38.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 11 +Release: 13 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Fri Apr 14 2006 - visnov(a)suse.de +- adapt KeyRing callbacks to new libzypp +- rev 3097 * Thu Apr 13 2006 - kkaempf(a)suse.de - add KeyRing callbacks to transact and parse-metadata - handle dry_run and nosignature on commit ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ ++++ 17075 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h --- old/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-13 12:45:28.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/KeyRingCallbacks.h 2006-04-14 14:10:47.000000000 +0200 @@ -19,6 +19,7 @@ #include <zypp/ZYppCallbacks.h> #include <zypp/Pathname.h> #include <zypp/KeyRing.h> +#include <zypp/Digest.h> /////////////////////////////////////////////////////////////////// namespace zypp { @@ -37,11 +38,19 @@ { return true; } virtual bool askUserToAcceptVerificationFailed( const Pathname &file, const std::string &keyid, const std::string &keyname ) { return true; } - virtual bool askUserToAcceptFileWithoutChecksum( const zypp::Pathname &file ) - { return true; } }; + struct DigestReceive : public zypp::callback::ReceiveReport<zypp::DigestReport> + { + virtual bool askUserToAcceptNoDigest( const zypp::Pathname &file ) + { return true; } + virtual bool askUserToAccepUnknownDigest( const Pathname &file, const std::string &name ) + { return true; } + virtual bool askUserToAcceptWrongDigest( const Pathname &file, const std::string &requested, const std::string &found ) + { return true; } + }; + /////////////////////////////////////////////////////////////////// }; // namespace zypp /////////////////////////////////////////////////////////////////// @@ -64,4 +73,23 @@ }; +class DigestCallbacks { + + private: + zypp::DigestReceive _digestReport; + + public: + DigestCallbacks() + { + _digestReport.connect(); + } + + ~DigestCallbacks() + { + _digestReport.disconnect(); + } + +}; + + #endif // ZMD_BACKEND_KEYRINGCALLBACKS_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-backend-7.1.1.0/src/transact.cc new/zmd-backend-7.1.1.0/src/transact.cc --- old/zmd-backend-7.1.1.0/src/transact.cc 2006-04-13 16:04:44.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/transact.cc 2006-04-14 14:08:05.000000000 +0200 @@ -69,7 +69,7 @@ main (int argc, char **argv) { if (argc < 2) { - cerr << "usage: " << argv[0] << " <database> [--test] [--nosignature]" << endl; + cerr << "usage: " << argv[0] << " <database> [--test] [--nosignature] [--nopretest]" << endl; return 1; } @@ -77,10 +77,13 @@ bool dry_run = false; bool nosignature = false; + bool nopretest = false; while (argp < argc) { string arg(argv[argp]); if (arg == "--test") dry_run = true; if (arg == "--nosignature") nosignature = true; +#warning nopretest not honored + if (arg == "--nopretest") nopretest = true; argp++; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-installation
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package yast2-installation checked in at Sat Apr 15 11:42:52 CEST 2006. -------- --- yast2-installation/yast2-installation.changes 2006-04-13 10:39:38.000000000 +0200 +++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-14 22:34:47.000000000 +0200 @@ -1,0 +2,20 @@ +Fri Apr 14 22:25:11 CEST 2006 - jsrain(a)suse.de + +- prevent from changing installation mode and system for update once + it is selected (#165832) +- added add-on products to installation/update proposal for SLES/SLED +- 2.13.72 + +------------------------------------------------------------------- +Fri Apr 14 13:19:52 CEST 2006 - lslezak(a)suse.cz + +- call vm_finish client at the end of installation - disable + some services in Xen domU (#161720, #161721, #161756) +- 2.13.71 + +------------------------------------------------------------------- +Thu Apr 13 18:17:52 CEST 2006 - jdsn(a)suse.de + +- changed control files according to (#165509) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.13.70.tar.bz2 New: ---- yast2-installation-2.13.72.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.VLoddh/_old 2006-04-15 11:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.VLoddh/_new 2006-04-15 11:42:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.13.70) +# spec file for package yast2-installation (Version 2.13.72) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.13.70 +Version: 2.13.72 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.13.70.tar.bz2 +Source0: yast2-installation-2.13.72.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite Requires: yast2 yast2-update @@ -48,7 +48,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-installation-2.13.70 +%setup -n yast2-installation-2.13.72 %build %{prefix}/bin/y2tool y2autoconf @@ -106,6 +106,17 @@ /usr/X11R6/share/fvwm/ %changelog -n yast2-installation +* Fri Apr 14 2006 - jsrain(a)suse.de +- prevent from changing installation mode and system for update once + it is selected (#165832) +- added add-on products to installation/update proposal for SLES/SLED +- 2.13.72 +* Fri Apr 14 2006 - lslezak(a)suse.cz +- call vm_finish client at the end of installation - disable + some services in Xen domU (#161720, #161721, #161756) +- 2.13.71 +* Thu Apr 13 2006 - jdsn(a)suse.de +- changed control files according to (#165509) * Thu Apr 13 2006 - mvidner(a)suse.cz - Do not display errors if language specific release notes are missing on the installation source (#165767). ++++++ yast2-installation-2.13.70.tar.bz2 -> yast2-installation-2.13.72.tar.bz2 ++++++ ++++ 14780 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/VERSION new/yast2-installation-2.13.72/VERSION --- old/yast2-installation-2.13.70/VERSION 2006-04-13 10:34:46.000000000 +0200 +++ new/yast2-installation-2.13.72/VERSION 2006-04-14 22:29:27.000000000 +0200 @@ -1 +1 @@ -2.13.70 +2.13.72 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/configure.in new/yast2-installation-2.13.72/configure.in --- old/yast2-installation-2.13.70/configure.in 2006-04-13 10:40:47.000000000 +0200 +++ new/yast2-installation-2.13.72/configure.in 2006-04-14 22:33:05.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.13.70, http://www.suse.de/feedback, yast2-installation) +AC_INIT(yast2-installation, 2.13.72, http://www.suse.de/feedback, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.70" +VERSION="2.13.72" RPMNAME="yast2-installation" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/control/control.xml new/yast2-installation-2.13.72/control/control.xml --- old/yast2-installation-2.13.70/control/control.xml 2006-04-12 13:31:00.000000000 +0200 +++ new/yast2-installation-2.13.72/control/control.xml 2006-04-14 22:20:46.000000000 +0200 @@ -70,6 +70,7 @@ <proposal_module>keyboard</proposal_module> <proposal_module>mouse</proposal_module> <proposal_module>partitions</proposal_module> + <proposal_module>add-on</proposal_module> <proposal_module>software</proposal_module> <proposal_module>bootloader</proposal_module> <proposal_module>timezone</proposal_module> @@ -92,6 +93,7 @@ <proposal_module>keyboard</proposal_module> <proposal_module>mouse</proposal_module> <proposal_module>partitions</proposal_module> + <proposal_module>add-on</proposal_module> <proposal_module>software</proposal_module> <proposal_module>bootloader</proposal_module> <proposal_module>timezone</proposal_module> @@ -124,8 +126,11 @@ <proposal_modules config:type="list"> <proposal_module>hwinfo</proposal_module> <proposal_module>media</proposal_module> + <proposal_module>update</proposal_module> + <proposal_module>add-on</proposal_module> <proposal_module>packages</proposal_module> <proposal_module>backup</proposal_module> <proposal_module>language</proposal_module> @@ -503,7 +508,7 @@ <enable_next>yes</enable_next> </module> <module> - <label>Update Configuration</label> + <label>Customer Center</label> <name>suse_register</name> <enable_back>yes</enable_back> <enable_next>yes</enable_next> @@ -595,7 +600,7 @@ <name>do_net_test</name> </module> <module> - <label>Update Configuration</label> + <label>Customer Center</label> <name>suse_register</name> <enable_back>yes</enable_back> <enable_next>yes</enable_next> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/control/docs/control-doc.xml new/yast2-installation-2.13.72/control/docs/control-doc.xml --- old/yast2-installation-2.13.70/control/docs/control-doc.xml 2005-04-19 15:34:02.000000000 +0200 +++ new/yast2-installation-2.13.72/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100 @@ -28,7 +28,7 @@ 0.1 </revnumber> <date> - $Date: 2004-10-27 16:25:24 +0200 (St, 27 říj 2004) $ + $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $ </date> <revremark>Initial Release as PDF</revremark> </revision> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/src/clients/add-on_proposal.ycp new/yast2-installation-2.13.72/src/clients/add-on_proposal.ycp --- old/yast2-installation-2.13.70/src/clients/add-on_proposal.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-2.13.72/src/clients/add-on_proposal.ycp 2006-04-14 21:59:02.000000000 +0200 @@ -0,0 +1,71 @@ +/** + * Module: add-on_proposal.ycp + * + * Authors: Jiri Srain <jsrain(a)suse.cz> + * + * Purpose: Proposal function dispatcher - add-no products + * + * See also file proposal-API.txt for details. + */ +{ +textdomain "installation"; + +include "installation/add-on-workflow.ycp"; + +string func = (string) WFM::Args(0); +map param = (map) WFM::Args(1); +map ret = $[]; + +if ( func == "MakeProposal" ) +{ + boolean force_reset = param["force_reset" ]:false; + boolean language_changed = param["language_changed"]:false; + + list<string> items = maplist (map<string,any> product, AddOnProduct::add_on_products, { + map data = Pkg::SourceGeneralData (product["media"]:-1); + // placeholder for unknown path + string dir = data["product_dir"]:_("Unknown"); + if (dir == "") + dir = "/"; + // summary item, %1 is product name, %2 media URL, %3 directory on media + return sformat ("%1 (Media %2, directory %3)", product["product"]:"", data["url"]:_("Unknown"), dir); + }); + if (size (items) == 0) + { + // summary string + items = [ "No add-on product selected for installation" ]; + } + ret = $[ + "raw_proposal" : items, + ]; +} +else if ( func == "AskUser" ) +{ + Wizard::CreateDialog(); + symbol result = RunAddOnMainDialog (true, true); + UI::CloseDialog(); + + // Fill return map + + ret = $[ "workflow_sequence" : result, + "mode_changed" : false]; +} +else if ( func == "Description" ) +{ + // Fill return map. + // + // Static values do just nicely here, no need to call a function. + + ret = $[ + // this is a heading + "rich_text_title" : _( "Add-on Products" ), + // this is a menu entry + "menu_title" : _( "Add-on &Products" ), + "id" : "add_on" + ]; +} + +return ret; + + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/src/clients/inst_finish.ycp new/yast2-installation-2.13.72/src/clients/inst_finish.ycp --- old/yast2-installation-2.13.70/src/clients/inst_finish.ycp 2006-03-20 10:57:13.000000000 +0100 +++ new/yast2-installation-2.13.72/src/clients/inst_finish.ycp 2006-04-14 22:20:46.000000000 +0200 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 29143 2006-03-20 09:31:07Z locilka $ + * $Id: inst_finish.ycp 30137 2006-04-14 11:25:00Z lslezak $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -84,6 +84,7 @@ // progress stage "label" : _("Prepare system for initial boot"), "steps" : [ + "vm", "copy_logs", "driver_update2", "umount", diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.70/src/clients/inst_system_analysis.ycp new/yast2-installation-2.13.72/src/clients/inst_system_analysis.ycp --- old/yast2-installation-2.13.70/src/clients/inst_system_analysis.ycp 2006-03-20 10:57:14.000000000 +0100 +++ new/yast2-installation-2.13.72/src/clients/inst_system_analysis.ycp 2006-04-14 22:26:26.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Installation mode selection, system analysis * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: inst_system_analysis.ycp 29142 2006-03-20 09:11:52Z locilka $ + * $Id: inst_system_analysis.ycp 30159 2006-04-14 20:24:08Z jsrain $ * */ @@ -362,7 +362,7 @@ { ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, - true); + false); if (ret == `next) ret = `finish; } @@ -372,7 +372,7 @@ UpdateWizardSteps (); ret = ProductControl::RunFrom ( ProductControl::CurrentStep () + 1, - true); + false); if (ret == `next) ret = `finish; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package libzypp checked in at Sat Apr 15 11:42:31 CEST 2006. -------- --- libzypp/libzypp.changes 2006-04-13 15:24:52.000000000 +0200 +++ STABLE/libzypp/libzypp.changes 2006-04-14 16:58:47.000000000 +0200 @@ -1,0 +2,23 @@ +Fri Apr 14 16:04:35 CEST 2006 - visnov(a)suse.cz + +- new callbacks for failing digest +- rev 3098 + +------------------------------------------------------------------- +Thu Apr 13 16:59:38 CEST 2006 - kkaempf(a)suse.de + +- dont install satisfied resolvables (#165843) +- rev 3095 + +------------------------------------------------------------------- +Thu Apr 13 17:01:41 CEST 2006 - visnov(a)suse.cz + +- ask for file without a checksum (#165125) + +------------------------------------------------------------------- +Thu Apr 13 16:00:21 CEST 2006 - kkaempf(a)suse.de + +- dont abort on failed "dry_run" (#164583) +- rev 3091 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.46MK9a/_old 2006-04-15 11:42:16.000000000 +0200 +++ /var/tmp/diff_new_pack.46MK9a/_new 2006-04-15 11:42:16.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 96 +Release: 98 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,17 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Fri Apr 14 2006 - visnov(a)suse.cz +- new callbacks for failing digest +- rev 3098 +* Thu Apr 13 2006 - visnov(a)suse.cz +- ask for file without a checksum (#165125) +* Thu Apr 13 2006 - kkaempf(a)suse.de +- dont install satisfied resolvables (#165843) +- rev 3095 +* Thu Apr 13 2006 - kkaempf(a)suse.de +- dont abort on failed "dry_run" (#164583) +- rev 3091 * Thu Apr 13 2006 - visnov(a)suse.cz - Ask user if signature file does not exist (#163765) - handle repomd.xml.asc as optional file (#163765) ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 STABLE/libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit amarok
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package amarok checked in at Sat Apr 15 11:42:08 CEST 2006. -------- --- KDE/amarok/amarok.changes 2006-04-13 12:53:18.000000000 +0200 +++ STABLE/amarok/amarok.changes 2006-04-13 20:11:02.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 13 20:06:49 CEST 2006 - bk(a)suse.de + +- make scope (visualisation) work with the helix wrapper on 64-bit + +------------------------------------------------------------------- +Thu Apr 13 16:29:59 CEST 2006 - bk(a)suse.de + +- helix/x86_64: when playing streams, we didn't show any track info +- fix build of last change (ChangeLog didn't apply, file was moved) + +------------------------------------------------------------------- New: ---- helix-wrapper-metadata.diff helix-wrapper-scope.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.9C4HUz/_old 2006-04-15 11:41:52.000000000 +0200 +++ /var/tmp/diff_new_pack.9C4HUz/_new 2006-04-15 11:41:52.000000000 +0200 @@ -19,7 +19,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.3.8 -Release: 26 +Release: 28 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define rversion 1.3.8 %define mversion 0.5 @@ -45,6 +45,8 @@ Patch15: konqsidebar-translation.diff Patch16: helix-memleak-fix.patch Patch17: amarok-skip-hidden-dirs.diff +Patch18: helix-wrapper-metadata.diff +Patch19: helix-wrapper-scope.diff %description amaroK is a media player for all kinds of media supported by aRts or @@ -216,6 +218,8 @@ %patch15 %patch16 %patch17 +%patch18 +%patch19 cp %{S:10} amarok/src/engine/helix/ . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -346,6 +350,11 @@ /opt/kde3/bin/amarok_libvisual %changelog -n amarok +* Thu Apr 13 2006 - bk(a)suse.de +- make scope (visualisation) work with the helix wrapper on 64-bit +* Thu Apr 13 2006 - bk(a)suse.de +- helix/x86_64: when playing streams, we didn't show any track info +- fix build of last change (ChangeLog didn't apply, file was moved) * Thu Apr 13 2006 - dmueller(a)suse.de - Readd fix to avoid scanning hidden dirs * Wed Apr 12 2006 - cthiel(a)suse.de ++++++ amarok-helix-helper.cpp ++++++ --- KDE/amarok/amarok-helix-helper.cpp 2006-04-10 18:19:34.000000000 +0200 +++ STABLE/amarok/amarok-helix-helper.cpp 2006-04-13 20:30:21.000000000 +0200 @@ -3,10 +3,36 @@ #include <string> #include <iostream> #include <fstream> +#include <fcntl.h> // for fcntl(pipefd, F_SETFL, flags|O_NONBLOCK|O_WRONLY) using namespace std; -int main() +int scopebuf2sendbuffer(DelayQueue *item, char *buf) +{ + int len; + + memcpy(buf, &item->len, sizeof(int) ); len = sizeof(int); + memcpy(&buf[len], &item->time, sizeof(unsigned long) ); len += sizeof(unsigned long); + memcpy(&buf[len], &item->etime, sizeof(unsigned long) ); len += sizeof(unsigned long); + memcpy(&buf[len], &item->nchan, sizeof(int) ); len += sizeof(int); + memcpy(&buf[len], &item->bps, sizeof(int) ); len += sizeof(int); + memcpy(&buf[len], &item->tps, sizeof(double) ); len += sizeof(double); + memcpy(&buf[len], &item->spb, sizeof(int) ); len += sizeof(int); + memcpy(&buf[len], item->buf, item->len ); len += item->len; + + return len; +} + +void makenonblocking(int pipefd) +{ + int flags = fcntl(pipefd, F_GETFL); + if (fcntl(pipefd, F_SETFL, flags|O_NONBLOCK|O_WRONLY)) { + perror("fcntl to set O_NONBLOCK"); + exit(8); + } +} + +int main(int argc, char *argv[]) { string in, coredir, pluginsdir, codecsdir, tmp; HelixSimplePlayer player; @@ -15,6 +41,18 @@ int retval; fd_set rfds; + // variables for sending new stream metadata as updates to amarokapp: + + bool isLocal = true; // initialisation, we only have to send stream info + HelixSimplePlayer::metaData saved_md; + memset(&saved_md, 0, sizeof(saved_md)); // the saved metadata is empty + char sendscopebuf[65536], *sendscopeptr = NULL; + size_t towrite = 0; + + int pipefd = atoi(argv[argc-1]); // It's the last argument which we get + + makenonblocking(pipefd); // make the received pipe fd nonblocking + while ( true ) { FD_ZERO(&rfds); FD_SET(0, &rfds); @@ -26,7 +64,37 @@ if (retval >= 0 && numPlayers) { player.dispatch(); + if (pipefd) { + if (!sendscopeptr) { + DelayQueue * scopebuf = player.getScopeBuf(); + if (scopebuf) { + sendscopeptr = sendscopebuf; + towrite = scopebuf2sendbuffer(scopebuf, sendscopeptr); + delete scopebuf; + } + } + if (sendscopeptr) { + int written = write(pipefd, sendscopeptr, towrite); + if (written > 0) { + towrite -= written; + sendscopeptr += written; + } + if (towrite <= 0) + sendscopeptr = NULL; + } + } else player.clearScopeQ(); + + // If the source is non-local, check MetaData and send updates: + + HelixSimplePlayer::metaData *md = player.getMetaData(0); + if (!isLocal && (strcmp(saved_md.title, md->title) + || strcmp(saved_md.artist, md->artist))) { + memcpy(&saved_md, md, sizeof(saved_md)); + cout << "###TITLE:" << saved_md.title << endl; + cout << "###ARTIST:" << saved_md.artist << endl; + cout << "###BITRATE:" << saved_md.bitrate << endl << flush; + } } if(retval == 1) { @@ -62,7 +130,8 @@ getline(cin, tmp); int nr = atoi(tmp.c_str()); getline(cin, tmp); - bool isLocal = atoi(tmp.c_str()) != 0; + isLocal = atoi(tmp.c_str()) != 0; + // (-> now saves the info if we play a local file or a stream) player.setURL( file.c_str(), nr, isLocal ); } ++++++ amarok-skip-hidden-dirs.diff ++++++ --- /var/tmp/diff_new_pack.9C4HUz/_old 2006-04-15 11:41:53.000000000 +0200 +++ /var/tmp/diff_new_pack.9C4HUz/_new 2006-04-15 11:41:53.000000000 +0200 @@ -6,18 +6,6 @@ BUG: 115478 ------------------------------------------------------------------------ -Index: amarok/ChangeLog -=================================================================== ---- amarok/ChangeLog (revision 529213) -+++ amarok/ChangeLog (revision 529214) -@@ -8,6 +8,7 @@ VERSION 1.3.9: - * Support for libtunepimp 0.4. (BR 94988) - - BUGFIXES: -+ * Skip hidden directories while scanning the collection. (BR115478) - * Fix leak of file descriptors with embedded cover art. Patch by Shane - King <kde(a)dontletsstart.com>. (BR 123472) - * Stop collection folders being automatically removed. Instead, allow Index: amarok/src/collectionreader.cpp =================================================================== --- amarok/src/collectionreader.cpp (revision 529213) ++++++ helix-wrapper-metadata.diff ++++++ --- amarok/src/engine/helix/helix-engine.cpp +++ amarok/src/engine/helix/helix-engine.cpp @@ -82,6 +82,16 @@ m_duration[l[1].toInt()] = l[2].toInt(); } else if(l[0].startsWith("###DODONE")) { m_done[l[1].toInt()] = l[2].toInt(); + // Reveive song title, artist and bitrate from helper: + } else if(l[0].startsWith("###TITLE")) { + strncpy(m_md.title, l[1].latin1(), sizeof(m_md.title)-1); + m_md.title[sizeof(m_md.title)] = '\0'; + } else if(l[0].startsWith("###ARTIST")) { + strncpy(m_md.artist, l[1].latin1(), sizeof(m_md.artist)-1); + m_md.artist[sizeof(m_md.artist)] = '\0'; + } else if(l[0].startsWith("###BITRATE")) { + m_md.bitrate = l[1].toLong(); + m_newMetaData = true; // got all, flag that we have new metadata } } @@ -384,6 +393,7 @@ m_pluginsdir(HELIX_LIBS "/plugins"), m_codecsdir(HELIX_LIBS "/codecs"), m_inited(false), + m_newMetaData(false), // initialisation to false (no new metadata) m_item(0), #ifdef DEBUG_PURPOSES_ONLY m_fps(0.0),m_fcount(0),m_ftime(0.0),m_scopebufwaste(0), m_scopebufnone(0), m_scopebuftotal(0), @@ -868,6 +878,11 @@ (strcmp(m_md.title, md->title) || strcmp(m_md.artist, md->artist))) { memcpy(&m_md, md, sizeof(m_md)); +#else // #ifdef USE_HELIX_WRAPPER: + if (m_isStream && m_newMetaData) // We are streaming and have new metadata: + { + m_newMetaData = false; // we are going to process it, but only once ;) +#endif // moved here, now we can use the function always to pass the metadata: //debug() << "Title: " << md->title << " Artist: " << md->artist << " Bitrate: " << md->bitrate << endl; @@ -896,7 +911,6 @@ bndl.bitrate = QString::number( m_md.bitrate / 1000 ); emit EngineBase::metaData( bndl ); } -#endif } --- amarok/src/engine/helix/helix-engine.h +++ amarok/src/engine/helix/helix-engine.h @@ -174,6 +174,7 @@ bool m_isStream; HelixSimplePlayer::metaData m_md; + bool m_newMetaData; DelayQueue *m_item; #ifdef DEBUG_PURPOSES_ONLY ++++++ helix-wrapper-scope.diff ++++++ --- amarok/src/engine/helix/helix-engine.cpp +++ amarok/src/engine/helix/helix-engine.cpp @@ -12,6 +12,8 @@ #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> +#include <fcntl.h> // for fcntl(m_scopefd, F_SETFL, flags|O_NONBLOCK) +#include <errno.h> // for EAGAIN to handle nonblocking reads #include <climits> #include <cmath> #include <stdarg.h> @@ -86,6 +94,7 @@ HelixSimplePlayer::HelixSimplePlayer() : m_error(0), m_volume(0), m_enabledEQ(false), m_preamp(0), m_scopecount(0) + , scopebufhead(0), scopebuftail(0) { m_duration[0] = m_duration[1] = 0; m_where[0] = m_where[1] = 0; @@ -104,6 +115,45 @@ void HelixSimplePlayer::dispatch() { + static char *buf = NULL; + static int offset = 0, bufsz = 0; + DelayQueue *item; + int len; + +#define MAXSCOPEDATA 17632 // max. supported package size, no scope if larger + + if (!buf) + buf = (char *)malloc(MAXSCOPEDATA); + + while(1) { + if (offset >= MAXSCOPEDATA) // safety measure against overflow + offset = 0; + + int nbytesread = read(m_scopefd, buf+offset, MAXSCOPEDATA-offset); + + if (nbytesread == -1 && errno == EAGAIN) + return; // no data was immediately available for reading + + if (!offset) // We are at the start of a new packet, read its size: + memcpy(&bufsz, buf, 4); + + if (nbytesread + offset != bufsz + 32) { + offset += nbytesread; + return; // We didn't get all data, update offset and return + } else + offset = 0; // We read the whole package now + + item = new DelayQueue(bufsz); + memcpy(&item->time, &buf[len=4], 4); + memcpy(&item->etime, &buf[len+=4], 4); + memcpy(&item->nchan, &buf[len+=4], 4); + memcpy(&item->bps, &buf[len+=4], 4); + memcpy(&item->tps, &buf[len+=4], sizeof(double)); + memcpy(&item->spb, &buf[len +=sizeof(double)], 4); + memcpy(item->buf, &buf[len+=4], item->len); + + addScopeBuf(item); + } } void HelixSimplePlayer::tearDown() @@ -113,8 +161,51 @@ DelayQueue* HelixSimplePlayer::getScopeBuf() { + dispatch(); + pthread_mutex_lock(&m_scope_m); + + struct DelayQueue *item = scopebufhead; + + if (item) + { + scopebufhead = item->fwd; + m_scopecount--; + if (!scopebufhead) + scopebuftail = 0; + } + + pthread_mutex_unlock(&m_scope_m); + + return item; - return 0; } + +void HelixSimplePlayer::addScopeBuf(struct DelayQueue *item) +{ + pthread_mutex_lock(&m_scope_m); + + if (scopebuftail) + { + item->fwd = 0; + scopebuftail->fwd = item; + scopebuftail = item; + m_scopecount++; + } + else + { + item->fwd = 0; + scopebufhead = item; + scopebuftail = item; + m_scopecount = 1; + } + pthread_mutex_unlock(&m_scope_m); +} + +void HelixSimplePlayer::clearScopeQ() +{ + struct DelayQueue *item; + while ((item = getScopeBuf())) + delete item; +} void HelixSimplePlayer::init( const QCString& m_coredir, const QCString& m_pluginsdir, const QCString& m_codecsdir, int nr) @@ -240,6 +341,10 @@ int HelixSimplePlayer::peekScopeTime(unsigned long& t) { + if (scopebufhead) + t = scopebufhead->time; + else + return -1; return 0; } @@ -296,6 +403,18 @@ #ifdef USE_HELIX_WRAPPER connect(&helper, SIGNAL(readyReadStdout()), this, SLOT(slotHandleHelper())); + int pipe_fds[2]; + if (pipe(pipe_fds) == -1) { + perror("pipe"); + exit(5); + } + m_scopefd = pipe_fds[0]; // use one side of the pipe ourselfes + int flags = fcntl(m_scopefd, F_GETFL); + if (fcntl(m_scopefd, F_SETFL, flags|O_NONBLOCK)) { + perror("fcntl to set O_NONBLOCK"); + exit(8); + } + helper.addArgument(QString::number(pipe_fds[1])); // and pass the other helper.start(); #endif } @@ -812,7 +937,7 @@ const Engine::Scope &HelixEngine::scope() { -#ifndef USE_HELIX_WRAPPER +#ifndef USE_HELIX_WRAPPER_this_function_now_passes_the_scope_to_visualisation int i; unsigned long t; @@ -938,7 +1063,7 @@ void HelixEngine::resetScope() { -#ifndef USE_HELIX_WRAPPER +#ifndef USE_HELIX_WRAPPER_this_function_is_now_needed_to_clear_the__scope // make sure the scope is clear of old buffers clearScopeQ(); m_scopeindex = 0; --- amarok/src/engine/helix/helix-engine.h +++ amarok/src/engine/helix/helix-engine.h @@ -63,6 +63,8 @@ int getScopeCount() { return m_scopecount; } int peekScopeTime(unsigned long&t); DelayQueue *getScopeBuf(); + void addScopeBuf(struct DelayQueue *item); + void clearScopeQ(); int getPluginInfo(int index, const char *&description, const char *&copyright, @@ -98,6 +101,10 @@ bool m_enabledEQ; int m_preamp; int m_scopecount; + int m_scopefd; + pthread_mutex_t m_scope_m; + struct DelayQueue *scopebufhead; + struct DelayQueue *scopebuftail; std::vector<int> m_equalizerGains; QProcess helper; private: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-devtools
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package yast2-devtools checked in at Sat Apr 15 11:41:44 CEST 2006. -------- --- yast2-devtools/yast2-devtools.changes 2006-03-13 19:09:39.000000000 +0100 +++ NOARCH/yast2-devtools/yast2-devtools.changes 2006-04-13 18:14:37.000000000 +0200 @@ -1,0 +2,17 @@ +Thu Apr 13 18:11:52 CEST 2006 - mvidner(a)suse.cz + +- Respect POTFILES in y2makepot and check-textdomain. +- y2autoconf: Write the devtools version to the output. +- top_srcdir/Makefile.am: Always call y2tool in the right prefix. +- yast2-deps: Process all BuildRequires lines, do not skip + liby2util-devel. +- recreate: Added usage (-h), skip recently recreated (-s), non-YaST + mode (-Y). +- 2.13.17 + +------------------------------------------------------------------- +Fri Mar 24 09:17:06 CET 2006 - mzugec(a)suse.cz + +- add Confirm::MustBeRoot() to ReadDialog() + +------------------------------------------------------------------- Old: ---- yast2-devtools-2.13.16.tar.bz2 New: ---- yast2-devtools-2.13.17.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.LsIO1u/_old 2006-04-15 11:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.LsIO1u/_new 2006-04-15 11:41:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-devtools (Version 2.13.16) +# spec file for package yast2-devtools (Version 2.13.17) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-devtools -Version: 2.13.16 +Version: 2.13.17 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-devtools-2.13.16.tar.bz2 +Source0: yast2-devtools-2.13.17.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets gcc-c++ libxslt perl-XML-Writer sgml-skel Requires: perl @@ -48,7 +48,7 @@ Michal Svec <msvec(a)suse.cz> %prep -%setup -n yast2-devtools-2.13.16 +%setup -n yast2-devtools-2.13.17 %build autoreconf --force --install @@ -86,6 +86,17 @@ %doc %{prefix}/share/doc/packages/yast2-devtools %changelog -n yast2-devtools +* Thu Apr 13 2006 - mvidner(a)suse.cz +- Respect POTFILES in y2makepot and check-textdomain. +- y2autoconf: Write the devtools version to the output. +- top_srcdir/Makefile.am: Always call y2tool in the right prefix. +- yast2-deps: Process all BuildRequires lines, do not skip + liby2util-devel. +- recreate: Added usage (-h), skip recently recreated (-s), non-YaST + mode (-Y). +- 2.13.17 +* Fri Mar 24 2006 - mzugec(a)suse.cz +- add Confirm::MustBeRoot() to ReadDialog() * Mon Mar 13 2006 - od(a)suse.de - moved yast2/showy2log to devtools/bin/showy2log - fixed endless loop in showy2log pretty-print when encountering ++++++ yast2-devtools-2.13.16.tar.bz2 -> yast2-devtools-2.13.17.tar.bz2 ++++++ ++++ 12305 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit OpenOffice_org
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package OpenOffice_org checked in at Sat Apr 15 11:41:42 CEST 2006. -------- --- arch/i386/OpenOffice_org/OpenOffice_org.changes 2006-04-05 19:11:37.000000000 +0200 +++ STABLE/OpenOffice_org/OpenOffice_org.changes 2006-04-14 20:13:43.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Apr 14 20:11:54 CEST 2006 - pmladek(a)suse.cz + +- updated ooo-build to version 2.0.2.7: + * better fix for crash when selecting email application [#154458] + * avoids strange 2.6 specific hacks + +------------------------------------------------------------------- +Thu Apr 13 21:11:25 CEST 2006 - pmladek(a)suse.cz + +- updated ooo-build to version 2.0.2.6: + * crash when selecting email application + * allow right-click if focus is set to mouse in Metacity + * prefer Calc over Gnumeric in KDE, set InitialPreference=6 in calc.desktop + * enable Math MIME type setting; use NoDisplay=true instead of Hidden=true + in math.desktop + * crash with a11y [#165538] + * -display and other options with ooqstart [#160296] + * expression evaluation changed between 1.x and 2.0 [#164294] + * disable use of fontconfig to enable/disable bitmaps again [#164868] + +------------------------------------------------------------------- Old: ---- minmem ooo-build-2.0.2.5.tar.gz New: ---- ooo-build-2.0.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org.spec ++++++ --- /var/tmp/diff_new_pack.w612Ja/_old 2006-04-15 11:39:26.000000000 +0200 +++ /var/tmp/diff_new_pack.w612Ja/_new 2006-04-15 11:39:26.000000000 +0200 @@ -54,12 +54,12 @@ %define ooo_prefix /usr/lib %define ooo_home ooo-2.0 %define ooo_build_dir build -%define ooo_build_version 2.0.2.5 +%define ooo_build_version 2.0.2.7 %define ooo_build_tag OOO_2_0_2 License: LGPL, BSD Group: Productivity/Office/Suite Version: 2.0.2 -Release: 13 +Release: 16 Autoreqprov: on PreReq: coreutils /usr/bin/update-mime-database Prereq: %suseconfig_fonts_prereq @@ -1856,6 +1856,21 @@ %endif %changelog -n OpenOffice_org +* Fri Apr 14 2006 - pmladek(a)suse.cz +- updated ooo-build to version 2.0.2.7: + * better fix for crash when selecting email application [#154458] + * avoids strange 2.6 specific hacks +* Thu Apr 13 2006 - pmladek(a)suse.cz +- updated ooo-build to version 2.0.2.6: + * crash when selecting email application + * allow right-click if focus is set to mouse in Metacity + * prefer Calc over Gnumeric in KDE, set InitialPreference=6 in calc.desktop + * enable Math MIME type setting; use NoDisplay=true instead of Hidden=true + in math.desktop + * crash with a11y [#165538] + * -display and other options with ooqstart [#160296] + * expression evaluation changed between 1.x and 2.0 [#164294] + * disable use of fontconfig to enable/disable bitmaps again [#164868] * Wed Apr 05 2006 - pmladek(a)suse.cz - updated ooo-build to version 2.0.2.5: * use fontconfig to enable/disable bitmaps ++++++ ooo-build-2.0.2.5.tar.gz -> ooo-build-2.0.2.7.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/ChangeLog new/ooo-build-2.0.2.7/ChangeLog --- old/ooo-build-2.0.2.5/ChangeLog 2006-04-05 19:07:18.000000000 +0200 +++ new/ooo-build-2.0.2.7/ChangeLog 2006-04-14 19:41:42.000000000 +0200 @@ -1,3 +1,57 @@ +2006-04-14 Petr Mladek <pmladek(a)suse.cz> + + * Version 2.0.2.7 + + * patches/src680/fix_filedlghelper.diff: better fix for crash when + selecting email application, provided by Giuseppe Ghibò, + Ubuntu #33767, n#154458 + +2006-04-13 Petr Mladek <pmladek(a)suse.cz> + + * Version 2.0.2.6 + +2006-04-13 Radek Doulik <rodo(a)novell.com> + + * patches/src680/xmloff/source/draw/ximpstyl.cxx: updated with + changes from cl + +2006-04-13 Jody Goldberg <jody(a)gnome.org> + + * patches/src680/sc-string-arg.diff : Return errCellNoValue rather than + errNoValue. The former is a cheesy internal hack to return out of band + data that the value did not exist. The wrappers catch it. errNoValue + is an actual error. This weakens the XL compatibility which does + return a real error on failure, even for cases like "" and " ". n#164294 + +2006-04-12 Jan Holesovsky <kendy(a)suse.cz> + + * patches/src680/speed-ooqstart-options.diff, + patches/src680/apply: Fix -display and other options. + +2006-04-12 Michael Meeks <michael.meeks(a)novell.com> + + * patches/src680/crash-sd-a11y.diff, + * patches/src680/apply: fix a11y crasher i#64334, n#165538 + +2006-04-09 Petr Mladek <pmladek(a)suse.cz> + + * desktop/calc.desktop.in: add InitialPreference=6 to be prefered + over gnumeric in KDE + + * desktop/math.desktop.in: use NoDisplay=true instead of Hidden=true; + finally, works as expected (is not visible in menu, only provides + the MIME type info) + +2006-04-09 Matthias Klose <doko(a)ubuntu.com> + + * patches/src680/vcl-metacity-focus.diff: New. + * patches/src680/apply: Apply in Fixes. + +2006-04-09 Martin Kretzschmar <martink(a)gnome.org> + + * patches/src680/fix_filedlghelper.diff: New. + * patches/src680/apply: Apply in Fixes. + 2006-04-05 Petr Mladek <pmladek(a)suse.cz> * Version 2.0.2.5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/NEWS new/ooo-build-2.0.2.7/NEWS --- old/ooo-build-2.0.2.5/NEWS 2006-04-05 19:09:24.000000000 +0200 +++ new/ooo-build-2.0.2.7/NEWS 2006-04-14 19:48:02.000000000 +0200 @@ -1,3 +1,22 @@ +ooo-build-2.0.2.7 + + + bug fixes: + + crash when selecting email application (Giuseppe) + + build bits: + + problems with checkdll.sh (Petr, Andreas) + +ooo-build-2.0.2.6 + + + bug fixes: + + crash when selecting email application (Martin) + + allow right-click if focus is set to mouse in Metacity (Matthias) + + prefer Calc over Gnumeric in KDE (Petr) + + enable Math MIME type setting (Petr) + + crash with a11y (Michael) + + -display and other options with ooqstart (Jan) + + expression evaluation changed between 1.x and 2.0 (Jody) + + disable use of fontconfig to enable/disable bitmaps again (Petr) + ooo-build-2.0.2.5 + bug fixes: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/configure new/ooo-build-2.0.2.7/configure --- old/ooo-build-2.0.2.5/configure 2006-04-05 19:38:19.000000000 +0200 +++ new/ooo-build-2.0.2.7/configure 2006-04-14 20:08:16.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for ooo-build 2.0.2.5. +# Generated by GNU Autoconf 2.59 for ooo-build 2.0.2.7. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='ooo-build' PACKAGE_TARNAME='ooo-build' -PACKAGE_VERSION='2.0.2.5' -PACKAGE_STRING='ooo-build 2.0.2.5' +PACKAGE_VERSION='2.0.2.7' +PACKAGE_STRING='ooo-build 2.0.2.7' PACKAGE_BUGREPORT='' ac_unique_file="bin/build-ooo" @@ -807,7 +807,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ooo-build 2.0.2.5 to adapt to many kinds of systems. +\`configure' configures ooo-build 2.0.2.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -869,7 +869,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ooo-build 2.0.2.5:";; + short | recursive ) echo "Configuration of ooo-build 2.0.2.7:";; esac cat <<\_ACEOF @@ -1143,7 +1143,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -ooo-build configure 2.0.2.5 +ooo-build configure 2.0.2.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1157,7 +1157,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ooo-build $as_me 2.0.2.5, which was +It was created by ooo-build $as_me 2.0.2.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1809,7 +1809,7 @@ # Define the identity of the package. PACKAGE='ooo-build' - VERSION='2.0.2.5' + VERSION='2.0.2.7' cat >>confdefs.h <<_ACEOF @@ -2021,7 +2021,7 @@ -OOO_BUILDVERSION=2.0.2.5 +OOO_BUILDVERSION=2.0.2.7 PROPAGATED_ARGS=$ac_configure_args @@ -5944,7 +5944,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by ooo-build $as_me 2.0.2.5, which was +This file was extended by ooo-build $as_me 2.0.2.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6002,7 +6002,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ooo-build config.status 2.0.2.5 +ooo-build config.status 2.0.2.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/configure.in new/ooo-build-2.0.2.7/configure.in --- old/ooo-build-2.0.2.5/configure.in 2006-04-05 19:06:47.000000000 +0200 +++ new/ooo-build-2.0.2.7/configure.in 2006-04-14 19:12:38.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(ooo-build, 2.0.2.5) +AC_INIT(ooo-build, 2.0.2.7) AC_PREREQ(2.51) AC_CONFIG_SRCDIR(bin/build-ooo) AC_PREFIX_DEFAULT(/usr) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/desktop/calc.desktop.in new/ooo-build-2.0.2.7/desktop/calc.desktop.in --- old/ooo-build-2.0.2.5/desktop/calc.desktop.in 2006-03-09 15:31:34.000000000 +0100 +++ new/ooo-build-2.0.2.7/desktop/calc.desktop.in 2006-04-11 14:34:19.000000000 +0200 @@ -6,6 +6,7 @@ Exec=oocalc@BINSUFFIX@ %U Icon=ooo-calc@BINSUFFIX@.png Type=Application +InitialPreference=6 Categories=Office;Spreadsheet StartupNotify=@STARTUPNOTIFY@ MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/desktop/math.desktop.in new/ooo-build-2.0.2.7/desktop/math.desktop.in --- old/ooo-build-2.0.2.5/desktop/math.desktop.in 2006-03-09 15:31:34.000000000 +0100 +++ new/ooo-build-2.0.2.7/desktop/math.desktop.in 2006-04-10 14:10:30.000000000 +0200 @@ -2,7 +2,7 @@ Version=0.92 Encoding=UTF-8 Terminal=0 -Hidden=true +NoDisplay=true TryExec=oomath@BINSUFFIX@ Exec=oomath@BINSUFFIX@ %U Icon=ooo-math@BINSUFFIX@.png diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/apply new/ooo-build-2.0.2.7/patches/src680/apply --- old/ooo-build-2.0.2.5/patches/src680/apply 2006-04-05 18:00:10.000000000 +0200 +++ new/ooo-build-2.0.2.7/patches/src680/apply 2006-04-13 20:52:06.000000000 +0200 @@ -255,7 +255,9 @@ # run crash_report only when it is built, i#54121 sal-when-to-run-crash-report.diff # use fontconfig to enable/disable bitmaps i#61841, n#16082 -vcl-fontconfig-hints.diff +#vcl-fontconfig-hints.diff +# fix a11y crasher i#64334, n#165538 +crash-sd-a11y.diff # Fix the print error dialog and pop-up when unable to print. BINC 64010 Issue 44695 print-error.diff @@ -328,10 +330,19 @@ # validator.w3.org; Ubuntu 20294, i#63081 sw-html-export-style-type.diff +# fix problems with styles containing dashes i#63107, https://bugzilla.novell.com/show_bug.cgi?id=160120 +styles-dash.diff + # i#63766 hang on import of ms doc with vba # containing the characters "Attribute" svx-vbaimport-basic-hang.diff +# outsmart Metacity's "focus:mouse" mode, i#63086 +vcl-metacity-focus.diff + +# fix crash when selecting email application, Ubuntu #33767 +fix_filedlghelper.diff + [ Leaks ] # silly leaks around the place i#50726 leak-sal-file.diff @@ -366,6 +377,8 @@ speed-ooqstart-more-steps.diff # Make it X11+glib-only speed-ooqstart-x11-only.diff +# Fix -display and other options, n#160296 +speed-ooqstart-options.diff # make the office socket name more predictable for external re-use @@ -914,7 +927,7 @@ win32-msvs-2003-configure.diff # Minor build fixes for win32 win32-build-fixes.diff -# This is a pretty nasty IE problem #19510 +# This is a pretty nasty IE problem i#19510 win32-activex-disable.diff # This enables building libIDL, glib and buildtools for mozilla from source mozilla-buildlibs-win32.diff diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/crash-sd-a11y.diff new/ooo-build-2.0.2.7/patches/src680/crash-sd-a11y.diff --- old/ooo-build-2.0.2.5/patches/src680/crash-sd-a11y.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.0.2.7/patches/src680/crash-sd-a11y.diff 2006-04-12 16:20:02.000000000 +0200 @@ -0,0 +1,17 @@ +Index: sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +=================================================================== +RCS file: /cvs/graphics/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx,v +retrieving revision 1.20 +diff -u -p -u -r1.20 SlideSorterViewShell.cxx +--- sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 19 Jan 2006 12:53:55 -0000 1.20 ++++ sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx 12 Apr 2006 14:16:00 -0000 +@@ -274,6 +275,9 @@ DrawController* SlideSorterViewShell::Ge + ::com::sun::star::accessibility::XAccessible> + SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow) + { ++ if (mpSlideSorterController.get() == NULL) ++ return ViewShell::CreateAccessibleDocumentView (pWindow); ++ + return new ::accessibility::AccessibleSlideSorterView ( + *mpSlideSorterController.get(), + pWindow->GetAccessibleParentWindow()->GetAccessible(), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/fix_filedlghelper.diff new/ooo-build-2.0.2.7/patches/src680/fix_filedlghelper.diff --- old/ooo-build-2.0.2.5/patches/src680/fix_filedlghelper.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.0.2.7/patches/src680/fix_filedlghelper.diff 2006-04-14 19:25:49.000000000 +0200 @@ -0,0 +1,31 @@ +--- sfx2/source/dialog/filedlghelper.cxx.old 2006-04-14 19:21:26.000000000 +0200 ++++ sfx2/source/dialog/filedlghelper.cxx 2006-04-14 19:21:43.000000000 +0200 +@@ -102,6 +102,12 @@ + #ifndef _COM_SUN_STAR_UCB_INTERACTIVEAUGMENTEDIOEXCEPTION_HPP_ + #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> + #endif ++#ifndef _COM_SUN_STAR_UCB_INTERACTIVENETWORKGENERALEXCEPTION_HPP_ ++#include <com/sun/star/ucb/InteractiveNetworkGeneralException.hpp> ++#endif ++#ifndef _COM_SUN_STAR_IO_IOEXCEPTION_HPP_ ++#include <com/sun/star/io/IOException.hpp> ++#endif + + #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ + #include <comphelper/processfactory.hxx> +@@ -2404,6 +2410,15 @@ int impl_isFolder( const OUString& rPath + catch ( star::ucb::InteractiveAugmentedIOException const & ) + { + } ++ catch ( star::uno::RuntimeException const & ) ++ { ++ } ++ catch ( star::ucb::InteractiveNetworkGeneralException const & ) ++ { ++ } ++ catch ( star::io::IOException const & ) ++ { ++ } + + return -1; + } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/framework-nofocussteal.diff new/ooo-build-2.0.2.7/patches/src680/framework-nofocussteal.diff --- old/ooo-build-2.0.2.5/patches/src680/framework-nofocussteal.diff 2006-04-04 16:12:58.000000000 +0200 +++ new/ooo-build-2.0.2.7/patches/src680/framework-nofocussteal.diff 2006-02-24 18:37:30.000000000 +0100 @@ -605,9 +605,14 @@ // fill XLFD aliases from fonts.alias files initFontsAlias(); ---- psprint/source/fontmanager/fontconfig.cxx 2006-04-02 11:06:33.000000000 +0200 -+++ psprint/source/fontmanager/fontconfig.cxx 2006-04-02 11:26:22.000000000 +0200 -@@ -44,10 +44,12 @@ +Index: source/fontmanager/fontconfig.cxx +=================================================================== +RCS file: /cvs/gsl/psprint/source/fontmanager/fontconfig.cxx,v +retrieving revision 1.14 +diff -u -p -u -r1.14 fontconfig.cxx +--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 27 Oct 2005 07:55:13 -0000 1.14 ++++ psprint/source/fontmanager/fontconfig.cxx 5 Nov 2005 11:22:58 -0000 +@@ -44,10 +44,12 @@ typedef void FcConfig; typedef void FcObjectSet; typedef void FcPattern; typedef void FcFontSet; @@ -620,7 +625,7 @@ #endif #include <cstdio> -@@ -80,6 +82,7 @@ +@@ -80,6 +82,7 @@ class FontCfgWrapper { void* m_pLib; FcConfig* m_pDefConfig; @@ -628,14 +633,14 @@ FcBool (*m_pFcInit)(); FcConfig* (*m_pFcConfigGetCurrent)(); -@@ -88,18 +91,24 @@ +@@ -88,17 +91,23 @@ class FontCfgWrapper FcPattern* (*m_pFcPatternCreate)(); void (*m_pFcPatternDestroy)(FcPattern*); FcFontSet* (*m_pFcFontList)(FcConfig*,FcPattern*,FcObjectSet*); + FcFontSet* (*m_pFcConfigGetFonts)(FcConfig*,FcSetName); FcFontSet* (*m_pFcFontSetCreate)(); -+ FcCharSet* (*m_pFcCharSetCreate)(); -+ FcBool (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32); ++ FcCharSet* (*m_pFcCharSetCreate)(); ++ FcBool (*m_pFcCharSetAddChar)(FcCharSet *, FcChar32); void (*m_pFcFontSetDestroy)(FcFontSet*); FcBool (*m_pFcFontSetAdd)(FcFontSet*,FcPattern*); + void (*m_pFcPatternReference)(FcPattern*); @@ -645,16 +650,15 @@ FcResult (*m_pFcPatternGetBool)(const FcPattern*,const char*,int,FcBool*); void (*m_pFcDefaultSubstitute)(FcPattern *); - FcPattern* (*m_pFcFontMatch)(FcConfig*,FcPattern*,FcResult*); - FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*); ++ FcPattern* (*m_pFcFontSetMatch)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*); FcBool (*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind); FcBool (*m_pFcPatternAddInteger)(FcPattern*,const char*,int); -+ FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool); -+ FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*); -+ ++ FcBool (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool); ++ FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*); FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*); void* loadSymbol( const char* ); -@@ -115,6 +124,7 @@ +@@ -114,6 +123,7 @@ public: { return m_pLib != NULL;} FcConfig* getDefConfig() { return m_pDefConfig; } @@ -662,7 +666,7 @@ FcBool FcInit() { return m_pFcInit(); } -@@ -144,14 +154,28 @@ +@@ -143,14 +153,28 @@ public: FcFontSet* FcFontList( FcConfig* pConfig, FcPattern* pPattern, FcObjectSet* pSet ) { return m_pFcFontList( pConfig, pPattern, pSet ); } @@ -692,14 +696,14 @@ FcResult FcPatternGetString( const FcPattern* pPattern, const char* object, int n, FcChar8** s ) { return m_pFcPatternGetString( pPattern, object, n, s ); } -@@ -165,14 +189,17 @@ +@@ -164,12 +188,16 @@ public: { return m_pFcPatternGetBool( pPattern, object, n, s ); } void FcDefaultSubstitute( FcPattern* pPattern ) { m_pFcDefaultSubstitute( pPattern ); } - FcPattern* FcFontMatch( FcConfig* pConfig, FcPattern* pPattern, FcResult* pResult ) - { return m_pFcFontMatch( pConfig, pPattern, pResult ); } - FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult ) - { return m_pFcFontSetMatch ? m_pFcFontSetMatch( pConfig, ppFontSet, nset, pPattern, pResult ) : 0; } ++ FcPattern* FcFontSetMatch(FcConfig* pConfig, FcFontSet** ppFontSet, int nset, FcPattern *pPattern, FcResult *pResult) ++ { return m_pFcFontSetMatch( pConfig, ppFontSet, nset, pPattern, pResult ); } FcBool FcConfigSubstitute( FcConfig* pConfig, FcPattern* pPattern, FcMatchKind eKind ) { return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); } FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue ) @@ -708,11 +712,10 @@ + { return m_pFcPatternAddBool( pPattern, pObject, b ); } + FcBool FcPatternAddCharSet( FcPattern* pPattern, const char* pObject, const FcCharSet *c) + { return m_pFcPatternAddCharSet( pPattern, pObject, c ); } -+ FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString ) { return m_pFcPatternAddString( pPattern, pObject, pString ); } }; -@@ -189,7 +216,8 @@ +@@ -186,7 +214,8 @@ void* FontCfgWrapper::loadSymbol( const FontCfgWrapper::FontCfgWrapper() : m_pLib( NULL ), @@ -722,7 +725,7 @@ { #ifdef ENABLE_FONTCONFIG OUString aLib( RTL_CONSTASCII_USTRINGPARAM( "libfontconfig.so.1" ) ); -@@ -223,12 +251,20 @@ +@@ -220,12 +249,20 @@ FontCfgWrapper::FontCfgWrapper() loadSymbol( "FcPatternDestroy" ); m_pFcFontList = (FcFontSet*(*)(FcConfig*,FcPattern*,FcObjectSet*)) loadSymbol( "FcFontList" ); @@ -743,26 +746,26 @@ m_pFcPatternGetString = (FcResult(*)(const FcPattern*,const char*,int,FcChar8**)) loadSymbol( "FcPatternGetString" ); m_pFcPatternGetInteger = (FcResult(*)(const FcPattern*,const char*,int,int*)) -@@ -239,7 +275,6 @@ +@@ -236,12 +273,16 @@ FontCfgWrapper::FontCfgWrapper() loadSymbol( "FcPatternGetBool" ); m_pFcDefaultSubstitute = (void(*)(FcPattern *)) loadSymbol( "FcDefaultSubstitute" ); - m_pFcFontMatch = (FcPattern*(*)(FcConfig*,FcPattern*,FcResult*)) - loadSymbol( "FcFontMatch" ); - m_pFcFontSetMatch = (FcPattern*(*)(FcConfig*,FcFontSet**,int,FcPattern*,FcResult*)) - loadSymbol( "FcFontSetMatch" ); -@@ -247,6 +282,10 @@ +- loadSymbol( "FcFontMatch" ); ++ m_pFcFontSetMatch = (FcPattern*(*)(FcConfig*,FcFontSet**, int, FcPattern*,FcResult*)) ++ loadSymbol( "FcFontSetMatch" ); + m_pFcConfigSubstitute = (FcBool(*)(FcConfig*,FcPattern*,FcMatchKind)) loadSymbol( "FcConfigSubstitute" ); m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int)) loadSymbol( "FcPatternAddInteger" ); + m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool)) -+ loadSymbol( "FcPatternAddBool" ); ++ loadSymbol( "FcPatternAddBool" ); + m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *)) -+ loadSymbol( "FcPatternAddCharSet" ); ++ loadSymbol( "FcPatternAddCharSet" ); m_pFcPatternAddString = (FcBool(*)(FcPattern*,const char*,const FcChar8*)) loadSymbol( "FcPatternAddString" ); -@@ -258,17 +297,23 @@ +@@ -253,17 +294,23 @@ FontCfgWrapper::FontCfgWrapper() m_pFcPatternCreate && m_pFcPatternDestroy && m_pFcFontList && @@ -787,7 +790,7 @@ m_pFcPatternAddString ) ) { -@@ -286,10 +331,35 @@ +@@ -281,10 +328,35 @@ FontCfgWrapper::FontCfgWrapper() osl_unloadModule( (oslModule)m_pLib ); m_pLib = NULL; } @@ -823,7 +826,7 @@ if( m_pLib ) osl_unloadModule( (oslModule)m_pLib ); } -@@ -328,18 +398,7 @@ +@@ -319,18 +391,7 @@ bool PrintFontManager::initFontconfig() if( ! rWrapper.isValid() ) return false; @@ -843,7 +846,7 @@ if( pFSet ) { -@@ -400,6 +459,8 @@ +@@ -373,6 +434,8 @@ bool PrintFontManager::initFontconfig() ); #endif @@ -852,7 +855,7 @@ // only outline fonts are usable to psprint anyway if( eOutRes == FcResultMatch && ! outline ) continue; -@@ -551,14 +612,6 @@ +@@ -515,14 +578,6 @@ bool PrintFontManager::initFontconfig() } } @@ -867,7 +870,7 @@ // how does one get rid of the config ? #if OSL_DEBUG_LEVEL > 1 fprintf( stderr, "inserted %d fonts from fontconfig\n", nFonts ); -@@ -572,39 +625,14 @@ +@@ -536,39 +591,14 @@ void PrintFontManager::deinitFontconfig( FontCfgWrapper::release(); } @@ -911,7 +914,7 @@ { case italic::Italic: nSlant = FC_SLANT_ITALIC;break; case italic::Oblique: nSlant = FC_SLANT_OBLIQUE;break; -@@ -613,10 +641,10 @@ +@@ -577,10 +607,10 @@ bool PrintFontManager::matchFont( FastPr } rWrapper.FcPatternAddInteger( pPattern, FC_SLANT, nSlant ); } @@ -924,7 +927,7 @@ { case weight::Thin: nWeight = FC_WEIGHT_THIN;break; case weight::UltraLight: nWeight = FC_WEIGHT_ULTRALIGHT;break; -@@ -633,10 +661,10 @@ +@@ -597,10 +627,10 @@ bool PrintFontManager::matchFont( FastPr } rWrapper.FcPatternAddInteger( pPattern, FC_WEIGHT, nWeight ); } @@ -937,7 +940,7 @@ { case width::UltraCondensed: nWidth = FC_WIDTH_ULTRACONDENSED;break; case width::ExtraCondensed: nWidth = FC_WIDTH_EXTRACONDENSED;break; -@@ -652,10 +680,10 @@ +@@ -616,10 +646,10 @@ bool PrintFontManager::matchFont( FastPr } rWrapper.FcPatternAddInteger( pPattern, FC_WIDTH, nWidth ); } @@ -950,7 +953,7 @@ { case pitch::Fixed: nSpacing = FC_MONO;break; case pitch::Variable: nSpacing = FC_PROPORTIONAL;break; -@@ -663,12 +691,123 @@ +@@ -627,12 +657,123 @@ bool PrintFontManager::matchFont( FastPr break; } rWrapper.FcPatternAddInteger( pPattern, FC_SPACING, nSpacing ); @@ -1016,8 +1019,8 @@ + // info: destroying the pSet destroys pResult implicitly + // since pResult was "added" to pSet + rWrapper.FcFontSetAdd( pSet, pResult ); -+ } -+ + } + + if( pSet ) + { + if( pSet->nfont > 0 ) @@ -1056,7 +1059,7 @@ + aLang.append( rLocale.Country ); + } + aLangAttrib = OUStringToOString( aLang.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); - } ++ } + if( aLangAttrib.getLength() ) + rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() ); + @@ -1065,7 +1068,7 @@ + rWrapper.FcPatternAddString( pPattern, FC_FAMILY, (FcChar8*)aFamily.getStr() ); + + addtopattern(rWrapper, pPattern, rInfo.m_eItalic, rInfo.m_eWeight, rInfo.m_eWidth, rInfo.m_ePitch); - ++ rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern ); rWrapper.FcDefaultSubstitute( pPattern ); FcResult eResult = FcResultNoMatch; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/sc-string-arg.diff new/ooo-build-2.0.2.7/patches/src680/sc-string-arg.diff --- old/ooo-build-2.0.2.5/patches/src680/sc-string-arg.diff 2005-04-20 13:52:54.000000000 +0200 +++ new/ooo-build-2.0.2.7/patches/src680/sc-string-arg.diff 2006-04-13 15:34:12.000000000 +0200 @@ -1,22 +1,23 @@ --- sc/source/core/tool/interpr4.cxx 2005-04-14 09:50:06.000000000 +0530 +++ sc/source/core/tool/interpr4.cxx 2005-04-19 13:12:20.678272373 +0530 -@@ -283,8 +283,6 @@ double ScInterpreter::GetCellValueOrZero +@@ -257,7 +257,7 @@ double ScInterpreter::GetCellValueOrZero break; case CELLTYPE_STRING: case CELLTYPE_EDIT: -#if 0 --// Xcl does it, but SUM(A1:A2) differs from A1+A2. No good. ++#if 1 /* JEG : re-enable because compatibility is more important than consistency for this */ + // Xcl does it, but SUM(A1:A2) differs from A1+A2. No good. { String aStr; - if ( eType == CELLTYPE_STRING ) -@@ -299,7 +297,6 @@ double ScInterpreter::GetCellValueOrZero +@@ -268,7 +268,7 @@ double ScInterpreter::GetCellValueOrZero + sal_uInt32 nFIndex = 0; // damit default Land/Spr. + if ( !pFormatter->IsNumberFormat( aStr, nFIndex, fValue ) ) + { +- SetError(errNoValue); ++ SetError(errCellNoValue); /* CellNoValue is not really an error */ + fValue = 0.0; } } - break; --#endif - default: - SetError(errCellNoValue); - fValue = 0.0; --- sc/source/core/tool/interpr1.cxx 2005-04-14 09:50:06.000000000 +0530 +++ sc/source/core/tool/interpr1.cxx 2005-04-19 12:08:07.486080311 +0530 @@ -2685,12 +2685,13 @@ double ScInterpreter::IterateParameters( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/speed-ooqstart-options.diff new/ooo-build-2.0.2.7/patches/src680/speed-ooqstart-options.diff --- old/ooo-build-2.0.2.5/patches/src680/speed-ooqstart-options.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.0.2.7/patches/src680/speed-ooqstart-options.diff 2006-04-12 17:03:44.000000000 +0200 @@ -0,0 +1,18 @@ +--- desktop/unx/source/start.c 2006-04-10 17:33:14.000000000 +0000 ++++ desktop/unx/source/start.c 2006-04-12 13:29:35.000000000 +0000 +@@ -415,10 +415,13 @@ setup_args (int argc, char **argv, const + + else if (arg_check (argv[i], "nologo") || + arg_check (argv[i], "headless") || +- arg_check (argv[i], "invisible")) ++ arg_check (argv[i], "invisible") || ++ arg_check (argv[i], "help") || arg_check (argv[i], "h") || arg_check (argv[i], "?") || ++ arg_check (argv[i], "minimized")) + *inhibit_splash = TRUE; + +- else if (arg_check (argv[i], "-pt")) ++ else if (arg_check (argv[i], "pt") || ++ arg_check (argv[i], "display")) + next_arg_not_filename = TRUE; + } + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/styles-dash.diff new/ooo-build-2.0.2.7/patches/src680/styles-dash.diff --- old/ooo-build-2.0.2.5/patches/src680/styles-dash.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.0.2.7/patches/src680/styles-dash.diff 2006-04-13 18:46:21.000000000 +0200 @@ -0,0 +1,273 @@ +Index: xmloff/source/draw/ximpstyl.cxx +=================================================================== +RCS file: /cvs/xml/xmloff/source/draw/ximpstyl.cxx,v +retrieving revision 1.46 +retrieving revision 1.46.100.1 +diff -u -p -r1.46 -r1.46.100.1 +--- xmloff/source/draw/ximpstyl.cxx 9 Sep 2005 14:02:13 -0000 1.46 ++++ xmloff/source/draw/ximpstyl.cxx 3 Apr 2006 12:24:56 -0000 1.46.100.1 +@@ -208,8 +208,7 @@ SvXMLImportContext *SdXMLDrawingPageProp + + if( (nPrefix == XML_NAMESPACE_XLINK) && IsXMLToken( aLocalName, XML_HREF ) ) + { +- uno::Any aAny; +- aAny <<= GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) ); ++ uno::Any aAny( GetImport().GetAbsoluteReference( xAttrList->getValueByIndex(i) ) ); + XMLPropertyState aPropState( rProp.mnIndex, aAny ); + rProperties.push_back( aPropState ); + } +@@ -392,10 +391,7 @@ void SdXMLDrawingPageStyleContext::FillP + xInfo = rPropSet->getPropertySetInfo(); + if ( xInfo->hasPropertyByName( rPropertyName ) ) + { +- Any aAny; +- aAny <<= sStyleName; +- +- rPropSet->setPropertyValue( rPropertyName, aAny ); ++ rPropSet->setPropertyValue( rPropertyName, Any( sStyleName ) ); + } + } + } +@@ -1336,10 +1332,7 @@ void SdXMLStylesContext::SetMasterPageSt + + if(GetSdImport().GetLocalDocStyleFamilies().is() && GetSdImport().GetLocalDocStyleFamilies()->hasByName(rMaster.GetDisplayName())) + { +- uno::Any aAny(GetSdImport().GetLocalDocStyleFamilies()->getByName(rMaster.GetDisplayName())); +- uno::Reference< container::XNameAccess > xMasterPageStyles; +- aAny >>= xMasterPageStyles; +- ++ uno::Reference< container::XNameAccess > xMasterPageStyles( GetSdImport().GetLocalDocStyleFamilies()->getByName(rMaster.GetDisplayName()), UNO_QUERY ); + if(xMasterPageStyles.is()) + { + ImpSetGraphicStyles(xMasterPageStyles, XML_STYLE_FAMILY_SD_PRESENTATION_ID, sPrefix); +@@ -1385,7 +1378,6 @@ void SdXMLStylesContext::ImpSetGraphicSt + const UniString& rPrefix) const + { + xub_StrLen nPrefLen(rPrefix.Len()); +- uno::Any aAny; + + sal_uInt32 a; + +@@ -1408,88 +1400,85 @@ void SdXMLStylesContext::ImpSetGraphicSt + const SvXMLStyleContext* pStyle = GetStyle(a); + if(nFamily == pStyle->GetFamily() && !pStyle->IsDefaultStyle()) + { +- const UniString aStyleName(pStyle->GetDisplayName(), (sal_uInt16)pStyle->GetDisplayName().getLength()); +- sal_uInt16 nStylePrefLen = aStyleName.SearchBackward( sal_Unicode('-') ) + 1; +- +- if(!nPrefLen || ((nPrefLen == nStylePrefLen) && aStyleName.Equals(rPrefix, 0, nPrefLen))) ++ OUString aStyleName(pStyle->GetDisplayName()); ++ if( nPrefLen ) + { +- uno::Reference< style::XStyle > xStyle; +- const OUString aPureStyleName = nStylePrefLen ? +- pStyle->GetDisplayName().copy((sal_Int32)nStylePrefLen) : pStyle->GetDisplayName(); +- +- if(xPageStyles->hasByName(aPureStyleName)) +- { +- aAny = xPageStyles->getByName(aPureStyleName); +- aAny >>= xStyle; ++ sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1; ++ if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) ) ++ continue; + +- // set properties of existing styles to default +- uno::Reference< beans::XPropertySet > xPropSet( xStyle, uno::UNO_QUERY ); +- uno::Reference< beans::XPropertySetInfo > xPropSetInfo; +- if( xPropSet.is() ) +- xPropSetInfo = xPropSet->getPropertySetInfo(); ++ aStyleName = aStyleName.copy( nPrefLen ); ++ } + +- uno::Reference< beans::XPropertyState > xPropState( xStyle, uno::UNO_QUERY ); ++ uno::Reference< style::XStyle > xStyle; ++ if(xPageStyles->hasByName(aStyleName)) ++ { ++ xPageStyles->getByName(aStyleName) >>= xStyle; + +- if( xPropState.is() ) ++ // set properties of existing styles to default ++ uno::Reference< beans::XPropertySet > xPropSet( xStyle, uno::UNO_QUERY ); ++ uno::Reference< beans::XPropertySetInfo > xPropSetInfo; ++ if( xPropSet.is() ) ++ xPropSetInfo = xPropSet->getPropertySetInfo(); ++ ++ uno::Reference< beans::XPropertyState > xPropState( xStyle, uno::UNO_QUERY ); ++ ++ if( xPropState.is() ) ++ { ++ UniReference < XMLPropertySetMapper > xPrMap; ++ UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily ); ++ DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); ++ if( xImpPrMap.is() ) ++ xPrMap = xImpPrMap->getPropertySetMapper(); ++ if( xPrMap.is() ) + { +- UniReference < XMLPropertySetMapper > xPrMap; +- UniReference < SvXMLImportPropertyMapper > xImpPrMap = GetImportPropertyMapper( nFamily ); +- DBG_ASSERT( xImpPrMap.is(), "There is the import prop mapper" ); +- if( xImpPrMap.is() ) +- xPrMap = xImpPrMap->getPropertySetMapper(); +- if( xPrMap.is() ) ++ const sal_Int32 nCount = xPrMap->GetEntryCount(); ++ for( sal_Int32 i = 0; i < nCount; i++ ) + { +- const sal_Int32 nCount = xPrMap->GetEntryCount(); +- for( sal_Int32 i = 0; i < nCount; i++ ) ++ const OUString& rName = xPrMap->GetEntryAPIName( i ); ++ if( xPropSetInfo->hasPropertyByName( rName ) && beans::PropertyState_DIRECT_VALUE == xPropState->getPropertyState( rName ) ) + { +- const OUString& rName = xPrMap->GetEntryAPIName( i ); +- if( xPropSetInfo->hasPropertyByName( rName ) && beans::PropertyState_DIRECT_VALUE == xPropState->getPropertyState( rName ) ) +- { +- xPropState->setPropertyToDefault( rName ); +- } ++ xPropState->setPropertyToDefault( rName ); + } + } + } + } +- else +- { +- // graphics style does not exist, create and add it +- uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY); +- if(xServiceFact.is()) +- { +- uno::Reference< style::XStyle > xNewStyle( +- xServiceFact->createInstance( +- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style"))), +- uno::UNO_QUERY); ++ } ++ else ++ { ++ // graphics style does not exist, create and add it ++ uno::Reference< lang::XMultiServiceFactory > xServiceFact(GetSdImport().GetModel(), uno::UNO_QUERY); ++ if(xServiceFact.is()) ++ { ++ uno::Reference< style::XStyle > xNewStyle( ++ xServiceFact->createInstance( ++ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.Style"))), ++ uno::UNO_QUERY); + +- if(xNewStyle.is()) +- { +- // remember style +- xStyle = xNewStyle; ++ if(xNewStyle.is()) ++ { ++ // remember style ++ xStyle = xNewStyle; + +- // add new style to graphics style pool +- uno::Reference< container::XNameContainer > xInsertContainer(xPageStyles, uno::UNO_QUERY); +- if(xInsertContainer.is()) +- { +- aAny <<= xStyle; +- xInsertContainer->insertByName(aPureStyleName, aAny); +- } +- } ++ // add new style to graphics style pool ++ uno::Reference< container::XNameContainer > xInsertContainer(xPageStyles, uno::UNO_QUERY); ++ if(xInsertContainer.is()) ++ xInsertContainer->insertByName(aStyleName, uno::Any( xStyle ) ); + } + } ++ } + +- if(xStyle.is()) +- { +- // set properties at style +- XMLShapeStyleContext* pPropStyle = +- (pStyle->ISA(XMLShapeStyleContext)) ? (XMLShapeStyleContext*)pStyle : 0L; +- uno::Reference< beans::XPropertySet > xPropSet(xStyle, uno::UNO_QUERY); ++ if(xStyle.is()) ++ { ++ // set properties at style ++ XMLShapeStyleContext* pPropStyle = ++ (pStyle->ISA(XMLShapeStyleContext)) ? (XMLShapeStyleContext*)pStyle : 0L; ++ uno::Reference< beans::XPropertySet > xPropSet(xStyle, uno::UNO_QUERY); + +- if(xPropSet.is() && pPropStyle) +- { +- pPropStyle->FillPropertySet(xPropSet); +- pPropStyle->SetStyle(xStyle); +- } ++ if(xPropSet.is() && pPropStyle) ++ { ++ pPropStyle->FillPropertySet(xPropSet); ++ pPropStyle->SetStyle(xStyle); + } + } + } +@@ -1507,35 +1496,40 @@ void SdXMLStylesContext::ImpSetGraphicSt + { + const SvXMLStyleContext* pStyle = GetStyle(a); + +- if(pStyle && nFamily == pStyle->GetFamily()) ++ if(pStyle && pStyle->GetName().getLength() && (nFamily == pStyle->GetFamily())) try + { +- const UniString aStyleName(pStyle->GetDisplayName(), (sal_uInt16)pStyle->GetDisplayName().getLength()); +- sal_uInt16 nStylePrefLen = aStyleName.SearchBackward( sal_Unicode('-') ) + 1; +- +- if(pStyle->GetName().getLength() && (!nPrefLen || ((nPrefLen == nStylePrefLen) && aStyleName.Equals(rPrefix, 0, nPrefLen)))) ++ OUString aStyleName(pStyle->GetDisplayName()); ++ if( nPrefLen ) + { +- try +- { ++ sal_Int32 nStylePrefLen = aStyleName.lastIndexOf( sal_Unicode('-') ) + 1; ++ if( (nPrefLen != nStylePrefLen) || (aStyleName.compareTo( rPrefix, nPrefLen ) != 0) ) ++ continue; + +- uno::Reference< style::XStyle > xStyle; +- const OUString aPureStyleName = nPrefLen ? pStyle->GetDisplayName().copy((sal_Int32)nPrefLen) : pStyle->GetDisplayName(); +- xPageStyles->getByName(aPureStyleName) >>= xStyle; ++ aStyleName = aStyleName.copy( nPrefLen ); ++ } + +- if(xStyle.is()) +- { +- // set parent style name +- ::rtl::OUString sParentStyleDisplayName = const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ); +- xStyle->setParentStyle( sParentStyleDisplayName ); +- } +- } +- catch( Exception& e ) ++ uno::Reference< style::XStyle > xStyle( xPageStyles->getByName(aStyleName), UNO_QUERY ); ++ if(xStyle.is()) ++ { ++ // set parent style name ++ ::rtl::OUString sParentStyleDisplayName( const_cast< SvXMLImport& >( GetImport() ).GetStyleDisplayName( pStyle->GetFamily(), pStyle->GetParentName() ) ); ++ if( nPrefLen ) + { +- (void)e; +- uno::Sequence<OUString> aSeq(0); +- const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL ); ++ sal_Int32 nStylePrefLen = sParentStyleDisplayName.lastIndexOf( sal_Unicode('-') ) + 1; ++ if( (nPrefLen != nStylePrefLen) || (sParentStyleDisplayName.compareTo( rPrefix, nPrefLen ) != 0) ) ++ continue; ++ ++ sParentStyleDisplayName = sParentStyleDisplayName.copy( nPrefLen ); + } ++ xStyle->setParentStyle( sParentStyleDisplayName ); + } + } ++ catch( Exception& e ) ++ { ++ (void)e; ++ uno::Sequence<OUString> aSeq(0); ++ const_cast<SdXMLImport*>(&GetSdImport())->SetError( XMLERROR_FLAG_WARNING | XMLERROR_API, aSeq, e.Message, NULL ); ++ } + } + } + +@@ -1603,8 +1597,7 @@ SvXMLImportContext* SdXMLMasterStylesCon + else + { + // existing page, use it +- uno::Any aAny(xMasterPages->getByIndex(GetSdImport().GetNewMasterPageCount())); +- aAny >>= xNewMasterPage; ++ xMasterPages->getByIndex(GetSdImport().GetNewMasterPageCount()) >>= xNewMasterPage; + } + + // increment global import page counter diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/patches/src680/vcl-metacity-focus.diff new/ooo-build-2.0.2.7/patches/src680/vcl-metacity-focus.diff --- old/ooo-build-2.0.2.5/patches/src680/vcl-metacity-focus.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/ooo-build-2.0.2.7/patches/src680/vcl-metacity-focus.diff 2006-04-10 20:50:52.000000000 +0200 @@ -0,0 +1,51 @@ +From: pl(a)openoffice.org +To: cvs(a)gsl.openoffice.org +Subject: [gsl-cvs] CVS update [cws_src680_vcl56]: /gsl/vcl/unx/gtk/window/ + +Tag: cws_src680_vcl56 +User: pl +Date: 06/03/16 04:28:11 + +Modified: + /gsl/vcl/unx/gtk/window/ + gtkframe.cxx + +Log: + #i63086# workaround another metacity bug + +File Changes: + +Directory: /gsl/vcl/unx/gtk/window/ +=================================== + +File [changed]: gtkframe.cxx +Url: http://gsl.openoffice.org/source/browse/gsl/vcl/unx/gtk/window/gtkframe.cxx… +Delta lines: +17 -3 +-------------------- +--- vcl/unx/gtk/window/gtkframe.cxx 25 Jan 2006 11:40:22 -0000 1.42 ++++ vcl/unx/gtk/window/gtkframe.cxx 16 Mar 2006 12:28:08 -0000 1.42.88.1 +@@ -1005,6 +1005,20 @@ + if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea ) + getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea ); + ++ if( isFloatGrabWindow() && ++ m_pParent && ++ m_nFloats == 0 && ++ ! getDisplay()->GetCaptureFrame() ) ++ { ++ /* #i63086# ++ * outsmart Metacity's "focus:mouse" mode ++ * which insists on taking the focus from the document ++ * to the new float. Grab focus to parent frame BEFORE ++ * showing the float (cannot grab it to the float ++ * before show). ++ */ ++ m_pParent->grabPointer( TRUE, TRUE ); ++ } + gtk_widget_show( GTK_WIDGET(m_pWindow) ); + if( isFloatGrabWindow() ) + { + + + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ooo-build-2.0.2.5/src/Novell.dic new/ooo-build-2.0.2.7/src/Novell.dic --- old/ooo-build-2.0.2.5/src/Novell.dic 2006-02-22 15:42:02.000000000 +0100 +++ new/ooo-build-2.0.2.7/src/Novell.dic 2006-04-13 15:34:13.000000000 +0200 @@ -14,6 +14,7 @@ NetMail NetStorage NetWare +Novell OnDemand PolyServe SecretStore @@ -29,4 +30,6 @@ iManager iPrint Ximian -SUSE +SLES +SLED +SUSE \ No newline at end of file ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit CASA
by root＠suse.de 15 Apr '06

15 Apr '06

Hello community, here is the log from the commit of package CASA checked in at Sat Apr 15 11:38:57 CEST 2006. -------- --- CASA/CASA.changes 2006-04-10 17:57:59.000000000 +0200 +++ STABLE/CASA/CASA.changes 2006-04-15 11:35:34.000000000 +0200 @@ -2 +2 @@ -Mon Apr 10 9:41:10 MST 2006 - jnorman(a)novell.com +Mon Apr 10 09:41:10 MST 2006 - jnorman(a)novell.com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA.spec ++++++ --- /var/tmp/diff_new_pack.0BMOYR/_old 2006-04-15 11:38:29.000000000 +0200 +++ /var/tmp/diff_new_pack.0BMOYR/_new 2006-04-15 11:38:29.000000000 +0200 @@ -23,7 +23,7 @@ Autoreqprov: on %define bldno 1.1.1 Version: 1.6.447 -Release: 1 +Release: 4 Summary: Novell Common Authentication Service Adapter (CASA) Source: %{name}-%{version}.tar.bz2 #Patch: %{name}-%{version}.diff @@ -256,8 +256,7 @@ %{prefix}/CASA/help/en/* %changelog -n CASA -* Thu Apr 13 14:49:00 CEST 2006 - broken(a)suse.de - Mon Apr 10 9:41:10 MST 2006 - jnorman(a)novell.com +* Mon Apr 10 2006 - jnorman(a)novell.com - Bug 154548. Fix to display firefox secrets in CASAManager. * Tue Apr 04 2006 - jnorman(a)novell.com - added timer to suppress viewing values(passwords) for micasa store ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0