rpms/kdebase/devel kdebase-4.1.70-konsole-session.patch, NONE, 1.1 .cvsignore, 1.79, 1.80 kdebase.spec, 1.345, 1.346 sources, 1.102, 1.103 kdebase-4.1.2-konsole-session-1.patch, 1.3, NONE kdebase-4.1.2-konsole-session.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Wed Nov 19 23:21:23 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24010
Modified Files:
.cvsignore kdebase.spec sources
Added Files:
kdebase-4.1.70-konsole-session.patch
Removed Files:
kdebase-4.1.2-konsole-session-1.patch
kdebase-4.1.2-konsole-session.patch
Log Message:
merged
kdebase-4.1.70-konsole-session.patch:
--- NEW FILE kdebase-4.1.70-konsole-session.patch ---
diff -Naur kdebase-4.1.70/apps/konsole/src/ViewManager.cpp kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp
--- kdebase-4.1.70/apps/konsole/src/ViewManager.cpp 2008-10-09 11:46:34.000000000 +0200
+++ kdebase-4.1.70.konsole-session/apps/konsole/src/ViewManager.cpp 2008-10-29 16:14:04.000000000 +0100
@@ -885,7 +885,7 @@
Q_ASSERT(view);
Session *session = _sessionMap[view];
ids << SessionManager::instance()->getRestoreId(session);
- if (view == activeview) group.writeEntry("Active", tab);
+ if (view == activeview) group.writeEntry("ActiveTabIndex", tab);
unique.insert(session, 1);
tab++;
}
@@ -905,24 +905,37 @@
void ViewManager::restoreSessions(const KConfigGroup& group)
{
QList<int> ids = group.readEntry("Sessions", QList<int>());
- int activeTab = group.readEntry("Active", 0);
- TerminalDisplay *display = 0;
- int tab = 1;
- foreach(int id, ids)
+ if (ids.isEmpty())
{
- Session *session = SessionManager::instance()->idToSession(id);
+ // Incomplete session file, e.g. from a KDE3 session. Create a
+ // default session so that we don't end up with an empty window.
+ kWarning() << i18n("Unable to restore saved tabs. Possibly unsupported KDE 3 session data.");
+ Session *session = SessionManager::instance()->createSession();
createView(session);
- if (!session->isRunning())
- session->run();
- if (tab++ == activeTab)
- display = dynamic_cast<TerminalDisplay*>(activeView());
+ session->run();
}
-
- if (display)
+ else
{
- _viewSplitter->activeContainer()->setActiveView(display);
- display->setFocus(Qt::OtherFocusReason);
+ int activeTab = group.readEntry("ActiveTabIndex", 0);
+ int tab = 1;
+ QWidget *focusView = 0;
+
+ foreach(int id, ids)
+ {
+ Session *session = SessionManager::instance()->idToSession(id);
+ createView(session);
+ if (!session->isRunning())
+ session->run();
+ if (tab++ == activeTab)
+ focusView = activeView();
+ }
+
+ if (focusView)
+ {
+ _viewSplitter->activeContainer()->setActiveView(focusView);
+ focusView->setFocus(Qt::OtherFocusReason);
+ }
}
}
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore 26 Sep 2008 19:44:10 -0000 1.79
+++ .cvsignore 19 Nov 2008 23:20:53 -0000 1.80
@@ -1 +1,2 @@
kdebase-4.1.2.tar.bz2
+kdebase-4.1.80.tar.bz2
Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- kdebase.spec 6 Oct 2008 18:56:30 -0000 1.345
+++ kdebase.spec 19 Nov 2008 23:20:53 -0000 1.346
@@ -1,7 +1,7 @@
Summary: K Desktop Environment 4 - Core Files
-Version: 4.1.2
-Release: 4%{?dist}
+Version: 4.1.80
+Release: 2%{?dist}
%if 0%{?fedora} > 8
Name: kdebase
@@ -26,9 +26,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora specific nsplugins paths
-Patch1: kdebase-nsplugins-paths.patch
-Patch2: kdebase-4.1.2-konsole-session.patch
-Patch3: kdebase-4.1.2-konsole-session-1.patch
+Patch0: kdebase-nsplugins-paths.patch
+# Konsole patches
+Patch1: kdebase-4.1.70-konsole-session.patch
## upstream patches
@@ -57,13 +57,14 @@
# FIXME: remove BRs which are only needed for stuff now in -runtime
BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
BuildRequires: cyrus-sasl-devel
BuildRequires: doxygen
BuildRequires: fontconfig-devel
BuildRequires: gettext
BuildRequires: giflib-devel
BuildRequires: hal-devel
+BuildRequires: pcre-devel
BuildRequires: kdelibs4-devel >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
%if "%{name}" == "kdebase"
@@ -104,7 +105,7 @@
%if 0%{?libs}
%package libs
-Summary: Runtime libraries for %{name}
+Summary: Runtime libraries for %{name}
Group: System Environment/Libraries
Requires: kdelibs4 >= %{version}, kdepimlibs >= %{version}
%description libs
@@ -113,7 +114,7 @@
%package devel
Group: Development/Libraries
-Summary: Development files for %{name}
+Summary: Development files for %{name}
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
%if "%{name}" != "kdebase4"
Obsoletes: kdebase4-devel < %{version}-%{release}
@@ -126,15 +127,14 @@
%prep
%setup -q -n kdebase-%{version}
-%patch1 -p0 -b .nsplugins-paths
-%patch2 -p1 -b .konsole-session
-%patch3 -p1 -b .konsole-session-1
+%patch0 -p0 -b .nsplugins-paths
+%patch1 -p1 -b .konsole-session
# 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
%build
-mkdir -p %{_target_platform}
+mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
@@ -144,7 +144,7 @@
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%if "%{name}" != "kdebase"
# remove files which conflict with KDE 3
@@ -309,6 +309,26 @@
%changelog
+* Thu Nov 20 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- merged
+
+* Wed Nov 19 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 6:4.1.80-1
+- 4.1.80
+- patch100 was backported from 4.2 (4.1.6x), removed from patch list
+- ported 4.1.2 konsole patches
+- drop the second konsole patch (upstreamed)
+- using make install/fast
+- BR cmake >= 2.6.2
+
+* Wed Nov 12 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.3-2
+- readd kde#156636 patch (Konsole keyboard actions backport)
+
+* Tue Nov  4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
+- KDE 4.1.3
+
+* Thu Oct 16 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-5
+- backport kbd actions for switching to Nth tab in Konsole from 4.2 (kde#156636)
+
* Mon Oct 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-4
- updated konsole session management patch from Stefan Becker
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase/devel/sources,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- sources 26 Sep 2008 19:44:10 -0000 1.102
+++ sources 19 Nov 2008 23:20:53 -0000 1.103
@@ -1 +1 @@
-705dc8a416cf472d04b9dc39d44652c6 kdebase-4.1.2.tar.bz2
+018039c8c51d92ace5365a8d6cd66fbf kdebase-4.1.80.tar.bz2
--- kdebase-4.1.2-konsole-session-1.patch DELETED ---
--- kdebase-4.1.2-konsole-session.patch DELETED ---
More information about the fedora-extras-commits
mailing list