From 6a776d9b89c2db0e71e25d8c7ba0dfaa3ff66f45 Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Tue, 29 Nov 2011 23:13:29 +0100
Subject: [PATCH] RHEL/Fedora: add forgotten kdebase patches

---
 redhat/kdebase/r1182808.diff | 29 ++++++++++++++++++++++++
 redhat/kdebase/r1201523.diff | 31 ++++++++++++++++++++++++++
 redhat/kdebase/r1201705.diff | 43 ++++++++++++++++++++++++++++++++++++
 redhat/kdebase/r1221326.diff | 13 +++++++++++
 4 files changed, 116 insertions(+)
 create mode 100644 redhat/kdebase/r1182808.diff
 create mode 100644 redhat/kdebase/r1201523.diff
 create mode 100644 redhat/kdebase/r1201705.diff
 create mode 100644 redhat/kdebase/r1221326.diff

diff --git a/redhat/kdebase/r1182808.diff b/redhat/kdebase/r1182808.diff
new file mode 100644
index 000000000..6163d996f
--- /dev/null
+++ b/redhat/kdebase/r1182808.diff
@@ -0,0 +1,29 @@
+Index: kdebase/kdesktop/init/My_Documents
+===================================================================
+--- kdebase/kdesktop/init/My_Documents	(revision 1182807)
++++ kdebase/kdesktop/init/My_Documents	(revision 1182808)
+@@ -1,10 +1,6 @@
+ [Desktop Entry]
+ Encoding=UTF-8
+-Comment=
+-Comment[en_US]=
+-Exec=kxdglauncher --xdgname DOCUMENTS
+ Icon=folder_wordprocessing
+-MimeType=
+ Name=My Documents
+ Name[af]=Dokument Gids
+ Name[ar]=مستنداتي
+@@ -70,10 +66,12 @@
+ Name[wa]=Ridant documints
+ Name[zh_CN]=文档文件夹
+ Name[zh_TW]=文件目錄
++URL=$( kxdglauncher --getpath --xdgname DOCUMENTS )
++Type=Link
+ StartupNotify=true
++MimeType=
+ Terminal=false
+ TerminalOptions=
+-Type=Application
+ X-DCOP-ServiceType=
+ X-KDE-SubstituteUID=false
+ X-KDE-Username=
diff --git a/redhat/kdebase/r1201523.diff b/redhat/kdebase/r1201523.diff
new file mode 100644
index 000000000..7272968b2
--- /dev/null
+++ b/redhat/kdebase/r1201523.diff
@@ -0,0 +1,31 @@
+Index: kdebase/kcontrol/crypto/crypto.cpp
+===================================================================
+--- kdebase/kcontrol/crypto/crypto.cpp	(revision 1201522)
++++ kdebase/kcontrol/crypto/crypto.cpp	(revision 1201523)
+@@ -2321,7 +2321,7 @@
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-SSL_METHOD *meth;
++const SSL_METHOD *meth;
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2337,7 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2365,7 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    SSL_CIPHER *sc;
++    const SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
diff --git a/redhat/kdebase/r1201705.diff b/redhat/kdebase/r1201705.diff
new file mode 100644
index 000000000..c7dff1e6e
--- /dev/null
+++ b/redhat/kdebase/r1201705.diff
@@ -0,0 +1,43 @@
+Index: kdebase/kcontrol/crypto/crypto.cpp
+===================================================================
+--- kdebase/kcontrol/crypto/crypto.cpp	(revision 1201704)
++++ kdebase/kcontrol/crypto/crypto.cpp	(revision 1201705)
+@@ -2316,12 +2316,19 @@
+ 
+ 
+ #ifdef HAVE_SSL
++
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++#define SSL_CONST const
++#else
++#define SSL_CONST
++#endif
++
+ // This gets all the available ciphers from OpenSSL
+ bool KCryptoConfig::loadCiphers() {
+ unsigned int i;
+ SSL_CTX *ctx;
+ SSL *ssl;
+-const SSL_METHOD *meth;
++SSL_CONST SSL_METHOD *meth;
+ 
+   SSLv2Box->clear();
+   SSLv3Box->clear();
+@@ -2337,7 +2344,7 @@
+   CipherItem *item;
+   for (i=0; ; i++) {
+     int j, k;
+-    const SSL_CIPHER *sc;
++    SSL_CONST SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
+@@ -2365,7 +2372,7 @@
+ 
+   for (i=0; ; i++) {
+     int j, k;
+-    const SSL_CIPHER *sc;
++    SSL_CONST SSL_CIPHER *sc;
+     sc = (meth->get_cipher)(i);
+     if (!sc)
+       break;
diff --git a/redhat/kdebase/r1221326.diff b/redhat/kdebase/r1221326.diff
new file mode 100644
index 000000000..b164a4679
--- /dev/null
+++ b/redhat/kdebase/r1221326.diff
@@ -0,0 +1,13 @@
+Index: kdebase/kcontrol/randr/krandrbindings.cpp
+===================================================================
+--- kdebase/kcontrol/randr/krandrbindings.cpp	(revision 1221325)
++++ kdebase/kcontrol/randr/krandrbindings.cpp	(revision 1221326)
+@@ -28,7 +28,7 @@
+ 
+ 	keys->insert( "Program:krandrtray", i18n("Display Control") );
+ 
+-	DEF( I18N_NOOP("Switch Displays"), KShortcut::KShortcut(TQString("XF86Display")), KShortcut::KShortcut(TQString("XF86Display")), slotCycleDisplays() );
++	DEF( I18N_NOOP("Switch Displays"), KShortcut(TQString("XF86Display")), KShortcut(TQString("XF86Display")), slotCycleDisplays() );
+ 
+ #undef DEF
+ #undef WIN