Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2012-09-11 07:56:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2012-08-07 21:29:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2012-09-11 07:56:22.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 5 12:04:04 UTC 2012 - dmuel...@suse.com
+
+- update to 4.9.1
+ * see http://kde.org/announcements/4.9.1/ for details
+- require windowmanager and xmessage,xprop, as they're needed for starting a
session
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes
2012-08-07 21:29:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes
2012-09-11 07:56:22.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Sep 5 12:04:04 UTC 2012 - dmuel...@suse.com
+
+- update to 4.9.1
+ * see http://kde.org/announcements/4.9.1/ for details
+
+
+-------------------------------------------------------------------
@@ -5,0 +13 @@
+- refresh patches
Old:
----
kde-workspace-4.8.5.tar.xz
plasma-fix-delete-preferred-launchers.diff
New:
----
kde-workspace-4.9.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:26.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:26.000000000 +0200
@@ -19,7 +19,7 @@
%define with_systemd 0
Name: kdebase4-workspace
-Version: 4.8.5
+Version: 4.9.1
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -117,8 +117,6 @@
Patch400: kdm_plymouth.patch
# PATCH-FIX-OPENSUSE opensuse-homepage.diff
Patch401: opensuse-homepage.diff
-# PATCH-FIX-UPSTREAM plasma-fix-delete-preferred-launchers.diff kde#278724
-Patch402: plasma-fix-delete-preferred-launchers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %suse_version > 1200
Requires: %{name}-branding = %{version}
@@ -135,6 +133,11 @@
Requires: polkit-kde-agent-1
Requires: polkit-kde-kcmmodules-1
%endif
+Requires: windowmanager
+%if %suse_version > 1220
+Requires: xmessage
+Requires: xprop
+%endif
Recommends: kdebase4-SuSE
Recommends: kwin
Recommends: plasma-addons
@@ -343,7 +346,6 @@
%endif
%patch400 -p0
%patch401 -p1
-%patch402 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
@@ -465,7 +467,6 @@
%doc COPYING
%{_kde4_appsdir}/kwin/cubecap.png
%{_kde4_appsdir}/kwin/titlebar_decor.png
-%{_kde4_appsdir}/ksplash/Themes/Default
%dir %{_kde4_wallpapersdir}
%if 0%{?suse_version} > 1140
%{_kde4_appsdir}/plasma-desktop/init
@@ -599,7 +600,6 @@
%exclude %{_kde4_appsdir}/doc
%exclude %{_kde4_appsdir}/doc/kdm
%exclude %{_kde4_appsdir}/kdm
-%exclude %{_kde4_appsdir}/ksplash/Themes/Default
%exclude %{_kde4_appsdir}/ksysguard
%exclude %{_kde4_appsdir}/kwin/cubecap.png
%exclude %{_kde4_appsdir}/kwin/titlebar_decor.png
++++++ python-kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:26.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:26.000000000 +0200
@@ -17,7 +17,7 @@
Name: python-kdebase4
-Version: 4.8.5
+Version: 4.9.1
Release: 0
Summary: Python bindings for KDE 4 desktop shell
License: GPL-2.0+
++++++ disable-python-support.diff ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:26.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:26.000000000 +0200
@@ -1,12 +1,13 @@
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -92,7 +92,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS
- endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400")
-
- macro_optional_find_package(PyKDE4)
--set(PythonSupport_FOUND TRUE)
-
- #### End Python support ####
+--- plasma/generic/scriptengines/CMakeLists.txt
++++ plasma/generic/scriptengines/CMakeLists.txt
+@@ -4,10 +4,6 @@
+ macro_optional_add_subdirectory(webkit)
+ endif(QT_QTWEBKIT_FOUND)
+-if (PYTHONLIBRARY_FOUND AND NOT WIN32)
+- macro_optional_add_subdirectory(python)
+-endif (PYTHONLIBRARY_FOUND AND NOT WIN32)
+-
+ if(GOOGLEGADGETS_FOUND)
+ macro_optional_add_subdirectory(google_gadgets)
+ endif(GOOGLEGADGETS_FOUND)
++++++ kdm-cope-with-new-grub.diff ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:27.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:27.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/backend/bootman.c.orig
+++ kdm/backend/bootman.c
-@@ -134,31 +134,10 @@ setGrub(const char *opt, SdRec *sdr)
+@@ -136,31 +136,10 @@ setGrub(const char *opt, SdRec *sdr)
static void
commitGrub(void)
{
@@ -36,4 +36,4 @@
+ system(buffer);
}
- static char *grubReboot;
+ #define GRUB2_MAX_MENU_LEVEL 5
++++++ kdm-suspend-hal.diff ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:27.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:27.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- kdm/backend/ctrl.c.orig
+++ kdm/backend/ctrl.c
-@@ -500,6 +500,10 @@ processCtrl(const char *string, int len,
+@@ -484,6 +484,10 @@ processCtrl(const char *string, int len,
Reply("nuke\t");
}
}
++++++ plasma-kickoff-newly-collapsing.diff ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:27.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:27.000000000 +0200
@@ -95,7 +95,7 @@
===================================================================
--- plasma/desktop/applets/kickoff/core/applicationmodel.cpp.orig
+++ plasma/desktop/applets/kickoff/core/applicationmodel.cpp
-@@ -109,7 +109,10 @@ public:
+@@ -108,7 +108,10 @@ public:
systemApplicationPolicy(ApplicationModel::ShowApplicationAndSystemPolicy),
primaryNamePolicy(ApplicationModel::GenericNamePrimary),
displayOrder(NameAfterDescription),
@@ -107,7 +107,7 @@
{
systemApplications = Kickoff::systemApplicationList();
reloadTimer = new QTimer(qq);
-@@ -123,6 +126,8 @@ public:
+@@ -122,6 +125,8 @@ public:
}
void fillNode(const QString &relPath, AppNode *node);
@@ -116,7 +116,7 @@
static QHash<QString, QString> iconNameMap();
ApplicationModel *q;
-@@ -133,78 +138,117 @@ public:
+@@ -132,78 +137,117 @@ public:
QStringList systemApplications;
DisplayOrder displayOrder;
bool allowSeparators;
@@ -280,7 +280,7 @@
}
if (systemApplicationPolicy ==
ApplicationModel::ShowSystemOnlyPolicy &&
-@@ -214,9 +258,40 @@ void ApplicationModelPrivate::fillNode(c
+@@ -213,9 +257,40 @@ void ApplicationModelPrivate::fillNode(c
continue;
}
@@ -323,7 +323,7 @@
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0)
{
continue;
-@@ -225,41 +300,42 @@ void ApplicationModelPrivate::fillNode(c
+@@ -224,41 +299,42 @@ void ApplicationModelPrivate::fillNode(c
kDebug(250) << "Service group" << serviceGroup->entryPath() <<
serviceGroup->icon()
<< serviceGroup->relPath() << serviceGroup->directoryEntryPath();
@@ -381,7 +381,7 @@
}
// set the subTitleMandatory field for nodes that do not provide a unique
generic
-@@ -274,6 +350,20 @@ void ApplicationModelPrivate::fillNode(c
+@@ -273,6 +349,20 @@ void ApplicationModelPrivate::fillNode(c
}
}
@@ -402,7 +402,7 @@
ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators)
: KickoffAbstractModel(parent),
d(new ApplicationModelPrivate(this, allowSeparators))
-@@ -283,6 +373,7 @@ ApplicationModel::ApplicationModel(QObje
+@@ -282,6 +372,7 @@ ApplicationModel::ApplicationModel(QObje
QDBusConnection::sessionBus().registerObject("/kickoff", this);
dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this,
SLOT(reloadMenu()));
connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this,
SLOT(checkSycocaChange(QStringList)));
@@ -410,7 +410,7 @@
}
ApplicationModel::~ApplicationModel()
-@@ -309,6 +400,32 @@ DisplayOrder ApplicationModel::nameDispl
+@@ -308,6 +399,32 @@ DisplayOrder ApplicationModel::nameDispl
return d->displayOrder;
}
@@ -443,7 +443,7 @@
int ApplicationModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
-@@ -516,8 +633,9 @@ void ApplicationModel::reloadMenu()
+@@ -515,8 +632,9 @@ void ApplicationModel::reloadMenu()
{
delete d->root;
d->root = new AppNode();
@@ -454,7 +454,7 @@
}
void ApplicationModel::checkSycocaChange(const QStringList &changes)
-@@ -537,6 +655,104 @@ ApplicationModel::SystemApplicationPolic
+@@ -536,6 +654,104 @@ ApplicationModel::SystemApplicationPolic
return d->systemApplicationPolicy;
}
++++++ systemsettings-desktop.diff ++++++
--- /var/tmp/diff_new_pack.NWftR2/_old 2012-09-11 07:56:27.000000000 +0200
+++ /var/tmp/diff_new_pack.NWftR2/_new 2012-09-11 07:56:27.000000000 +0200
@@ -30,7 +30,7 @@
===================================================================
--- systemsettings/app/kdesystemsettings.desktop.orig
+++ systemsettings/app/kdesystemsettings.desktop
-@@ -91,4 +91,4 @@ Name[zh_CN]=KDE 系统设置
+@@ -99,4 +99,4 @@ Name[zh_CN]=KDE 系统设置
Name[zh_TW]=KDE 系統設定
X-DBUS-StartupType=Unique
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
