rpms/kdebase/F-10 kdebase-4.2.2-konsole-flowcontrol.patch, 1.2, 1.3 kdebase.spec, 1.366, 1.367
Kevin Kofler
kkofler at fedoraproject.org
Sun May 31 21:22:41 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3036/F-10
Modified Files:
kdebase.spec
Added Files:
kdebase-4.2.2-konsole-flowcontrol.patch
Log Message:
* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
- fix disabling konsole's flow control again (#496447, regression in 4.2.3-1)
kdebase-4.2.2-konsole-flowcontrol.patch:
Index: kdebase-4.2.2-konsole-flowcontrol.patch
===================================================================
RCS file: kdebase-4.2.2-konsole-flowcontrol.patch
diff -N kdebase-4.2.2-konsole-flowcontrol.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ kdebase-4.2.2-konsole-flowcontrol.patch 31 May 2009 21:22:10 -0000 1.3
@@ -0,0 +1,14 @@
+--- kdebase/apps/konsole/src/EditProfileDialog.cpp 2009/04/17 14:36:49 955412
++++ kdebase/apps/konsole/src/EditProfileDialog.cpp 2009/04/17 14:36:52 955413
+@@ -71,11 +71,6 @@
+ // - Renable in a later KDE 4.x release when this feature works again
+ _ui->enableResizeWindowButton->setVisible(false);
+
+-#ifdef __GNUC__
+-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
+-#endif
+- _ui->enableFlowControlButton->setEnabled(false);
+-
+ // there are various setupXYZPage() methods to load the items
+ // for each page and update their states to match the profile
+ // being edited.
Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -p -r1.366 -r1.367
--- kdebase.spec 29 May 2009 14:08:21 -0000 1.366
+++ kdebase.spec 31 May 2009 21:22:10 -0000 1.367
@@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Core Files
Version: 4.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -29,6 +29,8 @@ Patch1: kdebase-4.1.70-konsole-session
Patch2: kdebase-4.2.1-home-icon.patch
# upstream patches
+# backported from 4.3:
+Patch200: kdebase-4.2.2-konsole-flowcontrol.patch
%ifnarch s390 s390x
Requires: eject
@@ -124,6 +126,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
%patch0 -p1 -b .nsplugins-paths
%patch1 -p1 -b .konsole-session
%patch2 -p1 -b .home-icon
+%patch200 -p1 -b .konsole-flowcontrol
# fix incorrect assumption that we're building in a combined kdebase tree
sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -315,6 +318,9 @@ fi
%changelog
+* Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
+- fix disabling konsole's flow control again (#496447, regression in 4.2.3-1)
+
* Fri May 29 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
- KDE 4.2.4
More information about the scm-commits
mailing list