diff --git a/general.ent b/general.ent
index 0a8a806d4f..11c3266dba 100644
--- a/general.ent
+++ b/general.ent
@@ -971,7 +971,7 @@ $Date$
-
+
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index b820a3c31e..d72970dbe5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -71,7 +71,10 @@
Fixes #3432.
- [abenton] - Upgrade Poppler to 0.20.1
+ [abenton] - Updated Poppler to 0.20.1
+
+
+ [abenton] - Updated Pidgin to 2.10.4
diff --git a/xsoft/other/pidgin.xml b/xsoft/other/pidgin.xml
index 7b25fdb0e0..d11b006f5e 100644
--- a/xsoft/other/pidgin.xml
+++ b/xsoft/other/pidgin.xml
@@ -4,12 +4,13 @@
%general-entities;
-
+
-
-
-
-
+
+
+
+
]>
@@ -29,10 +30,11 @@
Introduction to Pidgin
- Pidgin is a Gtk+-2 instant messaging
- client that can connect with a wide range of networks including AIM, ICQ,
- GroupWise, MSN, Jabber, IRC, Napster, Gadu-Gadu, SILC, Zephyr and
- Yahoo!.
+
+ Pidgin is a Gtk+ 2 instant messaging client
+ that can connect with a wide range of networks including AIM, ICQ,
+ GroupWise, MSN, Jabber, IRC, Napster, Gadu-Gadu, SILC, Zephyr and Yahoo!
+
&lfs71_checked;
@@ -61,147 +63,154 @@
Pidgin DependenciesRequired
- and
- . Gtk+-2 is
- required to build Pidgin, however, if you
- configure Pidgin with the option
- , it is possible to compile the command
- line finch program without
- Gtk+-2 installed.
+
+ and
+
+
- Optional for SSL Support
- or
-
+ Recommended
+
+ or
+
+
- SSL support is required for the MSN Messenger, Yahoo!, Novel
- Groupwise and Google Talk protocol plugins.
- GnuTLS is the preferred method (the Mozilla nss
- API is more likely to change and this can cause problems).
+
+ SSL support is required for the MSN Messenger, Yahoo!, Novel Groupwise and
+ Google Talk protocol plugins. GnuTLS is the
+ preferred method (the Mozilla nss API is more likely to change and this
+ can cause problems).
+ Optional
- ,
- Gtkspell,
- , ,
- , ,
- , ,
- SILC Client,
- SILC Toolkit,
- zephyr,
- (required for audio support),
- (required for video and voice support),
- ,
- (required for the Contact Availability Prediction
- plugin), ,
- (required for Kerberos support in the Zephyr
- module), , (required for the Bonjour plugin),
- Meanwhile
- (required for Sametime protocol support), NetworkManager,
- libgadu,
- check (only
- used during the test suite) and
-
- User Notes:
-
+
+ Gtkspell,
+ ,
+ ,
+ ,
+ ,
+ ,
+ SILC Client,
+ SILC Toolkit,
+ zephyr,
+ (required for audio support),
+ (required for video and voice support),
+ ,
+ (required for the Contact Availability Prediction
+ plugin),
+ ,
+ (required for Kerberos support in the Zephyr
+ module),
+ , (required for the Bonjour plugin),
+ Meanwhile
+ (required for Sametime protocol support),
+ ,
+ libgadu,
+ (only used during the test suite) and
+
+
+
+ User Notes:
+ Installation of Pidgin
- Compile Pidgin by running the following
- commands:
+
+ Compile Pidgin by running the following
+ commands:
+
-./configure --prefix=/usr --disable-screensaver \
- --disable-meanwhile --disable-avahi --disable-nm --disable-tcl \
- --disable-nss --disable-gnutls --disable-idn --disable-vv \
- --disable-gtkspell --disable-gstreamer --disable-dbus \
- --with-gconf-schema-file-dir=$GNOME_SYSCONFDIR/gconf/schemas &&
+./configure --prefix=/usr --disable-meanwhile --disable-avahi --disable-nm --disable-tcl \
+ --disable-idn --disable-gstreamer --disable-vv --disable-gtkspell
+ --disable-dbus LIBS=-lX11 &&
make
- If you have installed
- ( can be used also) and you wish to create the
- API documentation, issue: make docs
+
+ If you have installed
+ ( can be used also) and you wish to create the
+ API documentation, issue: make docs
+ To test the results, issue: make check.
- Now, as the root
- user:
+
+ Now, as the root user:
+ make install &&
mkdir /usr/share/doc/pidgin-&pidgin-version; &&
cp README doc/gtkrc-2.0 /usr/share/doc/pidgin-&pidgin-version;
- If you created the API documentation, install it using the following
- commands as the root user:
+
+ If you created the API documentation, install it using the following
+ commands as the root user:
+ mkdir /usr/share/doc/pidgin-&pidgin-version;/api &&
cp doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api
-
Command Explanations
-
-
- :
- This parameter is used so that the GConf schema
- files are installed into the existing database. If
- GConf is not installed, the parameter does not
- affect the build or installation of the package.
-
- : Remove this option if
- you installed libXscrnsaver before you installed
- libXext.
-
- : Remove this option if
- you've installed
- Meanwhile.
-
- : Remove this option if you've
- installed .
-
- : Remove this option if you've
- installed NetworkManager.
+ : Remove this option if you've
+ installed Meanwhile
- : Remove this option if you've
- installed .
+
+ : Remove this option if you've
+ installed .
- :
- Remove these options if you've installed
- .
+
+ : Remove this option if you've installed
+ .
+
- : Remove this option if you've
- installed .
+
+ : Remove this option if you've installed
+ .
+
- : Video and voice. Remove this
- option if you've installed .
+
+ : Remove this option if you've installed
+ .
+
- : Spellchecking. Remove this
- option if you've installed
- Gtkspell.
+
+ : Sounds. Remove this option if you've
+ installed .
+
- : Sounds. Remove this option if
- you've installed .
+
+ : Video and voice. Remove this option if
+ you've installed .
+
- : Remove this option if you've
- installed .
+
+ : Spellchecking. Remove this option if
+ you've installed
+ Gtkspell.
+
- : Use this option if you've not
- installed and you just want the
- Ncurses based finch
- program.
+
+ : Remove this option if you've installed
+ .
+
+
+ LIBS=-lX11: This parameter needs to be passed to
+ configure to avoid a link time error with recent versions of binutils.
+
+
+
+ : Use this option if you've not installed
+ and you just want the
+ Ncurses based finch
+ program.
+
@@ -223,16 +232,16 @@ cp doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api
Configuration Information
- Most configuration can be accomplished by using the various
- preference settings inside the programs. Additionally, you can create
- a ~/.gtkrc-02 file which can store gtk+-2 theme
- settings that affect Pidgin and other gtk+-2
- applications. Note that an example gtkrc-02 file was
- installed during the package installation and can be used as a starting
- point or reference.
-
+
+ Most configuration can be accomplished by using the various preference
+ settings inside the programs. Additionally, you can create a
+ ~/.gtkrc-02 file which can store gtk+-2 theme
+ settings that affect Pidgin and other Gtk+ 2
+ applications. Note that an example gtkrc-02 file
+ was installed during the package installation and can be used as a
+ starting point or reference.
+
-
@@ -244,16 +253,36 @@ cp doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api
Installed Directories
- finch, pidgin, purple-client-example, purple-remote, purple-send,
- purple-send-async, and purple-url-handler
- libgnt.so, libpurple.so, and libpurple-client.so along with
- numerous plugin and support modules located in various subdirectories
- of /usr/lib.
- /usr/include/finch, /usr/include/gnt, /usr/include/libpurple,
- /usr/include/pidgin, /usr/lib/finch, /usr/lib/gnt, /usr/lib/pidgin,
- /usr/lib/purple-2, /usr/share/doc/pidgin-&pidgin-version;,
- /usr/share/pixmaps/pidgin, /usr/share/purple and
- /usr/share/sounds/purple
+
+ finch,
+ pidgin,
+ purple-client-example,
+ purple-remote,
+ purple-send,
+ purple-send-async and
+ purple-url-handler
+
+
+ libgnt.so,
+ libpurple.so and
+ libpurple-client.so along with numerous plugin and support modules
+ located in /usr/lib/finch, /usr/lib/gnt, /usr/lib/pidgin and
+ /usr/lib/purple-2
+
+
+ /usr/include/finch,
+ /usr/include/gnt,
+ /usr/include/libpurple,
+ /usr/include/pidgin,
+ /usr/lib/finch,
+ /usr/lib/gnt,
+ /usr/lib/pidgin,
+ /usr/lib/purple-2,
+ /usr/share/doc/pidgin-&pidgin-version;,
+ /usr/share/pixmaps/pidgin,
+ /usr/share/purple and
+ /usr/share/sounds/purple
+
@@ -265,8 +294,7 @@ cp doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api
pidgin
- is an instant messaging client based on the
- Gtk+-2 GUI toolkit.
+ is a Gtk+-2 instant messaging clientpidgin
@@ -276,16 +304,12 @@ cp doc/html/* /usr/share/doc/pidgin-&pidgin-version;/api
finch
- is a text-based (Ncurses) instant
- messaging client.
+ is a text-based instant messaging clientfinch
-
-
-