rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.2-kdm-i18n.patch, NONE, 1.1 kdebase-workspace-4.1.2-ldap.patch, NONE, 1.1 kdebase-workspace.spec, 1.116, 1.117
Than Ngo
than at fedoraproject.org
Thu Nov 6 11:23:55 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24900
Modified Files:
kdebase-workspace.spec
Added Files:
kdebase-workspace-4.1.2-kdm-i18n.patch
kdebase-workspace-4.1.2-ldap.patch
Log Message:
- fix i18n issue in kdm
- add workaround for ldap issue
kdebase-workspace-4.1.2-kdm-i18n.patch:
--- NEW FILE kdebase-workspace-4.1.2-kdm-i18n.patch ---
diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.orig kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp
--- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.orig 2008-11-06 11:51:38.000000000 +0100
+++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp 2008-11-06 11:45:09.000000000 +0100
@@ -233,39 +233,47 @@ KdmLabel::update()
}
}
-static const struct {
- const char *type, *text;
-} stocks[] = {
- { "language", I18N_NOOP2("@action:button", "Lan_guage") },
- { "session", I18N_NOOP2("@action:button", "Session _Type") },
- { "system", I18N_NOOP2("@action:button", "_Menu") }, // i18n("Actions");
- { "disconnect", I18N_NOOP2("@action:button ... from XDMCP server", "Disconn_ect") },
- { "quit", I18N_NOOP2("@action:button", "_Quit") },
- { "halt", I18N_NOOP2("@action:button", "Power o_ff") },
-// { "suspend", I18N_NOOP2("@action:button", "_Suspend") },
- { "reboot", I18N_NOOP2("@action:button", "Re_boot") },
- { "chooser", I18N_NOOP2("@action:button", "_Remote login") },
- { "caps-lock-warning", I18N_NOOP("Caps Lock is enabled") },
- { "timed-label", I18N_NOOP("User %u will log in in %t") },
- { "welcome-label", I18N_NOOP("Welcome to %h") }, // _greetString
- { "domain-label", I18N_NOOP("_Domain:") },
- { "username-label", I18N_NOOP("_Username:") },
- { "password-label", I18N_NOOP("_Password:") },
- { "login", I18N_NOOP2("@action:button", "_Login") }
-};
-
// public static
QString
KdmLabel::lookupStock( const QString &stock )
{
QString type( stock.toLower() );
-
- for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++)
- if (type == stocks[i].type)
- return i18n(stocks[i].text);
-
- kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
- return stock;
+ if (type == "language") {
+ return i18nc("@action:button", "Lan_guage");
+ } else if (type == "session") {
+ return i18nc("@action:button", "Session _Type");
+ } else if (type == "system") {
+ return i18nc("@action:button", "_Menu");
+ } else if (type == "disconnect") {
+ return i18nc("@action:button ... from XDMCP server", "Disconn_ect");
+ } else if (type == "quit") {
+ return i18nc("@action:button", "_Quit");
+ } else if (type == "halt") {
+ return i18nc("@action:button", "Power o_ff");
+ } else if (type == "suspend") {
+ return i18nc("@action:button", "_Suspend");
+ } else if (type == "reboot") {
+ return i18nc("@action:button", "Re_boot");
+ } else if (type == "chooser") {
+ return i18nc("@action:button", "_Remote login");
+ } else if (type == "caps-lock-warning") {
+ return i18n("Caps Lock is enabled");
+ } else if (type == "timed-label") {
+ return i18n("User %u will log in in %t");
+ } else if (type == "welcome-label") {
+ return i18n("Welcome to %h");
+ } else if (type == "domain-label") {
+ return i18n("_Domain:");
+ } else if (type == "username-label") {
+ return i18n("_Username:");
+ } else if (type == "password-label") {
+ return i18n("_Password:");
+ } else if (type == "login") {
+ return i18nc("@action:button", "_Login");
+ } else {
+ kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
+ return stock;
+ }
}
QString KdmLabel::timedUser = QString();
kdebase-workspace-4.1.2-ldap.patch:
--- NEW FILE kdebase-workspace-4.1.2-ldap.patch ---
diff -up kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt.ldap kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt
--- kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt.ldap 2008-11-04 18:09:52.000000000 +0100
+++ kdebase-workspace-4.1.2/kcontrol/kdm/CMakeLists.txt 2008-11-04 18:17:11.000000000 +0100
@@ -27,7 +27,7 @@ set(kcm_kdm_PART_SRCS ${kcmbackgroundlib
kde4_add_plugin(kcm_kdm ${kcm_kdm_PART_SRCS})
-target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_kdm ${KDE4_KDE3SUPPORT_LIBS} ${QIMAGEBLITZ_LIBRARIES} ${KDE4_KNEWSTUFF2_LIBS} ${X11_LIBRARIES} -lldap)
install(TARGETS kcm_kdm DESTINATION ${PLUGIN_INSTALL_DIR})
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- kdebase-workspace.spec 4 Nov 2008 22:42:44 -0000 1.116
+++ kdebase-workspace.spec 6 Nov 2008 11:23:25 -0000 1.117
@@ -3,7 +3,7 @@
Summary: K Desktop Environment - Workspace
Name: kdebase-workspace
Version: 4.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -27,6 +27,8 @@
Patch11: kdebase-workspace-4.0.85-plasma-default-wallpaper.patch
Patch12: kdebase-workspace-4.1.2-multihead.patch
Patch13: kdebase-workspace-4.1.2-session-button.patch
+Patch14: kdebase-workspace-4.1.2-ldap.patch
+Patch15: kdebase-workspace-4.1.2-kdm-i18n.patch
# upstream patches:
# backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -97,6 +99,7 @@
BuildRequires: pam-devel
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel
+BuildRequires: openldap-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: kde-settings-kdm
@@ -203,6 +206,8 @@
%patch11 -p1 -b .plasma-default-wallpaper
%patch12 -p1 -b .multihead
%patch13 -p1 -b .session-button
+%patch14 -p1 -b .ldap
+%patch15 -p1 -b .kdm-i18n
# upstream patches
%patch100 -p1 -b .plasma-tooltips
@@ -351,6 +356,10 @@
%changelog
+* Thu Nov 06 2008 Than Ngo <than at redhat.com 4.1.3-2
+- fix i18n issue in kdm
+- add workaround for ldap issue
+
* Tue Nov 4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
- KDE 4.1.3
More information about the fedora-extras-commits
mailing list