From 10b1f2f79f47d736979d32f1b5700fa118867ae6 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 23 Dec 2013 09:46:31 -0200
Subject: kdenetwork-kopete-libre-nonprism: fix libre-nonprism.patch

---
 nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD     |  3 ++-
 .../libre-nonprism.patch                               | 18 +++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index cd932ac3e..86a91508f 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -20,7 +20,8 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libre-nonprism.patch')
-sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875'
+          'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
 
 prepare() {
   cd kopete-${pkgver}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
index b6915cbb5..6d73766cc 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
@@ -1,8 +1,8 @@
 diff --git a/doc/index.docbook b/doc/index.docbook
-index 1576dc9..daf7170 100644
+index b55fd88..416de49 100644
 --- a/doc/index.docbook
 +++ b/doc/index.docbook
-@@ -20,7 +20,6 @@
+@@ -24,7 +24,6 @@
    <!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
    <!ENTITY kopete-pipes SYSTEM "pipes.docbook">
    <!ENTITY kopete-jabber SYSTEM "jabber.docbook">
@@ -10,7 +10,7 @@ index 1576dc9..daf7170 100644
  ]>
  <!--
  Intro (1st draft, Will)
-@@ -112,15 +111,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
  <keyword>Messaging</keyword>
  <keyword>Jabber</keyword>
  <keyword>IRC</keyword>
@@ -26,7 +26,7 @@ index 1576dc9..daf7170 100644
  </keywordset>
  
  </bookinfo>
-@@ -174,13 +165,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
  <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>
@@ -35,14 +35,14 @@ index 1576dc9..daf7170 100644
  <sect1 id="creating-accounts">
  <title>Creating Accounts</title>
  <para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
- <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>New</guibutton> to display the <interface>Account Wizard</interface>.</para>
- <para>The <interface>Account Wizard</interface> helps you create an &im; account.  After the <guilabel>Introduction</guilabel> page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
+ <para>The Configure window is the main way to set up and customize &kopete;.  On the left a column of icons control which aspect of &kopete; is being configured.  Click the <guiicon>Accounts</guiicon> icon.  The main pane will change to display the account management pane.  This is currently empty, but will soon list your &im; accounts.  Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account.  On the first page, you are asked to select the messaging service that you'd like to use.  Click one of the services shown and then click <guibutton>Next</guibutton>.  On the following page, you should enter your registration details for that instant messaging service.</para>
 -<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
 +<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password.  The special purpose services Winpopup work slightly differently, so please see their specific sections.  There are a couple of other options that apply to most services that you should look at:</para>
  <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>
-@@ -256,7 +247,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
  <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>
@@ -51,7 +51,7 @@ index 1576dc9..daf7170 100644
  </orderedlist>
  
  <para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -699,47 +690,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
  	<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>
@@ -100,7 +100,7 @@ index 1576dc9..daf7170 100644
  		</sect2>
  	</sect1>
  </chapter>
-@@ -1120,7 +1081,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
  &kopete-chatstyle;
  &kopete-pipes;
  &kopete-jabber;
-- 
cgit v1.2.3-54-g00ecf