Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-08-07 21:29:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2012-08-04 09:17:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-08-07 21:29:48.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 30 16:54:23 UTC 2012 - [email protected] + +- update to 4.8.5 + * see http://kde.org/announcements/changelogs/changelog4_8_4to4_8_5.php for details +- refresh patches + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/python-kdebase4.changes 2012-08-04 09:17:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/python-kdebase4.changes 2012-08-07 21:29:48.000000000 +0200 @@ -2 +2,7 @@ -Mon Jul 30 02:49:02 UTC 2012 - [email protected] +Mon Jul 30 16:54:23 UTC 2012 - [email protected] + +- update to 4.8.5 + * see http://kde.org/announcements/changelogs/changelog4_8_4to4_8_5.php for details + +------------------------------------------------------------------- +Mon Jul 30 02:48:47 UTC 2012 - [email protected] @@ -4,0 +11,6 @@ + +------------------------------------------------------------------- +Sun Jul 1 20:26:42 UTC 2012 - [email protected] + +- plasma-calendar recommends akonadi-runtime instead of kde4_akonadi_requires +- No supplement of packageand(akonadi-runtime:kdebase4-workspace) Old: ---- kde-workspace-4.8.4.tar.xz New: ---- kde-workspace-4.8.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -19,7 +19,7 @@ %define with_systemd 0 Name: kdebase4-workspace -Version: 4.8.4 +Version: 4.8.5 Release: 0 Summary: The KDE Workspace Components License: GPL-2.0+ ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-kdebase4 -Version: 4.8.4 +Version: 4.8.5 Release: 0 Summary: Python bindings for KDE 4 desktop shell License: GPL-2.0+ @@ -38,6 +38,9 @@ BuildRequires: libusb-devel BuildRequires: python-kde4-devel BuildRequires: pkgconfig(libxklavier) +%if %suse_version < 1130 +BuildRequires: xz +%endif Requires: python-kde4 = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %py_requires ++++++ disable-python-support.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -68,7 +68,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS +@@ -92,7 +92,6 @@ if(PYQT4_FOUND AND PYQT4_VERSION STRLESS endif(PYQT4_FOUND AND PYQT4_VERSION STRLESS "040400") macro_optional_find_package(PyKDE4) ++++++ kde4-migrate.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -1,8 +1,8 @@ Index: startkde.cmake =================================================================== ---- startkde.cmake.orig 2010-11-21 20:47:03.402842733 +0100 -+++ startkde.cmake 2010-11-21 20:47:03.667718141 +0100 -@@ -84,6 +84,11 @@ fi +--- startkde.cmake.orig ++++ startkde.cmake +@@ -64,6 +64,11 @@ fi kdehome=$HOME/@KDE_DEFAULT_HOME@ test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"` ++++++ kdm-all-users-nopass.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -16,7 +16,7 @@ =================================================================== --- kdm/config.def.orig +++ kdm/config.def -@@ -1894,6 +1894,15 @@ Description: +@@ -1895,6 +1895,15 @@ Description: (and any other user with UID = 0). <emphasis>Never</emphasis> list <systemitem class="username">root</systemitem>. ++++++ kdm-cope-with-new-grub.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdm/backend/bootman.c.orig +++ kdm/backend/bootman.c -@@ -133,31 +133,10 @@ setGrub(const char *opt, SdRec *sdr) +@@ -134,31 +134,10 @@ setGrub(const char *opt, SdRec *sdr) static void commitGrub(void) { ++++++ kdm-fix-generic-greeter.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -1,6 +1,8 @@ ---- kdm/kfrontend/kgreeter.cpp +Index: kdm/kfrontend/kgreeter.cpp +=================================================================== +--- kdm/kfrontend/kgreeter.cpp.orig +++ kdm/kfrontend/kgreeter.cpp -@@ -922,8 +922,6 @@ +@@ -976,8 +976,6 @@ KThemedGreeter::KThemedGreeter(KdmThemer timed_label = themer->findNode("timed-label"); KdmItem *itm; @@ -9,9 +11,11 @@ if ((itm = themer->findNode("language_button"))) // not implemented yet itm->setVisible(false); ---- kdm/kfrontend/themes/greeter.dtd +Index: kdm/kfrontend/themes/greeter.dtd +=================================================================== +--- kdm/kfrontend/themes/greeter.dtd.orig +++ kdm/kfrontend/themes/greeter.dtd -@@ -19,9 +19,9 @@ +@@ -19,9 +19,9 @@ Items with these IDs get special treatme caps-lock-warning | xauth-warning | pam-error | timed-label | login_button | session_button | system_button Items with these IDs might get special treatment by conversation plugins: @@ -23,7 +27,9 @@ --> <!ATTLIST item ---- kdm/kfrontend/themes/oxygen-air/oxygen-air.xml +Index: kdm/kfrontend/themes/oxygen-air/oxygen-air.xml +=================================================================== +--- kdm/kfrontend/themes/oxygen-air/oxygen-air.xml.orig +++ kdm/kfrontend/themes/oxygen-air/oxygen-air.xml @@ -26,7 +26,7 @@ <stock type="welcome-label"/> @@ -74,9 +80,11 @@ </box> </item> ---- libs/kdm/kgreet_generic.cpp +Index: libs/kdm/kgreet_generic.cpp +=================================================================== +--- libs/kdm/kgreet_generic.cpp.orig +++ libs/kdm/kgreet_generic.cpp -@@ -41,24 +41,14 @@ +@@ -41,24 +41,14 @@ extern KDE_EXPORT KGreeterPluginInfo kgr static int echoMode; @@ -103,7 +111,7 @@ m_lineEdit(0), fixedUser(_fixedEntity), func(_func), -@@ -66,22 +56,56 @@ +@@ -66,22 +56,56 @@ KGenericGreeter::KGenericGreeter(KGreete exp(-1), running(false) { @@ -167,7 +175,7 @@ } void // virtual -@@ -127,8 +151,7 @@ +@@ -127,8 +151,7 @@ KGenericGreeter::setEnabled(bool enable) { // assert(func == Authenticate && ctx == Shutdown); // XXX this is likely to bear some bogosity @@ -177,7 +185,7 @@ if (enable && m_lineEdit) m_lineEdit->setFocus(); } -@@ -143,9 +166,7 @@ +@@ -143,9 +166,7 @@ KGenericGreeter::textMessage(const char revive(); QString qtext = QString::fromUtf8(text); m_infoMsgs.append(qtext); @@ -188,7 +196,7 @@ return true; } -@@ -168,15 +189,20 @@ +@@ -169,15 +190,20 @@ KGenericGreeter::textPrompt(const char * revive(); else m_infoMsgs.clear(); @@ -215,7 +223,7 @@ if (!m_users.isEmpty()) { KCompletion *userNamesCompletion = new KCompletion; userNamesCompletion->setItems(m_users); -@@ -187,20 +213,18 @@ +@@ -188,20 +214,18 @@ KGenericGreeter::textPrompt(const char * if (!curUser.isEmpty()) { m_lineEdit->setText(curUser); m_lineEdit->selectAll(); @@ -241,7 +249,7 @@ m_lineEdit->setFocus(); } -@@ -235,7 +259,6 @@ +@@ -236,7 +260,6 @@ KGenericGreeter::next() if (m_lineEdit) { m_lineEdit->setEnabled(false); QString text = m_lineEdit->text(); @@ -249,7 +257,7 @@ handler->gplugReturnText(text.toLocal8Bit(), !m_echo ? KGreeterPluginHandler::IsSecret : -@@ -272,8 +295,7 @@ +@@ -273,8 +296,7 @@ KGenericGreeter::failed() revive(); handler->gplugMsgBox(QMessageBox::Information, text); } else { @@ -259,7 +267,7 @@ } exp = -1; running = false; -@@ -283,12 +305,9 @@ +@@ -284,12 +306,9 @@ void // virtual KGenericGreeter::revive() { // assert(!running); @@ -274,9 +282,11 @@ } void // virtual ---- libs/kdm/kgreet_generic.h +Index: libs/kdm/kgreet_generic.h +=================================================================== +--- libs/kdm/kgreet_generic.h.orig +++ libs/kdm/kgreet_generic.h -@@ -33,7 +33,6 @@ +@@ -33,7 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fi #include <QObject> @@ -284,7 +294,7 @@ class QWidget; class KLineEdit; -@@ -68,11 +67,11 @@ +@@ -68,11 +67,11 @@ class KGenericGreeter : public QObject, void slotChanged(); private: ++++++ kdm-fix-labelcolors.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -4,10 +4,10 @@ Bug: bnc#533189 Relates: kdm-fix-generic-greeter.diff, same-pam-generic-classic.diff -Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.h +Index: kde-workspace-4.8.5/kdm/kfrontend/themer/kdmlabel.h =================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmlabel.h -+++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.h +--- kde-workspace-4.8.5.orig/kdm/kfrontend/themer/kdmlabel.h ++++ kde-workspace-4.8.5/kdm/kfrontend/themer/kdmlabel.h @@ -61,6 +61,8 @@ protected: virtual void doPlugActions(bool plug); @@ -17,10 +17,10 @@ virtual void setWidget(QWidget *widget); struct LabelStruct { -Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmitem.h +Index: kde-workspace-4.8.5/kdm/kfrontend/themer/kdmitem.h =================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmitem.h -+++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmitem.h +--- kde-workspace-4.8.5.orig/kdm/kfrontend/themer/kdmitem.h ++++ kde-workspace-4.8.5/kdm/kfrontend/themer/kdmitem.h @@ -199,7 +199,7 @@ protected: bool eventFilter(QObject *o, QEvent *e); @@ -30,10 +30,10 @@ void updateThisVisible(); -Index: kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.cpp +Index: kde-workspace-4.8.5/kdm/kfrontend/themer/kdmlabel.cpp =================================================================== ---- kdebase-workspace-4.6.0.orig/kdm/kfrontend/themer/kdmlabel.cpp -+++ kdebase-workspace-4.6.0/kdm/kfrontend/themer/kdmlabel.cpp +--- kde-workspace-4.8.5.orig/kdm/kfrontend/themer/kdmlabel.cpp ++++ kde-workspace-4.8.5/kdm/kfrontend/themer/kdmlabel.cpp @@ -221,6 +221,8 @@ KdmLabel::statusChanged(bool descend) if ((state == Sprelight && !label.prelight.present) || (state == Sactive && !label.active.present)) ++++++ kdm-kdmconf.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdm/kfrontend/genkdmconf.c.orig +++ kdm/kfrontend/genkdmconf.c -@@ -1040,6 +1040,26 @@ copyFile(Entry *ce, int mode, int (*proc +@@ -1049,6 +1049,26 @@ copyFile(Entry *ce, int mode, int (*proc } static void @@ -29,7 +29,7 @@ doLinkFile(const char *name) { File file; -@@ -1078,9 +1098,10 @@ writeFile(const char *tname, int mode, c +@@ -1087,9 +1107,10 @@ writeFile(const char *tname, int mode, c fputs_(cont, f); fclose_(f); addedFile(tname); @@ -41,7 +41,7 @@ static void handleBgCfg(Entry *ce, Section *cs) { -@@ -3170,9 +3191,6 @@ int main(int argc, char **argv) +@@ -3179,9 +3200,6 @@ int main(int argc, char **argv) memcmp(oldkde + olen - sizeof(SHR_CONF) + 1, SHR_CONF, sizeof(SHR_CONF))) { @@ -51,7 +51,7 @@ oldkdepfx = oldkde; } else ASPrintf((char **)&oldkdepfx, -@@ -3284,6 +3302,8 @@ int main(int argc, char **argv) +@@ -3293,6 +3311,8 @@ int main(int argc, char **argv) f = createFile("kdmrc", kdmrcmode); writeKdmrc(f); fclose_(f); @@ -60,7 +60,7 @@ f = createFile("README", 0644); fprintf_(f, -@@ -3332,6 +3352,8 @@ int main(int argc, char **argv) +@@ -3341,6 +3361,8 @@ int main(int argc, char **argv) "\nTry 'genkdmconf --help' if you want to generate another configuration.\n" "\nYou may delete this README.\n"); fclose_(f); ++++++ kdm-long-xserver-timeout.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:53.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:53.000000000 +0200 @@ -9,7 +9,7 @@ =================================================================== --- kdm/config.def.orig +++ kdm/config.def -@@ -1363,7 +1363,7 @@ Description: +@@ -1364,7 +1364,7 @@ Description: Key: ServerTimeout Type: int ++++++ kdm-suspend-hal.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- kdm/backend/ctrl.c.orig +++ kdm/backend/ctrl.c -@@ -499,6 +499,10 @@ processCtrl(const char *string, int len, +@@ -500,6 +500,10 @@ processCtrl(const char *string, int len, Reply("nuke\t"); } } @@ -17,7 +17,7 @@ =================================================================== --- kdm/backend/greet.h.orig +++ kdm/backend/greet.h -@@ -150,6 +150,7 @@ from the copyright holder. +@@ -152,6 +152,7 @@ from the copyright holder. # define SHUT_REBOOT 1 /* how */ # define SHUT_HALT 2 # define SHUT_CONSOLE -1 /* pseudo-code */ @@ -29,7 +29,7 @@ =================================================================== --- kdm/config.def.orig +++ kdm/config.def -@@ -1798,6 +1798,19 @@ Description: +@@ -1799,6 +1799,19 @@ Description: Who is allowed to shut down the system. This applies both to the greeter and to the command sockets. @@ -70,7 +70,7 @@ set(kdmthemer_SRCS @@ -70,7 +74,7 @@ endif (WITH_KDM_XCONSOLE) - macro_add_file_dependencies(kdm_greet.h ${confci}) + macro_add_file_dependencies(kdmconfig.h ${confci}) kde4_add_executable(kdm_greet ${kdm_greet_SRCS}) -target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${POSIX4_LIBRARIES}) +target_link_libraries(kdm_greet ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${X11_X11_LIB} ${POSIX4_LIBRARIES} lazy) ++++++ kdm-sysconfig-values.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -402,7 +402,7 @@ =================================================================== --- kdm/kfrontend/genkdmconf.c.orig +++ kdm/kfrontend/genkdmconf.c -@@ -53,6 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fi +@@ -62,6 +62,7 @@ Foundation, Inc., 51 Franklin Street, Fi #include <config.ci> #define RCVERSTR stringify(RCVERMAJOR) "." stringify(RCVERMINOR) @@ -410,7 +410,7 @@ static int old_scripts, no_old_scripts, old_confs, no_old, no_backup, no_in_notice, use_destdir, mixed_scripts; -@@ -60,7 +61,7 @@ static const char *newdir = KDMCONF, *fa +@@ -69,7 +70,7 @@ static const char *newdir = KDMCONF, *fa *oldxdm, *oldkde, *oldkdepfx; static int oldver; @@ -419,7 +419,7 @@ typedef struct StrList { struct StrList *next; -@@ -542,6 +543,7 @@ writeKdmrc(FILE *f) +@@ -551,6 +552,7 @@ writeKdmrc(FILE *f) const char *cmt; putFqVal("General", "ConfigVersion", RCVERSTR); @@ -427,7 +427,7 @@ for (cs = config; cs; cs = cs->next) { fprintf_(f, "%s[%s]\n", cs->comment ? cs->comment : "\n", cs->name); -@@ -1637,6 +1639,26 @@ upd_servercmd(Entry *ce, Section *cs ATT +@@ -1646,6 +1648,26 @@ upd_servercmd(Entry *ce, Section *cs ATT ce->written = True; } @@ -454,7 +454,7 @@ #ifdef XDMCP static void cp_keyfile(Entry *ce, Section *cs ATTR_UNUSED) -@@ -2629,7 +2651,7 @@ static int +@@ -2638,7 +2660,7 @@ static int mergeKdmRcNewer(const char *path, int obsRet) { char *p; @@ -463,7 +463,7 @@ RSection *rootsect, *cs; REntry *ce; int i, j, ma, mi; -@@ -2655,6 +2677,9 @@ mergeKdmRcNewer(const char *path, int ob +@@ -2664,6 +2686,9 @@ mergeKdmRcNewer(const char *path, int ob p, ma, mi); free(p); @@ -473,7 +473,7 @@ for (cs = rootsect; cs; cs = cs->next) { cp = strrchr(cs->name, '-'); if (!cp) -@@ -2700,7 +2725,7 @@ mergeKdmRcNewer(const char *path, int ob +@@ -2709,7 +2734,7 @@ mergeKdmRcNewer(const char *path, int ob ; } ++++++ plasma-branding-defaults-applets.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,7 +1,7 @@ Index: plasma/desktop/applets/kickoff/applet/applet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/applet/applet.cpp.orig 2010-11-05 11:47:50.000000000 +0100 -+++ plasma/desktop/applets/kickoff/applet/applet.cpp 2010-11-21 20:47:03.734717865 +0100 +--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig ++++ plasma/desktop/applets/kickoff/applet/applet.cpp @@ -27,6 +27,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QLabel> @@ -10,7 +10,7 @@ // KDE #include <KAuthorized> -@@ -188,7 +189,10 @@ void LauncherApplet::toolTipAboutToShow( +@@ -191,7 +192,10 @@ void LauncherApplet::toolTipAboutToShow( void LauncherApplet::configChanged() { KConfigGroup cg = config(); @@ -22,7 +22,7 @@ constraintsEvent(Plasma::ImmutableConstraint); if (d->launcher) { -@@ -207,7 +211,12 @@ void LauncherApplet::configAccepted() +@@ -210,7 +214,12 @@ void LauncherApplet::configAccepted() d->createLauncher(); KConfigGroup cg = config(); @@ -38,8 +38,8 @@ Index: plasma/desktop/applets/kickoff/core/favoritesmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig 2010-05-27 19:23:43.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp 2010-11-21 20:47:03.735718347 +0100 +--- plasma/desktop/applets/kickoff/core/favoritesmodel.cpp.orig ++++ plasma/desktop/applets/kickoff/core/favoritesmodel.cpp @@ -167,6 +167,11 @@ FavoritesModel::~FavoritesModel() void FavoritesModel::add(const QString& url) @@ -54,8 +54,8 @@ Index: plasma/desktop/applets/kickoff/core/models.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/models.cpp.orig 2009-10-15 18:33:38.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/models.cpp 2010-11-21 20:47:03.735718347 +0100 +--- plasma/desktop/applets/kickoff/core/models.cpp.orig ++++ plasma/desktop/applets/kickoff/core/models.cpp @@ -177,7 +177,19 @@ QStringList Kickoff::systemApplicationLi { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -79,9 +79,9 @@ } Index: plasma/desktop/applets/kickoff/core/systemmodel.cpp =================================================================== ---- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig 2010-04-15 10:59:33.000000000 +0200 -+++ plasma/desktop/applets/kickoff/core/systemmodel.cpp 2010-11-21 20:47:03.736717501 +0100 -@@ -81,7 +81,7 @@ public: +--- plasma/desktop/applets/kickoff/core/systemmodel.cpp.orig ++++ plasma/desktop/applets/kickoff/core/systemmodel.cpp +@@ -71,7 +71,7 @@ public: connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); @@ -90,7 +90,7 @@ << i18n("Places") << i18n("Removable Storage") << i18n("Storage"); -@@ -225,19 +225,33 @@ QVariant SystemModel::data(const QModelI +@@ -217,19 +217,33 @@ QVariant SystemModel::data(const QModelI } KService::Ptr service = d->appsList[index.row()]; @@ -139,8 +139,8 @@ if (role == UrlRole && !d->placesModel->isHidden(mapToSource(index))) { Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp =================================================================== ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig 2010-11-19 11:51:20.000000000 +0100 -+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2010-11-21 20:47:03.737717526 +0100 +--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig ++++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -36,6 +36,7 @@ #include <QtGui/QSpacerItem> #include <QtGui/QListWidget> ++++++ plasma-dashboard-leave.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- plasma/desktop/shell/dashboardview.cpp.orig +++ plasma/desktop/shell/dashboardview.cpp -@@ -224,6 +224,15 @@ bool DashboardView::eventFilter(QObject +@@ -225,6 +225,15 @@ bool DashboardView::eventFilter(QObject widgetExplorer->setPos(0, containment()->geometry().height() - widgetExplorer->geometry().height()); } ++++++ plasma-disable-networkmanager.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -10,11 +10,11 @@ So simply make it possible to disable it on KDE start depending on sysconfig and if the system changes, the user is expected to reconfigure plasma too -diff --git a/plasma/generic/applets/systemtray/ui/applet.cpp b/plasma/generic/applets/systemtray/ui/applet.cpp -index bf983e1..f9cf13f 100644 ---- a/plasma/generic/applets/systemtray/ui/applet.cpp -+++ b/plasma/generic/applets/systemtray/ui/applet.cpp -@@ -729,7 +729,7 @@ void Applet::checkDefaultApplets() +Index: kde-workspace-4.8.5/plasma/generic/applets/systemtray/ui/applet.cpp +=================================================================== +--- kde-workspace-4.8.5.orig/plasma/generic/applets/systemtray/ui/applet.cpp ++++ kde-workspace-4.8.5/plasma/generic/applets/systemtray/ui/applet.cpp +@@ -706,7 +706,7 @@ void Applet::checkDefaultApplets() QStringList applets = s_manager->applets(this); ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,6 +1,8 @@ ---- plasma/desktop/applets/kickoff/applet/applet.cpp +Index: plasma/desktop/applets/kickoff/applet/applet.cpp +=================================================================== +--- plasma/desktop/applets/kickoff/applet/applet.cpp.orig +++ plasma/desktop/applets/kickoff/applet/applet.cpp -@@ -165,6 +165,8 @@ +@@ -166,6 +166,8 @@ void LauncherApplet::createConfiguration d->ui.iconButton->setIcon(popupIcon()); d->ui.switchOnHoverCheckBox->setChecked(d->launcher->switchTabsOnHover()); d->ui.appsByNameCheckBox->setChecked(d->launcher->showAppsByName()); @@ -9,7 +11,7 @@ connect(d->ui.iconButton, SIGNAL(iconChanged(QString)), parent, SLOT(settingsModified())); connect(d->ui.switchOnHoverCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); connect(d->ui.appsByNameCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); -@@ -204,6 +206,9 @@ +@@ -208,6 +210,9 @@ void LauncherApplet::configAccepted() bool switchTabsOnHover = d->ui.switchOnHoverCheckBox->isChecked(); bool showAppsByName = d->ui.appsByNameCheckBox->isChecked(); @@ -19,7 +21,7 @@ const QString iconname = d->ui.iconButton->icon(); // TODO: should this be moved into Launcher as well? perhaps even the config itself? -@@ -223,6 +228,9 @@ +@@ -232,6 +237,9 @@ void LauncherApplet::configAccepted() d->launcher->setSwitchTabsOnHover(switchTabsOnHover); d->launcher->setShowAppsByName(showAppsByName); @@ -29,7 +31,9 @@ } QList<QAction*> LauncherApplet::contextualActions() ---- plasma/desktop/applets/kickoff/applet/kickoffConfig.ui +Index: plasma/desktop/applets/kickoff/applet/kickoffConfig.ui +=================================================================== +--- plasma/desktop/applets/kickoff/applet/kickoffConfig.ui.orig +++ plasma/desktop/applets/kickoff/applet/kickoffConfig.ui @@ -54,7 +54,7 @@ </property> @@ -87,9 +91,11 @@ </layout> </widget> <customwidgets> ---- plasma/desktop/applets/kickoff/core/applicationmodel.cpp +Index: plasma/desktop/applets/kickoff/core/applicationmodel.cpp +=================================================================== +--- plasma/desktop/applets/kickoff/core/applicationmodel.cpp.orig +++ plasma/desktop/applets/kickoff/core/applicationmodel.cpp -@@ -109,7 +109,10 @@ +@@ -109,7 +109,10 @@ public: systemApplicationPolicy(ApplicationModel::ShowApplicationAndSystemPolicy), primaryNamePolicy(ApplicationModel::GenericNamePrimary), displayOrder(NameAfterDescription), @@ -101,7 +107,7 @@ { systemApplications = Kickoff::systemApplicationList(); reloadTimer = new QTimer(qq); -@@ -123,6 +126,8 @@ +@@ -123,6 +126,8 @@ public: } void fillNode(const QString &relPath, AppNode *node); @@ -110,7 +116,7 @@ static QHash<QString, QString> iconNameMap(); ApplicationModel *q; -@@ -133,78 +138,117 @@ +@@ -133,78 +138,117 @@ public: QStringList systemApplications; DisplayOrder displayOrder; bool allowSeparators; @@ -274,7 +280,7 @@ } if (systemApplicationPolicy == ApplicationModel::ShowSystemOnlyPolicy && -@@ -214,9 +258,40 @@ +@@ -214,9 +258,40 @@ void ApplicationModelPrivate::fillNode(c continue; } @@ -317,7 +323,7 @@ if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { continue; -@@ -225,41 +300,42 @@ +@@ -225,41 +300,42 @@ void ApplicationModelPrivate::fillNode(c kDebug(250) << "Service group" << serviceGroup->entryPath() << serviceGroup->icon() << serviceGroup->relPath() << serviceGroup->directoryEntryPath(); @@ -375,7 +381,7 @@ } // set the subTitleMandatory field for nodes that do not provide a unique generic -@@ -274,6 +350,20 @@ +@@ -274,6 +350,20 @@ void ApplicationModelPrivate::fillNode(c } } @@ -396,7 +402,7 @@ ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators) : KickoffAbstractModel(parent), d(new ApplicationModelPrivate(this, allowSeparators)) -@@ -283,6 +373,7 @@ +@@ -283,6 +373,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))); @@ -404,7 +410,7 @@ } ApplicationModel::~ApplicationModel() -@@ -309,6 +400,32 @@ +@@ -309,6 +400,32 @@ DisplayOrder ApplicationModel::nameDispl return d->displayOrder; } @@ -437,7 +443,7 @@ int ApplicationModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent) -@@ -516,8 +633,9 @@ +@@ -516,8 +633,9 @@ void ApplicationModel::reloadMenu() { delete d->root; d->root = new AppNode(); @@ -448,7 +454,7 @@ } void ApplicationModel::checkSycocaChange(const QStringList &changes) -@@ -537,6 +655,104 @@ +@@ -537,6 +655,104 @@ ApplicationModel::SystemApplicationPolic return d->systemApplicationPolicy; } @@ -553,9 +559,11 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) ---- plasma/desktop/applets/kickoff/core/applicationmodel.h +Index: plasma/desktop/applets/kickoff/core/applicationmodel.h +=================================================================== +--- plasma/desktop/applets/kickoff/core/applicationmodel.h.orig +++ plasma/desktop/applets/kickoff/core/applicationmodel.h -@@ -114,10 +114,19 @@ +@@ -114,10 +114,19 @@ public: virtual QModelIndex parent(const QModelIndex &index) const; virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -575,7 +583,7 @@ private: bool nameAfterDescription(const QModelIndex &index) const; -@@ -125,6 +134,8 @@ +@@ -125,6 +134,8 @@ private: friend class ApplicationModelPrivate; ApplicationModelPrivate *const d; @@ -584,9 +592,11 @@ Q_DISABLE_COPY(ApplicationModel) }; ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +Index: plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +=================================================================== +--- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp.orig +++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp -@@ -114,12 +114,17 @@ +@@ -115,12 +115,17 @@ public: MenuLauncherApplet::FormatType formattype; int maxRecentApps; bool showMenuTitles; @@ -604,7 +614,7 @@ QList<QAction*> actions; QAction* switcher; -@@ -137,6 +142,8 @@ +@@ -138,6 +143,8 @@ public: iconButton(0), formatComboBox(0), showMenuTitlesCheckBox(0), @@ -613,7 +623,7 @@ switcher(0), contextMenuFactory(0) {} -@@ -485,7 +492,19 @@ +@@ -489,7 +496,19 @@ void MenuLauncherApplet::createConfigura d->showMenuTitlesCheckBox->setChecked(d->showMenuTitles); grid->addWidget(d->showMenuTitlesCheckBox, 3, 1); @@ -634,7 +644,7 @@ parent->addPage(p, i18n("Options"), "configure"); connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted())); -@@ -551,6 +570,19 @@ +@@ -555,6 +574,19 @@ void MenuLauncherApplet::configAccepted( d->showMenuTitles = showMenuTitles; cg.writeEntry("showMenuTitles", showMenuTitles); } @@ -654,7 +664,7 @@ if (needssaving) { d->updateTooltip(); -@@ -618,6 +650,9 @@ +@@ -622,6 +654,9 @@ void MenuLauncherApplet::showMenu(bool p } appModel->setSystemApplicationPolicy(Kickoff::ApplicationModel::ShowApplicationAndSystemPolicy); @@ -664,7 +674,7 @@ menuview->addModel(appModel, Kickoff::MenuView::None, d->relativePath); if (d->relativePath.isEmpty()) { -@@ -873,6 +908,8 @@ +@@ -877,6 +912,8 @@ void MenuLauncherApplet::configChanged() d->setMaxRecentApps(cg.readEntry("maxRecentApps", qMin(5, Kickoff::RecentApplications::self()->maximum()))); d->showMenuTitles = cg.readEntry("showMenuTitles", false); @@ -673,9 +683,11 @@ d->icon->setIcon(KIcon(cg.readEntry("icon", d->iconname))); ---- plasma/desktop/applets/kickoff/ui/launcher.cpp +Index: plasma/desktop/applets/kickoff/ui/launcher.cpp +=================================================================== +--- plasma/desktop/applets/kickoff/ui/launcher.cpp.orig +++ plasma/desktop/applets/kickoff/ui/launcher.cpp -@@ -680,6 +680,30 @@ +@@ -680,6 +680,30 @@ void Launcher::setShowAppsByName(bool sh } } @@ -706,7 +718,7 @@ bool Launcher::switchTabsOnHover() const { return d->contentSwitcher->switchTabsOnHover(); -@@ -690,6 +714,16 @@ +@@ -690,6 +714,16 @@ bool Launcher::showAppsByName() const return d->applicationModel->nameDisplayOrder() == Kickoff::NameBeforeDescription; } @@ -723,7 +735,7 @@ void Launcher::setVisibleItemCount(int count) { d->visibleItemCount = count; -@@ -708,6 +742,9 @@ +@@ -708,6 +742,9 @@ void Launcher::setApplet(Plasma::Applet cg = applet->config(); setShowAppsByName(cg.readEntry("ShowAppsByName", showAppsByName())); setVisibleItemCount(cg.readEntry("VisibleItemsCount", visibleItemCount())); @@ -733,9 +745,11 @@ d->applet = applet; d->contextMenuFactory->setApplet(applet); ---- plasma/desktop/applets/kickoff/ui/launcher.h +Index: plasma/desktop/applets/kickoff/ui/launcher.h +=================================================================== +--- plasma/desktop/applets/kickoff/ui/launcher.h.orig +++ plasma/desktop/applets/kickoff/ui/launcher.h -@@ -78,6 +78,14 @@ +@@ -78,6 +78,14 @@ public: we don't display old searches and switch back to the favorite-view. */ void reset(); ++++++ plasma-panel-resize-hint.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,8 +1,8 @@ Index: plasma/desktop/shell/panelcontroller.cpp =================================================================== ---- plasma/desktop/shell/panelcontroller.cpp.orig 2010-10-05 13:39:06.000000000 +0200 -+++ plasma/desktop/shell/panelcontroller.cpp 2010-11-21 20:47:03.782718456 +0100 -@@ -627,6 +627,8 @@ void PanelController::mouseMoveFilter(QM +--- plasma/desktop/shell/panelcontroller.cpp.orig ++++ plasma/desktop/shell/panelcontroller.cpp +@@ -663,6 +663,8 @@ void PanelController::mouseMoveFilter(QM newX = qMin(newX, screenGeom.left() + screenGeom.width()/3); move(newX, pos().y()); resizeFrameHeight(geometry().left() - screenGeom.left()); @@ -11,7 +11,7 @@ break; } case Plasma::RightEdge: { -@@ -635,6 +637,8 @@ void PanelController::mouseMoveFilter(QM +@@ -671,6 +673,8 @@ void PanelController::mouseMoveFilter(QM newX = qMax(newX, screenGeom.left() + 2*(screenGeom.width()/3) - width()); move(newX, pos().y()); resizeFrameHeight(screenGeom.right() - geometry().right()); @@ -20,7 +20,7 @@ break; } case Plasma::TopEdge: { -@@ -643,6 +647,9 @@ void PanelController::mouseMoveFilter(QM +@@ -679,6 +683,9 @@ void PanelController::mouseMoveFilter(QM newY = qMin(newY, screenGeom.top() + screenGeom.height()/3); move(pos().x(), newY); resizeFrameHeight(geometry().top() - screenGeom.top()); @@ -30,7 +30,7 @@ break; } case Plasma::BottomEdge: -@@ -652,6 +659,8 @@ void PanelController::mouseMoveFilter(QM +@@ -688,6 +695,8 @@ void PanelController::mouseMoveFilter(QM newY = qMax(newY, screenGeom.top() + 2*(screenGeom.height()/3) - height()); move(pos().x(), newY); resizeFrameHeight(screenGeom.bottom() - geometry().bottom()); ++++++ rotate-wacom-pointers.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,8 +1,8 @@ Index: kcontrol/randr/randrscreen.cpp =================================================================== ---- kcontrol/randr/randrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200 -+++ kcontrol/randr/randrscreen.cpp 2010-11-21 20:47:03.651718637 +0100 -@@ -538,6 +538,8 @@ bool RandRScreen::applyProposed(bool con +--- kcontrol/randr/randrscreen.cpp.orig ++++ kcontrol/randr/randrscreen.cpp +@@ -543,6 +543,8 @@ bool RandRScreen::applyProposed(bool con if (succeed && confirm) succeed = RandR::confirm(r); @@ -13,8 +13,8 @@ if (succeed) Index: kcontrol/randr/randr.h =================================================================== ---- kcontrol/randr/randr.h.orig 2010-08-11 12:08:09.000000000 +0200 -+++ kcontrol/randr/randr.h 2010-11-21 20:47:03.651718637 +0100 +--- kcontrol/randr/randr.h.orig ++++ kcontrol/randr/randr.h @@ -104,6 +104,7 @@ public: static bool confirm(const QRect &rect = QRect()); @@ -25,8 +25,8 @@ #endif Index: kcontrol/randr/legacyrandrscreen.cpp =================================================================== ---- kcontrol/randr/legacyrandrscreen.cpp.orig 2010-09-01 15:36:50.000000000 +0200 -+++ kcontrol/randr/legacyrandrscreen.cpp 2010-11-21 20:47:03.653717490 +0100 +--- kcontrol/randr/legacyrandrscreen.cpp.orig ++++ kcontrol/randr/legacyrandrscreen.cpp @@ -104,6 +104,7 @@ bool LegacyRandRScreen::applyProposed() m_currentSize = m_proposedSize; m_currentRotation = m_proposedRotation; @@ -37,8 +37,8 @@ Index: kcontrol/randr/randrcrtc.cpp =================================================================== ---- kcontrol/randr/randrcrtc.cpp.orig 2008-11-19 11:17:57.000000000 +0100 -+++ kcontrol/randr/randrcrtc.cpp 2010-11-21 20:47:03.653717490 +0100 +--- kcontrol/randr/randrcrtc.cpp.orig ++++ kcontrol/randr/randrcrtc.cpp @@ -317,6 +317,7 @@ bool RandRCrtc::applyProposed() m_currentRect = m_proposedRect; m_currentRate = mode.refreshRate(); @@ -49,8 +49,8 @@ else Index: kcontrol/randr/randr.cpp =================================================================== ---- kcontrol/randr/randr.cpp.orig 2010-08-11 12:08:09.000000000 +0200 -+++ kcontrol/randr/randr.cpp 2010-11-21 20:47:03.653717490 +0100 +--- kcontrol/randr/randr.cpp.orig ++++ kcontrol/randr/randr.cpp @@ -19,6 +19,8 @@ #include "randr.h" @@ -60,7 +60,7 @@ bool RandR::has_1_2 = false; bool RandR::has_1_3 = false; -@@ -177,5 +179,40 @@ SizeList RandR::sortSizes(const SizeList +@@ -179,5 +181,40 @@ SizeList RandR::sortSizes(const SizeList return sorted; } ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,6 +1,8 @@ ---- startkde.cmake 2011-06-22 16:29:19.000000000 +0200 -+++ startkde.cmake 2011-06-28 20:20:35.408688730 +0200 -@@ -88,6 +88,9 @@ +Index: startkde.cmake +=================================================================== +--- startkde.cmake.orig ++++ startkde.cmake +@@ -68,6 +68,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD mkdir -m 700 -p $kdehome mkdir -m 700 -p $kdehome/share mkdir -m 700 -p $kdehome/share/config @@ -10,7 +12,7 @@ cat >$kdehome/share/config/startupconfigkeys <<EOF kcminputrc Mouse cursorTheme 'Oxygen_White' kcminputrc Mouse cursorSize '' -@@ -102,6 +105,7 @@ +@@ -82,6 +85,7 @@ krandrrc [Screen3] kcmfonts General forceFontDPI 0 kdeglobals Locale Language '' # trigger requesting languages from KLocale EOF @@ -18,7 +20,7 @@ kstartupconfig4 returncode=$? if test $returncode -ne 0; then -@@ -181,7 +185,7 @@ +@@ -160,7 +164,7 @@ fi libpath=`kde4-config --path lib | tr : '\n'` ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.Ij272G/_old 2012-08-07 21:29:54.000000000 +0200 +++ /var/tmp/diff_new_pack.Ij272G/_new 2012-08-07 21:29:54.000000000 +0200 @@ -1,6 +1,8 @@ ---- systemsettings/app/systemsettings.desktop 2011-10-20 22:52:49.000000000 +0200 -+++ systemsettings/app/systemsettings.desktop 2011-10-25 18:16:59.288042602 +0200 -@@ -6,7 +6,7 @@ +Index: systemsettings/app/systemsettings.desktop +=================================================================== +--- systemsettings/app/systemsettings.desktop.orig ++++ systemsettings/app/systemsettings.desktop +@@ -6,7 +6,7 @@ X-DocPath=systemsettings/index.html X-KDE-StartupNotify=true OnlyShowIn=KDE; @@ -9,7 +11,7 @@ GenericName[ar]=إعدادات النظام GenericName[ast]=Preferencies del sistema GenericName[be@latin]=Systemnyja nałady -@@ -88,7 +88,7 @@ +@@ -88,7 +88,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 @@ -18,15 +20,17 @@ Name[ar]=إعدادات النظام Name[ast]=Preferencies del sistema Name[be]=Сістэмныя настаўленні -@@ -175,4 +175,4 @@ +@@ -175,4 +175,4 @@ Name[zh_CN]=系统设置 Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique -Categories=Qt;KDE;Settings; +Categories=Qt;KDE;Settings;X-SuSE-core;Qt;Core; ---- systemsettings/app/kdesystemsettings.desktop 2011-10-21 08:08:27.000000000 +0200 -+++ systemsettings/app/kdesystemsettings.desktop 2011-10-21 20:15:04.235935203 +0200 -@@ -45,4 +45,4 @@ +Index: systemsettings/app/kdesystemsettings.desktop +=================================================================== +--- systemsettings/app/kdesystemsettings.desktop.orig ++++ systemsettings/app/kdesystemsettings.desktop +@@ -91,4 +91,4 @@ Name[zh_CN]=KDE 系统设置 Name[zh_TW]=KDE 系統設定 X-DBUS-StartupType=Unique -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
