[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1a765a0

The following commit has been merged in the master branch:
commit 1a765a02935a8ddc6a494ee9eac361e02eed3441
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Feb 26 15:20:22 2015 +0100

    [kaccounts] Disable the steam plugin
    
    It turns out that the steam purple plugin is really hacky and actually
    requires system symlinks to be done as it tries to dlopen a hardcoded
    .so of gnome-keyring. This is baaad and until it's fixed to use proper
    keyring APIs or using KWallet, this will be disabled for now.
    
    It's still possible to install it if one wishes to, there's a _README
    which has all the needed details.
---
 data/kaccounts/{ => disabled}/CMakeLists.txt         | 11 ++++++++++-
 data/kaccounts/disabled/_README                      | 20 ++++++++++++++++++++
 .../ktp-haze-steam-mobile-im.service.in}             |  4 ++--
 .../ktp-haze-steam-mobile.provider.in}               |  2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/data/kaccounts/CMakeLists.txt b/data/kaccounts/disabled/CMakeLists.txt
similarity index 74%
copy from data/kaccounts/CMakeLists.txt
copy to data/kaccounts/disabled/CMakeLists.txt
index f5178c8..aaeff0a 100644
--- a/data/kaccounts/CMakeLists.txt
+++ b/data/kaccounts/disabled/CMakeLists.txt
@@ -1,3 +1,12 @@
+cmake_minimum_required(VERSION 2.8.12)
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/modules ${CMAKE_MODULE_PATH})
+
+find_package (AccountsFileDir REQUIRED)
+find_package (Intltool REQUIRED) #needed to generate service and provider files
+
+include(FeatureSummary)
+
 file(GLOB service_files_in *.service.in)
 foreach(service_file_in ${service_files_in})
     get_filename_component(service_filename ${service_file_in} NAME_WE)
@@ -12,4 +21,4 @@ foreach(provider_in_file ${provider_in_files})
     set(provider_file ${CMAKE_CURRENT_BINARY_DIR}/${provider_filename}.provider)
     execute_process(COMMAND intltool-merge -x -u --no-translations ${provider_in_file} ${provider_file})
     install(FILES ${provider_file} DESTINATION ${ACCOUNTS_PROVIDERS_DIR})
-endforeach()
\ No newline at end of file
+endforeach()
diff --git a/data/kaccounts/disabled/_README b/data/kaccounts/disabled/_README
new file mode 100644
index 0000000..91c21e4
--- /dev/null
+++ b/data/kaccounts/disabled/_README
@@ -0,0 +1,20 @@
+This folder contains provider/service files for services or accounts that are
+either currently broken or not properly supported. You can install these at
+your own risk and play around, but please don't report any bugs for these.
+
+You can install these by executing:
+
+mkdir -p build && cd build && cmake .. && make install
+
+===============================================================================
+
+Current disabled providers:
+
+ * steam/ktp-haze-steam-mobile
+
+   This requires the pidgin-opensteamworks plugin, which uses a bit of a hack
+   in order to store the authentication data and supports only "libgnome-keyring.so"
+   which usually requires manual symlinking of system libraries. This is very bad
+   and thus is not officially supported by us. Once it's using the keyring properly
+   via the APIs meant to be used or even better once it works with KWallet (properly)
+   it will be moved to supported providers.
diff --git a/data/kaccounts/ktp-haze-steam-im.service.in b/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in
similarity index 76%
rename from data/kaccounts/ktp-haze-steam-im.service.in
rename to data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in
index 7408ba2..3057b0c 100644
--- a/data/kaccounts/ktp-haze-steam-im.service.in
+++ b/data/kaccounts/disabled/ktp-haze-steam-mobile-im.service.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<service id="ktp-steam-im">
+<service id="ktp-haze-steam-mobile-im">
   <type>IM</type>
   <!-- Steam Chat - The string below is being displayed as a checkbox label to enable/disable this service -->
   <_name>Chat</_name>
   <icon>input-gaming</icon>
-  <provider>ktp-steam</provider>
+  <provider>ktp-haze-steam-mobile</provider>
   <translations>kaccounts-providers</translations>
 </service>
diff --git a/data/kaccounts/ktp-haze-steam.provider.in b/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in
similarity index 92%
rename from data/kaccounts/ktp-haze-steam.provider.in
rename to data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in
index 916a87f..dca7e2c 100644
--- a/data/kaccounts/ktp-haze-steam.provider.in
+++ b/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<provider id="ktp-steam">
+<provider id="ktp-haze-steam-mobile">
     <_name>Steam Chat</_name>
     <icon>input-gaming</icon>
     <!-- Tooltip text appearing over the button to create this type of account -->

-- 
ktp-accounts-kcm packaging