June 2007 - openSUSE Commits - openSUSE Mailing Lists

commit patterns-openSUSE
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package patterns-openSUSE checked in at Thu Jun 28 19:26:20 CEST 2007. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2007-06-14 08:24:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2007-06-28 09:17:52.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jun 28 09:17:34 CEST 2007 - aj(a)suse.de + +- Add vm-install and virt-manager to XEN pattern (#286987). +- Require xkeyboard-config in X11 (#285001). +- Require hal-resmgr in enhanced basis (#285057), add setserial + as recommended. +- Make some packages only recommended in GNOME Imaging (#285251). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.G25473/_old 2007-06-28 19:26:04.000000000 +0200 +++ /var/tmp/diff_new_pack.G25473/_new 2007-06-28 19:26:04.000000000 +0200 @@ -17,7 +17,7 @@ Autoreqprov: on Summary: Patterns for Installation (full ftp tree) Version: 10.3 -Release: 64 +Release: 66 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess @@ -185,6 +185,12 @@ /CD1/suse/setup/descr/non_oss*.pat %changelog +* Thu Jun 28 2007 - aj(a)suse.de +- Add vm-install and virt-manager to XEN pattern (#286987). +- Require xkeyboard-config in X11 (#285001). +- Require hal-resmgr in enhanced basis (#285057), add setserial + as recommended. +- Make some packages only recommended in GNOME Imaging (#285251). * Thu Jun 14 2007 - aj(a)suse.de - Add KDE4 Basis pattern (#283896). - Cleanup devel-qt4 pattern (#283889). ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2007-06-11 12:01:36.000000000 +0200 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2007-06-28 09:17:26.000000000 +0200 @@ -23,6 +23,7 @@ fillup findutils groff +hal-resmgr insserv iproute2 iptables @@ -96,7 +97,6 @@ gpg gpm hal -hal-resmgr hdparm hplip ifplugd @@ -153,6 +153,7 @@ sash screen scsi +setserial sharutils smartmontools smpppd diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-IMAGE new/patterns-openSUSE-data/data/GNOME-IMAGE --- old/patterns-openSUSE-data/data/GNOME-IMAGE 2006-11-12 18:04:06.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-IMAGE 2007-06-28 08:43:31.000000000 +0200 @@ -1,8 +1,10 @@ +Prq: -dia eog +-Prq: ++Prc: +dia f-spot gphoto ImageMagick inkscape --Prq: +-Prc: \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11 new/patterns-openSUSE-data/data/X11 --- old/patterns-openSUSE-data/data/X11 2007-06-09 16:00:22.000000000 +0200 +++ new/patterns-openSUSE-data/data/X11 2007-06-28 09:11:33.000000000 +0200 @@ -1,4 +1,5 @@ +Prq: +xkeyboard-config xterm #if defined __x86_64__ libasound2-32bit @@ -37,7 +38,6 @@ xdg-menu xdg-utils xdmbgrd -xkeyboard-config xlockmore xorg-x11 xorg-x11-Xvnc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/XEN new/patterns-openSUSE-data/data/XEN --- old/patterns-openSUSE-data/data/XEN 2006-11-07 23:21:10.000000000 +0100 +++ new/patterns-openSUSE-data/data/XEN 2007-06-28 09:10:09.000000000 +0200 @@ -1,11 +1,13 @@ +Prq: bridge-utils +vm-install xen xen-libs xen-tools xen-tools-ioemu -Prq: +Prc: +virt-manager xen-doc-html xen-doc-pdf xterm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mercurial
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package mercurial checked in at Thu Jun 28 19:26:15 CEST 2007. -------- --- mercurial/mercurial.changes 2006-12-19 16:03:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/mercurial/mercurial.changes 2007-06-27 11:49:33.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Jun 27 11:48:40 CEST 2007 - tiwai(a)suse.de + +- updated to version 0.9.4: + * support for symlinks + * improved tag handling + * improved merge handling of file and directory renames + * improved named branch usability + * numerous improvements to commands + * generic pre- and post-command hooks + * improved Windows support + * basic BeOS and OpenVMS support + * numerous bug fixes + * extensions can now be specified in .hg/hgrc + * new convert extension with CVS support + * new graphlog extension + * improved patchbomb extension + * example FastCGI script + +------------------------------------------------------------------- Old: ---- mercurial-0.9.3.tar.bz2 New: ---- mercurial-0.9.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mercurial.spec ++++++ --- /var/tmp/diff_new_pack.t24918/_old 2007-06-28 19:25:49.000000000 +0200 +++ /var/tmp/diff_new_pack.t24918/_new 2007-06-28 19:25:49.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package mercurial (Version 0.9.3) +# spec file for package mercurial (Version 0.9.4) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,9 +11,9 @@ # norootforbuild Name: mercurial -BuildRequires: asciidoc python-devel sgml-skel xmlto +BuildRequires: asciidoc fdupes python-devel sgml-skel xmlto Summary: Scalable Distributed SCM -Version: 0.9.3 +Version: 0.9.4 Release: 1 License: GNU General Public License (GPL) Group: Development/Tools/Version Control @@ -60,7 +60,6 @@ done # install programs in contrib install -c -m 0755 contrib/hgk $RPM_BUILD_ROOT%{_bindir} -install -c -m 0755 contrib/purge/purge.py $RPM_BUILD_ROOT%{py_sitedir}/hgext install -c -m 0755 contrib/convert-repo $RPM_BUILD_ROOT%{_bindir} install -c -m 0755 contrib/darcs2hg.py $RPM_BUILD_ROOT%{_bindir}/darcs2hg python%{py_ver} %{py_libdir}/compileall.py -d %{py_site}/ \ @@ -69,13 +68,15 @@ # mkdir -p $RPM_BUILD_ROOT/etc/bash_completion.d # install -c -m 0644 contrib/bash_completion $RPM_BUILD_ROOT/etc/bash_completion.d/mercurial.sh mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -install -c -m 0644 contrib/mercurial.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp +install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp -install -c -m 0644 contrib/mercurial.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp +install -c -m 0644 contrib/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-lisp # install default hgrc mkdir -p $RPM_BUILD_ROOT/etc/mercurial install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/mercurial +%fdupes -s + %clean rm -rf $RPM_BUILD_ROOT @@ -93,7 +94,23 @@ %{_datadir}/emacs %{_datadir}/xemacs -%changelog -n mercurial +%changelog +* Wed Jun 27 2007 - tiwai(a)suse.de +- updated to version 0.9.4: + * support for symlinks + * improved tag handling + * improved merge handling of file and directory renames + * improved named branch usability + * numerous improvements to commands + * generic pre- and post-command hooks + * improved Windows support + * basic BeOS and OpenVMS support + * numerous bug fixes + * extensions can now be specified in .hg/hgrc + * new convert extension with CVS support + * new graphlog extension + * improved patchbomb extension + * example FastCGI script * Tue Dec 19 2006 - tiwai(a)suse.de - updated to version 0.9.3: * improved mq and hgk ++++++ hgrc ++++++ --- mercurial/hgrc 2006-07-31 17:06:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/mercurial/hgrc 2007-06-27 11:48:24.000000000 +0200 @@ -5,3 +5,5 @@ hgk= acl= purge= +fetch= +transplant= ++++++ mercurial-0.9.3.tar.bz2 -> mercurial-0.9.4.tar.bz2 ++++++ ++++ 31342 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package libqt4 checked in at Thu Jun 28 19:25:42 CEST 2007. -------- --- libqt4/libqt4.changes 2007-06-21 11:27:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-06-28 13:19:57.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 13:19:33 CEST 2007 - dmueller(a)suse.de + +- add various critical bugfixes needed for KDE4 + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change New: ---- 0177-qurl-clear-fix.diff 0178-transparency-window-types.diff 0179-transient-hack.diff 0180-window-role.diff 0181-qdnd-x11-fix.diff 0182-argb-visuals-default.diff 0183-qprocess-corruption.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.P20959/_old 2007-06-28 19:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.P20959/_new 2007-06-28 19:24:49.000000000 +0200 @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.0 -Release: 8 +Release: 10 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -45,6 +45,13 @@ Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff +Patch28: 0177-qurl-clear-fix.diff +Patch29: 0178-transparency-window-types.diff +Patch30: 0179-transient-hack.diff +Patch31: 0180-window-role.diff +Patch32: 0181-qdnd-x11-fix.diff +Patch33: 0182-argb-visuals-default.diff +Patch34: 0183-qprocess-corruption.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -81,6 +88,13 @@ %patch24 %patch25 %patch27 +%patch28 +%patch29 +%patch30 +%patch31 +%patch32 +%patch33 +%patch34 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -118,6 +132,8 @@ /usr/share/doc/packages/libqt4/examples %changelog +* Thu Jun 28 2007 - dmueller(a)suse.de +- add various critical bugfixes needed for KDE4 * Thu Jun 21 2007 - stbinner(a)suse.de - fix invalid .desktop files * Fri Jun 08 2007 - dmueller(a)suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.P20959/_old 2007-06-28 19:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.P20959/_new 2007-06-28 19:24:49.000000000 +0200 @@ -36,7 +36,7 @@ Provides: qt # COMMON-BEGIN Version: 4.3.0 -Release: 8 +Release: 10 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -55,6 +55,13 @@ Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff +Patch28: 0177-qurl-clear-fix.diff +Patch29: 0178-transparency-window-types.diff +Patch30: 0179-transient-hack.diff +Patch31: 0180-window-role.diff +Patch32: 0181-qdnd-x11-fix.diff +Patch33: 0182-argb-visuals-default.diff +Patch34: 0183-qprocess-corruption.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -92,6 +99,13 @@ %patch24 %patch25 %patch27 +%patch28 +%patch29 +%patch30 +%patch31 +%patch32 +%patch33 +%patch34 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -425,6 +439,8 @@ %_libdir/libQtSql*.so.* %changelog +* Thu Jun 28 2007 - dmueller(a)suse.de +- add various critical bugfixes needed for KDE4 * Thu Jun 21 2007 - stbinner(a)suse.de - fix invalid .desktop files * Fri Jun 08 2007 - dmueller(a)suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.P20959/_old 2007-06-28 19:24:49.000000000 +0200 +++ /var/tmp/diff_new_pack.P20959/_new 2007-06-28 19:24:49.000000000 +0200 @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.0 -Release: 3 +Release: 4 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -45,6 +45,13 @@ Patch24: qt4-pedantic-headers.diff Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff +Patch28: 0177-qurl-clear-fix.diff +Patch29: 0178-transparency-window-types.diff +Patch30: 0179-transient-hack.diff +Patch31: 0180-window-role.diff +Patch32: 0181-qdnd-x11-fix.diff +Patch33: 0182-argb-visuals-default.diff +Patch34: 0183-qprocess-corruption.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -no-exceptions -system-libtiff @@ -80,6 +87,13 @@ %patch24 %patch25 %patch27 +%patch28 +%patch29 +%patch30 +%patch31 +%patch32 +%patch33 +%patch34 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -222,6 +236,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Thu Jun 28 2007 - dmueller(a)suse.de +- add various critical bugfixes needed for KDE4 * Thu Jun 21 2007 - stbinner(a)suse.de - fix invalid .desktop files * Fri Jun 08 2007 - dmueller(a)suse.de ++++++ 0177-qurl-clear-fix.diff ++++++ qt-bugs@ issue : none Trolltech task ID : none bugs.kde.org number : None applied: yes author: Trolltech ASA Fix QUrl::clear(). --- src/corelib/io/qurl.cpp Tue May 29 14:55:12 CEST 2007 +++ src/corelib/io/qurl.cpp Tue May 29 14:55:12 CEST 2007 @@ -3411,6 +3411,7 @@ fragment.clear(); encodedOriginal.clear(); + encodedNormalized.clear(); isValid = false; hasQuery = false; @@ -3419,7 +3420,7 @@ valueDelimiter = '='; pairDelimiter = '&'; - QURL_UNSETFLAG(stateFlags, Parsed | Validated); + QURL_UNSETFLAG(stateFlags, Parsed | Validated | Normalized); } QByteArray QUrlPrivate::toEncoded(QUrl::FormattingOptions options) const ++++++ 0178-transparency-window-types.diff ++++++ qt-bugs@ issue : none yet Trolltech task ID : none bugs.kde.org number : none applied: no author: Lubos Lunak <l.lunak(a)kde.org> This patch adds Qt support for new window types used for compositing. --- src/gui/kernel/qapplication_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 +++ src/gui/kernel/qapplication_x11.cpp 2007-05-31 16:14:54.000000000 +0200 @@ -199,6 +199,11 @@ static const char * x11_atomnames = { "_NET_WM_WINDOW_TYPE_SPLASH\0" "_NET_WM_WINDOW_TYPE_TOOLBAR\0" "_NET_WM_WINDOW_TYPE_UTILITY\0" + "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0" + "_NET_WM_WINDOW_TYPE_POPUP_MENU\0" + "_NET_WM_WINDOW_TYPE_COMBO\0" + "_NET_WM_WINDOW_TYPE_DND\0" + "_NET_WM_WINDOW_TYPE_TOOLTIP\0" "_KDE_NET_WM_FRAME_STRUT\0" --- src/gui/kernel/qdnd_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 +++ src/gui/kernel/qdnd_x11.cpp 2007-05-31 13:32:33.000000000 +0200 @@ -254,6 +254,7 @@ public: QWidget(QApplication::desktop()->screen(screen), Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint) { + x11SetWindowType( X11WindowTypeDND ); } void setPixmap(const QPixmap &pm) @@ -1392,6 +1393,7 @@ void QDragManager::move(const QPoint & g // recreate the pixmap on the new screen... delete xdnd_data.deco; xdnd_data.deco = new QShapedPixmapWidget(screen); + xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget()); if (!QWidget::mouseGrabber()) { updatePixmap(); xdnd_data.deco->grabMouse(); @@ -1852,6 +1854,7 @@ Qt::DropAction QDragManager::drag(QDrag object = o; object->d_func()->target = 0; xdnd_data.deco = new QShapedPixmapWidget(); + xdnd_data.deco->x11SetWindowTransient( object->source()->topLevelWidget()); willDrop = false; --- src/gui/kernel/qwidget.h.sav 2007-05-29 14:07:19.000000000 +0200 +++ src/gui/kernel/qwidget.h 2007-05-31 13:35:50.000000000 +0200 @@ -339,6 +339,19 @@ public: void setWindowOpacity(qreal level); qreal windowOpacity() const; +#if defined(Q_WS_X11) + enum X11WindowType { + X11WindowTypeSelect, + X11WindowTypeCombo, + X11WindowTypeDND, + X11WindowTypeTooltip, + X11WindowTypeMenu, // torn-off + X11WindowTypeDropdown, + X11WindowTypePopup + }; + void x11SetWindowType( X11WindowType type = X11WindowTypeSelect ); + void x11SetWindowTransient( QWidget* parent ); +#endif bool isWindowModified() const; #ifndef QT_NO_TOOLTIP --- src/gui/kernel/qtooltip.cpp.sav 2007-05-09 11:43:46.000000000 +0200 +++ src/gui/kernel/qtooltip.cpp 2007-05-31 14:15:28.000000000 +0200 @@ -134,6 +134,9 @@ QTipLabel::QTipLabel(const QPoint &pos, setMouseTracking(true); fadingOut = false; reuseTip(text); +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypeTooltip ); +#endif } void QTipLabel::restartHideTimer() @@ -351,6 +354,9 @@ void QToolTip::showText(const QPoint &po // that is showing (removes flickering) if (QTipLabel::instance->tipChanged(pos, text, w)){ QTipLabel::instance->reuseTip(text); +#ifdef Q_WS_X11 + QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget()); +#endif QTipLabel::instance->setTipRect(w, rect); QTipLabel::instance->placeTip(pos, w); } @@ -360,6 +366,9 @@ void QToolTip::showText(const QPoint &po if (!text.isEmpty()){ // no tip can be reused, create new tip: new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself +#ifdef Q_WS_X11 + QTipLabel::instance->x11SetWindowTransient( w->topLevelWidget()); +#endif QTipLabel::instance->setTipRect(w, rect); QTipLabel::instance->placeTip(pos, w); QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label")); --- src/gui/kernel/qwidget_x11.cpp.sav 2007-05-29 14:07:19.000000000 +0200 +++ src/gui/kernel/qwidget_x11.cpp 2007-05-31 17:05:25.000000000 +0200 @@ -510,10 +510,6 @@ void QWidgetPrivate::create_sys(WId wind } #endif // QT_NO_XRENDER - // NET window types - long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; - int curr_wintype = 0; - QtMWMHints mwmhints; mwmhints.flags = 0L; mwmhints.functions = MWM_FUNC_ALL; @@ -524,15 +520,11 @@ void QWidgetPrivate::create_sys(WId wind if (topLevel) { ulong wsa_mask = 0; if (type == Qt::SplashScreen) { - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH); } else { // if (customize) { mwmhints.decorations = 0L; mwmhints.flags |= MWM_HINTS_DECORATIONS; - if (flags & Qt::FramelessWindowHint) { - // override netwm type - quick and easy for KDE noborder - net_wintypes[curr_wintype++] = ATOM(_KDE_NET_WM_WINDOW_TYPE_OVERRIDE); - } else { + if ((flags & Qt::FramelessWindowHint) == 0 ) { mwmhints.decorations |= MWM_DECOR_BORDER; mwmhints.decorations |= MWM_DECOR_RESIZEH; @@ -554,22 +546,6 @@ void QWidgetPrivate::create_sys(WId wind wsa.save_under = True; wsa_mask |= CWSaveUnder; } - // ### need a better way to do this - if (q->inherits("QMenu")) { - // menu netwm type - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU); - } else if (q->inherits("QToolBar")) { - // toolbar netwm type - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR); - } else if (type == Qt::Tool || type == Qt::Drawer) { - // utility netwm type - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY); - } - - if (dialog) // dialog netwm type - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG); - // normal netwm type - default - net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL); if (flags & Qt::X11BypassWindowManagerHint) { wsa.override_redirect = True; @@ -588,6 +564,7 @@ void QWidgetPrivate::create_sys(WId wind wsa.save_under = True; XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder, &wsa); + q->x11SetWindowType(); } else if (topLevel && !desktop) { // top-level widget if (!X11->wm_client_leader) create_wm_client_leader(); @@ -632,12 +609,7 @@ void QWidgetPrivate::create_sys(WId wind // set mwm hints SetMWMHints(dpy, id, mwmhints); - // set _NET_WM_WINDOW_TYPE - if (curr_wintype > 0) - XChangeProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, - (unsigned char *) net_wintypes, curr_wintype); - else - XDeleteProperty(dpy, id, ATOM(_NET_WM_WINDOW_TYPE)); + q->x11SetWindowType(); // set _NET_WM_WINDOW_TYPE // set _NET_WM_PID long curr_pid = getpid(); @@ -733,6 +705,63 @@ void QWidgetPrivate::create_sys(WId wind q->setAttribute(Qt::WA_OutsideWSRange, true); } +// Sets the EWMH (netwm) window type. Needed as a separate function +// because create() may be too soon in some cases. +void QWidget::x11SetWindowType( X11WindowType type ) +{ + Display* dpy = X11->display; + // NET window types + long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 }; + int curr_wintype = 0; + if( type == X11WindowTypeSelect ) { + if ( windowType() == Qt::SplashScreen ) { + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_SPLASH); + } else if (inherits("QToolBar")) { + // toolbar netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLBAR); + } else if (windowType() == Qt::Tool || windowType() == Qt::Drawer) { + // utility netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_UTILITY); + } else if (windowType() == Qt::Dialog || windowType() == Qt::Sheet + || (windowFlags() & Qt::MSWindowsFixedSizeDialogHint)) { + // dialog netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DIALOG); + } + } else if( type == X11WindowTypeCombo ) { + // combo netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_COMBO); + } else if( type == X11WindowTypeDND ) { + // dnd netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DND); + } else if( type == X11WindowTypeDropdown ) { + // dropdown netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_DROPDOWN_MENU); + } else if( type == X11WindowTypePopup ) { + // popup netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_POPUP_MENU); + } else if( type == X11WindowTypeMenu ) { + // menu netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_MENU); + } else if( type == X11WindowTypeTooltip ) { + // tooltip netwm type + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_TOOLTIP); + } + + // normal netwm type - default + net_wintypes[curr_wintype++] = ATOM(_NET_WM_WINDOW_TYPE_NORMAL); + // set _NET_WM_WINDOW_TYPE + if (curr_wintype > 0) + XChangeProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, + (unsigned char *) net_wintypes, curr_wintype); + else + XDeleteProperty(dpy, winId(), ATOM(_NET_WM_WINDOW_TYPE)); +} + +void QWidget::x11SetWindowTransient( QWidget* parent ) +{ + XSetTransientForHint( X11->display, winId(), parent->window()->winId()); +} + /*! Frees up window system resources. Destroys the widget window if \a destroyWindow is true. --- src/gui/kernel/qt_x11_p.h.sav 2007-03-27 16:12:51.000000000 +0200 +++ src/gui/kernel/qt_x11_p.h 2007-05-31 16:11:42.000000000 +0200 @@ -514,6 +514,11 @@ struct QX11Data _NET_WM_WINDOW_TYPE_SPLASH, _NET_WM_WINDOW_TYPE_TOOLBAR, _NET_WM_WINDOW_TYPE_UTILITY, + _NET_WM_WINDOW_TYPE_DROPDOWN_MENU, + _NET_WM_WINDOW_TYPE_POPUP_MENU, + _NET_WM_WINDOW_TYPE_COMBO, + _NET_WM_WINDOW_TYPE_DND, + _NET_WM_WINDOW_TYPE_TOOLTIP, _KDE_NET_WM_FRAME_STRUT, --- src/gui/widgets/qcombobox.cpp.sav 2007-05-09 11:43:55.000000000 +0200 +++ src/gui/widgets/qcombobox.cpp 2007-05-31 14:15:01.000000000 +0200 @@ -370,6 +370,10 @@ QComboBoxPrivateContainer::QComboBoxPriv layout->insertSpacing(0, verticalMargin); layout->addSpacing(verticalMargin); } +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypeCombo ); + x11SetWindowTransient( combo->topLevelWidget()); +#endif } void QComboBoxPrivateContainer::scrollItemView(int action) --- src/gui/widgets/qmenu.cpp.sav 2007-05-29 14:07:22.000000000 +0200 +++ src/gui/widgets/qmenu.cpp 2007-05-31 17:01:03.000000000 +0200 @@ -84,6 +84,9 @@ public: QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p))) { setParent(p, Qt::Window | Qt::Tool); +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypeMenu ); +#endif setAttribute(Qt::WA_DeleteOnClose, true); setWindowTitle(p->windowTitle()); setEnabled(p->isEnabled()); @@ -130,6 +133,9 @@ void QMenuPrivate::init() } defaultMenuAction = menuAction = new QAction(q); menuAction->d_func()->menu = q; +#ifdef Q_WS_X11 + q->x11SetWindowType( QWidget::X11WindowTypePopup ); +#endif } //Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't @@ -1611,6 +1617,32 @@ void QMenu::popup(const QPoint &p, QActi } setGeometry(QRect(pos, size)); +#ifdef Q_WS_X11 + QWidget* top = this; + for(;;) { + if( QMenu* m = qobject_cast< QMenu* >( top )) { + if( m->d_func()->causedPopup.widget == NULL ) + break; // ---> + top = m->d_func()->causedPopup.widget; + } else + break; // --> + } + if( QMenu* m = qobject_cast< QMenu* >( top )) + x11SetWindowType( X11WindowTypePopup ); + else + x11SetWindowType( X11WindowTypeDropdown ); + // hackish ... try to find the main window related to this popup + QWidget* parent = d_func()->causedPopup.widget; + if( parent == NULL ) + parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL; + if( parent == NULL ) + parent = QApplication::widgetAt( pos ); + if( parent == NULL ) + parent = qApp->activeWindow(); + if( parent != NULL ) + x11SetWindowTransient( parent ); +#endif + #ifndef QT_NO_EFFECTS int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll; int vGuess = QEffects::DownScroll; @@ -1807,6 +1839,9 @@ void QMenu::hideEvent(QHideEvent *) if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget)) mb->d_func()->setCurrentAction(0); #endif +#ifdef Q_WS_X11 + x11SetWindowType( X11WindowTypePopup ); // reset +#endif d->mouseDown = 0; d->hasHadMouse = false; d->causedPopup.widget = 0; ++++++ 0179-transient-hack.diff ++++++ qt-bugs@ issue : 166027 Trolltech task ID : none bugs.kde.org number : none applied: no author: Lubos Lunak <l.lunak(a)kde.org> This patch is just a hackish workaround that makes setting of WM_TRANSIENT_FOR work with some window types (needed basically by the #0178 qt-copy patch). It is not a proper solution, waiting for TT to come up with something. --- src/gui/kernel/qwidget_x11.cpp.sav 2007-06-06 15:29:46.000000000 +0200 +++ src/gui/kernel/qwidget_x11.cpp 2007-06-15 11:52:19.000000000 +0200 @@ -1598,7 +1598,7 @@ void QWidgetPrivate::show_sys() do_size_hints(q, extra); // udpate WM_TRANSIENT_FOR - if (isTransient(q)) { + if (isTransient(q) && !( q->windowFlags() & Qt::X11BypassWindowManagerHint)) { QWidget *p = q->parentWidget(); if (p) p = p->window(); ++++++ 0180-window-role.diff ++++++ qt-bugs@ issue : none yet Trolltech task ID : none bugs.kde.org number : none applied: no author: Lubos Lunak <l.lunak(a)kde.org> Hello, there are several problems with Qt's support for the WM_WINDOW_ROLE property: - plain "QWidget w; w.setWindowRole( "test" );" aborts with Qt::WA_WState_Created not being set - while QWidgetPrivate::create_sys() uses QObject object name for initial setting of WM_WINDOW_ROLE, later calls to QObject::setObjectName() have no effect on it - Qt3 used the QObject object name for setting the window role, however Qt4 uses some strange mix of object name and what's set manually with setWindowRole(). The result is that that Qt3 and KDE3 apps that had WM_WINDOW_ROLE set don't in their Qt4 and KDE4 versions. I suggest using the attached patch which fixed all of the above problems: - set explicit window role is used when actually set, otherwise the object name is used. This e.g. takes care of apps ported using setObjectName() from their Qt3/KDE3 versions (including e.g. Qt Designer) and generally makes it somewhat less demanding to actually set a usable window role (I can't quite see how many developers would be bothered to explicitly call setWindowRole()). - calls to QObject::setObjectName() update the WM_WINDOW_ROLE property. Since QObjectPrivate already has a virtual dtor I think adding another virtual for handling the QWidget-related functionality from QtCore is fine. --- src/corelib/kernel/qobject.cpp.sav 2007-05-29 14:07:18.000000000 +0200 +++ src/corelib/kernel/qobject.cpp 2007-06-15 16:03:39.000000000 +0200 @@ -994,9 +994,18 @@ void QObject::setObjectName(const QStrin { Q_D(QObject); d->objectName = name; +#if defined(Q_WS_X11) + d->checkWindowRole(); +#endif } +#if defined(Q_WS_X11) +void QObjectPrivate::checkWindowRole() +{ +} +#endif + #ifdef QT3_SUPPORT /*! \internal QObject::child is compat but needs to call itself recursively, --- src/corelib/kernel/qobject_p.h.sav 2007-05-09 11:43:32.000000000 +0200 +++ src/corelib/kernel/qobject_p.h 2007-06-15 16:04:50.000000000 +0200 @@ -124,6 +124,9 @@ public: mutable quint32 connectedSignals; QString objectName; +#if defined(Q_WS_X11) + virtual void checkWindowRole(); +#endif }; class QSemaphore; --- src/gui/kernel/qwidget_p.h.sav 2007-05-09 11:43:46.000000000 +0200 +++ src/gui/kernel/qwidget_p.h 2007-06-15 16:05:02.000000000 +0200 @@ -286,6 +286,7 @@ public: #if defined(Q_WS_X11) void setWindowRole(const char *role); + virtual void checkWindowRole(); void sendStartupMessage(const char *message) const; #endif --- src/gui/kernel/qwidget_x11.cpp.sav 2007-06-15 16:14:57.000000000 +0200 +++ src/gui/kernel/qwidget_x11.cpp 2007-06-15 16:28:06.000000000 +0200 @@ -619,11 +619,8 @@ void QWidgetPrivate::create_sys(WId wind // when we create a toplevel widget, the frame strut should be dirty data.fstrut_dirty = 1; - // declare the widget's object name as window role - QByteArray objName = q->objectName().toLocal8Bit(); - XChangeProperty(dpy, id, - ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, - (unsigned char *)objName.constData(), objName.length()); + // declare the widget's object name as window role if not set + setWindowRole( !q->windowRole().isEmpty() ? q->windowRole().toUtf8() : q->objectName().toUtf8()); // set client leader property XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER), @@ -2617,12 +2614,20 @@ const QX11Info &QWidget::x11Info() const void QWidgetPrivate::setWindowRole(const char *role) { Q_Q(QWidget); - Q_ASSERT(q->testAttribute(Qt::WA_WState_Created)); + if( !q->testAttribute(Qt::WA_WState_Created)) + return; XChangeProperty(X11->display, q->internalWinId(), ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace, (unsigned char *)role, qstrlen(role)); } +void QWidgetPrivate::checkWindowRole() +{ + Q_Q(QWidget); + if( q->windowRole().isEmpty()) + setWindowRole( objectName.toUtf8()); +} + Q_GLOBAL_STATIC(QX11PaintEngine, qt_widget_paintengine) QPaintEngine *QWidget::paintEngine() const { ++++++ 0181-qdnd-x11-fix.diff ++++++ qt-bugs@ issue : 166518 Trolltech task ID : 167509 bugs.kde.org number : applied: no author: Matthias Kretz <kretz(a)kde.org> os: unix Consider: QWidget toplevel; QWidget dropWidget(&toplevel); dropWidget.setAcceptDrops(true); QWidget visibleFooWidget(&toplevel); find_child in qdnd_x11.cpp will find visibleFooWidget because it's the last entry in toplevel.children() and the QPoint of the drop is contained in it. But since it does not acceptDrops() handle_xdnd_position will now look at the parent widget which is toplevel. That one isWindow() so the iteration stops and no QDragEnterEvent will be sent. But it never even looked at dropWidget even though it also contains the QPoint of the drop! This patch makes the algorithm look at _all_ widgets that contain the QPoint. This bug effectively breaks all drops on QAbstractScrollArea subclasses with the KDE4 Oxygen widget style. Index: src/gui/kernel/qdnd_x11.cpp =================================================================== --- src/gui/kernel/qdnd_x11.cpp (revision 671753) +++ src/gui/kernel/qdnd_x11.cpp (working copy) @@ -42,6 +42,7 @@ #include "qdebug.h" #include "qimagewriter.h" #include "qbuffer.h" +#include "qstack.h" #include "qdnd_p.h" #include "qt_x11_p.h" @@ -668,8 +669,45 @@ } -static QWidget *find_child(QWidget *tlw, QPoint & p) +static QWidget *find_next_child(QWidget *child, QPoint &p, QStack<int> &chosenLine) { + p = child->mapToParent(p); + QWidget *widget = child->parentWidget(); + if (!widget) { + return widget; + } + + bool done = false; + bool backwards = true; + while (!done) { + done = true; + if (((QExtraWidget*)widget)->extraData() && + ((QExtraWidget*)widget)->extraData()->xDndProxy != 0) + break; // stop searching for widgets under the mouse cursor if found widget is a proxy. + QObjectList children = widget->children(); + if (!chosenLine.isEmpty() && !children.isEmpty()) { + for(int i = backwards ? chosenLine.pop() : children.size(); i > 0;) { + --i; + QWidget *w = qobject_cast<QWidget *>(children.at(i)); + if (!w) + continue; + if (w->isVisible() && + w->geometry().contains(p) && + !w->isWindow()) { + widget = w; + done = false; + backwards = false; + p = widget->mapFromParent(p); + chosenLine << i; + break; + } + } + } + } + return widget; +} +static QWidget *find_child(QWidget *tlw, QPoint & p, QStack<int> &chosenLine) +{ QWidget *widget = tlw; p = widget->mapFromGlobal(p); @@ -692,6 +730,7 @@ widget = w; done = false; p = widget->mapFromParent(p); + chosenLine.push(i); break; } } @@ -780,7 +819,8 @@ const unsigned long *l = (const unsigned long *)xe->xclient.data.l; QPoint p((l[2] & 0xffff0000) >> 16, l[2] & 0x0000ffff); - QWidget * c = find_child(w, p); // changes p to to c-local coordinates + QStack<int> chosenLine; + QWidget * c = find_child(w, p, chosenLine); // changes p to to c-local coordinates if (!passive && checkEmbedded(c, xe)) return; @@ -814,8 +854,7 @@ if (!passive) { // otherwise just reject while (c && !c->acceptDrops() && !c->isWindow()) { - p = c->mapToParent(p); - c = c->parentWidget(); + c = find_next_child(c, p, chosenLine); } QWidget *target_widget = c && c->acceptDrops() ? c : 0; ++++++ 0182-argb-visuals-default.diff ++++++ qt-bugs@ issue : none, in Qt 4.4 already Trolltech task ID : 120338 applied: no author: Zack Rusin <zrusin(a)trolltech.com> os: unix Fixes: Qt handling argb visuals on X11 Details: we make Qt pick ARGB visuals when available. this allows people writing properly semi-transparent apps on X11. Index: src/gui/kernel/qapplication_x11.cpp =================================================================== --- src/gui/kernel/qapplication_x11.cpp +++ src/gui/kernel/qapplication_x11.cpp @@ -1537,6 +1537,30 @@ / (DisplayHeightMM(X11->display, s)*10); } + +#ifndef QT_NO_XRENDER + int xrender_eventbase, xrender_errorbase; + // See if XRender is supported on the connected display + if (XQueryExtension(X11->display, "RENDER", &X11->xrender_major, + &xrender_eventbase, &xrender_errorbase) + && XRenderQueryExtension(X11->display, &xrender_eventbase, + &xrender_errorbase)) { + // Check the version as well - we need v0.4 or higher + int major = 0; + int minor = 0; + XRenderQueryVersion(X11->display, &major, &minor); + if (qgetenv("QT_X11_NO_XRENDER").isNull()) { + X11->use_xrender = (major >= 0 && minor >= 5); + X11->xrender_version = major*100+minor; + // workaround for broken XServer on Ubuntu Breezy (6.8 compiled with 7.0 + // protocol headers) + if (X11->xrender_version == 10 + && VendorRelease(X11->display) < 60900000 + && QByteArray(ServerVendor(X11->display)).contains("X.Org")) + X11->xrender_version = 9; + } + } +#endif // QT_NO_XRENDER QColormap::initialize(); // Support protocols @@ -1560,30 +1584,15 @@ #endif // QT_NO_XRANDR #ifndef QT_NO_XRENDER - int xrender_eventbase, xrender_errorbase; - // See if XRender is supported on the connected display - if (XQueryExtension(X11->display, "RENDER", &X11->xrender_major, - &xrender_eventbase, &xrender_errorbase) - && XRenderQueryExtension(X11->display, &xrender_eventbase, - &xrender_errorbase)) { + if (X11->use_xrender) { // XRender is supported, let's see if we have a PictFormat for the // default visual XRenderPictFormat *format = XRenderFindVisualFormat(X11->display, (Visual *) QX11Info::appVisual(X11->defaultScreen)); - // Check the version as well - we need v0.4 or higher - int major = 0; - int minor = 0; - XRenderQueryVersion(X11->display, &major, &minor); - if (qgetenv("QT_X11_NO_XRENDER").isNull() && format != 0) { - X11->use_xrender = (major >= 0 && minor >= 5); - X11->xrender_version = major*100+minor; - // workaround for broken XServer on Ubuntu Breezy (6.8 compiled with 7.0 - // protocol headers) - if (X11->xrender_version == 10 - && VendorRelease(X11->display) < 60900000 - && QByteArray(ServerVendor(X11->display)).contains("X.Org")) - X11->xrender_version = 9; + + if (!format) { + X11->use_xrender = false; } } #endif // QT_NO_XRENDER Index: src/gui/kernel/qwidget_x11.cpp =================================================================== --- src/gui/kernel/qwidget_x11.cpp +++ src/gui/kernel/qwidget_x11.cpp @@ -491,7 +491,7 @@ picture = 0; } - if (X11->use_xrender) { + if (X11->use_xrender && !desktop) { XRenderPictFormat *format = XRenderFindVisualFormat(dpy, (Visual *) xinfo.visual()); if (format) picture = XRenderCreatePicture(dpy, id, format, 0, 0); Index: src/gui/painting/qcolormap_x11.cpp =================================================================== --- src/gui/painting/qcolormap_x11.cpp +++ src/gui/painting/qcolormap_x11.cpp @@ -376,7 +376,33 @@ } else if (!X11->custom_cmap) { XStandardColormap *stdcmap = 0; int ncmaps = 0; - if (XGetRGBColormaps(display, RootWindow(display, i), + + bool foundArgbVisual = false; +#ifndef QT_NO_XRENDER + if (X11->use_xrender) { + int nvi; + XVisualInfo templ; + templ.screen = i; + templ.depth = 32; + templ.c_class = TrueColor; + XVisualInfo *xvi = XGetVisualInfo(X11->display, VisualScreenMask | + VisualDepthMask | + VisualClassMask, &templ, &nvi); + for (int idx = 0; idx < nvi; ++idx) { + XRenderPictFormat *format = XRenderFindVisualFormat(X11->display, + xvi[idx].visual); + if (format->type == PictTypeDirect && format->direct.alphaMask) { + d->visual = xvi[idx].visual; + d->depth = 32; + d->defaultVisual = false; + foundArgbVisual = true; + break; + } + } + } +#endif + if (!foundArgbVisual && + XGetRGBColormaps(display, RootWindow(display, i), &stdcmap, &ncmaps, XA_RGB_DEFAULT_MAP)) { if (stdcmap) { for (int c = 0; c < ncmaps; ++c) { @@ -434,7 +460,6 @@ } } } - if (!use_stdcmap) { switch (d->visual->c_class) { case StaticGray: ++++++ 0183-qprocess-corruption.diff ++++++ qt-bugs@ issue : Trolltech task ID : 161944 bugs.kde.org number : applied: yes author: Andreas Aardal Hanssen <ahanssen(a)trolltech.com> --- src/corelib/io/qprocess.cpp Thu Jun 28 10:00:58 CEST 2007 +++ src/corelib/io/qprocess.cpp Thu Jun 28 10:00:58 CEST 2007 @@ -816,15 +816,21 @@ read(), readAll(), readLine(), and getChar(). It also determines which channel triggers QProcess to emit readyRead(). - Changing the read channel will clear the unget buffer. - \sa readChannel() */ void QProcess::setReadChannel(ProcessChannel channel) { Q_D(QProcess); - if (d->processChannel != channel) - d->buffer.clear(); + if (d->processChannel != channel) { + QByteArray buf = d->buffer.readAll(); + if (d->processChannel == QProcess::StandardOutput) { + for (int i = buf.size() - 1; i >= 0; --i) + d->outputReadBuffer.ungetChar(buf.at(i)); + } else { + for (int i = buf.size() - 1; i >= 0; --i) + d->errorReadBuffer.ungetChar(buf.at(i)); + } + } d->processChannel = channel; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeutils4
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package kdeutils4 checked in at Thu Jun 28 19:25:21 CEST 2007. -------- --- KDE/kdeutils4/kdeutils4.changes 2007-06-26 12:09:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-06-27 09:57:46.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 09:57:43 CEST 2007 - stbinner(a)suse.de + +- fix build in beta + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.F22821/_old 2007-06-28 19:25:03.000000000 +0200 +++ /var/tmp/diff_new_pack.F22821/_new 2007-06-28 19:25:03.000000000 +0200 @@ -19,7 +19,7 @@ Summary: Base Package of KDE Utility Programs URL: http://www.kde.org Version: 3.90.1.svn679151 -Release: 3 +Release: 4 Source0: kdeutils.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -655,6 +655,8 @@ %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Wed Jun 27 2007 - stbinner(a)suse.de +- fix build in beta * Tue Jun 26 2007 - dmueller(a)suse.de - fix file conflicts * Sat Jun 23 2007 - stbinner(a)suse.de ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.F22821/_old 2007-06-28 19:25:03.000000000 +0200 +++ /var/tmp/diff_new_pack.F22821/_new 2007-06-28 19:25:03.000000000 +0200 @@ -40,12 +40,12 @@ GenericName[zh_TW]=可移動媒體公用程式 Terminal=false Categories=Qt;KDE;System;X-KDE-More; -+OnlyShownIn=KDE; ++OnlyShowIn=KDE; --- kwallet/kwalletmanager.desktop 2007/06/23 07:59:49 1.1 +++ kwallet/kwalletmanager.desktop 2007/06/23 08:00:00 @@ -56,3 +56,5 @@ X-KDE-StartupNotify=false Categories=Qt;KDE;Settings; DocPath=kwallet/index.html -+OnlyShownIn=KDE; ++OnlyShowIn=KDE; + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdeutils4
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package kdeutils4 checked in at Thu Jun 28 19:24:32 CEST 2007. -------- --- KDE/kdeutils4/kdeutils4.changes 2007-06-23 10:35:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes 2007-06-26 12:09:41.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 26 12:09:26 CEST 2007 - dmueller(a)suse.de + +- fix file conflicts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdeutils4.spec ++++++ --- /var/tmp/diff_new_pack.B15798/_old 2007-06-28 19:23:58.000000000 +0200 +++ /var/tmp/diff_new_pack.B15798/_new 2007-06-28 19:23:58.000000000 +0200 @@ -19,7 +19,7 @@ Summary: Base Package of KDE Utility Programs URL: http://www.kde.org Version: 3.90.1.svn679151 -Release: 1 +Release: 3 Source0: kdeutils.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -111,18 +111,20 @@ %files -n kde4-ark %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/ark -/usr/%_lib/kde4/libarkpart.so -/usr/%_lib/libkdeinit4_ark.so -/usr/share/applications/kde4/ark.desktop +%doc %lang(en) /usr/share/doc/HTML/en/ark + +%_kde_libdir/kde4/libarkpart.so + +%_kde_libdir/libkdeinit4_ark.so %_kde_share_dir/apps/ark %_kde_share_dir/config.kcfg/ark.kcfg -%doc %lang(en) /usr/share/doc/HTML/en/ark -/usr/share/icons/hicolor/*/apps/ark.* %_kde_share_dir/services/ark_part.desktop +/usr/bin/ark +/usr/share/applications/kde4/ark.desktop +/usr/share/icons/hicolor/*/apps/ark.* %package -n kde4-kcalc Group: Productivity/Scientific/Math Summary: Scientific Calculator @@ -147,17 +149,18 @@ %files -n kde4-kcalc %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/kcalc -/usr/%_lib/libkdeinit4_kcalc.so -/usr/share/applications/kde4/kcalc.desktop +%doc %lang(en) /usr/share/doc/HTML/en/kcalc + +%_kde_libdir/libkdeinit4_kcalc.so %_kde_share_dir/apps/kcalc +%_kde_share_dir/apps/kconf_update/kcalcrc.upd + %_kde_share_dir/config.kcfg/kcalc.kcfg -%doc %lang(en) /usr/share/doc/HTML/en/kcalc +/usr/bin/kcalc +/usr/share/applications/kde4/kcalc.desktop /usr/share/icons/hicolor/*/apps/kcalc.* - -%_kde_share_dir/apps/kconf_update/kcalcrc.upd %package -n kde4-kcharselect Group: Productivity/Other Summary: KDE Character Selector @@ -240,14 +243,16 @@ %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README /usr/bin/kdf -/usr/%_lib/kde4/kcm_kdf.so + +%_kde_libdir/kde4/kcm_kdf.so /usr/share/applications/kde4/kdf.desktop %_kde_share_dir/apps/kdf %doc %lang(en) /usr/share/doc/HTML/en/kdf /usr/share/icons/hicolor/*/apps/kdf.* /usr/share/icons/oxygen/*/apps/kcmdf.* -/usr/share/kde4/services/kcmdf.desktop + +%_kde_share_dir/services/kcmdf.desktop %package -n kde4-kfloppy Group: System/GUI/KDE Summary: Floppy Formatter @@ -304,22 +309,22 @@ %files -n kde4-kgpg %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/kgpg -/usr/share/applications/kde4/kgpg.desktop - -%_kde_share_dir/apps/kgpg -/usr/share/autostart/kgpg.desktop - -%_kde_share_dir/config.kcfg/kgpg.kcfg -/usr/share/dbus-1/interfaces/org.kde.kgpg.Key.xml %doc %lang(en) /usr/share/doc/HTML/en/kgpg -/usr/share/icons/hicolor/*/apps/kgpg.* %dir %_kde_share_dir/apps/konqueror %dir %_kde_share_dir/apps/konqueror/servicemenus +%_kde_share_dir/apps/kgpg + %_kde_share_dir/apps/konqueror/servicemenus/encryptfile.desktop %_kde_share_dir/apps/konqueror/servicemenus/encryptfolder.desktop + +%_kde_share_dir/config.kcfg/kgpg.kcfg +/usr/bin/kgpg +/usr/share/applications/kde4/kgpg.desktop +/usr/share/autostart/kgpg.desktop +/usr/share/dbus-1/interfaces/org.kde.kgpg.Key.xml +/usr/share/icons/hicolor/*/apps/kgpg.* %package -n kde4-khexeditor Group: Development/Tools/Other Summary: Binary Editor @@ -344,24 +349,30 @@ %files -n kde4-khexeditor %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/khexedit -/usr/%_lib/kde4/libkbytearrayedit.so -/usr/share/applications/kde4/khexedit.desktop +%doc %lang(en) /usr/share/doc/HTML/en/khexedit + +%_kde_libdir/kde4/libkbytearrayedit.so + +%_kde_libdir/kde4/liboktetapart.so + +%_kde_libdir/liboktetacore.so + +%_kde_libdir/liboktetacore.so.* + +%_kde_libdir/liboktetagui.so + +%_kde_libdir/liboktetagui.so.* %_kde_share_dir/apps/khexedit -%doc %lang(en) /usr/share/doc/HTML/en/khexedit -/usr/share/icons/hicolor/*/apps/khexedit.* + +%_kde_share_dir/apps/oktetapart %_kde_share_dir/services/kbytearrayedit.desktop -/usr/%_lib/kde4/liboktetapart.so -/usr/%_lib/liboktetagui.so -/usr/%_lib/libsuperkaramba.so -/usr/%_lib/liboktetacore.so -/usr/%_lib/liboktetacore.so.* -/usr/%_lib/liboktetagui.so.* -/usr/%_lib/libsuperkaramba.so.* -/usr/share/kde4/apps/oktetapart -/usr/share/kde4/services/oktetapart.desktop + +%_kde_share_dir/services/oktetapart.desktop +/usr/bin/khexedit +/usr/share/applications/kde4/khexedit.desktop +/usr/share/icons/hicolor/*/apps/khexedit.* %package -n kde4-kjots Group: Productivity/Other Summary: Note Taker @@ -386,13 +397,13 @@ %files -n kde4-kjots %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/kjots -/usr/share/applications/kde4/Kjots.desktop +%doc %lang(en) /usr/share/doc/HTML/en/kjots %_kde_share_dir/apps/kjots %_kde_share_dir/config.kcfg/kjots.kcfg -%doc %lang(en) /usr/share/doc/HTML/en/kjots +/usr/bin/kjots +/usr/share/applications/kde4/Kjots.desktop /usr/share/icons/hicolor/*/apps/kjots.* %package -n kde4-kregexpeditor Group: Productivity/Other @@ -418,20 +429,22 @@ %files -n kde4-kregexpeditor %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/kregexpeditor -/usr/%_lib/kde4/libkregexpeditorgui.so -/usr/%_lib/libkregexpeditorcommon.* -/usr/share/applications/kde4/kregexpeditor.desktop +%doc %lang(en) /usr/share/doc/HTML/en/KRegExpEditor + +%_kde_libdir/kde4/libkregexpeditorgui.so + +%_kde_libdir/libkregexpeditorcommon.* %_kde_share_dir/apps/kregexpeditor -%doc %lang(en) /usr/share/doc/HTML/en/KRegExpEditor -/usr/share/icons/hicolor/*/apps/kregexpeditor.* %_kde_share_dir/services/kregexpeditorgui.desktop -/usr/include/kmultiformlistbox.h +/usr/bin/kregexpeditor /usr/include/kmultiformlistboxentry.h /usr/include/kmultiformlistboxfactory.h +/usr/include/kmultiformlistbox.h /usr/include/kwidgetstreamer.h +/usr/share/applications/kde4/kregexpeditor.desktop +/usr/share/icons/hicolor/*/apps/kregexpeditor.* %package -n kde4-ktimer Group: Productivity/Other Summary: Countdown Launcher @@ -456,9 +469,9 @@ %files -n kde4-ktimer %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README +%doc %lang(en) /usr/share/doc/HTML/en/ktimer /usr/bin/ktimer /usr/share/applications/kde4/ktimer.desktop -%doc %lang(en) /usr/share/doc/HTML/en/ktimer /usr/share/icons/hicolor/*/apps/ktimer.* %package -n kde4-kwalletmanager Group: System/GUI/KDE @@ -484,19 +497,20 @@ %files -n kde4-kwalletmanager %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/kwalletmanager -/usr/%_lib/kde4/kcm_kwallet.so -/usr/share/applications/kde4/kwalletmanager-kwalletd.desktop -/usr/share/applications/kde4/kwalletmanager.desktop +%doc %lang(en) /usr/share/doc/HTML/en/kwallet + +%_kde_libdir/kde4/kcm_kwallet.so %_kde_share_dir/apps/kwalletmanager -%doc %lang(en) /usr/share/doc/HTML/en/kwallet -/usr/share/icons/hicolor/*/apps/kwalletmanager.* -/usr/share/icons/hicolor/*/apps/kwalletmanager2.* %_kde_share_dir/services/kwalletconfig.desktop %_kde_share_dir/services/kwalletmanager_show.desktop +/usr/bin/kwalletmanager +/usr/share/applications/kde4/kwalletmanager.desktop +/usr/share/applications/kde4/kwalletmanager-kwalletd.desktop +/usr/share/icons/hicolor/*/apps/kwalletmanager.* +/usr/share/icons/hicolor/*/apps/kwalletmanager2.* %package -n kde4-kwikdisk Group: System/GUI/KDE Summary: Removable Media Utility @@ -548,18 +562,20 @@ %files -n kde4-superkaramba %defattr(-,root,root) +%config %_kde_config_dir/superkaramba.knsrc %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/superkaramba-bin -/usr/%_lib/libsuperkaramba.so -/usr/%_lib/libsuperkaramba.so.* -/usr/share/applications/kde4/superkaramba.desktop +%doc %lang(en) /usr/share/doc/HTML/en/superkaramba + +%_kde_libdir/libsuperkaramba.so + +%_kde_libdir/libsuperkaramba.so.* %_kde_share_dir/apps/superkaramba -%doc %lang(en) /usr/share/doc/HTML/en/superkaramba +/usr/bin/superkaramba-bin +/usr/share/applications/kde4/superkaramba.desktop +/usr/share/dbus-1/interfaces/org.kde.superkaramba.xml /usr/share/icons/hicolor/*/apps/superkaramba.* /usr/share/icons/oxygen/*/mimetypes/superkaramba_theme.* -/usr/share/dbus-1/interfaces/org.kde.superkaramba.xml -%config %_kde_config_dir/superkaramba.knsrc %package -n kde4-sweeper Group: System/GUI/KDE Summary: KDE Privacy Utility @@ -575,19 +591,17 @@ The KDE Team <kde(a)kde.org> -%post -n kde4-sweeper -%run_ldconfig +%post -n kde4-sweeper -p /sbin/ldconfig -%postun -n kde4-sweeper -%run_ldconfig +%postun -n kde4-sweeper -p /sbin/ldconfig %files -n kde4-sweeper %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/bin/sweeper -/usr/share/applications/kde4/sweeper.desktop %_kde_share_dir/apps/sweeper +/usr/bin/sweeper +/usr/share/applications/kde4/sweeper.desktop /usr/share/dbus-1/interfaces/org.kde.sweeper.xml %package -n kde4-kmilo Group: System/GUI/KDE @@ -614,26 +628,35 @@ %files -n kde4-kmilo %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README -/usr/%_lib/kde4/kcm_thinkpad.so -/usr/%_lib/kde4/kded_kmilod.so -/usr/share/dbus-1/interfaces/org.kde.kmilod.xml -/usr/%_lib/kde4/kmilo_asus.so -/usr/%_lib/kde4/kmilo_kvaio.so -/usr/%_lib/kde4/kmilo_thinkpad.so -/usr/%_lib/libkmilo.* + +%_kde_libdir/kde4/kcm_thinkpad.so + +%_kde_libdir/kde4/kded_kmilod.so + +%_kde_libdir/kde4/kmilo_asus.so + +%_kde_libdir/kde4/kmilo_kvaio.so + +%_kde_libdir/kde4/kmilo_thinkpad.so + +%_kde_libdir/libkmilo.* %_kde_share_dir/services/kded/kmilod.desktop %_kde_share_dir/services/kmilo +%_kde_share_dir/services/thinkpad.desktop + %_kde_share_dir/servicetypes/kmilo -/usr/share/kde4/services/thinkpad.desktop +/usr/share/dbus-1/interfaces/org.kde.kmilod.xml %files %defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS README %changelog +* Tue Jun 26 2007 - dmueller(a)suse.de +- fix file conflicts * Sat Jun 23 2007 - stbinner(a)suse.de - update to 3.90.1.svn679151 * Fri Jun 08 2007 - stbinner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdenetwork4
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package kdenetwork4 checked in at Thu Jun 28 19:24:32 CEST 2007. -------- --- KDE/kdenetwork4/kdenetwork4.changes 2007-06-25 12:04:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-06-27 09:50:00.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 09:49:56 CEST 2007 - stbinner(a)suse.de + +- update to 3.90.1.svn672301 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenetwork4.spec ++++++ --- /var/tmp/diff_new_pack.u14949/_old 2007-06-28 19:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.u14949/_new 2007-06-28 19:23:29.000000000 +0200 @@ -16,7 +16,7 @@ Summary: KDE Network Base Package URL: http://www.kde.org Version: 3.90.1.svn679956 -Release: 1 +Release: 3 Source0: kdenetwork.tar.bz2 Source1: _upstream BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -590,6 +590,8 @@ %_libdir/libiris_kopete.so %changelog +* Wed Jun 27 2007 - stbinner(a)suse.de +- update to 3.90.1.svn672301 * Mon Jun 25 2007 - stbinner(a)suse.de - update to 3.90.1.svn679956 * Fri Jun 08 2007 - stbinner(a)suse.de ++++++ desktop-files.diff ++++++ --- /var/tmp/diff_new_pack.u14949/_old 2007-06-28 19:23:29.000000000 +0200 +++ /var/tmp/diff_new_pack.u14949/_new 2007-06-28 19:23:29.000000000 +0200 @@ -1,7 +1,5 @@ -Index: kget/desktop/kget.desktop -=================================================================== ---- kget/desktop/kget.desktop (Revision 670620) -+++ kget/desktop/kget.desktop (Arbeitskopie) +--- kget/desktop/kget.desktop 2007/06/26 07:16:06 1.1 ++++ kget/desktop/kget.desktop 2007/06/26 07:16:29 @@ -3,7 +3,6 @@ Encoding=UTF-8 Type=Application @@ -10,6 +8,11 @@ Terminal=false Name=KGet Name[ar]=ك.جيت +@@ -62,3 +61,4 @@ + GenericName[zh_TW]=下載管理員 + Categories=Qt;KDE;Network;FileTransfer; + X-DBUS-ServiceType=Unique ++OnlyShowIn=KDE; Index: filesharing/simple/fileshare.desktop =================================================================== --- filesharing/simple/fileshare.desktop (Revision 670620) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit eclipse-archdep
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package eclipse-archdep checked in at Thu Jun 28 19:23:55 CEST 2007. -------- --- eclipse-archdep/eclipse-archdep.changes 2007-06-11 17:23:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-archdep.changes 2007-06-26 22:27:42.000000000 +0200 @@ -1,0 +2,29 @@ +Tue Jun 26 22:22:35 CEST 2007 - dbornkessel(a)suse.de + +- update to next milestone 3.3RC4 + +------------------------------------------------------------------- +Mon Jun 11 20:05:41 CEST 2007 - dbornkessel(a)suse.de + +- removed VMARGS from eclipse.conf (Bug #227263 ) + +------------------------------------------------------------------- +Mon Jun 11 17:22:53 CEST 2007 - dbornkessel(a)suse.de + +- update to next milestone m3 + +------------------------------------------------------------------- +Wed May 30 18:40:01 CEST 2007 - dbornkessel(a)suse.de +- the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages: + - eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm + - eclipse-archdep-platform-<version>-<release>.<arch>.rpm + - libswt3-gtk2-<version>-<release>.<arch>.rpm + it creates the packges: + - eclipse-<version>-<release>.noarch.rpm + - eclipse-jdt-<version>-<release>.noarch.rpm + - eclipse-pde-<version>-<release>.noarch.rpm + - eclipse-platform-<version>-<release>.noarch.rpm + - eclipse-scripts-<version>-<release>.noarch.rpm + - eclipse-source-<version>-<release>.noarch.rpm + +------------------------------------------------------------------- --- eclipse-archdep/eclipse.changes 2007-06-11 20:06:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/eclipse-archdep/eclipse.changes 2007-06-26 22:29:12.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 26 22:28:31 CEST 2007 - dbornkessel(a)suse.de + +- update to the next milestone 3.3RC4 + +------------------------------------------------------------------- Old: ---- eclipse-sourceBuild-srcIncluded-3.3RC3.tar.bz2 New: ---- AnnotationProcessors.java eclipse-sourceBuild-srcIncluded-3.3RC4.tar.bz2 README.packager ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ecj-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.Ah8989/_old 2007-06-28 19:21:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ah8989/_new 2007-06-28 19:21:55.000000000 +0200 @@ -12,14 +12,14 @@ Name: ecj-bootstrap BuildRequires: fastjar gcc-gij gcc-java libgcj-devel unzip zip -%define eclipse_version 3.3RC3 +%define eclipse_version 3.3RC4 %define jarname eclipse-ecj License: Other uncritical OpenSource License, http://www.eclipse.org/legal/epl-v10.html Group: Development/Libraries/Java Autoreqprov: on Summary: Eclipse Java Compiler Version: 0.755 -Release: 9 +Release: 13 URL: http//www.eclipse.org Group: Development/Libraries/Java Source0: eclipse-sourceBuild-srcIncluded-%{eclipse_version}.tar.bz2 @@ -41,7 +41,7 @@ #<<< package descriptions end #>>> %prep %setup -c -T ecj-bootstrap -tar -jxf %{SOURCE0} jdtcoresrc/src +tar -jxf %{SOURCE0} #<<< #>>> %build ++++++ eclipse-archdep.spec ++++++ --- /var/tmp/diff_new_pack.Ah8989/_old 2007-06-28 19:21:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ah8989/_new 2007-06-28 19:21:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package eclipse-archdep (Version 3.3RC3) +# spec file for package eclipse-archdep (Version 3.3RC4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,7 +27,7 @@ %define swt_version 3063 %define corelib_version 2_1_0b %define eclipse_major 3 -%define eclipse_minor 3RC3 +%define eclipse_minor 3RC4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 1 %define libname libswt3 @@ -71,8 +71,8 @@ %define java_arch amd64 %endif Summary: Eclipse Platform and Java IDE -Version: 3.3RC3 -Release: 2 +Version: 3.3RC4 +Release: 1 License: Any permissive, Common Public License, see http://www.eclipse.org/legal/cpl-v05.html Group: Development/Tools/IDE URL: http://www.eclipse.org @@ -506,9 +506,27 @@ # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6:foldlevel=42: %changelog +* Tue Jun 26 2007 - dbornkessel(a)suse.de +- update to next milestone 3.3RC4 +* Mon Jun 11 2007 - dbornkessel(a)suse.de +- removed VMARGS from eclipse.conf (Bug #227263 ) +* Mon Jun 11 2007 - dbornkessel(a)suse.de +- update to next milestone m3 * Mon Jun 11 2007 - dbornkessel(a)suse.de - update to next milestone m3 * Wed May 30 2007 - dbornkessel(a)suse.de +- the original eclipse-* package and it's sub-packages are now renamed to eclipse-archdep-*; this is a noarch package now; in order to be complete, it needs the arch-dependent packages: + - eclipse-archdep-gtk2-<version>-<release>.<arch>.rpm + - eclipse-archdep-platform-<version>-<release>.<arch>.rpm + - libswt3-gtk2-<version>-<release>.<arch>.rpm + it creates the packges: + - eclipse-<version>-<release>.noarch.rpm + - eclipse-jdt-<version>-<release>.noarch.rpm + - eclipse-pde-<version>-<release>.noarch.rpm + - eclipse-platform-<version>-<release>.noarch.rpm + - eclipse-scripts-<version>-<release>.noarch.rpm + - eclipse-source-<version>-<release>.noarch.rpm +* Wed May 30 2007 - dbornkessel(a)suse.de - renamed package and sub-packages to eclipse-archdep-*; the eclipse-* packages are now noarch packges - split eclipse-platform in eclipse-archdep-platform and eclipse-archdep-platform-commons - moved arch dependent files to %%{_libdir}/eclipse ++++++ eclipse.spec ++++++ --- /var/tmp/diff_new_pack.Ah8989/_old 2007-06-28 19:21:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Ah8989/_new 2007-06-28 19:21:56.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package eclipse (Version 3.3RC3) +# spec file for package eclipse (Version 3.3RC4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,20 +20,20 @@ %define pkg_summary An open extensible IDE %define section free %define swt_version 3063 -%define corelib_version 3.3RC3 +%define corelib_version 3.3RC4 %define eclipse_major 3 -%define eclipse_minor 3RC3 +%define eclipse_minor 3RC4 %define eclipse_majmin %{eclipse_major}.%{eclipse_minor} %define eclipse_micro 1 %define libname libswt3 Summary: Eclipse Platform and Java IDE -Version: 3.3RC3 -Release: 2 +Version: 3.3RC4 +Release: 1 License: Any permissive, Common Public License, see http://www.eclipse.org/legal/cpl-v05.html Group: Development/Tools/IDE URL: http://www.eclipse.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: %{archdepname}-gtk2 +Requires: %{archdepname}-gtk2 = %{version} BuildArch: noarch %description @@ -65,7 +65,7 @@ Provides: eclipse:/opt/eclipse/eclipse Obsoletes: %{name}-sdk Provides: %{name}-sdk -Requires: %{archdepname}-platform +Requires: %{archdepname}-platform = %{version} %description platform The Eclipse Platform is designed for building integrated development @@ -252,6 +252,8 @@ %defattr(-,root,root,-) %changelog +* Tue Jun 26 2007 - dbornkessel(a)suse.de +- update to the next milestone 3.3RC4 * Mon Jun 11 2007 - dbornkessel(a)suse.de - removed VMARGS from eclipse.conf (Bug #227263 ) * Mon Jun 11 2007 - dbornkessel(a)suse.de ++++++ eclipse-sourceBuild-srcIncluded-3.3RC3.tar.bz2 -> eclipse-sourceBuild-srcIncluded-3.3RC4.tar.bz2 ++++++ eclipse-archdep/eclipse-sourceBuild-srcIncluded-3.3RC3.tar.bz2 /mounts/work_src_done/STABLE/eclipse-archdep/eclipse-sourceBuild-srcIncluded-3.3RC4.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase3-SuSE
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package kdebase3-SuSE checked in at Thu Jun 28 19:23:50 CEST 2007. -------- --- KDE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-06-21 14:47:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3-SuSE/kdebase3-SuSE.changes 2007-06-27 18:23:52.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 27 18:23:46 CEST 2007 - stbinner(a)suse.de + +- improve KRPMView + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3-SuSE.spec ++++++ --- /var/tmp/diff_new_pack.av8898/_old 2007-06-28 19:21:54.000000000 +0200 +++ /var/tmp/diff_new_pack.av8898/_new 2007-06-28 19:21:54.000000000 +0200 @@ -35,7 +35,7 @@ PreReq: %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 10.3 -Release: 75 +Release: 77 Source0: kdebase-SuSE-%{version}.tar.bz2 Source2: kdebase3-SuSE-displaymanager.fillup Source3: kdebase3-SuSE-windowmanager.fillup @@ -179,6 +179,8 @@ /var/lib/kde-profiles %changelog +* Wed Jun 27 2007 - stbinner(a)suse.de +- improve KRPMView * Thu Jun 21 2007 - stbinner(a)suse.de - fix invalid .desktop files - suseplugger: call kbluetooth instead of kbluetoothd ++++++ kdebase-SuSE-10.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/krpmview/krpmview.cpp new/kdebase-SuSE/krpmview/krpmview.cpp --- old/kdebase-SuSE/krpmview/krpmview.cpp 2006-11-16 16:49:04.000000000 +0100 +++ new/kdebase-SuSE/krpmview/krpmview.cpp 2007-06-27 18:14:48.000000000 +0200 @@ -20,9 +20,6 @@ #include <krun.h> #include <kaboutdata.h> #include <klocale.h> -#include <rpmlib.h> -#include <rpm/rpmts.h> -#include <rpm/misc.h> #include <time.h> #include "krpmview.h" @@ -74,14 +71,20 @@ // create the tab box tab = new QTabBar( box ); browserDescription = new KTextBrowser( box, "browser" ); + browserTechnicalData = new KTextBrowser( box, "technicaldata" ); + browserDependencies = new KTextBrowser( box, "dependencies" ); browserChangelog = new KTextBrowser( box, "changelog" ); browserFilelist = new KTextBrowser( box, "filelist" ); + browserTechnicalData->hide(); + browserDependencies->hide(); browserChangelog->hide(); browserFilelist->hide(); tab->addTab( new QTab(i18n("Description")) ); - tab->addTab( new QTab(i18n("Changelog")) ); - tab->addTab( new QTab(i18n("Files")) ); + tab->addTab( new QTab(i18n("Technical Data")) ); + tab->addTab( new QTab(i18n("Dependencies")) ); + tab->addTab( new QTab(i18n("File List")) ); + tab->addTab( new QTab(i18n("Change Log")) ); connect( tab, SIGNAL(selected(int)), this, SLOT(selectedTab(int)) ); setWidget( box ); @@ -97,6 +100,8 @@ void KRPMViewPart::selectedTab(int t) { browserDescription->hide(); + browserDependencies->hide(); + browserTechnicalData->hide(); browserChangelog->hide(); browserFilelist->hide(); switch( t ){ @@ -104,17 +109,62 @@ browserDescription->show(); break; case 1: - browserChangelog->show(); + browserTechnicalData->show(); break; case 2: + browserDependencies->show(); + break; + case 3: browserFilelist->show(); break; + case 4: + browserChangelog->show(); + break; } } +QString KRPMViewPart::createDependencyList(const Header &h, const QString &caption, int TAGNAME, int TAGVERSION, int TAGFLAGS, bool strongState) +{ + QString result, temp; + void *tmpVoid = 0; + int nEntries; + bool captionAdded = false; + + if (headerGetEntry(h, TAGNAME, NULL, &tmpVoid, &nEntries)) { + const char **files = (const char **)tmpVoid; + headerGetEntry(h, TAGVERSION, NULL, &tmpVoid, NULL); + const char **version = (const char **)tmpVoid; + headerGetEntry(h, TAGFLAGS, NULL, &tmpVoid, NULL); + const uint *flags = (const uint *)tmpVoid; + for (int i = 0; i < nEntries; i++){ + if (((flags[i] & RPMSENSE_STRONG) == RPMSENSE_STRONG) == strongState) { + if (!captionAdded) { + result += "<h3>"+caption+"</h3>"; + captionAdded = true; + } + temp.sprintf("%s", files[i]); + result += temp; + temp.sprintf("%s", version[i]); + if (!temp.isEmpty()) { + result += " "; + if (flags[i] & RPMSENSE_LESS) + result += "<"; + if (flags[i] & RPMSENSE_GREATER) + result += ">"; + if (flags[i] & RPMSENSE_EQUAL) + result += "="; + result += " " + temp; + } + result += "<br>"; + } + } + } + return result; +} + bool KRPMViewPart::openFile() { - QString changelog, filelist, temp; + QString changelog, filelist, temp, technicaldata, dependencies; int nfiles; int numchangelog; int i; @@ -143,14 +193,21 @@ else description=(const char*)tmpVoid; - if (!headerGetEntry(h, RPMTAG_DESCRIPTION, NULL, &tmpVoid, NULL)) + if (!headerGetEntry(h, RPMTAG_SUMMARY, NULL, &tmpVoid, NULL)) + summary=0; + else + summary=(const char*)tmpVoid; + + if (!headerGetEntry(h, RPMTAG_VENDOR, NULL, &tmpVoid, NULL)) vendor=0; else vendor=(const char*)tmpVoid; + if (!headerGetEntry(h, RPMTAG_URL, NULL, &tmpVoid, NULL)) url=0; else url=(const char*)tmpVoid; + if (headerGetEntry(h, RPMTAG_CHANGELOGTEXT, NULL, &tmpVoid, &numchangelog)) { const char **changelogtext=(const char**)tmpVoid; headerGetEntry(h, RPMTAG_CHANGELOGNAME, NULL, &tmpVoid, NULL); @@ -174,10 +231,59 @@ } } + if (headerGetEntry(h, RPMTAG_LICENSE, NULL, &tmpVoid, NULL)) + technicaldata += i18n("License: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_GROUP, NULL, &tmpVoid, NULL)) + technicaldata += i18n("RPM group: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_DISTRIBUTION, NULL, &tmpVoid, NULL)) + technicaldata += i18n("Distribution: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_PACKAGER, NULL, &tmpVoid, NULL)) + technicaldata += i18n("Packager: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_VENDOR, NULL, &tmpVoid, NULL)) + technicaldata += i18n("Vendor: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_BUILDTIME, NULL, &tmpVoid, NULL)) { + const uint_32 * buildtime=(const uint_32 *)tmpVoid; + time_t t=buildtime[0]; + temp.sprintf("%.24s", ctime(&t)); + technicaldata += i18n("Build time: %1\n").arg(temp); + } + + if (headerGetEntry(h, RPMTAG_BUILDHOST, NULL, &tmpVoid, NULL)) + technicaldata += i18n("Build host: %1\n").arg((const char *)(tmpVoid)); + + if (headerGetEntry(h, RPMTAG_SIZE, NULL, &tmpVoid, NULL)) { + const uint *size = (const uint *)tmpVoid; + temp.sprintf("%d", *size); + technicaldata += i18n("Size: %1\n").arg(temp); + } + if (headerGetEntry(h, RPMTAG_SOURCERPM, NULL, &tmpVoid, NULL)) + technicaldata += i18n("Source RPM: %1\n").arg((const char *)(tmpVoid)); + + dependencies += createDependencyList(h, i18n("Provides"), RPMTAG_PROVIDENAME, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS, false); + + dependencies += createDependencyList(h, i18n("Requires"), RPMTAG_REQUIRENAME, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS, false); + + dependencies += createDependencyList(h, i18n("Conflicts"), RPMTAG_CONFLICTNAME, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS, false); + + dependencies += createDependencyList(h, i18n("Obsoletes"), RPMTAG_OBSOLETENAME, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS, false); + + dependencies += createDependencyList(h, i18n("Recommends"), RPMTAG_SUGGESTSNAME, RPMTAG_SUGGESTSVERSION, RPMTAG_SUGGESTSFLAGS, true); + + dependencies += createDependencyList(h, i18n("Suggests"), RPMTAG_SUGGESTSNAME, RPMTAG_SUGGESTSVERSION, RPMTAG_SUGGESTSFLAGS, false); + + dependencies += createDependencyList(h, i18n("Enhances"), RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS, false); + + dependencies += createDependencyList(h, i18n("Supplements"), RPMTAG_ENHANCESNAME, RPMTAG_ENHANCESVERSION, RPMTAG_ENHANCESFLAGS, true); + Fclose(fd); QString text; - text = "<h2>" + QStyleSheet::convertFromPlainText(QString(name)) + "</h2><h3>" + text = "<h2>" + QStyleSheet::convertFromPlainText(QString(name) + " - " + QString(summary)) + "</h2><h3>" " Version: " + QString(version) + "-" + QString(release) + "</h3>"; text += "<p>" + i18n("Project Page: ") + "<a href=" + QString::fromLocal8Bit(url) + ">" + QString::fromLocal8Bit(url) + "</a>"; // text += "<p>" + i18n("Vendor: ") + QStyleSheet::convertFromPlainText(QString::fromLocal8Bit(vendor)); @@ -185,6 +291,8 @@ text += QStyleSheet::convertFromPlainText(QString::fromLocal8Bit(description)); browserDescription->setText( text ); browserDescription->setNotifyClick(true); + browserDependencies->setText( dependencies ); + browserTechnicalData->setText( technicaldata ); browserChangelog->setText( changelog ); browserFilelist->setText( filelist ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdebase-SuSE/krpmview/krpmview.h new/kdebase-SuSE/krpmview/krpmview.h --- old/kdebase-SuSE/krpmview/krpmview.h 2005-03-04 09:45:29.000000000 +0100 +++ new/kdebase-SuSE/krpmview/krpmview.h 2007-06-27 18:14:48.000000000 +0200 @@ -2,7 +2,7 @@ krpmview.h - description ------------------- begin : Die Jul 9 13:09:32 CEST 2002 - copyright : (C) 2002 by Adrian Schr�ter + copyright : (C) 2002 by Adrian Schr�ter email : adrian(a)suse.de ***************************************************************************/ @@ -23,6 +23,10 @@ #include <qtabbar.h> #include <qpushbutton.h> +#include <rpmlib.h> +#include <rpm/rpmts.h> +#include <rpm/misc.h> + // Forward declarations, saves time compared to including the full headers class QListView; class KAboutData; @@ -46,6 +50,7 @@ const char *name; const char *version; const char *release; + const char *summary; const char *description; const char *url; const char *vendor; @@ -62,10 +67,15 @@ KTextBrowser *browserChangelog; KTextBrowser *browserDescription; KTextBrowser *browserFilelist; + KTextBrowser *browserTechnicalData; + KTextBrowser *browserDependencies; QVBox *box; QTabBar *tab; QPushButton *PushButtonPackage; QPushButton *PushButtonDir; + + QString createDependencyList(const Header &, const QString &caption, + int TAGNAME, int TAGVERSION, int TAGFLAGS, bool strongState); }; #endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit java-1_4_2-gcj-compat
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package java-1_4_2-gcj-compat checked in at Thu Jun 28 19:21:47 CEST 2007. -------- --- java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-06-25 14:04:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/java-1_4_2-gcj-compat/java-1_4_2-gcj-compat.changes 2007-06-27 21:57:57.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jun 27 21:57:40 CEST 2007 - rguenther(a)suse.de + +- do not require libgcj at all. The proper one is required by + gcc-gij. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_4_2-gcj-compat.spec ++++++ --- /var/tmp/diff_new_pack.jF7760/_old 2007-06-28 19:21:19.000000000 +0200 +++ /var/tmp/diff_new_pack.jF7760/_new 2007-06-28 19:21:19.000000000 +0200 @@ -27,7 +27,7 @@ %define _jvmjardir %{_libdir}/jvm-exports %endif Version: 1.4.2.0 -Release: 126 +Release: 128 %define section free %define gccsuffix %{nil} %define origin gcj%{gccsuffix} @@ -62,7 +62,6 @@ #PreReq: libgcj%{gccsuffix} >= %{gccver} #Requires: libgcj%{gccsuffix} >= %{gccver} PreReq: gcc-gij -Requires: libgcj42 %if %{?!suse_version:1}0 %if %{?!mandriva_release:1}0 PreReq: chkconfig which @@ -340,6 +339,9 @@ #%ghost %{_jvmdir}/%{cname}-%{version}/include/jni.h %changelog +* Wed Jun 27 2007 - rguenther(a)suse.de +- do not require libgcj at all. The proper one is required by + gcc-gij. * Mon Jun 25 2007 - adrian(a)suse.de - fix last change (gccsuffix is undefined) and require libgcj42 directly * Mon Jun 25 2007 - adrian(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc42
by root＠Hilbert.suse.de 28 Jun '07

28 Jun '07

Hello community, here is the log from the commit of package gcc42 checked in at Thu Jun 28 19:20:26 CEST 2007. -------- --- gcc42/cross-alpha-gcc-icecream-backend.changes 2007-06-23 18:10:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/cross-alpha-gcc-icecream-backend.changes 2007-06-28 18:49:26.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jun 28 18:48:59 CEST 2007 - matz(a)suse.de + +- Add AMDFAM10h patches and fix for PR31307. + +------------------------------------------------------------------- cross-arm-gcc-icecream-backend.changes: same change cross-avr-gcc42.changes: same change cross-hppa-gcc-icecream-backend.changes: same change cross-i386-gcc-icecream-backend.changes: same change cross-ia64-gcc-icecream-backend.changes: same change cross-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc42.changes: same change libgcj42.changes: same change New: ---- amdfam10-allpatch.diff amdfam10-barcelona.diff amdfam10-more.diff pr31307.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-alpha-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.T27490/_old 2007-06-28 19:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.T27490/_new 2007-06-28 19:18:16.000000000 +0200 @@ -30,7 +30,7 @@ URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) Version: 4.2.1_20070604 -Release: 3 +Release: 5 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -65,6 +65,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -127,6 +131,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -324,6 +332,8 @@ /usr/share/icecream-envs %changelog +* Thu Jun 28 2007 - matz(a)suse.de +- Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de - Add conflicts for libgcj42 and libgcj42-devel. * Thu Jun 21 2007 - rguenther(a)suse.de cross-arm-gcc-icecream-backend.spec: same change ++++++ cross-avr-gcc42.spec ++++++ --- /var/tmp/diff_new_pack.T27490/_old 2007-06-28 19:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.T27490/_new 2007-06-28 19:18:16.000000000 +0200 @@ -27,7 +27,7 @@ URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) Version: 4.2.1_20070604 -Release: 8 +Release: 10 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -62,6 +62,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -121,6 +125,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -287,6 +295,8 @@ %{_prefix} %changelog +* Thu Jun 28 2007 - matz(a)suse.de +- Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de - Add conflicts for libgcj42 and libgcj42-devel. * Thu Jun 21 2007 - rguenther(a)suse.de ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.T27490/_old 2007-06-28 19:18:16.000000000 +0200 +++ /var/tmp/diff_new_pack.T27490/_new 2007-06-28 19:18:16.000000000 +0200 @@ -30,7 +30,7 @@ URL: http://gcc.gnu.org/ License: BSD License and BSD-like, GNU General Public License (GPL) Version: 4.2.1_20070604 -Release: 3 +Release: 5 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -65,6 +65,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -127,6 +131,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -324,6 +332,8 @@ /usr/share/icecream-envs %changelog +* Thu Jun 28 2007 - matz(a)suse.de +- Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de - Add conflicts for libgcj42 and libgcj42-devel. * Thu Jun 21 2007 - rguenther(a)suse.de cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change ++++++ gcc42.spec ++++++ --- /var/tmp/diff_new_pack.T27490/_old 2007-06-28 19:18:17.000000000 +0200 +++ /var/tmp/diff_new_pack.T27490/_new 2007-06-28 19:18:17.000000000 +0200 @@ -103,7 +103,7 @@ URL: http://gcc.gnu.org/ License: GNU General Public License (GPL) Version: 4.2.1_20070604 -Release: 8 +Release: 10 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -145,6 +145,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -1202,6 +1206,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -1699,6 +1707,7 @@ %ifarch %ix86 x86_64 %{libsubdir}/include/mm3dnow.h %{libsubdir}/include/mmintrin.h +%{libsubdir}/include/ammintrin.h %{libsubdir}/include/emmintrin.h %{libsubdir}/include/pmmintrin.h %{libsubdir}/include/xmmintrin.h @@ -2155,6 +2164,8 @@ %endif %changelog +* Thu Jun 28 2007 - matz(a)suse.de +- Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de - Add conflicts for libgcj42 and libgcj42-devel. * Thu Jun 21 2007 - rguenther(a)suse.de ++++++ libgcj42.spec ++++++ --- /var/tmp/diff_new_pack.T27490/_old 2007-06-28 19:18:17.000000000 +0200 +++ /var/tmp/diff_new_pack.T27490/_new 2007-06-28 19:18:17.000000000 +0200 @@ -115,7 +115,7 @@ Url: http://gcc.gnu.org/ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Version: 4.2.1_20070604 -Release: 9 +Release: 11 %define gcc_version %(echo %version | sed 's/_.*//') %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') %define binsuffix -4.2 @@ -157,6 +157,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -494,6 +498,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -955,6 +963,8 @@ %endif %changelog +* Thu Jun 28 2007 - matz(a)suse.de +- Add AMDFAM10h patches and fix for PR31307. * Fri Jun 22 2007 - rguenther(a)suse.de - Add conflicts for libgcj42 and libgcj42-devel. * Thu Jun 21 2007 - rguenther(a)suse.de ++++++ amdfam10-allpatch.diff ++++++ ++++ 3591 lines (skipped) ++++++ amdfam10-barcelona.diff ++++++ Index: gcc/doc/invoke.texi =================================================================== --- gcc/doc/invoke.texi.orig +++ gcc/doc/invoke.texi @@ -9409,7 +9409,7 @@ instruction set support. @item k8, opteron, athlon64, athlon-fx AMD K8 core based CPUs with x86-64 instruction set support. (This supersets MMX, SSE, SSE2, 3dNOW!, enhanced 3dNOW! and 64-bit instruction set extensions.) -@item amdfam10 +@item amdfam10, barcelona AMD Family 10 core based CPUs with x86-64 instruction set support. (This supersets MMX, SSE, SSE2, SSE3, SSE4A, 3dNOW!, enhanced 3dNOW!, ABM and 64-bit instruction set extensions.) Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog.orig +++ gcc/ChangeLog @@ -524,6 +524,12 @@ sync_double_compare_and_swap_ccdi_pic): Use "SD" as constraint for operand 3. +2007-03-28 Dwarakanath Rajagopal <dwarak.rajagopal(a)amd.com> + + * config.gcc: Accept barcelona as a variant of amdfam10. + * config/i386/i386.c (override_options): Likewise. + * doc/invoke.texi: Likewise. + 2007-03-28 Mike Stump <mrs(a)apple.com> * config/darwin9.h (ASM_OUTPUT_ALIGNED_COMMON): Add. Index: gcc/config.gcc =================================================================== --- gcc/config.gcc.orig +++ gcc/config.gcc @@ -1209,14 +1209,14 @@ i[34567]86-*-solaris2*) # FIXME: -m64 for i[34567]86-*-* should be allowed just # like -m32 for x86_64-*-*. case X"${with_cpu}" in - Xgeneric|Xnocona|Xx86-64|Xamdfam10|Xk8|Xopteron|Xathlon64|Xathlon-fx) + Xgeneric|Xnocona|Xx86-64|Xamdfam10|Xbarcelona|Xk8|Xopteron|Xathlon64|Xathlon-fx) ;; X) with_cpu=generic ;; *) echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2 - echo "generic nocona x86-64 amdfam10 k8 opteron athlon64 athlon-fx" 1>&2 + echo "generic nocona x86-64 amdfam10 barcelona k8 opteron athlon64 athlon-fx" 1>&2 exit 1 ;; esac @@ -2515,7 +2515,7 @@ if test x$with_cpu = x ; then ;; i686-*-* | i786-*-*) case ${target_noncanonical} in - amdfam10-*) + amdfam10-*|barcelona-*) with_cpu=amdfam10 ;; k8-*|opteron-*|athlon_64-*) @@ -2555,7 +2555,7 @@ if test x$with_cpu = x ; then ;; x86_64-*-*) case ${target_noncanonical} in - amdfam10-*) + amdfam10-*|barcelona-*) with_cpu=amdfam10 ;; k8-*|opteron-*|athlon_64-*) @@ -2795,7 +2795,7 @@ case "${target}" in esac # OK ;; - "" | amdfam10 | k8 | opteron | athlon64 | athlon-fx | nocona | generic) + "" | amdfam10 | barcelona | k8 | opteron | athlon64 | athlon-fx | nocona | generic) # OK ;; *) Index: gcc/config/i386/i386.c =================================================================== --- gcc/config/i386/i386.c.orig +++ gcc/config/i386/i386.c @@ -1670,6 +1670,10 @@ override_options (void) | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2 | PTA_SSE3 | PTA_POPCNT | PTA_ABM | PTA_SSE4A /*| PTA_CX16*/}, + {"barcelona", PROCESSOR_AMDFAM10, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW + | PTA_64BIT | PTA_3DNOW_A | PTA_SSE + | PTA_SSE2 | PTA_SSE3 | PTA_POPCNT + | PTA_ABM | PTA_SSE4A /*| PTA_CX16*/}, {"generic32", PROCESSOR_GENERIC32, 0 /* flags are only used for -march switch. */ }, {"generic64", PROCESSOR_GENERIC64, PTA_64BIT /* flags are only used for -march switch. */ }, }; ++++++ amdfam10-more.diff ++++++ Index: gcc/doc/invoke.texi =================================================================== --- gcc/doc/invoke.texi.orig +++ gcc/doc/invoke.texi @@ -9409,8 +9409,10 @@ instruction set support. @item k8, opteron, athlon64, athlon-fx AMD K8 core based CPUs with x86-64 instruction set support. (This supersets MMX, SSE, SSE2, 3dNOW!, enhanced 3dNOW! and 64-bit instruction set extensions.) +@item k8-sse3, opteron-sse3, athlon64-sse3 +Improved versions of k8, opteron and athlon64 with SSE3 instruction set support. @item amdfam10, barcelona -AMD Family 10 core based CPUs with x86-64 instruction set support. (This +AMD Family 10h core based CPUs with x86-64 instruction set support. (This supersets MMX, SSE, SSE2, SSE3, SSE4A, 3dNOW!, enhanced 3dNOW!, ABM and 64-bit instruction set extensions.) @item winchip-c6 Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog.orig +++ gcc/ChangeLog @@ -179,6 +179,24 @@ * tree-ssa-forwprop.c (forward_propagate_addr_expr): Do not propagate into a stmt that has volatile ops. +2007-05-01 Dwarakanath Rajagopal <dwarak.rajagopal(a)amd.com> + + * doc/invoke.texi: Fix typo, 'AMD Family 10h core' instead of + 'AMD Family 10 core'. + +2007-05-01 Dwarakanath Rajagopal <dwarak.rajagopal(a)amd.com> + + * config/i386/i386.c (override_options): Accept k8-sse3, opteron-sse3 + and athlon64-sse3 as improved versions of k8, opteron and athlon64 + with SSE3 instruction set support. + * doc/invoke.texi: Likewise. + +2007-05-01 Dwarakanath Rajagopal <dwarak.rajagopal(a)amd.com> + + * config/i386/i386.c (override_options): Tuning 32-byte loop + alignment for amdfam10 architecture. Increasing the max loop + alignment to 24 bytes. + 2007-05-01 Ian Lance Taylor <iant(a)google.com> PR tree-optimization/31739 Index: gcc/config/i386/i386.c =================================================================== --- gcc/config/i386/i386.c.orig +++ gcc/config/i386/i386.c @@ -1660,10 +1660,19 @@ override_options (void) | PTA_SSE | PTA_SSE2 }, {"k8", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"k8-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT + | PTA_3DNOW_A | PTA_SSE | PTA_SSE2 + | PTA_SSE3}, {"opteron", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"opteron-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW + | PTA_64BIT | PTA_3DNOW_A | PTA_SSE + | PTA_SSE2 | PTA_SSE3}, {"athlon64", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, + {"athlon64-sse3", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW + | PTA_64BIT | PTA_3DNOW_A | PTA_SSE + | PTA_SSE2 | PTA_SSE3}, {"athlon-fx", PROCESSOR_K8, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW | PTA_64BIT | PTA_3DNOW_A | PTA_SSE | PTA_SSE2}, {"amdfam10", PROCESSOR_AMDFAM10, PTA_MMX | PTA_PREFETCH_SSE | PTA_3DNOW ++++++ gcc.spec.in ++++++ --- gcc42/gcc.spec.in 2007-06-23 18:10:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc42/gcc.spec.in 2007-06-28 18:48:30.000000000 +0200 @@ -162,6 +162,10 @@ # AMD stuff Patch102: fold-floor.patch Patch104: pr3511.patch +Patch105: amdfam10-allpatch.diff +Patch106: amdfam10-barcelona.diff +Patch107: amdfam10-more.diff +Patch108: pr31307.diff # Enhancements Patch200: fortify-2.diff Patch201: parentheses-mathematical-41.diff @@ -761,6 +765,10 @@ %patch200 %patch201 -p1 cd .. +%patch105 +%patch106 +%patch107 +%patch108 %build # Avoid conflict with commercial libjawt.so @@ -1284,6 +1292,7 @@ %ifarch %ix86 x86_64 %{libsubdir}/include/mm3dnow.h %{libsubdir}/include/mmintrin.h +%{libsubdir}/include/ammintrin.h %{libsubdir}/include/emmintrin.h %{libsubdir}/include/pmmintrin.h %{libsubdir}/include/xmmintrin.h ++++++ pr31307.diff ++++++ Index: gcc/fold-const.c =================================================================== --- gcc/fold-const.c.orig +++ gcc/fold-const.c @@ -2802,9 +2802,13 @@ operand_equal_p (tree arg0, tree arg1, u case ARRAY_REF: case ARRAY_RANGE_REF: - /* Operands 2 and 3 may be null. */ + /* Operands 2 and 3 may be null. + Compare the array index by value if it is constant first as we + may have different types but same value here. */ return (OP_SAME (0) - && OP_SAME (1) + && (tree_int_cst_equal (TREE_OPERAND (arg0, 1), + TREE_OPERAND (arg1, 1)) + || OP_SAME (1)) && OP_SAME_WITH_NULL (2) && OP_SAME_WITH_NULL (3)); Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog.orig +++ gcc/ChangeLog @@ -418,6 +418,18 @@ * omp-low.c (expand_omp_parallel): If child_cfun->cfg, free dominators, post dominators and cleanup cfg before returning. +2007-04-12 Richard Guenther <rguenther(a)suse.de> + + PR tree-optimization/24689 + PR tree-optimization/31307 + * fold-const.c (operand_equal_p): Compare INTEGER_CST array + indices by value. + * gimplify.c (canonicalize_addr_expr): To be consistent with + gimplify_compound_lval only set operands two and three of + ARRAY_REFs if they are not gimple_min_invariant. This makes + it never at this place. + * tree-ssa-ccp.c (maybe_fold_offset_to_array_ref): Likewise. + 2007-04-11 John David Anglin <dave.anglin(a)nrc-cnrc.gc.ca> * pa.c (pa_som_asm_init_sections): Ensure that cfun->machine is not Index: gcc/testsuite/gcc.dg/tree-ssa/pr24689.c =================================================================== --- /dev/null +++ gcc/testsuite/gcc.dg/tree-ssa/pr24689.c @@ -0,0 +1,24 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fdump-tree-optimized" } */ + +extern void bar (unsigned int); + +int +foo (void) +{ + char buf[1] = { 3 }; + const char *p = buf; + const char **q = &p; + unsigned int ch; + switch (**q) + { + case 1: ch = 5; break; + default: ch = 0; break; + } + + bar (ch); + return ch; +} + +/* { dg-final { scan-tree-dump "return 0;" "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog.orig +++ gcc/testsuite/ChangeLog @@ -233,6 +233,13 @@ * gcc.dg/tree-ssa/loadpre1.c, gcc.dg/tree-ssa/loadpre14.c, gcc.dg/tree-ssa/loadpre15.c: XFAIL. +2007-04-12 Richard Guenther <rguenther(a)suse.de> + + PR tree-optimization/24689 + PR tree-optimization/31307 + * g++.dg/tree-ssa/pr31307.C: New testcase. + * gcc.dg/tree-ssa/pr24689.c: Likewise. + 2007-04-10 Mike Stump <mrs(a)apple.com> * g++.dg/tree-ssa/pr29585.C: Don't die on an expected warning. Index: gcc/testsuite/g++.dg/tree-ssa/pr31307.C =================================================================== --- /dev/null +++ gcc/testsuite/g++.dg/tree-ssa/pr31307.C @@ -0,0 +1,40 @@ +/* { dg-do compile } */ +/* { dg-options "-O -fdump-tree-optimized" } */ + +union MY_M128 +{ + double i; +}; + +struct RegFile +{ + MY_M128 dst[4]; +}; + +__inline__ __attribute__((always_inline)) static void +MEM_OPT_LOAD(MY_M128* reg, double* mem) +{ + reg[0].i = *mem; +} + +void _ia32_movntdq (double *, double); + +__inline__ __attribute__((always_inline)) static void +MEM_OPT_STORE(MY_M128* reg, double* mem) +{ + _ia32_movntdq ((double*)mem, (double)reg[0].i); +} + +double _mm_adds_epu8 (double __A, double __B); + +int test(unsigned char *d) +{ + RegFile r; + MEM_OPT_LOAD((r.dst) , ((double*) d)); + r.dst[0].i = _mm_adds_epu8(r.dst[0].i, r.dst[0].i); + MEM_OPT_STORE((r.dst), (double*) d); + return 0; +} + +/* { dg-final { scan-tree-dump-not "r.dst" "optimized" } } */ +/* { dg-final { cleanup-tree-dump "optimized" } } */ Index: gcc/tree-ssa-ccp.c =================================================================== --- gcc/tree-ssa-ccp.c.orig +++ gcc/tree-ssa-ccp.c @@ -1621,9 +1621,7 @@ maybe_fold_offset_to_array_ref (tree bas if (!integer_zerop (elt_offset)) idx = int_const_binop (PLUS_EXPR, idx, elt_offset, 0); - return build4 (ARRAY_REF, orig_type, base, idx, min_idx, - size_int (tree_low_cst (elt_size, 1) - / (TYPE_ALIGN_UNIT (elt_type)))); + return build4 (ARRAY_REF, orig_type, base, idx, NULL_TREE, NULL_TREE); } Index: gcc/gimplify.c =================================================================== --- gcc/gimplify.c.orig +++ gcc/gimplify.c @@ -1600,9 +1600,7 @@ canonicalize_addr_expr (tree *expr_p) /* All checks succeeded. Build a new node to merge the cast. */ *expr_p = build4 (ARRAY_REF, dctype, obj_expr, TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - TYPE_MIN_VALUE (TYPE_DOMAIN (datype)), - size_binop (EXACT_DIV_EXPR, TYPE_SIZE_UNIT (dctype), - size_int (TYPE_ALIGN_UNIT (dctype)))); + NULL_TREE, NULL_TREE); *expr_p = build1 (ADDR_EXPR, ctype, *expr_p); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0