From ca7e6ca89067cdf62169478fecc035ed9c51baaf Mon Sep 17 00:00:00 2001
From: Andreas Grapentin <andreas@grapentin.org>
Date: Sun, 10 Feb 2019 00:19:24 +0100
Subject: nonprism/kopete: updated to 18.12.2

---
 nonprism/kopete/libre-nonprism.patch | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

(limited to 'nonprism/kopete/libre-nonprism.patch')

diff --git a/nonprism/kopete/libre-nonprism.patch b/nonprism/kopete/libre-nonprism.patch
index 712220546..1655ac573 100644
--- a/nonprism/kopete/libre-nonprism.patch
+++ b/nonprism/kopete/libre-nonprism.patch
@@ -1,7 +1,7 @@
 diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
 --- kopete-14.12.1.orig/doc/index.docbook	2014-11-19 21:39:14.000000000 -0200
 +++ kopete-14.12.1/doc/index.docbook	2015-01-25 16:44:09.213439141 -0200
-@@ -24,7 +24,6 @@
+@@ -18,7 +18,6 @@
    <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
    <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
    <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
@@ -9,14 +9,12 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
    <!ENTITY kopete-emoticonspec SYSTEM "emoticonspec.docbook">
  ]>
  <!--
-@@ -117,15 +116,7 @@
+@@ -111,13 +110,7 @@ Appendix: Chat Window Style Guide (1st d
  <keyword>Messaging</keyword>
  <keyword>Jabber</keyword>
  <keyword>IRC</keyword>
--<keyword>WLM</keyword>
 -<keyword>ICQ</keyword>
 -<keyword>AIM</keyword>
--<keyword>Yahoo</keyword>
 -<keyword>Gadu-Gadu</keyword>
 -<keyword>GroupWise</keyword>
 -<keyword>Novell</keyword>
@@ -25,11 +23,11 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
  </keywordset>
  
  </bookinfo>
-@@ -179,13 +170,13 @@
+@@ -156,13 +149,13 @@ Appendix: Chat Window Style Guide (1st d
  <para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
  <para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends.  If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software.  Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
  <para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
--<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, Jabber, and <trademark>WLM</trademark> from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
+-<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Gadu-Gadu, and Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
 +<para>The following section assumes you are registered with an &im; service already.  If not, you can register with Jabber from inside &kopete;; for other services, you'll have to register using their respective web site before creating an account in &kopete;.</para>
  <sect1 id="creating-accounts">
  <title>Creating Accounts</title>
@@ -41,7 +39,7 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
  <variablelist>
  <varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service.  If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
  <varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts.  If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
-@@ -261,7 +252,7 @@
+@@ -238,7 +231,7 @@ Shortcuts...</guimenuitem></menuchoice>.
  <listitem><para>Select Display Name and Group.  Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
  <listitem><para>Select &im; Accounts.  Here you can choose which accounts you want to use to chat to the new contact.  If you only have one &im; account, you won't see this screen.</para></listitem>
  <listitem><para>Account-specific Add Contact Pages.  For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
@@ -50,7 +48,7 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
  </orderedlist>
  
  <para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -706,47 +697,17 @@
+@@ -683,38 +676,17 @@ Shortcuts...</guimenuitem></menuchoice>.
  	<para>&kopete; calls different &im; systems 'Protocols'.  When you add an account, it is specific to a single protocol.  Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
  	<sect1 id="protocols-list">
  		<title>Protocols</title>
@@ -61,15 +59,6 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
 -		<sect2 id="protocols-icq">
 -			<title>ICQ</title>
 -			<para>ICQ has an Invisibility feature which allows you to hide from selected contacts.  You may also search the ICQ user folder when adding a contact.  A wide range of contact details can be set using the <guilabel>Properties</guilabel> option.</para>
--		</sect2>
--		<sect2 id="protocols-msn">
--			<title>WLM</title> 
--			<para>File transfer and multi user chats work.  To transfer a file,  drag the file from &dolphin; or the desktop into the chat window.  To invite someone else into a chat, drag them from the Contact List into the chat window.  The <menuchoice><guimenu>File</guimenu></menuchoice> menu also contains these commands.  In addition, WLM supports custom emoticons.</para>
--			<para>To use file transfer, make sure port 6891 is forwarded to your computer.</para>
--		</sect2>
--		<sect2 id="protocols-yahoo">
--			<title>Yahoo</title>
--			<para>Yahoo can send and receive webcam video.  It also supports Yahoo mail and the Yahoo address book from the account menu.  Conferencing is also possible.</para>
 -		</sect2>
  		<sect2 id="protocols-jabber">
  			<title>Jabber</title>
@@ -94,12 +83,12 @@ diff -Nur kopete-14.12.1.orig/doc/index.docbook kopete-14.12.1/doc/index.docbook
  		</sect2>
  		<sect2 id="protocols-others">
  			<title>Other protocols</title>
--			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS and SILC are provided in this way.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
-+			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  See &kopetewww; for details, however, the &kopete; team are not responsible for these protocols.</para>
+-			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed.  Meanwhile, SMS and SILC are provided in this way.  However, the &kopete; team are not responsible for these protocols.</para>
++			<para>As well as the protocols named above, &kopete; has support for several other protocols.  In most cases, this is not enabled by default or an additional plugin must be installed. However, the &kopete; team are not responsible for these protocols.</para>
  		</sect2>
  	</sect1>
  </chapter>
-@@ -1245,7 +1206,6 @@
+@@ -1188,7 +1160,6 @@ Documentation copyright 2003,2004,2005 &
  &kopete-chatstyle;
  &kopete-pipes;
  &kopete-jabber;
-- 
cgit v1.2.3