Mailinglist Archive: opensuse-commit (1262 mails)
| < Previous | Next > |
commit kdelibs3
- From: root@xxxxxxx (h_root)
- Date: Thu, 14 Sep 2006 18:43:58 +0200 (CEST)
- Message-id: <20060914164358.864D118BC9A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdelibs3
checked in at Thu Sep 14 18:43:58 CEST 2006.
--------
--- KDE/kdelibs3/kdelibs3.changes 2006-09-13 11:29:17.000000000 +0200
+++ kdelibs3/kdelibs3.changes 2006-09-14 14:06:06.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Sep 14 14:03:31 CEST 2006 - coolo@xxxxxxx
+
+- update admin tar ball for python 2.5
+- update 3.5 branch diff:
+ - khtml, kjs fixes
+ - QXIMInputContext crash workaround
+ - cups 1.2: also support unix sockets and IPv6
+ - protect urls in kdeprint interface
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.fNWHed/_old 2006-09-14 18:43:29.000000000 +0200
+++ /var/tmp/diff_new_pack.fNWHed/_new 2006-09-14 18:43:29.000000000 +0200
@@ -18,7 +18,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Additional Package Documentation
Version: 3.5.4
-Release: 17
+Release: 18
%define kdelibs_patch_level b
BuildArch: noarch
Requires: kdelibs3 qt3-devel-doc
++++++ kdelibs3.spec ++++++
--- /var/tmp/diff_new_pack.fNWHed/_old 2006-09-14 18:43:29.000000000 +0200
+++ /var/tmp/diff_new_pack.fNWHed/_new 2006-09-14 18:43:29.000000000 +0200
@@ -21,7 +21,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: KDE Base Libraries
Version: 3.5.4
-Release: 17
+Release: 18
Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kups keramik kdelibs3-cups kdelibs3-33addons
Provides: kdelibs3_base = 3.3
@@ -741,6 +741,13 @@
/opt/kde3/%_lib/libkwalletclient.so
%changelog -n kdelibs3
+* Thu Sep 14 2006 - coolo@xxxxxxx
+- update admin tar ball for python 2.5
+- update 3.5 branch diff:
+- khtml, kjs fixes
+- QXIMInputContext crash workaround
+- cups 1.2: also support unix sockets and IPv6
+- protect urls in kdeprint interface
* Wed Sep 13 2006 - stbinner@xxxxxxx
- fix build for < 10.1
* Mon Sep 11 2006 - ltinkl@xxxxxxx
++++++ testkhtml.spec ++++++
--- /var/tmp/diff_new_pack.fNWHed/_old 2006-09-14 18:43:29.000000000 +0200
+++ /var/tmp/diff_new_pack.fNWHed/_new 2006-09-14 18:43:29.000000000 +0200
@@ -16,7 +16,7 @@
License: Other License(s), see package, BSD
Group: System/GUI/KDE
Version: 3.5.4
-Release: 14
+Release: 15
Summary: Internal: regression testing for konqueror renderer
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: kdelibs-%{version}.tar.bz2
++++++ 3_5_BRANCH.diff ++++++
++++ 7911 lines (skipped)
++++ between KDE/kdelibs3/3_5_BRANCH.diff
++++ and kdelibs3/3_5_BRANCH.diff
++++++ admin.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/acinclude.m4.in new/admin/acinclude.m4.in
--- old/admin/acinclude.m4.in 2006-06-12 11:04:57.000000000 +0200
+++ new/admin/acinclude.m4.in 2006-09-14 14:02:28.000000000 +0200
@@ -3499,14 +3499,10 @@
AC_DEFUN([KDE_CHECK_LIB64],
[
- kdelibsuff="$kde_libs_suffix"
- if test -z "$kdelibsuff"; then
- kdelibsuff="no"
- fi
AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none,auto[=default])]),
- kdelibsuff=$enableval)
+ kdelibsuff=$enableval, kdelibsuff="auto")
if test "$kdelibsuff" = "auto"; then
@@ -4628,12 +4624,14 @@
AC_DEFUN([KDE_CHECK_PYTHON],
[
- KDE_CHECK_PYTHON_INTERN("2.4",
- [KDE_CHECK_PYTHON_INTERN("2.3",
- [KDE_CHECK_PYTHON_INTERN("2.2",
- [KDE_CHECK_PYTHON_INTERN("2.1",
- [KDE_CHECK_PYTHON_INTERN("2.0",
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+ KDE_CHECK_PYTHON_INTERN("2.5",
+ [KDE_CHECK_PYTHON_INTERN("2.4",
+ [KDE_CHECK_PYTHON_INTERN("2.3",
+ [KDE_CHECK_PYTHON_INTERN("2.2",
+ [KDE_CHECK_PYTHON_INTERN("2.1",
+ [KDE_CHECK_PYTHON_INTERN("2.0",
+ [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+ ])
])
])
])
@@ -5001,7 +4999,6 @@
])
fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
- kde_libs_suffix=`$KDECONFIG --libsuffix` || kde_libs_suffix=auto
AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/admin/cvs.sh new/admin/cvs.sh
--- old/admin/cvs.sh 2006-06-28 21:26:30.000000000 +0200
+++ new/admin/cvs.sh 2006-09-14 14:02:29.000000000 +0200
@@ -316,7 +316,7 @@
fi
fi
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
- VERSION="\"3.5.3\""
+ VERSION="\"3.5.4\""
fi
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
modulename=`pwd`;
++++++ smooth-scrolling.diff ++++++
--- /var/tmp/diff_new_pack.fNWHed/_old 2006-09-14 18:43:32.000000000 +0200
+++ /var/tmp/diff_new_pack.fNWHed/_new 2006-09-14 18:43:32.000000000 +0200
@@ -1,6 +1,8 @@
---- khtml/khtmlview.cpp.sav 2006-05-18 19:13:56.000000000 +0200
-+++ khtml/khtmlview.cpp 2006-05-18 19:41:19.000000000 +0200
-@@ -150,6 +150,9 @@ public:
+Index: khtml/khtmlview.cpp
+===================================================================
+--- khtml/khtmlview.cpp (Revision 584319)
++++ khtml/khtmlview.cpp (Arbeitskopie)
+@@ -150,6 +150,9 @@
KHTMLViewPrivate()
: underMouse( 0 ), underMouseNonShared( 0 ), visibleWidgets( 107 )
@@ -10,8 +12,8 @@
{
#ifndef KHTML_NO_CARET
m_caretViewContext = 0;
-@@ -395,6 +398,17 @@ public:
- int m_mouseScroll_byY : 4;
+@@ -395,6 +398,17 @@
+ short m_mouseScroll_byY;
QTimer *m_mouseScrollTimer;
QWidget *m_mouseScrollIndicator;
+#ifndef NO_SMOOTH_SCROLL_HACK
@@ -28,7 +30,7 @@
};
#ifndef QT_NO_TOOLTIP
-@@ -503,6 +517,11 @@ KHTMLView::KHTMLView( KHTMLPart *part, Q
+@@ -503,6 +517,11 @@
init();
viewport()->show();
@@ -40,43 +42,94 @@
}
KHTMLView::~KHTMLView()
-@@ -1512,7 +1531,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
- _ke->accept();
- else {
- if (!d->scrollTimerId || d->scrollSuspended)
-- scrollBy( 0, 10 );
-+ scrollBy( 0, 10 * _ke->count());
- if (d->scrollTimerId)
- d->newScrollTimer(this, 0);
- }
-@@ -1535,7 +1554,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
- _ke->accept();
- else {
- if (!d->scrollTimerId || d->scrollSuspended)
-- scrollBy( 0, -10 );
-+ scrollBy( 0, -10 * _ke->count());
- if (d->scrollTimerId)
- d->newScrollTimer(this, 0);
- }
-@@ -1556,7 +1575,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
- _ke->accept();
- else {
- if (!d->scrollTimerId || d->scrollSuspended)
-- scrollBy( 10, 0 );
-+ scrollBy( 10 * _ke->count(), 0 );
- if (d->scrollTimerId)
- d->newScrollTimer(this, 0);
- }
-@@ -1567,7 +1586,7 @@ void KHTMLView::keyPressEvent( QKeyEvent
- _ke->accept();
- else {
- if (!d->scrollTimerId || d->scrollSuspended)
-- scrollBy( -10, 0 );
-+ scrollBy( -10 * _ke->count(), 0 );
- if (d->scrollTimerId)
- d->newScrollTimer(this, 0);
- }
-@@ -1709,8 +1728,16 @@ void KHTMLView::keyReleaseEvent(QKeyEven
+@@ -659,14 +678,14 @@
+ for (QPtrDictIterator<QWidget> it(d->visibleWidgets); it.current(); ++it) {
+ QWidget *w = it.current();
+ RenderWidget* rw = static_cast<RenderWidget*>( it.currentKey() );
+- if (w && rw && !rw->isKHTMLWidget()) {
++ if (w && rw && !rw->isKHTMLWidget()) {
+ int x, y;
+ rw->absolutePosition(x, y);
+ contentsToViewport(x, y, x, y);
+ int pbx = rw->borderLeft()+rw->paddingLeft();
+ int pby = rw->borderTop()+rw->paddingTop();
+- QRect g = QRect(x+pbx, y+pby,
+- rw->width()-pbx-rw->borderRight()-rw->paddingRight(),
++ QRect g = QRect(x+pbx, y+pby,
++ rw->width()-pbx-rw->borderRight()-rw->paddingRight(),
+ rw->height()-pby-rw->borderBottom()-rw->paddingBottom());
+ if ( !rw->isFrame() && ((g.top() > pt.y()+eh) || (g.bottom() <= pt.y()) ||
+ (g.right() <= pt.x()) || (g.left() > pt.x()+ew) ))
+@@ -783,7 +802,7 @@
+
+ d->layoutSchedulingEnabled=false;
+
+- // the reference object for the overflow property on canvas
++ // the reference object for the overflow property on canvas
+ RenderObject * ref = 0;
+ RenderObject* root = document->documentElement() ? document->documentElement()->renderer() : 0;
+
+@@ -802,13 +821,13 @@
+ if (!d->tooltip)
+ d->tooltip = new KHTMLToolTip( this, d );
+ // only apply body's overflow to canvas if root as a visible overflow
+- if (root)
++ if (root)
+ ref = (!body || root->style()->hidesOverflow()) ? root : body->renderer();
+ }
+ } else {
+ ref = root;
+ }
+-
++
+ if (ref) {
+ if( ref->style()->overflow() == OHIDDEN ) {
+ if (d->vmode == Auto) QScrollView::setVScrollBarMode(AlwaysOff);
+@@ -816,7 +835,7 @@
+ } else {
+ if (QScrollView::vScrollBarMode() == AlwaysOff) QScrollView::setVScrollBarMode(d->vmode);
+ if (QScrollView::hScrollBarMode() == AlwaysOff) QScrollView::setHScrollBarMode(d->hmode);
+- }
++ }
+ }
+ d->needsFullRepaint = d->firstRelayout;
+ if (_height != visibleHeight() || _width != visibleWidth()) {;
+@@ -1503,7 +1522,7 @@
+ case Key_Down:
+ case Key_J:
+ if (!d->scrollTimerId || d->scrollSuspended)
+- scrollBy( 0, 10 );
++ scrollBy( 0, 10 * _ke->count() );
+ if (d->scrollTimerId)
+ d->newScrollTimer(this, 0);
+ break;
+@@ -1518,7 +1537,7 @@
+ case Key_Up:
+ case Key_K:
+ if (!d->scrollTimerId || d->scrollSuspended)
+- scrollBy( 0, -10 );
++ scrollBy( 0, -10 * _ke->count());
+ if (d->scrollTimerId)
+ d->newScrollTimer(this, 0);
+ break;
+@@ -1531,14 +1550,14 @@
+ case Key_Right:
+ case Key_L:
+ if (!d->scrollTimerId || d->scrollSuspended)
+- scrollBy( 10, 0 );
++ scrollBy( 10 * _ke->count(), 0 );
+ if (d->scrollTimerId)
+ d->newScrollTimer(this, 0);
+ break;
+ case Key_Left:
+ case Key_H:
+ if (!d->scrollTimerId || d->scrollSuspended)
+- scrollBy( -10, 0 );
++ scrollBy( -10 * _ke->count(), 0 );
+ if (d->scrollTimerId)
+ d->newScrollTimer(this, 0);
+ break;
+@@ -1671,12 +1690,20 @@
d->scrollSuspendPreActivate = false;
if( _ke->key() == Key_Shift && d->scrollSuspendPreActivate && _ke->state() == Qt::ShiftButton
&& !(KApplication::keyboardMouseState() & Qt::ShiftButton))
@@ -92,9 +145,33 @@
+ }
+ }
- if (d->accessKeysEnabled)
+- if (d->accessKeysEnabled)
++ if (d->accessKeysEnabled)
{
-@@ -3249,7 +3276,11 @@ void KHTMLView::viewportWheelEvent(QWhee
+- if (d->accessKeysPreActivate && _ke->key() != Key_Control)
++ if (d->accessKeysPreActivate && _ke->key() != Key_Control)
+ d->accessKeysPreActivate=false;
+ if (d->accessKeysPreActivate && _ke->state() == Qt::ControlButton && !(KApplication::keyboardMouseState() & Qt::ControlButton))
+ {
+@@ -1687,7 +1714,7 @@
+ _ke->accept();
+ return;
+ }
+- else if (d->accessKeysActivated)
++ else if (d->accessKeysActivated)
+ {
+ accessKeysTimeout();
+ _ke->accept();
+@@ -2640,7 +2667,7 @@
+ if( !url.isEmpty() && !url.startsWith( "javascript:", false )) {
+ for( QValueList< AccessKeyData >::Iterator it2 = data.begin();
+ it2 != data.end();
+- ) {
++ ) {
+ if( (*it2).url == url ) {
+ ret[ (*it2).element ] = key;
+ if( it == it2 )
+@@ -3206,7 +3233,11 @@
else
{
d->scrollBarMoved = true;
@@ -106,7 +183,7 @@
QMouseEvent *tempEvent = new QMouseEvent( QEvent::MouseMove, QPoint(-1,-1), QPoint(-1,-1), Qt::NoButton, e->state() );
emit viewportMouseMoveEvent ( tempEvent );
-@@ -4448,4 +4479,117 @@ void KHTMLView::moveCaretToLineEnd()
+@@ -4406,4 +4437,117 @@
#endif // KHTML_NO_CARET
@@ -224,9 +301,11 @@
+#endif // NO_SMOOTH_SCROLL_HACK
+
#undef DEBUG_CARETMODE
---- khtml/khtmlview.h.sav 2006-05-18 19:06:24.000000000 +0200
-+++ khtml/khtmlview.h 2006-05-18 19:18:47.000000000 +0200
-@@ -181,6 +181,11 @@ signals:
+Index: khtml/khtmlview.h
+===================================================================
+--- khtml/khtmlview.h (Revision 584319)
++++ khtml/khtmlview.h (Arbeitskopie)
+@@ -181,6 +181,11 @@
void hideAccessKeys();
void repaintAccessKeys();
void findAheadActive( bool );
@@ -238,7 +317,7 @@
protected:
void clear();
-@@ -211,9 +216,23 @@ protected:
+@@ -211,9 +216,23 @@
void contentsContextMenuEvent ( QContextMenuEvent *_ce );
void doAutoScroll();
void timerEvent ( QTimerEvent * );
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |