rpms/kdenetwork/devel kdenetwork-3.5.4-kde#63494.patch, NONE, 1.1 kdenetwork-3.5.4-kde#73519.patch, NONE, 1.1 .cvsignore, 1.37, 1.38 kdenetwork.spec, 1.87, 1.88 sources, 1.42, 1.43 kdenetwork-3.5.3-to-3.5.4.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 10 14:38:39 UTC 2006
- Previous message (by thread): rpms/eel2/devel .cvsignore, 1.37, 1.38 eel2.spec, 1.53, 1.54 sources, 1.37, 1.38
- Next message (by thread): rpms/nautilus/devel .cvsignore, 1.42, 1.43 nautilus.spec, 1.114, 1.115 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/dist/rpms/kdenetwork/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29099
Modified Files:
.cvsignore kdenetwork.spec sources
Added Files:
kdenetwork-3.5.4-kde#63494.patch
kdenetwork-3.5.4-kde#73519.patch
Removed Files:
kdenetwork-3.5.3-to-3.5.4.patch
Log Message:
- apply upstream patches,
- check the return value from XF86VidModeGetAllModeLines() to avoid crashing kde#73519
- Fixed flickering when scrolling in newsticker kde#63494
kdenetwork-3.5.4-kde#63494.patch:
newsscroller.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE kdenetwork-3.5.4-kde#63494.patch ---
Index: knewsticker/newsscroller.cpp
===================================================================
--- knewsticker/newsscroller.cpp (Revision 566105)
+++ knewsticker/newsscroller.cpp (Revision 566106)
@@ -129,7 +129,7 @@
};
NewsScroller::NewsScroller(QWidget *parent, ConfigAccess *cfg, const char *name)
- : QFrame(parent, name),
+ : QFrame(parent, name, WNoAutoErase),
m_cfg(cfg),
m_scrollTimer(new QTimer(this)),
m_activeHeadline(0),
@@ -258,8 +258,8 @@
if (contentsRect().contains(pt))
updateActive(pt);
-
- repaint(false);
+
+ update();
}
void NewsScroller::enterEvent(QEvent *)
@@ -337,7 +337,7 @@
}
if (updateActive(e->pos()))
- repaint(false);
+ update();
}
void NewsScroller::wheelEvent(QWheelEvent *e)
@@ -360,7 +360,7 @@
if (m_activeHeadline) {
m_activeHeadline = 0;
- repaint(false);
+ update();
}
}
@@ -488,7 +488,7 @@
m_offset = - scrollHeight();
}
- repaint(false);
+ update();
}
int NewsScroller::scrollWidth() const
kdenetwork-3.5.4-kde#73519.patch:
vidmode.cpp | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE kdenetwork-3.5.4-kde#73519.patch ---
Index: krdc/vidmode.cpp
===================================================================
--- krdc/vidmode.cpp (Revision 571506)
+++ krdc/vidmode.cpp (Revision 571507)
@@ -38,7 +38,9 @@
if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
return;
- XF86VidModeGetAllModeLines(dpy,oldResolution.screen,&modecount, &modes);
+ if (!XF86VidModeGetAllModeLines(dpy, oldResolution.screen, &modecount, &modes))
+ return;
+
for (int i = 0; i < modecount; i++) {
int w = (*modes[i]).hdisplay;
int h = (*modes[i]).vdisplay;
@@ -69,7 +71,9 @@
if (!XF86VidModeQueryExtension(dpy, &eventB, &errorB))
return Resolution();
- XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes);
+ if (!XF86VidModeGetAllModeLines(dpy,screen,&modecount, &modes))
+ return Resolution();
+
int cw = (*modes[0]).hdisplay;
int ch = (*modes[0]).vdisplay;
nx = cw;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore 5 Jun 2006 14:42:08 -0000 1.37
+++ .cvsignore 10 Aug 2006 14:38:37 -0000 1.38
@@ -10,3 +10,4 @@
kdenetwork-3.5.0.tar.bz2
kdenetwork-3.5.1.tar.bz2
kdenetwork-3.5.3.tar.bz2
+kdenetwork-3.5.4.tar.bz2
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- kdenetwork.spec 7 Aug 2006 13:55:07 -0000 1.87
+++ kdenetwork.spec 10 Aug 2006 14:38:37 -0000 1.88
@@ -13,7 +13,7 @@
Name: kdenetwork
Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: K Desktop Environment - Network Applications
Epoch: 7
Group: Applications/Internet
@@ -21,13 +21,12 @@
License: GPL
Url: http://www.kde.org
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-3.5.3.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Source1: kppp.pamd
Source2: ktalk
Source4: lisarc
Source5: lisa.redhat
-Patch10: kdenetwork-3.5.3-to-3.5.4.patch
Patch0: kdenetwork-3.1-desktop.patch
Patch1: kdenetwork-3.1-buildroot.patch
Patch2: kde-libtool.patch
@@ -37,6 +36,8 @@
# upstream patches
Patch100: kdenetwork-3.5.4-kde#130630.patch
+Patch101: kdenetwork-3.5.4-kde#73519.patch
+Patch102: kdenetwork-3.5.4-kde#63494.patch
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
Requires: kdebase >= %{kdebase_epoch}:%{version}
@@ -49,7 +50,7 @@
BuildRequires: glibc-devel
BuildRequires: gcc-c++
BuildRequires: automake
-BuildRequires: autoconf >= 2.53
+BuildRequires: autoconf
%ifnarch s390 s390x
BuildRequires: wireless-tools >= 25
%endif
@@ -73,8 +74,7 @@
to develop or compile KDE networking applications.
%prep
-%setup -q -n %{name}-3.5.3
-%patch10 -p0 -b .kde3.5.4
+%setup -q
%patch0 -p1 -b .dt
%patch1 -p1 -b .buildroot
%patch2 -p1 -b .libtool
@@ -84,6 +84,8 @@
# upstream patches
%patch100 -p0 -b .kde#130630
+%patch101 -p0 -b .kde#73519
+%patch102 -p0 -b .kde#63494
echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE nowlistening\"" > kopete/plugins/nowlistening/configure.in.in
@@ -166,16 +168,16 @@
/sbin/ldconfig
/sbin/chkconfig --add lisa ||:
for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
for f in crystalsvg hicolor locolor ; do
- touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||:
+ touch --no-create %{_datadir}/icons/$f 2> /dev/null ||:
+ gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -227,6 +229,11 @@
%exclude %{_libdir}/libkdeinit_*
%changelog
+* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
+- apply upstream patches,
+ - check the return value from XF86VidModeGetAllModeLines() to avoid crashing kde#73519
+ - Fixed flickering when scrolling in newsticker kde#63494
+
* Mon Aug 07 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
- apply upstream patch,
no connection to icq-server kde#130630
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdenetwork/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 5 Jun 2006 14:42:09 -0000 1.42
+++ sources 10 Aug 2006 14:38:37 -0000 1.43
@@ -1 +1 @@
-119af91a048c34d9a917a1898f215554 kdenetwork-3.5.3.tar.bz2
+81660b1a73e81b6c01a55861c154dd3b kdenetwork-3.5.4.tar.bz2
--- kdenetwork-3.5.3-to-3.5.4.patch DELETED ---
- Previous message (by thread): rpms/eel2/devel .cvsignore, 1.37, 1.38 eel2.spec, 1.53, 1.54 sources, 1.37, 1.38
- Next message (by thread): rpms/nautilus/devel .cvsignore, 1.42, 1.43 nautilus.spec, 1.114, 1.115 sources, 1.45, 1.46
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list