summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernels/linux-libre-pae/PKGBUILD6
-rw-r--r--kernels/linux-libre-rt/PKGBUILD22
-rw-r--r--kernels/linux-libre-rt/config.i6864
-rw-r--r--kernels/linux-libre-xen/PKGBUILD6
-rw-r--r--libre/bbswitch-libre/PKGBUILD2
-rw-r--r--libre/calibre-libre/PKGBUILD8
-rw-r--r--libre/ghostscript-libre/PKGBUILD22
-rw-r--r--libre/gnu-ghostscript/PKGBUILD35
-rw-r--r--libre/iceape-l10n/PKGBUILD9
-rw-r--r--libre/iceape-libre/PKGBUILD17
-rw-r--r--libre/icedove-l10n/PKGBUILD5
-rw-r--r--libre/icedove-libre/Icedove-branding.patch37
-rw-r--r--libre/icedove-libre/PKGBUILD35
-rw-r--r--libre/icedove-libre/branding.patch19
-rw-r--r--libre/icedove-libre/libre.patch49
-rw-r--r--libre/icedove-libre/makefile.patch46
-rw-r--r--libre/iceweasel-l10n/PKGBUILD11
-rw-r--r--libre/iceweasel-libre/PKGBUILD11
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
-rw-r--r--libre/linux-libre/PKGBUILD10
-rw-r--r--libre/lirc-libre/PKGBUILD4
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD6
-rw-r--r--libre/mplayer-libre/PKGBUILD4
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD4
-rw-r--r--libre/tp_smapi-libre/PKGBUILD4
-rw-r--r--libre/vhba-module-libre/PKGBUILD4
-rw-r--r--nonprism/pidgin-nonprism/PKGBUILD131
-rw-r--r--nonprism/pidgin-nonprism/nonprism-b.patch5623
-rw-r--r--nonprism/pidgin-nonprism/nonprism.patch4930
-rw-r--r--nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch12
-rw-r--r--nonprism/pidgin-nonprism/pidgin.install11
-rw-r--r--pcr/debootstrap-libre/PKGBUILD (renamed from pcr/debootstrap/PKGBUILD)27
-rw-r--r--pcr/debootstrap-libre/debootstrap.install (renamed from pcr/debootstrap/debootstrap.install)2
-rw-r--r--pcr/debootstrap-libre/gnewsense (renamed from pcr/debootstrap/metad)11
-rw-r--r--pcr/debootstrap-libre/trisquel (renamed from pcr/debootstrap/trisquel)0
-rw-r--r--pcr/imagemagick-srv/PKGBUILD80
-rw-r--r--pcr/imagemagick-srv/perlmagick.rpath.patch11
-rw-r--r--pcr/libquvi-scripts-current/PKGBUILD28
-rw-r--r--pcr/youtube-dl-current/PKGBUILD4
-rw-r--r--~fauno/afew/LICENSE15
-rw-r--r--~fauno/afew/PKGBUILD29
-rw-r--r--~fauno/afew/SRCBUILD36
-rw-r--r--~fauno/bibutils-dynamic/PKGBUILD30
-rw-r--r--~fauno/dbacl/PKGBUILD32
-rw-r--r--~fauno/distccd-zeroconf/PKGBUILD50
-rwxr-xr-x~fauno/distccd-zeroconf/distccd38
-rw-r--r--~fauno/distccd-zeroconf/distccd.conf.d8
-rw-r--r--~fauno/emerillon/PKGBUILD26
-rw-r--r--~fauno/emerillon/emerillon.install12
-rw-r--r--~fauno/ethos/PKGBUILD24
-rw-r--r--~fauno/faenza-icon-theme/PKGBUILD25
-rw-r--r--~fauno/geoclue/PKGBUILD28
-rw-r--r--~fauno/haskell-base64-bytestring/PKGBUILD45
-rw-r--r--~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install26
-rw-r--r--~fauno/haskell-citeproc-hs/PKGBUILD60
-rw-r--r--~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install26
-rw-r--r--~fauno/haskell-digest/PKGBUILD46
-rw-r--r--~fauno/haskell-digest/haskell-digest.install26
-rw-r--r--~fauno/haskell-dlist/PKGBUILD43
-rw-r--r--~fauno/haskell-dlist/haskell-dlist.install26
-rw-r--r--~fauno/haskell-hs-bibutils/PKGBUILD48
-rw-r--r--~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install18
-rw-r--r--~fauno/haskell-json/PKGBUILD51
-rw-r--r--~fauno/haskell-json/haskell-json.install26
-rw-r--r--~fauno/haskell-pandoc-types/PKGBUILD46
-rw-r--r--~fauno/haskell-pandoc-types/haskell-pandoc-types.install26
-rw-r--r--~fauno/haskell-tagsoup/PKGBUILD47
-rw-r--r--~fauno/haskell-tagsoup/haskell-tagsoup.install26
-rw-r--r--~fauno/haskell-texmath/PKGBUILD48
-rw-r--r--~fauno/haskell-texmath/haskell-texmath.install26
-rw-r--r--~fauno/haskell-xml/PKGBUILD45
-rw-r--r--~fauno/haskell-xml/haskell-xml.install26
-rw-r--r--~fauno/haskell-zip-archive/PKGBUILD49
-rw-r--r--~fauno/haskell-zip-archive/haskell-zip-archive.install26
-rw-r--r--~fauno/kyotocabinet/PKGBUILD26
-rw-r--r--~fauno/kyototycoon/PKGBUILD26
-rw-r--r--~fauno/ldapscripts/PKGBUILD20
-rw-r--r--~fauno/librest/PKGBUILD28
-rw-r--r--~fauno/localepurge/PKGBUILD38
-rw-r--r--~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD62
-rw-r--r--~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD58
-rw-r--r--~fauno/spawn-fcgi-php/PKGBUILD40
-rw-r--r--~fauno/spawn-fcgi-php/nginx.conf.example34
-rw-r--r--~fauno/spawn-fcgi-php/public_html.conf.example16
-rw-r--r--~fauno/spawn-fcgi-php/server.conf.example22
-rwxr-xr-x~fauno/spawn-fcgi-php/spawn-fcgi-php460
-rw-r--r--~fauno/spawn-fcgi-php/spawn-fcgi-php.conf60
-rw-r--r--~fauno/sphinx/PKGBUILD42
-rw-r--r--~fauno/sphinx/sphinx.conf.d5
-rw-r--r--~fauno/sphinx/sphinx.rc.d44
-rw-r--r--~fauno/vala-notmuch/PKGBUILD31
-rw-r--r--~fauno/vala-notmuch/SRCBUILD39
-rw-r--r--~fauno/vala-notmuch/vala-notmuch.install6
94 files changed, 10977 insertions, 2503 deletions
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index a2e8a5627..6d30bb5d3 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
+# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-pkgver=${_basekernel}.7
+pkgver=${_basekernel}.9
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'criu-no-expert.patch'
'3.10.6-logitech-dj.patch')
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '8d05dec5772b17c4c21c00b93da42bd8'
+ '312e4b4203d2e74201a14f1a9633482d'
'7dc48829b6bcb5db3779d558c705ab63'
'f302c931bd85309da9d9792b4cc96467'
'04b21c79df0a952c22d681dd4f4562df'
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 613d8b993..7391edac4 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $
# Maintainer: Joakim Hernberg <jbh@alchemy.lu>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: timbosa <tinny_tim@dodo.com.au>
@@ -9,12 +10,12 @@
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_releasever=6
-_rtpatchver=rt3
+_releasever=9
+_rtpatchver=rt5
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
-pkgrel=2
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,12 +34,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
'3.10.6-logitech-dj.patch'
- '3.10.6-reset-superseed-xhci-hcd.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '63a1c2aba22871f8e8dacdb4968d9a1f'
- 'a339a92745c5e34533e20cb9100bbb11'
- '9240ca6835f21e4d2a54d2218de5d246'
+ '312e4b4203d2e74201a14f1a9633482d'
+ '9840bcd0525a85e13cfa95ea95b16ba0'
+ '9dad7b1491caf056b10d4fbf54081988'
'6fb1660497947ec5c20405dc439b5c5a'
'82496e68851d1960543a07ba51cdb44a'
'2967cecc3af9f954ccc822fd63dca6ff'
@@ -47,8 +47,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
'3ff40ca684cfe719723e627e2cef7cea'
- 'e751378a3e94532bfe85fb82c80e26c0'
- '0f0e9441467a3eca33e23ebb75709f06')
+ 'd2fb29339d9ec7978af71f80daa27a12')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -83,9 +82,6 @@ prepare() {
# fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch"
- # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd
- patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch"
-
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index c19bc2f10..8b98c58a5 100644
--- a/kernels/linux-libre-rt/config.i686
+++ b/kernels/linux-libre-rt/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.5-1 Kernel Configuration
+# Linux/x86 3.10.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1630,7 +1630,7 @@ CONFIG_AD525X_DPOT_I2C=m
# CONFIG_AD525X_DPOT_SPI is not set
# CONFIG_DUMMY_IRQ is not set
# CONFIG_IBM_ASM is not set
-CONFIG_HWLAT_DETECTOR=m
+# CONFIG_HWLAT_DETECTOR is not set
CONFIG_PHANTOM=m
CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 227a66426..03649c605 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
+# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-pkgver=${_basekernel}.7
+pkgver=${_basekernel}.9
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'criu-no-expert.patch'
'3.10.6-logitech-dj.patch')
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '8d05dec5772b17c4c21c00b93da42bd8'
+ '312e4b4203d2e74201a14f1a9633482d'
'f104314d8db864b1702c50ea97134be3'
'b7c2805bb287a644c0a303bf7721e534'
'04b21c79df0a952c22d681dd4f4562df'
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index aa3f3181d..cb7c71655 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=bbswitch
pkgname=bbswitch-libre
pkgver=0.7
_extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install
-pkgrel=10
+pkgrel=11
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 1a0bff6b6..1eb17b175 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95754 2013-08-16 10:44:14Z jelle $
+# $Id: PKGBUILD 96275 2013-08-23 10:26:11Z jelle $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=0.9.44
+pkgver=1.0.0
pkgrel=1
pkgdesc="Ebook management application, with unar support included and nonfree fonts removed"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx'
'python2-imaging' 'shared-mime-info' 'python2-dnspython'
'unar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp'
- 'python2-netifaces' 'python2-cssselect')
+ 'python2-netifaces' 'python2-cssselect' 'python2-apsw')
makedepends=('python2-pycountry' 'qt4-private-headers')
optdepends=('ipython2: to use calibre-debug')
replaces=$_pkgname
@@ -30,7 +30,7 @@ install=calibre.install
source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('5598d6717ce568a32ea2a4a1c173016b'
+md5sums=('5f3d0c3630a7289ef1f36d68153ea7a3'
'8353d1878c5a498b3e49eddef473605f'
'675cd87d41342119827ef706055491e7')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index d9be53172..63958664e 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 192537 2013-08-13 17:54:45Z andyrtr $
+# $Id: PKGBUILD 193535 2013-08-22 17:59:22Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
_pkgname=ghostscript
pkgname=ghostscript-libre
-pkgver=9.07
-pkgrel=3
+pkgver=9.09
+pkgrel=1
pkgdesc="An interpreter for the PostScript language, without nonfree files"
arch=('i686' 'x86_64' 'mips64el')
license=('AGPL') #non free files removed
depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
- 'libtiff>=4.0.0' 'lcms' 'dbus')
-makedepends=('gtk2' 'gnutls')
+ 'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
conflicts=('ghostscript')
@@ -20,18 +20,18 @@ replaces=('ghostscript')
provides=("ghostscript=$pkgver")
url="http://www.ghostscript.com/"
source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
-options=('!libtool')
-md5sums=('eea27befc1e85bef6d4768202f6b03a5')
+options=('!libtool' '!makeflags')
+md5sums=('4f47c29daae8e567ebdef842b7e0f8ea')
build() {
cd ghostscript-${pkgver}
- # delete non-free packages
+ # delete nonfree files
grep -l "are not altered" Resource/CMap/* | xargs rm -fv
grep -l "not be copied" Resource/CMap/* | xargs rm -fv
# force it to use system-libs
- rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+ rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
./configure --prefix=/usr \
--enable-dynamic \
@@ -60,7 +60,7 @@ build() {
package() {
cd ghostscript-${pkgver}
- make -j1 DESTDIR="${pkgdir}" \
+ make DESTDIR="${pkgdir}" \
cups_serverroot="${pkgdir}"/etc/cups \
cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
@@ -74,7 +74,7 @@ package() {
# install IJS
cd ijs
- make -j1 DESTDIR="${pkgdir}" install
+ make DESTDIR="${pkgdir}" install
# remove filters that are now maintained in cups-filters as upstream home
rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 46bbb845d..6d44a7646 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,15 +2,16 @@
_pkgname=ghostscript
pkgname=gnu-ghostscript
-_gspkgver=9.07 # ghostscript package version
+_gspkgver=9.09 # ghostscript package version
_pkgver=9.06
pkgver=9.06.0
-pkgrel=4
+pkgrel=5
pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
-depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2')
-makedepends=('gtk2' 'gnutls')
+depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg'
+ 'libtiff>=4.0.0' 'lcms2' 'dbus')
+makedepends=('gtk2' 'gnutls' 'openjpeg')
optdepends=('texlive-core: needed for dvipdf'
'gtk2: needed for gsx')
conflicts=${_pkgname}
@@ -19,13 +20,13 @@ url="https://www.gnu.org/software/${_pkgname}/"
source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz
ijs-automake.patch
libtool.patch)
-options=('!libtool')
+options=('!libtool' '!makeflags')
md5sums=('85a5e07a6b91937c157576293b381065'
'83bcae456ad4c9fb790be483914dbeba'
'5bd5d4966007b460deed866a30a0b3c8')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
# fix build with recent automake
patch -p1 -i "$srcdir/ijs-automake.patch"
@@ -34,7 +35,7 @@ build() {
patch -Np1 -i ${srcdir}/libtool.patch
# force it to use system-libs
- rm -rf jpeg libpng zlib jasper expat tiff lcms freetype
+ rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community
./configure --prefix=/usr \
--enable-dynamic \
@@ -48,35 +49,37 @@ build() {
--enable-fontconfig \
--enable-freetype \
--without-luratech \
+ --without-omni \
--with-system-libtiff \
--disable-compile-inits #--help # needed for linking with system-zlib
make
# Build IJS
- cd ${srcdir}/${pkgname}-${pkgver}/ijs
+ cd ijs
+ sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac
./autogen.sh
./configure --prefix=/usr --enable-shared --disable-static
make
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make -j1 DESTDIR=${pkgdir} \
- cups_serverroot=${pkgdir}/etc/cups \
- cups_serverbin=${pkgdir}/usr/lib/cups install soinstall
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" \
+ cups_serverroot="${pkgdir}"/etc/cups \
+ cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall
# install missing doc files # http://bugs.archlinux.org/task/18023
- install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/
+ install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/
mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname}
install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/
# remove unwanted localized man-pages
- rm -rf $pkgdir/usr/share/man/[^man1]*
+ rm -rf "$pkgdir"/usr/share/man/[^man1]*
# install IJS
- cd ${srcdir}/${pkgname}-${pkgver}/ijs
- make -j1 DESTDIR=${pkgdir} install
+ cd ijs
+ make DESTDIR="${pkgdir}" install
# remove filters that are now maintained in cups-filters as upstream home
rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster}
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index c9f22703d..5e088da07 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -12,7 +12,7 @@
_debname=iceape
_debver=2.7.12
-_debrel=1
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,19 +22,20 @@ pkgbase=iceape-l10n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
+epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=4
+pkgrel=1
pkgdesc="Language packs for Debian Iceape."
arch=('any')
url="http://packages.debian.org/sid/iceape"
license=('MPL' 'GPL')
-depends=("iceape-libre>=$pkgver")
+depends=("iceape-libre>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
source=('region.properties')
for lang in ${_langpacks[@]}
do
- source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+ source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
done
_path="/usr/lib/iceape/extensions"
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 22ad1541b..1ea0c56b0 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -4,14 +4,15 @@
# We're getting this from Debian Sid
_debname=iceape
_debver=2.7.12
-_debrel=1
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
+epoch=1
pkgver=${_debver}.${_debrel}
-pkgrel=8
+pkgrel=1
pkgdesc="A libre version of Debian Iceape, the internet suite based on SeaMonkey."
arch=('i686' 'x86_64' 'mips64el')
license=('MPL' 'GPL' 'LGPL')
@@ -23,7 +24,7 @@ provides=('seamonkey')
install=$_pkgname.install
url="http://packages.debian.org/sid/${_pkgname}"
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
mozconfig
${_pkgname}.desktop
${_pkgname}-2.0-lang.patch
@@ -98,6 +99,11 @@ prepare() {
}
build() {
+ export DEBIAN_BUILD="comm-release"
+ export DEBIAN_BRANDING_DIR="debian/branding"
+
+ export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
cd "${srcdir}/${DEBIAN_BUILD}"
export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
@@ -113,6 +119,11 @@ build() {
}
package() {
+ export DEBIAN_BUILD="comm-release"
+ export DEBIAN_BRANDING_DIR="debian/branding"
+
+ export ICEAPE_ICONS_BRANDING="suite/branding/nightly"
+
cd "${srcdir}/${DEBIAN_BUILD}"
make -j1 -f client.mk DESTDIR="${pkgdir}" install
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index f1446b23b..bbd3e1213 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -2,8 +2,9 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
pkgbase=icedove-l10n
+epoch=1
_pkgver=17.0.8
-pkgver=17.0.8.1
+pkgver=17.0.8.deb1
_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
@@ -16,7 +17,7 @@ pkgdesc="Language packs for Debian Icedove."
arch=('any')
url="http://packages.debian.org/sid/icedove"
license=('MPL' 'GPL')
-depends=("icedove-libre>=$pkgver")
+depends=("icedove-libre>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
_url=https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$_pkgver/linux-i686/xpi
diff --git a/libre/icedove-libre/Icedove-branding.patch b/libre/icedove-libre/Icedove-branding.patch
deleted file mode 100644
index 751305147..000000000
--- a/libre/icedove-libre/Icedove-branding.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Sat, 24 Nov 2012 11:36:16 +0100
-Subject: Icedove branding
-
----
- mail/app/application.ini | 2 +-
- mail/confvars.sh | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/mail/app/application.ini b/mail/app/application.ini
-index 8380eb7..12902c2 100644
---- a/mail/app/application.ini
-+++ b/mail/app/application.ini
-@@ -4,7 +4,7 @@
-
- #filter substitution
- [App]
--Name=Thunderbird
-+Name=Icedove
- Version=@APP_VERSION@
- BuildID=@GRE_BUILDID@
- #ifdef MOZ_SOURCE_REPO
-diff --git a/mail/confvars.sh b/mail/confvars.sh
-index 5c34d70..395bb87 100755
---- a/mail/confvars.sh
-+++ b/mail/confvars.sh
-@@ -3,8 +3,8 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--MOZ_APP_BASENAME=Thunderbird
--MOZ_APP_NAME=thunderbird
-+MOZ_APP_BASENAME=Icedove
-+MOZ_APP_NAME=icedove
- MOZ_UPDATER=1
- MOZ_THUNDERBIRD=1
- MOZ_CHROME_FILE_FORMAT=omni
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index e793f5924..246f228bc 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -4,12 +4,13 @@
# We're getting this from Debian Sid
_debname=icedove
_debver=17.0.8
-_debrel=1
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=${_debname}
pkgname=${_debname}-libre
+epoch=1
pkgver=${_debver}.${_debrel}
pkgrel=1
pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
@@ -24,24 +25,18 @@ conflicts=('thunderbird')
provides=('thunderbird')
install=${_pkgname}.install
source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
mozconfig
replace-urls.txt
vendor.js
- makefile.patch
- branding.patch
- ${_pkgname}.desktop
- Icedove-branding.patch)
+ ${_pkgname}.desktop)
options=(!emptydirs)
md5sums=('37a706e6b2c17049ab70739600ef47b0'
'0524d248bd0e83fa62c261700640ac0d'
'5cf95ea94f69cdd36604890cfbf7b954'
'a8fc4658d45b6bf9350023e5c3f34e56'
'4eecc4fc5aafaf0da651a09eadc90bee'
- 'c4ed43e85945e180a89cce03e45ec62c'
- '126b1446212396c33220936c01d9592d'
- 'e785e0c267f4435ae1a9aa0b03bcacfb'
- 'ea5f7a06967f561d47d7e5c35b23de6f')
+ 'e785e0c267f4435ae1a9aa0b03bcacfb')
prepare() {
export DEBIAN_BUILD="comm-esr17"
@@ -63,14 +58,24 @@ prepare() {
install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
done
- # This patch has a orthographic issue ("Icdove" instead of "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
- rm -v debian/patches/debian-hacks/Icedove-branding.patch || true
+ # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
+ sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
quilt push -av
- patch -Np1 -i "${srcdir}/makefile.patch" # small fix
- patch -Np1 -i "${srcdir}/branding.patch" # fixing branding
- patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version
+ # Fix paths on makefile
+ sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|;
+ s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+ s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+ ' mail/branding/icedove/Makefile.in
+
+ sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|;
+ s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+ s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+ ' mail/branding/icedove/locales/Makefile.in
+
+ # Fix branding
+ sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
# Replace common URLs
sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
diff --git a/libre/icedove-libre/branding.patch b/libre/icedove-libre/branding.patch
deleted file mode 100644
index d84b8075a..000000000
--- a/libre/icedove-libre/branding.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd comm-release/mail/branding/icedove/locales/en-US/brand.dtd
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-30 16:41:16.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.dtd 2012-10-31 22:35:04.203666114 -0200
-@@ -1,4 +1,4 @@
- <!ENTITY brandShortName "Icedove">
--<!ENTITY brandFullName "Icedove Mail/News">
--<!ENTITY vendorShortName "Icedove">
-+<!ENTITY brandFullName "Icedove">
-+<!ENTITY vendorShortName "Mozilla">
- <!ENTITY trademarkInfo.part1 " ">
-diff -Naur comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties comm-release/mail/branding/icedove/locales/en-US/brand.properties
---- comm-release.orig/mail/branding/icedove/locales/en-US/brand.properties 2012-10-30 10:13:50.000000000 -0200
-+++ comm-release/mail/branding/icedove/locales/en-US/brand.properties 2012-10-31 22:35:14.786423732 -0200
-@@ -1,3 +1,3 @@
- brandShortName=Icedove
--brandFullName=Icedove Mail/News
--vendorShortName=Icedove
-+brandFullName=Icedove
-+vendorShortName=Mozilla
diff --git a/libre/icedove-libre/libre.patch b/libre/icedove-libre/libre.patch
deleted file mode 100644
index a6f23bdcd..000000000
--- a/libre/icedove-libre/libre.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Nur comm-esr17.orig/mail/app/profile/all-thunderbird.js comm-esr17/mail/app/profile/all-thunderbird.js
---- comm-esr17.orig/mail/app/profile/all-thunderbird.js 2013-05-18 18:46:27.290732014 -0300
-+++ comm-esr17/mail/app/profile/all-thunderbird.js 2013-05-18 18:10:57.239376924 -0300
-@@ -160,11 +160,11 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/guid:%IDS%?src=thunderbird&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=thunderbird");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/thunderbird/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.getWithPerformance.url", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.browseURL", "https://trisquel.info/browser-plain");
-+pref("extensions.getAddons.search.url", "https://trisquel.info/browser-plain");
-+pref("extensions.webservice.discoverURL", "https://trisquel.info/browser-plain");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -189,7 +189,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
-
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/thunderbird/themes/");
-+pref("extensions.getMoreThemesURL", "https://trisquel.info/browser-plain");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
-
-@@ -390,7 +390,7 @@
-
- pref("spellchecker.dictionary", "");
- // Dictionary download preference
--pref("spellchecker.dictionaries.download.url", "https://addons.mozilla.com/%LOCALE%/thunderbird/dictionaries/");
-+pref("spellchecker.dictionaries.download.url", "https://trisquel.info/browser-plain");
-
- // profile.force.migration can be used to bypass the migration wizard, forcing migration from a particular
- // mail application without any user intervention. Possible values are:
-@@ -747,9 +747,7 @@
- #endif
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.
--php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=
--%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://trisquel.info/sites/pfs.php?mime=%PLUGIN_MIMETYPE%");
-
- // By default we show an infobar message when pages require plugins the user has
- // not installed, or are outdated.
diff --git a/libre/icedove-libre/makefile.patch b/libre/icedove-libre/makefile.patch
deleted file mode 100644
index 8f8137bec..000000000
--- a/libre/icedove-libre/makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Nur comm-release.orig/mail/branding/icedove/Makefile.in comm-release/mail/branding/icedove/Makefile.in
---- comm-release.orig/mail/branding/icedove/Makefile.in 2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/Makefile.in 2012-05-08 04:03:25.680643202 -0300
-@@ -38,11 +38,11 @@
- # Branding Makefile for Icedove branding
-
- DEPTH = ../../..
--topsrcdir = ../../../
-+topsrcdir = @top_srcdir@
- srcdir = @srcdir@
- VPATH = @srcdir@
-
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
-
- DIRS = \
- locales \
-@@ -50,7 +50,7 @@
-
- PREF_JS_EXPORTS += $(srcdir)/thunderbird-branding.js
-
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
-
- export::
- $(NSINSTALL) -D $(DIST)/branding
-diff -Nur comm-release.orig/mail/branding/icedove/locales/Makefile.in comm-release/mail/branding/icedove/locales/Makefile.in
---- comm-release.orig/mail/branding/icedove/locales/Makefile.in 2012-04-18 15:42:15.000000000 -0300
-+++ comm-release/mail/branding/icedove/locales/Makefile.in 2012-05-08 05:32:57.481620942 -0300
-@@ -36,13 +36,13 @@
- # ***** END LICENSE BLOCK *****
-
- DEPTH = ../../../..
--topsrcdir = ../../../..
-+topsrcdir = @top_srcdir@
- srcdir = @srcdir@
- VPATH = @srcdir@
- relativesrcdir = mail/branding/icedove/locales
-
--include $(topsrcdir)/config/autoconf.mk
-+include $(DEPTH)/config/autoconf.mk
-
- DEFINES += -DAB_CD=$(AB_CD) -DMOZ_DISTRIBUTION_ID_UNQUOTED=$(MOZ_DISTRIBUTION_ID)
-
--include $(DEPTH)/config/rules.mk
-+include $(topsrcdir)/config/rules.mk
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index fae6951dd..19400ce5f 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -12,7 +12,7 @@
_debname=iceweasel
_debver=23.0.1
-_debrel=1
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,19 +22,20 @@ pkgbase=iceweasel-l10n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
+epoch=1
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="Language packs for Debian Iceweasel."
arch=('any')
-url="http://packages.debian.org/experimental/iceweasel"
+url="http://packages.debian.org/sid/iceweasel"
license=('MPL' 'GPL')
-depends=("iceweasel-libre>=$pkgver")
+depends=("iceweasel-libre>=$epoch:$pkgver")
makedepends=('unzip' 'zip')
source=('region.properties')
for lang in ${_langpacks[@]}
do
- source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb")
+ source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel#deb}_all.deb")
done
_path="/usr/lib/iceweasel/browser/extensions/"
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 6172155ef..1918e27a6 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -12,17 +12,18 @@
_pgo=true
-# We're getting this from Debian Experimental
+# We're getting this from Debian Sid
_debname=iceweasel
_debver=23.0.1
-_debrel=1
+_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
_pkgname=iceweasel
pkgname=iceweasel-libre
+epoch=1
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 mips64el)
@@ -37,13 +38,13 @@ if $_pgo; then
fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/experimental/${_pkgname}"
+url="http://packages.debian.org/sid/${_pkgname}"
install=iceweasel.install
replaces=('firefox')
conflicts=('firefox')
provides=('firefox')
source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
- "$_debrepo/`debfile $_debname`_$_debver-$_debrel.debian.tar.gz"
+ "$_debrepo/`debfile $_debname`_$_debver-${_debrel#deb}.debian.tar.gz"
mozconfig
mozconfig.pgo
libre.patch
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 00714409a..c6262a0dc 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.91
+_kernver=3.0.93
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=14
+pkgrel=15
pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index fc8e94f77..bfe0c4000 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193105 2013-08-16 10:56:05Z tpowa $
+# $Id: PKGBUILD 193507 2013-08-21 13:08:50Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=91
+_sublevel=93
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.91 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.93 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- 'cb479cc4ee4709804bf65677c4178985'
+ '0d900fb04812ca03cd2a6de094cdcc04'
'7373cc3ac66342156a7fc32af8577b46'
'b7229f80282337979514f9640a969ff5'
'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '0acdb5346ba868c3a1819f36902ef562')
+ '0b0f582f9736f7d99d75b5f67cb56dfc')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index b45052181..5bd6ff7c2 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193106 2013-08-16 10:56:45Z tpowa $
+# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -10,10 +10,10 @@
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=7
+_sublevel=9
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.10.6-logitech-dj.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '8d05dec5772b17c4c21c00b93da42bd8'
+ '312e4b4203d2e74201a14f1a9633482d'
'8ec987449e0e42a1c98d8ce92b9019c2'
'8efbd1f17f37bdaa8649c8a63761bf07'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
'3ff40ca684cfe719723e627e2cef7cea'
- '797e952fb0a168c0c1822acc0fac67bc')
+ 'd2fb29339d9ec7978af71f80daa27a12')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index a5e5212b1..a1c0ddbae 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193099 2013-08-16 10:37:27Z tpowa $
+# $Id: PKGBUILD 193472 2013-08-20 22:18:28Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@ _pkgbase=lirc
pkgbase=lirc-libre
pkgname=('lirc-libre' 'lirc-utils-libre')
pkgver=0.9.0
-pkgrel=56
+pkgrel=57
epoch=1
_extramodules=extramodules-3.10-LIBRE
arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index 6721ff845..2405ac889 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -10,7 +10,7 @@
pkgname=mozilla-searchplugins
pkgver=1.4
-pkgrel=1
+pkgrel=2
pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers."
arch=('any')
license=('MPL' 'GPL' 'LGPL')
@@ -21,7 +21,7 @@ source=(
internet-archive.xml
parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/
parabola-wiki-en.xml::
- seeks-search.xml::http://seeks.zat.im/opensearch.xml
+ seeks-search.xml::http://www.seeks.fr/opensearch.xml
# yacy.xml::http://search.ipredator.se/opensearchdescription.xml
yacy.xml
wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php
@@ -37,6 +37,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4'
'462c68585461f8cdc23c93c46f6ee4cf'
'92f834a3a1d85c9ae202955cdfe941eb'
'b9a0893d7f6d41d755c478fd60c44be8'
- '76df72680069a41a476539213a569302'
+ 'dc6c76acf4c68a40710383513d72fa8b'
'0f6cb4119f54e90d678827e2928474d4'
'dbdd9b61e89d73cc3a70cbe20a1160e1')
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 36bf2f4ff..a5bda5d85 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $
+# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=36285
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 9923b356b..71d158d17 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $
+# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
pkgver=36265
-pkgrel=3
+pkgrel=4
pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 04773b21a..11faf618b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95735 2013-08-16 09:00:08Z tpowa $
+# $Id: PKGBUILD 96173 2013-08-20 22:21:57Z tpowa $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,7 +12,7 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=31
+pkgrel=32
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index d0a47e872..b26b45dd1 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95737 2013-08-16 09:00:28Z tpowa $
+# $Id: PKGBUILD 96175 2013-08-20 22:22:25Z tpowa $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20130607
_extramodules=extramodules-3.10-LIBRE
-pkgrel=10
+pkgrel=11
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
diff --git a/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD
new file mode 100644
index 000000000..ccf2a9af6
--- /dev/null
+++ b/nonprism/pidgin-nonprism/PKGBUILD
@@ -0,0 +1,131 @@
+# $Id: PKGBUILD 185869 2013-05-19 16:42:53Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
+
+_pkgname=pidgin
+pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism')
+pkgver=2.10.7
+pkgrel=4
+arch=('i686' 'x86_64' 'mips64el')
+url="http://pidgin.im/"
+license=('GPL')
+makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
+ 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
+ 'tk' 'ca-certificates' 'intltool' 'networkmanager')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2
+ pidgin-2.10.7-link-libirc-to-libsasl2.patch nonprism.patch)
+sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
+ '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f'
+ '54c185493f7139768e316b989a5d23aa9d46662bf69026a92efbf69ad7d00973')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ msg 'remove nonfree services'
+ patch -Np1 -i $srcdir/nonprism.patch
+ #rm -vrf libpurple/protocols/{gg,jabber/google,msn,mxit,myspace,novell,oscar,yahoo}
+ #rm -v pidgin/pixmaps/protocols/16/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+ #rm -v pidgin/pixmaps/protocols/16/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+ #rm -v pidgin/pixmaps/protocols/22/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png
+ #rm -v pidgin/pixmaps/protocols/22/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg
+ #rm -v pidgin/pixmaps/protocols/48/{aim,facebook,gadu-gadu,icq,msn,mxit,myspace,novell,yahoo}.png
+ #rm -v pidgin/pixmaps/protocols/scalable/{aim,gadu-gadu,google-talk,icq,msn,mxit,novell,yahoo}.svg
+ msg 'remove wrong OS term'
+ sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h
+ sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ # https://developer.pidgin.im/ticket/15517
+ patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch"
+ autoreconf -vi
+
+ # Use Python 2
+ sed -i 's/env python$/&2/' */plugins/*.py \
+ libpurple/purple-{remote,notifications-example,url-handler}
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-schemas-install \
+ --disable-meanwhile \
+ --disable-gnutls \
+ --enable-cyrus-sasl \
+ --disable-doxygen \
+ --enable-nm \
+ --with-python=/usr/bin/python2 \
+ --with-system-ssl-certs=/etc/ssl/certs
+ make
+}
+
+package_pidgin-nonprism(){
+ pkgdesc="Multi-protocol instant messaging client"
+ depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
+ 'hicolor-icon-theme')
+ optdepends=('aspell: for spelling correction')
+ provides=("$_pkgname=$pkgver")
+ conflicts=$_pkgname
+ replaces=$_pkgname
+ install=pidgin.install
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C pidgin DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
+
+ rm "$pkgdir/usr/share/man/man1/finch.1"
+}
+
+package_libpurple-nonprism(){
+ pkgdesc="IM library extracted from Pidgin"
+ depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss')
+ optdepends=('avahi: Bonjour protocol support'
+ 'ca-certificates: SSL CA certificates'
+ 'python2-dbus: for purple-remote and purple-url-handler'
+ 'tk: Tcl/Tk scripting support')
+ provides=("${pkgname%-nonprism}=$pkgver")
+ conflicts=${pkgname%-nonprism}
+ replaces=${pkgname%-nonprism}
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ for _dir in libpurple share/sounds share/ca-certs m4macros po; do
+ make -C "$_dir" DESTDIR="$pkgdir" install
+ done
+}
+
+package_finch-nonprism(){
+ pkgdesc="A ncurses-based messaging client"
+ depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
+ provides=("${pkgname%-nonprism}=$pkgver")
+ conflicts=${pkgname%-nonprism}
+ replaces=${pkgname%-nonprism}
+
+ cd "$srcdir/pidgin-$pkgver"
+
+ # For linking
+ make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
+
+ make -C finch DESTDIR="$pkgdir" install
+ make -C doc DESTDIR="$pkgdir" install
+
+ # Remove files that are packaged in libpurle
+ make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
+
+ rm "$pkgdir"/usr/share/man/man1/pidgin.1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/nonprism/pidgin-nonprism/nonprism-b.patch b/nonprism/pidgin-nonprism/nonprism-b.patch
new file mode 100644
index 000000000..8e64b73d5
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism-b.patch
@@ -0,0 +1,5623 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in 2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in 2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure 2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure 2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+ --disable-farstream compile without farstream support
+ --disable-vv compile without voice and video support
+ --disable-idn compile without IDN support
+- --disable-meanwhile compile without meanwhile (required for Sametime
+- support)
+ --disable-avahi compile without avahi (required for Bonjour support)
+
+ --disable-plugins compile without plugin support
+@@ -1826,9 +1795,6 @@
+ --with-silc-includes=DIR
+ compile the SILC plugin against includes in DIR
+ --with-silc-libs=DIR compile the SILC plugin against the SILC libs in DIR
+- --with-gadu-includes=DIR
+- compile the Gadu-Gadu plugin against includes in DIR
+- --with-gadu-libs=DIR compile the Gadu-Gadu plugin against the libs in DIR
+ --with-static-prpls Link to certain protocols statically
+ --with-dynamic-prpls specify which protocols to build dynamically
+ --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+ linker flags for FARSTREAM, overriding pkg-config
+ IDN_CFLAGS C compiler flags for IDN, overriding pkg-config
+ IDN_LIBS linker flags for IDN, overriding pkg-config
+- MEANWHILE_CFLAGS
+- C compiler flags for MEANWHILE, overriding pkg-config
+- MEANWHILE_LIBS
+- linker flags for MEANWHILE, overriding pkg-config
+ AVAHI_CFLAGS
+ C compiler flags for AVAHI, overriding pkg-config
+ AVAHI_LIBS linker flags for AVAHI, overriding pkg-config
+ SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+ SILC_LIBS linker flags for SILC, overriding pkg-config
+- GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+- GADU_LIBS linker flags for GADU, overriding pkg-config
+ DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+ DBUS_LIBS linker flags for DBUS, overriding pkg-config
+ NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+- enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+- enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+- pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+- pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+- else
+- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+- fi
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+- fi
+-else
+- MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+- MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+ enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+
+
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+- withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+- ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+- withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+- ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+- gadu_manual_check="yes"
+-else
+- gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+- pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+- pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+- else
+- GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GADU_PKG_ERRORS" >&5
+-
+-
+- gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+- gadu_includes="no"
+-
+-else
+- GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+- GADU_LIBS=$pkg_cv_GADU_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- gadu_includes="yes"
+- gadu_libs="yes"
+-
+-fi
+-else
+- if test "$ac_gadu_includes" != "no"; then
+- GADU_CFLAGS="-I$ac_gadu_includes"
+- fi
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+- gadu_includes=yes
+-fi
+-
+-
+- CPPFLAGS="$CPPFLAGS_save"
+-
+- if test "$ac_gadu_libs" != "no"; then
+- GADU_LIBS="-L$ac_gadu_libs"
+- fi
+- GADU_LIBS="$GADU_LIBS -lgadu"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+- ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+- gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- echo
+- echo
+- echo "Your supplied copy of libgadu is too old."
+- echo "Install version 1.11.0 or newer."
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- echo
+- echo
+- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+- echo "To compile against system libgadu, please recompile libgadu using:"
+- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+- USE_INTERNAL_LIBGADU_TRUE=
+- USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+- USE_INTERNAL_LIBGADU_TRUE='#'
+- USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+- gadu_libs=no
+-fi
+-
+
+
+
+@@ -19500,10 +19100,7 @@
+ fi
+
+ if test "x$STATIC_PRPLS" = "xall" ; then
+- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+- extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+- load_proto="$load_proto purple_init_aim_plugin();"
+- load_proto="$load_proto purple_init_icq_plugin();"
+- elif test "x$i" = "xyahoo"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+- load_proto="$load_proto purple_init_yahoo_plugin();"
+- load_proto="$load_proto purple_init_yahoojp_plugin();"
++ if test "x$i" = "xsilc"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++ elif test "x$i" = "xsilc10"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ else
+- if test "x$i" = "xsilc"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+- elif test "x$i" = "xsilc10"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+- else
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+- fi
+- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+- load_proto="$load_proto purple_init_${i}_plugin();"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ fi
++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++ load_proto="$load_proto purple_init_${i}_plugin();"
+ case $i in
+ bonjour) static_bonjour=yes ;;
+- gg) static_gg=yes ;;
+ irc) static_irc=yes ;;
+ jabber) static_jabber=yes ;;
+- msn) static_msn=yes ;;
+- myspace) static_myspace=yes ;;
+- mxit) static_mxit=yes ;;
+- novell) static_novell=yes ;;
+- oscar) static_oscar=yes ;;
+- aim) static_oscar=yes ;;
+- icq) static_oscar=yes ;;
+- sametime) static_sametime=yes ;;
+ silc) static_silc=yes ;;
+ silc10) static_silc=yes ;;
+ simple) static_simple=yes ;;
+- yahoo) static_yahoo=yes ;;
+ zephyr) static_zephyr=yes ;;
+ *) echo "Invalid static protocol $i!!" ; exit 1 ;;
+ esac
+@@ -19571,14 +19144,6 @@
+ STATIC_BONJOUR_FALSE=
+ fi
+
+- if test "x$static_gg" = "xyes"; then
+- STATIC_GG_TRUE=
+- STATIC_GG_FALSE='#'
+-else
+- STATIC_GG_TRUE='#'
+- STATIC_GG_FALSE=
+-fi
+-
+ if test "x$static_irc" = "xyes"; then
+ STATIC_IRC_TRUE=
+ STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+ STATIC_JABBER_FALSE=
+ fi
+
+- if test "x$static_msn" = "xyes"; then
+- STATIC_MSN_TRUE=
+- STATIC_MSN_FALSE='#'
+-else
+- STATIC_MSN_TRUE='#'
+- STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+- STATIC_MYSPACE_TRUE=
+- STATIC_MYSPACE_FALSE='#'
+-else
+- STATIC_MYSPACE_TRUE='#'
+- STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+- STATIC_MXIT_TRUE=
+- STATIC_MXIT_FALSE='#'
+-else
+- STATIC_MXIT_TRUE='#'
+- STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+- STATIC_NOVELL_TRUE=
+- STATIC_NOVELL_FALSE='#'
+-else
+- STATIC_NOVELL_TRUE='#'
+- STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+- STATIC_OSCAR_TRUE=
+- STATIC_OSCAR_FALSE='#'
+-else
+- STATIC_OSCAR_TRUE='#'
+- STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+- STATIC_SAMETIME_TRUE=
+- STATIC_SAMETIME_FALSE='#'
+-else
+- STATIC_SAMETIME_TRUE='#'
+- STATIC_SAMETIME_FALSE=
+-fi
+-
+ if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+ STATIC_SILC_TRUE=
+ STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+ STATIC_SIMPLE_FALSE=
+ fi
+
+- if test "x$static_yahoo" = "xyes"; then
+- STATIC_YAHOO_TRUE=
+- STATIC_YAHOO_FALSE='#'
+-else
+- STATIC_YAHOO_TRUE='#'
+- STATIC_YAHOO_FALSE=
+-fi
+-
+ if test "x$static_zephyr" = "xyes"; then
+ STATIC_ZEPHYR_TRUE=
+ STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ case $i in
+ bonjour) dynamic_bonjour=yes ;;
+- gg) dynamic_gg=yes ;;
+ irc) dynamic_irc=yes ;;
+ jabber) dynamic_jabber=yes ;;
+- msn) dynamic_msn=yes ;;
+- myspace) dynamic_myspace=yes ;;
+- mxit) dynamic_mxit=yes ;;
+- novell) dynamic_novell=yes ;;
+ null) dynamic_null=yes ;;
+- oscar) dynamic_oscar=yes ;;
+- aim) dynamic_oscar=yes ;;
+- icq) dynamic_oscar=yes ;;
+- sametime) dynamic_sametime=yes ;;
+ silc) dynamic_silc=yes ;;
+ silc10) dynamic_silc=yes ;;
+ simple) dynamic_simple=yes ;;
+- yahoo) dynamic_yahoo=yes ;;
+ zephyr) dynamic_zephyr=yes ;;
+ *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ esac
+@@ -21001,7 +20497,7 @@
+ fi
+
+
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+
+@@ -23176,7 +22670,7 @@
+ fi
+
+
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+ as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+- as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+ as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+ as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+ as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+ as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+ "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+ "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+ "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+- "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+ "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+ "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+- "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+- "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+- "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+- "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+ "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+- "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+- "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+ "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+ "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+ "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+- "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+ "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+ "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+ "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac 2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+- [AC_HELP_STRING([--disable-meanwhile],
+- [compile without meanwhile (required for Sametime support)])],
+- enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+- PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+- have_meanwhile="yes"
+- ], [
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+- fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ CPPFLAGS="$CPPFLAGS_save"
+ fi
+
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+- gadu_manual_check="yes"
+-else
+- gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+- PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+- gadu_includes="yes"
+- gadu_libs="yes"
+- ], [
+- gadu_includes="no"
+- ])
+-else
+- if test "$ac_gadu_includes" != "no"; then
+- GADU_CFLAGS="-I$ac_gadu_includes"
+- fi
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+- CPPFLAGS="$CPPFLAGS_save"
+-
+- if test "$ac_gadu_libs" != "no"; then
+- GADU_LIBS="-L$ac_gadu_libs"
+- fi
+- GADU_LIBS="$GADU_LIBS -lgadu"
+- AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+- AC_MSG_CHECKING(for libgadu GPL compatibility)
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+- ]])], [
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+- ]])], [
+- AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_LIBGADU], [1],
+- [Define to 1 if you have libgadu.])
+- ], [
+- AC_MSG_RESULT(no)
+- echo
+- echo
+- echo "Your supplied copy of libgadu is too old."
+- echo "Install version 1.11.0 or newer."
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+- ])
+- ], [
+- AC_MSG_RESULT(no)
+- echo
+- echo
+- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+- echo "To compile against system libgadu, please recompile libgadu using:"
+- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+- ])
+- CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+- gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+
+ if test "x$STATIC_PRPLS" = "xall" ; then
+- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ dnl Ugly special case for "libsilcpurple.la":
+- dnl ... and Ugly special case for multi-protocol oscar and yahoo
+- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+- extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+- load_proto="$load_proto purple_init_aim_plugin();"
+- load_proto="$load_proto purple_init_icq_plugin();"
+- elif test "x$i" = "xyahoo"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+- load_proto="$load_proto purple_init_yahoo_plugin();"
+- load_proto="$load_proto purple_init_yahoojp_plugin();"
++ if test "x$i" = "xsilc"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++ elif test "x$i" = "xsilc10"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ else
+- if test "x$i" = "xsilc"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+- elif test "x$i" = "xsilc10"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+- else
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+- fi
+- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+- load_proto="$load_proto purple_init_${i}_plugin();"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ fi
++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++ load_proto="$load_proto purple_init_${i}_plugin();"
+ case $i in
+ bonjour) static_bonjour=yes ;;
+- gg) static_gg=yes ;;
+ irc) static_irc=yes ;;
+ jabber) static_jabber=yes ;;
+- msn) static_msn=yes ;;
+- myspace) static_myspace=yes ;;
+- mxit) static_mxit=yes ;;
+- novell) static_novell=yes ;;
+- oscar) static_oscar=yes ;;
+- aim) static_oscar=yes ;;
+- icq) static_oscar=yes ;;
+- sametime) static_sametime=yes ;;
+ silc) static_silc=yes ;;
+ silc10) static_silc=yes ;;
+ simple) static_simple=yes ;;
+- yahoo) static_yahoo=yes ;;
+ zephyr) static_zephyr=yes ;;
+ *) echo "Invalid static protocol $i!!" ; exit 1 ;;
+ esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ case $i in
+ bonjour) dynamic_bonjour=yes ;;
+- gg) dynamic_gg=yes ;;
+ irc) dynamic_irc=yes ;;
+ jabber) dynamic_jabber=yes ;;
+- msn) dynamic_msn=yes ;;
+- myspace) dynamic_myspace=yes ;;
+- mxit) dynamic_mxit=yes ;;
+- novell) dynamic_novell=yes ;;
+ null) dynamic_null=yes ;;
+- oscar) dynamic_oscar=yes ;;
+- aim) dynamic_oscar=yes ;;
+- icq) dynamic_oscar=yes ;;
+- sametime) dynamic_sametime=yes ;;
+ silc) dynamic_silc=yes ;;
+ silc10) dynamic_silc=yes ;;
+ simple) dynamic_simple=yes ;;
+- yahoo) dynamic_yahoo=yes ;;
+ zephyr) dynamic_zephyr=yes ;;
+ *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ esac
+@@ -1713,7 +1548,7 @@
+ [enable_nss="$enableval"],
+ [enable_nss="yes"])
+
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+
+@@ -2577,20 +2409,12 @@
+ libpurple/Makefile
+ libpurple/protocols/Makefile
+ libpurple/protocols/bonjour/Makefile
+- libpurple/protocols/gg/Makefile
+ libpurple/protocols/irc/Makefile
+ libpurple/protocols/jabber/Makefile
+- libpurple/protocols/msn/Makefile
+- libpurple/protocols/myspace/Makefile
+- libpurple/protocols/mxit/Makefile
+- libpurple/protocols/novell/Makefile
+ libpurple/protocols/null/Makefile
+- libpurple/protocols/oscar/Makefile
+- libpurple/protocols/sametime/Makefile
+ libpurple/protocols/silc/Makefile
+ libpurple/protocols/silc10/Makefile
+ libpurple/protocols/simple/Makefile
+- libpurple/protocols/yahoo/Makefile
+ libpurple/protocols/zephyr/Makefile
+ libpurple/tests/Makefile
+ libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in 2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt 2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+- unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+ confirmation is requested, the file gets transfered
+ automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in 2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c 2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+ * Reading from disk *
+ *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+- /* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+- * to use the new prpl-yahoojp. Also remove the account-specific settings
+- * we no longer need */
+-
+- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+- if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+- const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+- const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+- g_return_if_fail(serverjp != NULL);
+- g_return_if_fail(xferjp_host != NULL);
+-
+- purple_account_set_string(account, "server", serverjp);
+- purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+- purple_account_set_protocol_id(account, "prpl-yahoojp");
+- }
+-
+- /* these should always be nuked */
+- purple_account_remove_setting(account, "yahoojp");
+- purple_account_remove_setting(account, "serverjp");
+- purple_account_remove_setting(account, "xferjp_host");
+-
+- }
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+- /* Migrate the login server setting for ICQ accounts. See
+- * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+- * for details on the change. */
+-
+- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+- const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+- /* Non-secure server */
+- if(purple_strequal(tmp, "login.messaging.aol.com") ||
+- purple_strequal(tmp, "login.oscar.aol.com"))
+- purple_account_set_string(account, "server", "login.icq.com");
+-
+- /* Secure server */
+- if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+- purple_account_set_string(account, "server", "slogin.icq.com");
+- }
+-}
+
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ g_free(data);
+ }
+
+- /* we do this here because we need access to account settings to determine
+- * if we can/should migrate an old Yahoo! JAPAN account */
+- migrate_yahoo_japan(account);
+- /* we do this here because we need access to account settings to determine
+- * if we can/should migrate an ICQ account's server setting */
+- migrate_icq_server(account);
+ /* we do this here because we need to do it before the user views the
+ * Edit Account dialog. */
+ migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ return NULL;
+ }
+
+- ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ g_free(name);
+ g_free(protocol_id);
+
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c 2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+
+ acct_name = xmlnode_get_attrib(bnode, "account");
+ protocol = xmlnode_get_attrib(bnode, "protocol");
+- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ proto = xmlnode_get_attrib(bnode, "proto");
+- proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+
+ if (!acct_name || (!proto && !protocol))
+ return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c 2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ {
+ PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ const char *prpl_id = purple_account_get_protocol_id(account);
+-
+- if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+- {
+- int checksum = purple_blist_node_get_int(node, "icon_checksum");
+- if (checksum != 0)
+- {
+- char *checksum_str = g_strdup_printf("%i", checksum);
+- purple_blist_node_remove_setting(node, "icon_checksum");
+- purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+- g_free(checksum_str);
+- }
+- }
+ }
+ }
+ }
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h 2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+ * can be used to jump backward in the file if the protocol detects
+ * that some bit of data needs to be resent or has been sent twice.
+ *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+ * @param xfer The file transfer.
+ * @param bytes_sent The new current position in the file. If we're
+ * sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h 2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin purple_init_gg_plugin
+ #define gaim_init_jabber_plugin purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin purple_init_sametime_plugin
+-#define gaim_init_msn_plugin purple_init_msn_plugin
+-#define gaim_init_novell_plugin purple_init_novell_plugin
+-#define gaim_init_qq_plugin purple_init_qq_plugin
+ #define gaim_init_simple_plugin purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin purple_init_aim_plugin
+-#define gaim_init_icq_plugin purple_init_icq_plugin
+
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h 2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+ *
+ * The Singular/Plural/Number ngettext dummy definition below was
+ * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+ */
+ #ifdef ENABLE_NLS
+ # include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c 2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ g_object_set(G_OBJECT(session->session),
+ "no-rtcp-timeout", 0, NULL);
+
+- /*
+- * Hack to make x264 work with Gmail video.
+- */
+- if (is_nice && !strcmp(sess_id, "google-video")) {
+- FsElementAddedNotifier *notifier =
+- fs_element_added_notifier_new();
+- g_signal_connect(G_OBJECT(notifier), "element-added",
+- G_CALLBACK(gst_element_added_cb), NULL);
+- fs_element_added_notifier_add(notifier,
+- GST_BIN(priv->conference));
+- }
+-
+ session->id = g_strdup(sess_id);
+ session->backend = self;
+ session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c 2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME N_("Psychic Mode")
+ #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \
+- " users begin to message you. This works for" \
+- " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++ " users begin to message you. This works for XMPP")
+ #define PLUGIN_AUTHOR "Christopher O'Brien <siege@preoccupied.net>"
+
+
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c 2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ g_free(data->account_name);
+ data->account_name = g_strdup(buffer);
+ tmp = data->protocol_id;
+- data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ g_free(tmp);
+ }
+ else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c 2013-08-17 00:14:13.334946817 -0300
+@@ -320,7 +320,7 @@
+ xmlnode_set_namespace(auth, NS_XMPP_SASL);
+ xmlnode_set_attrib(auth, "mechanism", js->current_mech);
+
+- xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++ xmlnode_set_attrib(auth, "xmlns:ga", "");
+ xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+
+ if (clientout) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c 2013-08-17 00:19:44.801822370 -0300
+@@ -40,7 +40,7 @@
+ auth = xmlnode_new("auth");
+ xmlnode_set_namespace(auth, NS_XMPP_SASL);
+
+- xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth");
++ xmlnode_set_attrib(auth, "xmlns:ga", "");
+ xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true");
+
+ response = g_string_new("");
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/buddy.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/buddy.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c 2013-08-17 00:22:49.080836449 -0300
+@@ -38,7 +38,6 @@
+ #include "xdata.h"
+ #include "pep.h"
+ #include "adhoccommands.h"
+-#include "google/google.h"
+
+ typedef struct {
+ long idle_seconds;
+@@ -945,17 +944,7 @@
+
+ /* Republish our vcard if the photo is different than the server's */
+ if (js->initial_avatar_hash && !purple_strequal(vcard_hash, js->initial_avatar_hash)) {
+- /*
+- * Google Talk has developed the behavior that it will not accept
+- * a vcard set in the first 10 seconds (or so) of the connection;
+- * it returns an error (namespaces trimmed):
+- * <error code="500" type="wait"><internal-server-error/></error>.
+- */
+- if (js->googletalk)
+- js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb,
+- js);
+- else
+- jabber_set_info(js->gc, purple_account_get_user_info(account));
++ jabber_set_info(js->gc, purple_account_get_user_info(account));
+ } else if (vcard_hash) {
+ /* A photo is in the vCard. Advertise its hash */
+ js->avatar_hash = vcard_hash;
+@@ -1861,13 +1850,6 @@
+ NULL, NULL);
+ m = g_list_append(m, act);
+ }
+-
+- if (js->googletalk) {
+- act = purple_menu_action_new(_("Initiate _Chat"),
+- PURPLE_CALLBACK(google_buddy_node_chat),
+- NULL, NULL);
+- m = g_list_append(m, act);
+- }
+
+ /*
+ * This if-condition implements parts of XEP-0100: Gateway Interaction
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/disco.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/disco.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c 2013-08-27 22:49:34.275219711 -0300
+@@ -30,9 +30,6 @@
+ #include "adhoccommands.h"
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/gmail.h"
+-#include "google/jingleinfo.h"
+ #include "iq.h"
+ #include "jabber.h"
+ #include "jingle/jingle.h"
+@@ -142,44 +139,6 @@
+ xmlnode_set_attrib(feature, "var", feat->namespace);
+ }
+ }
+-#ifdef USE_VV
+- } else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) {
+- /*
+- * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+- * where we add <c/> to the <presence/>) for the Google Talk
+- * clients that don't actually check disco#info features.
+- *
+- * This specific feature is redundant but is what
+- * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+- * advertises as 'voice-v1'.
+- */
+- xmlnode *feature = xmlnode_new_child(query, "feature");
+- xmlnode_set_attrib(feature, "var", NS_GOOGLE_VOICE);
+- } else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) {
+- /*
+- * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+- * where we add <c/> to the <presence/>) for the Google Talk
+- * clients that don't actually check disco#info features.
+- *
+- * This specific feature is redundant but is what
+- * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+- * advertises as 'video-v1'.
+- */
+- xmlnode *feature = xmlnode_new_child(query, "feature");
+- xmlnode_set_attrib(feature, "var", NS_GOOGLE_VIDEO);
+- } else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) {
+- /*
+- * HUGE HACK! We advertise this ext (see jabber_presence_create_js
+- * where we add <c/> to the <presence/>) for the Google Talk
+- * clients that don't actually check disco#info features.
+- *
+- * This specific feature is redundant but is what
+- * node='http://mail.google.com/xmpp/client/caps', ver='1.1'
+- * advertises as 'camera-v1'.
+- */
+- xmlnode *feature = xmlnode_new_child(query, "feature");
+- xmlnode_set_attrib(feature, "var", NS_GOOGLE_CAMERA);
+-#endif
+ } else {
+ xmlnode *error, *inf;
+
+@@ -419,7 +378,7 @@
+
+ }
+
+-/* should probably share this code with google.c, or maybe from 2.7.0
++/* maybe from 2.7.0
+ introduce an abstracted hostname -> IP function in dns.c */
+ static void
+ jabber_disco_stun_lookup_cb(GSList *hosts, gpointer data,
+@@ -538,16 +497,7 @@
+
+ g_free(js->server_name);
+ js->server_name = g_strdup(name);
+- if (!strcmp(name, "Google Talk")) {
+- purple_debug_info("jabber", "Google Talk!\n");
+- js->googletalk = TRUE;
+-
+- /* autodiscover stun and relays */
+- if (purple_network_get_stun_ip() == NULL ||
+- purple_strequal(purple_network_get_stun_ip(), "")) {
+- jabber_google_send_jingle_info(js);
+- }
+- } else if (purple_network_get_stun_ip() == NULL ||
++ if (purple_network_get_stun_ip() == NULL ||
+ purple_strequal(purple_network_get_stun_ip(), "")) {
+ js->srv_query_data =
+ purple_srv_resolve_account(
+@@ -565,12 +515,7 @@
+ if (!var)
+ continue;
+
+- if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) {
+- js->server_caps |= JABBER_CAP_GMAIL_NOTIFY;
+- jabber_gmail_init(js);
+- } else if (!strcmp(NS_GOOGLE_ROSTER, var)) {
+- js->server_caps |= JABBER_CAP_GOOGLE_ROSTER;
+- } else if (!strcmp("http://jabber.org/protocol/commands", var)) {
++ if (!strcmp("http://jabber.org/protocol/commands", var)) {
+ js->server_caps |= JABBER_CAP_ADHOC;
+ } else if (!strcmp(NS_SIMPLE_BLOCKING, var)) {
+ js->server_caps |= JABBER_CAP_BLOCKING;
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/iq.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/iq.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c 2013-08-17 00:19:05.943958296 -0300
+@@ -28,10 +28,6 @@
+
+ #include "buddy.h"
+ #include "disco.h"
+-#include "google/gmail.h"
+-#include "google/google.h"
+-#include "google/jingleinfo.h"
+-#include "google/google_session.h"
+ #include "iq.h"
+ #include "jingle/jingle.h"
+ #include "oob.h"
+@@ -461,13 +457,7 @@
+ signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+
+ jabber_iq_register_handler("jingle", JINGLE, jingle_parse);
+- jabber_iq_register_handler("mailbox", NS_GOOGLE_MAIL_NOTIFY,
+- jabber_gmail_poke);
+- jabber_iq_register_handler("new-mail", NS_GOOGLE_MAIL_NOTIFY,
+- jabber_gmail_poke);
+ jabber_iq_register_handler("ping", NS_PING, jabber_ping_parse);
+- jabber_iq_register_handler("query", NS_GOOGLE_JINGLE_INFO,
+- jabber_google_handle_jingle_info);
+ jabber_iq_register_handler("query", NS_BYTESTREAMS,
+ jabber_bytestreams_parse);
+ jabber_iq_register_handler("query", NS_DISCO_INFO, jabber_disco_info_parse);
+@@ -481,8 +471,6 @@
+ jabber_iq_register_handler("query", "jabber:iq:version",
+ jabber_iq_version_parse);
+ #ifdef USE_VV
+- jabber_iq_register_handler("session", NS_GOOGLE_SESSION,
+- jabber_google_session_parse);
+ #endif
+ jabber_iq_register_handler("block", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+ jabber_iq_register_handler("unblock", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c 2013-08-27 23:23:55.191865468 -0300
+@@ -51,9 +51,6 @@
+ #include "chat.h"
+ #include "data.h"
+ #include "disco.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+-#include "google/google_session.h"
+ #include "ibb.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -1003,9 +1000,6 @@
+ js->stun_ip = NULL;
+ js->stun_port = 0;
+ js->stun_query = NULL;
+- js->google_relay_token = NULL;
+- js->google_relay_host = NULL;
+- js->google_relay_requests = NULL;
+
+ /* if we are idle, set idle-ness on the stream (this could happen if we get
+ disconnected and the reconnects while being idle. I don't think it makes
+@@ -1679,8 +1673,6 @@
+ }
+ g_free(js->server_name);
+ g_free(js->certificate_CN);
+- g_free(js->gmail_last_time);
+- g_free(js->gmail_last_tid);
+ g_free(js->old_msg);
+ g_free(js->old_avatarhash);
+ g_free(js->old_artist);
+@@ -1709,21 +1701,6 @@
+ js->stun_query = NULL;
+ }
+
+- /* remove Google relay-related stuff */
+- g_free(js->google_relay_token);
+- g_free(js->google_relay_host);
+- if (js->google_relay_requests) {
+- while (js->google_relay_requests) {
+- PurpleUtilFetchUrlData *url_data =
+- (PurpleUtilFetchUrlData *) js->google_relay_requests->data;
+- purple_util_fetch_url_cancel(url_data);
+- g_free(url_data);
+- js->google_relay_requests =
+- g_list_delete_link(js->google_relay_requests,
+- js->google_relay_requests);
+- }
+- }
+-
+ g_free(js);
+
+ gc->proto_data = NULL;
+@@ -1916,12 +1893,6 @@
+ if (js == NULL)
+ return;
+
+- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+- {
+- jabber_google_roster_add_deny(js, who);
+- return;
+- }
+-
+ if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ {
+ purple_notify_error(NULL, _("Server doesn't support blocking"),
+@@ -1952,12 +1923,6 @@
+ if (js == NULL)
+ return;
+
+- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+- {
+- jabber_google_roster_rem_deny(js, who);
+- return;
+- }
+-
+ if (!(js->server_caps & JABBER_CAP_BLOCKING))
+ return;
+
+@@ -3310,13 +3275,7 @@
+ jbr = jabber_buddy_find_resource(jb, resource);
+ g_free(resource);
+
+- if (type & PURPLE_MEDIA_AUDIO &&
+- !jabber_resource_has_capability(jbr,
+- JINGLE_APP_RTP_SUPPORT_AUDIO) &&
+- jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE))
+- return jabber_google_session_initiate(js, who, type);
+- else
+- return jingle_rtp_initiate_media(js, who, type);
++ return jingle_rtp_initiate_media(js, who, type);
+ }
+
+ jb = jabber_buddy_find(js, who, FALSE);
+@@ -3500,11 +3459,6 @@
+ caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION |
+ PURPLE_MEDIA_CAPS_CHANGE_DIRECTION;
+ }
+- if (jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) {
+- caps |= PURPLE_MEDIA_CAPS_AUDIO;
+- if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO))
+- caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO;
+- }
+
+ total |= caps;
+ }
+@@ -3869,10 +3823,6 @@
+ jabber_add_feature(JINGLE, 0);
+
+ #ifdef USE_VV
+- jabber_add_feature(NS_GOOGLE_PROTOCOL_SESSION, jabber_audio_enabled);
+- jabber_add_feature(NS_GOOGLE_VOICE, jabber_audio_enabled);
+- jabber_add_feature(NS_GOOGLE_VIDEO, jabber_video_enabled);
+- jabber_add_feature(NS_GOOGLE_CAMERA, jabber_video_enabled);
+ jabber_add_feature(JINGLE_APP_RTP, 0);
+ jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
+ jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.h 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h 2013-08-17 00:10:38.778345348 -0300
+@@ -36,12 +36,6 @@
+ JABBER_CAP_IQ_SEARCH = 1 << 7,
+ JABBER_CAP_IQ_REGISTER = 1 << 8,
+
+- /* Google Talk extensions:
+- * http://code.google.com/apis/talk/jep_extensions/extensions.html
+- */
+- JABBER_CAP_GMAIL_NOTIFY = 1 << 9,
+- JABBER_CAP_GOOGLE_ROSTER = 1 << 10,
+-
+ JABBER_CAP_PING = 1 << 11,
+ JABBER_CAP_ADHOC = 1 << 12,
+ JABBER_CAP_BLOCKING = 1 << 13,
+@@ -195,12 +189,8 @@
+ gboolean reinit;
+
+ JabberCapabilities server_caps;
+- gboolean googletalk;
+ char *server_name;
+
+- char *gmail_last_time;
+- char *gmail_last_tid;
+-
+ char *serverFQDN;
+
+ #ifdef HAVE_CYRUS_SASL
+@@ -276,12 +266,6 @@
+ gchar *stun_ip;
+ int stun_port;
+ PurpleDnsQueryData *stun_query;
+-
+- /* stuff for Google's relay handling */
+- gchar *google_relay_token;
+- gchar *google_relay_host;
+- GList *google_relay_requests; /* the HTTP requests to get */
+- /* relay info */
+ };
+
+ typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c 2013-08-17 00:17:51.991679891 -0300
+@@ -486,13 +486,11 @@
+
+ if (has_account_stun) {
+ purple_debug_info("jabber",
+- "setting param stun-ip for stream using Google auto-config: %s\n",
+ js->stun_ip);
+ params[next_index].name = "stun-ip";
+ g_value_init(&params[next_index].value, G_TYPE_STRING);
+ g_value_set_string(&params[next_index].value, js->stun_ip);
+ purple_debug_info("jabber",
+- "setting param stun-port for stream using Google auto-config: %d\n",
+ js->stun_port);
+ next_index++;
+ params[next_index].name = "stun-port";
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h 2013-08-27 23:02:43.456476444 -0300
+@@ -79,8 +79,7 @@
+ void jingle_terminate_sessions(JabberStream *js);
+
+ #ifdef USE_VV
+-/* create a GParam array given autoconfigured STUN (and later perhaps TURN).
+- if google_talk is TRUE, set compatability mode to GOOGLE_TALK */
++/* create a GParam array given autoconfigured STUN (and later perhaps TURN).*/
+ GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip,
+ guint relay_udp, guint relay_tcp, guint relay_ssltcp,
+ const gchar *relay_username, const gchar *relay_password, guint *num_params);
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c 2013-08-17 00:13:06.222881329 -0300
+@@ -41,7 +41,6 @@
+ #include "si.h"
+ #include "message.h"
+ #include "presence.h"
+-#include "google/google.h"
+ #include "pep.h"
+ #include "usermood.h"
+ #include "usertune.h"
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am 2013-08-17 00:18:17.592468560 -0300
+@@ -27,20 +27,6 @@
+ data.h \
+ disco.c \
+ disco.h \
+- google/gmail.c \
+- google/gmail.h \
+- google/google.c \
+- google/google.h \
+- google/google_presence.c \
+- google/google_presence.h \
+- google/google_roster.c \
+- google/google_roster.h \
+- google/google_session.c \
+- google/google_session.h \
+- google/jingleinfo.c \
+- google/jingleinfo.h \
+- google/relay.c \
+- google/relay.h \
+ ibb.c \
+ ibb.h \
+ iq.c \
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in 2013-02-11 07:17:20.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in 2013-08-17 00:12:44.605549467 -0300
+@@ -104,12 +104,7 @@
+ auth.h auth_digest_md5.c auth_digest_md5.h auth_plain.c \
+ auth_scram.c auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c \
+ caps.h chat.c chat.h data.c data.h disco.c disco.h \
+- google/gmail.c google/gmail.h google/google.c google/google.h \
+- google/google_presence.c google/google_presence.h \
+- google/google_roster.c google/google_roster.h \
+- google/google_session.c google/google_session.h \
+- google/jingleinfo.c google/jingleinfo.h google/relay.c \
+- google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++ ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ jingle/jingle.c jingle/jingle.h jingle/content.c \
+ jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -126,9 +121,7 @@
+ libjabber_la-auth_scram.lo libjabber_la-buddy.lo \
+ libjabber_la-bosh.lo libjabber_la-caps.lo libjabber_la-chat.lo \
+ libjabber_la-data.lo libjabber_la-disco.lo \
+- libjabber_la-gmail.lo libjabber_la-google.lo \
+- libjabber_la-google_presence.lo libjabber_la-google_roster.lo \
+- libjabber_la-google_session.lo libjabber_la-jingleinfo.lo \
++ libjabber_la-jingleinfo.lo \
+ libjabber_la-relay.lo libjabber_la-ibb.lo libjabber_la-iq.lo \
+ libjabber_la-jabber.lo libjabber_la-jingle.lo \
+ libjabber_la-content.lo libjabber_la-iceudp.lo \
+@@ -244,8 +237,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -307,8 +298,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -457,13 +446,8 @@
+ JABBERSOURCES = adhoccommands.c adhoccommands.h auth.c auth.h \
+ auth_digest_md5.c auth_digest_md5.h auth_plain.c auth_scram.c \
+ auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c caps.h \
+- chat.c chat.h data.c data.h disco.c disco.h google/gmail.c \
+- google/gmail.h google/google.c google/google.h \
+- google/google_presence.c google/google_presence.h \
+- google/google_roster.c google/google_roster.h \
+- google/google_session.c google/google_session.h \
+- google/jingleinfo.c google/jingleinfo.h google/relay.c \
+- google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
++ chat.c chat.h data.c data.h disco.c disco.h \
++ ibb.c ibb.h iq.c iq.h jabber.c jabber.h \
+ jingle/jingle.c jingle/jingle.h jingle/content.c \
+ jingle/content.h jingle/iceudp.c jingle/iceudp.h \
+ jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \
+@@ -600,11 +584,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-content.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-data.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-disco.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-gmail.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_presence.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_roster.Plo@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_session.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-ibb.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iceudp.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iq.Plo@am__quote@
+@@ -731,55 +710,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-disco.lo `test -f 'disco.c' || echo '$(srcdir)/'`disco.c
+
+-libjabber_la-gmail.lo: google/gmail.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-gmail.lo -MD -MP -MF $(DEPDIR)/libjabber_la-gmail.Tpo -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-gmail.Tpo $(DEPDIR)/libjabber_la-gmail.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/gmail.c' object='libjabber_la-gmail.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c
+-
+-libjabber_la-google.lo: google/google.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google.Tpo -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google.Tpo $(DEPDIR)/libjabber_la-google.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google.c' object='libjabber_la-google.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c
+-
+-libjabber_la-google_presence.lo: google/google_presence.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_presence.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_presence.Tpo -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_presence.Tpo $(DEPDIR)/libjabber_la-google_presence.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_presence.c' object='libjabber_la-google_presence.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c
+-
+-libjabber_la-google_roster.lo: google/google_roster.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_roster.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_roster.Tpo -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_roster.Tpo $(DEPDIR)/libjabber_la-google_roster.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_roster.c' object='libjabber_la-google_roster.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c
+-
+-libjabber_la-google_session.lo: google/google_session.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_session.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_session.Tpo -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_session.Tpo $(DEPDIR)/libjabber_la-google_session.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_session.c' object='libjabber_la-google_session.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c
+-
+-libjabber_la-jingleinfo.lo: google/jingleinfo.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-jingleinfo.lo -MD -MP -MF $(DEPDIR)/libjabber_la-jingleinfo.Tpo -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-jingleinfo.Tpo $(DEPDIR)/libjabber_la-jingleinfo.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/jingleinfo.c' object='libjabber_la-jingleinfo.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c
+-
+-libjabber_la-relay.lo: google/relay.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-relay.lo -MD -MP -MF $(DEPDIR)/libjabber_la-relay.Tpo -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-relay.Tpo $(DEPDIR)/libjabber_la-relay.Plo
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/relay.c' object='libjabber_la-relay.lo' libtool=yes @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c
+-
+ libjabber_la-ibb.lo: ibb.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-ibb.lo -MD -MP -MF $(DEPDIR)/libjabber_la-ibb.Tpo -c -o libjabber_la-ibb.lo `test -f 'ibb.c' || echo '$(srcdir)/'`ibb.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-ibb.Tpo $(DEPDIR)/libjabber_la-ibb.Plo
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/message.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/message.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c 2013-08-17 00:20:08.115874207 -0300
+@@ -30,7 +30,6 @@
+ #include "buddy.h"
+ #include "chat.h"
+ #include "data.h"
+-#include "google/google.h"
+ #include "message.h"
+ #include "xmlnode.h"
+ #include "pep.h"
+@@ -151,11 +150,6 @@
+ jbr->thread_id = g_strdup(jbr->thread_id);
+ }
+
+- if (jm->js->googletalk && jm->xhtml == NULL) {
+- char *tmp = jm->body;
+- jm->body = jabber_google_format_to_html(jm->body);
+- g_free(tmp);
+- }
+ serv_got_im(gc, jm->from, jm->xhtml ? jm->xhtml : jm->body, 0, jm->sent);
+ }
+
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h
+--- pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h 2013-08-17 00:11:17.449534779 -0300
+@@ -95,18 +95,4 @@
+ /* XEP-0264 File Transfer Thumbnails (Thumbs) */
+ #define NS_THUMBS "urn:xmpp:thumbs:0"
+
+-/* Google extensions */
+-#define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1"
+-#define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1"
+-#define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1"
+-#define NS_GOOGLE_JINGLE_INFO "google:jingleinfo"
+-
+-#define NS_GOOGLE_MAIL_NOTIFY "google:mail:notify"
+-#define NS_GOOGLE_ROSTER "google:roster"
+-
+-#define NS_GOOGLE_PROTOCOL_SESSION "http://www.google.com/xmpp/protocol/session"
+-#define NS_GOOGLE_SESSION "http://www.google.com/session"
+-#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone"
+-#define NS_GOOGLE_SESSION_VIDEO "http://www.google.com/session/video"
+-
+ #endif /* PURPLE_JABBER_NAMESPACES_H_ */
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/presence.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/presence.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c 2013-08-17 00:16:58.436696950 -0300
+@@ -34,8 +34,6 @@
+
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_presence.h"
+ #include "presence.h"
+ #include "iq.h"
+ #include "jutil.h"
+@@ -208,9 +206,6 @@
+ /* changing the buzz state has to trigger a re-broadcasting of the presence for caps */
+
+ tune = purple_presence_get_status(p, "tune");
+- if (js->googletalk && !stripped && purple_status_is_active(tune)) {
+- stripped = jabber_google_presence_outgoing(tune);
+- }
+
+ #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \
+ (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b)))
+@@ -361,11 +356,6 @@
+ #ifdef USE_VV
+ /*
+ * MASSIVE HUGE DISGUSTING HACK
+- * This is a huge hack. As far as I can tell, Google Talk's gmail client
+- * doesn't bother to check the actual features we advertise; they
+- * just assume that if we specify a 'voice-v1' ext (ignoring that
+- * these are to be assigned no semantic value), we support receiving voice
+- * calls.
+ *
+ * Ditto for 'video-v1'.
+ */
+@@ -883,7 +873,6 @@
+
+ jbr = jabber_buddy_find_resource(presence->jb, NULL);
+ if (jbr) {
+- jabber_google_presence_incoming(js, buddy_name, jbr);
+ purple_prpl_got_user_status(account, buddy_name,
+ jabber_buddy_state_get_status_id(jbr->state),
+ "priority", jbr->priority,
+diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/roster.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c
+--- pidgin-2.10.7/libpurple/protocols/jabber/roster.c 2013-02-11 07:16:52.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c 2013-08-17 00:09:16.245807467 -0300
+@@ -27,8 +27,6 @@
+
+ #include "buddy.h"
+ #include "chat.h"
+-#include "google/google.h"
+-#include "google/google_roster.h"
+ #include "presence.h"
+ #include "roster.h"
+ #include "iq.h"
+@@ -83,11 +81,6 @@
+ iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster");
+ query = xmlnode_get_child(iq->node, "query");
+
+- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+- xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+- xmlnode_set_attrib(query, "gr:ext", "2");
+- }
+-
+ jabber_iq_set_callback(iq, roster_request_cb, NULL);
+ jabber_iq_send(iq);
+ }
+@@ -244,10 +237,6 @@
+ } else {
+ GSList *groups = NULL;
+
+- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER)
+- if (!jabber_google_roster_incoming(js, item))
+- continue;
+-
+ for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) {
+ char *group_name = xmlnode_get_data(group);
+
+@@ -349,11 +338,6 @@
+
+ g_slist_free(groups);
+
+- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) {
+- jabber_google_roster_outgoing(js, query, item);
+- xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER);
+- xmlnode_set_attrib(query, "gr:ext", "2");
+- }
+ jabber_iq_send(iq);
+ }
+
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am 2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in 2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in 2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h 2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+
+ /**
+ * Notify on new mail.
+- *
+- * MSN and Yahoo notify you when you have new mail.
+ */
+ OPT_PROTO_MAIL_CHECK = 0x00000020,
+
+ /**
+ * Images in IMs.
+- *
+- * Oscar lets you send images in direct IMs.
+ */
+ OPT_PROTO_IM_IMAGE = 0x00000040,
+
+@@ -184,16 +180,13 @@
+ /**
+ * Allows font size to be specified in sane point size
+ *
+- * Probably just XMPP and Y!M
++ * Probably just XMPP
+ */
+ OPT_PROTO_USE_POINTSIZE = 0x00000100,
+
+ /**
+ * Set the Register button active even when the username has not
+ * been specified.
+- *
+- * Gadu-Gadu doesn't need a username to register new account (because
+- * usernames are assigned by the server).
+ */
+ OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+
+@@ -467,9 +460,7 @@
+ void (*convo_closed)(PurpleConnection *, const char *who);
+
+ /**
+- * Convert the username @a who to its canonical form. (For example,
+- * AIM treats "fOo BaR" and "foobar" as the same user; this function
+- * should return the same normalized string for both of those.)
++ * Convert the username @a who to its canonical form.
+ */
+ const char *(*normalize)(const PurpleAccount *, const char *who);
+
+@@ -923,7 +914,7 @@
+ * @param who Whose attention to request.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * of the attention request command to send. 0 if prpl only defines one
+- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * , but some protocols define more.
+ *
+ * Note that you can't send arbitrary PurpleAttentionType's, because there is
+ * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler 2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+ cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+
+-
+-def aim(uri):
+- protocol = "prpl-aim"
+- match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid aim URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("account", "")
+- screenname = params.get("screenname", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "goim":
+- goim(account, screenname, params.get("message"))
+- elif command.lower() == "gochat":
+- gochat(account, params)
+- elif command.lower() == "addbuddy":
+- addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+- protocol = "prpl-gg"
+- match = re.match(r"^gg:(.*)", uri)
+- if not match:
+- print "Invalid gg URI: %s" % uri
+- return
+-
+- screenname = urllib.unquote_plus(match.group(1))
+- account = findaccount(protocol)
+- goim(account, screenname)
+-
+-def icq(uri):
+- protocol = "prpl-icq"
+- match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid icq URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("account", "")
+- screenname = params.get("screenname", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "goim":
+- goim(account, screenname, params.get("message"))
+- elif command.lower() == "gochat":
+- gochat(account, params)
+- elif command.lower() == "addbuddy":
+- addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+ protocol = "prpl-irc"
+ match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+ channel = "#" + channel
+ gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+
+-def msnim(uri):
+- protocol = "prpl-msn"
+- match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid msnim URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- screenname = params.get("contact", "")
+-
+- account = findaccount(protocol)
+-
+- if command.lower() == "chat":
+- goim(account, screenname)
+- elif command.lower() == "add":
+- addbuddy(account, screenname)
+-
+-def myim(uri):
+- protocol = "prpl-myspace"
+- print "TODO: send uri: ", uri
+- assert False, "Not implemented"
+-
+ def sip(uri):
+ protocol = "prpl-simple"
+ match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+ else:
+ goim(account, screenname)
+
+-def gtalk(uri):
+- protocol = "prpl-jabber"
+- match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid gtalk URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("from_jid", "")
+- jid = params.get("jid", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "chat":
+- goim(account, jid)
+- elif command.lower() == "call":
+- # XXX V&V prompt to establish call
+- goim(account, jid)
+-
+-def ymsgr(uri):
+- protocol = "prpl-yahoo"
+- match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+- if not match:
+- print "Invalid ymsgr URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- screenname = urllib.unquote_plus(match.group(3))
+- paramstring = match.group(5)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+-
+- account = findaccount(protocol)
+-
+- if command.lower() == "sendim":
+- goim(account, screenname, params.get("m"))
+- elif command.lower() == "chat":
+- gochat(account, {"room": screenname})
+- elif command.lower() == "addfriend":
+- addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+ if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+ print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c 2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ const char *protocol;
+ acct_name = xmlnode_get_data(node);
+ protocol = xmlnode_get_attrib(node, "protocol");
+- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ if ((acct_name != NULL) && (protocol != NULL))
+ ret->account = purple_accounts_find(acct_name, protocol);
+ g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h 2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+ * @param who Whose attention to request.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * of the attention request command to send. 0 if prpl only defines one
+- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * , but some protocols define more.
+ *
+ * Note that you can't send arbitrary PurpleAttentionType's, because there is
+ * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h 2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+ * one of your AIM buddies has set himself as "away." You have a
+ * PurpleBuddy node for this person in your buddy list. Purple wants
+ * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL. The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+ * away message. PurpleStatuses are sometimes saved, depending on
+ * the context. The current PurpleStatuses associated with each of
+ * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c 2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ srunner_add_suite(sr, jabber_digest_md5_suite());
+ srunner_add_suite(sr, jabber_jutil_suite());
+ srunner_add_suite(sr, jabber_scram_suite());
+- srunner_add_suite(sr, oscar_util_suite());
+- srunner_add_suite(sr, yahoo_util_suite());
+ srunner_add_suite(sr, util_suite());
+ srunner_add_suite(sr, xmlnode_suite());
+
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am 2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ test_jabber_digest_md5.c \
+ test_jabber_jutil.c \
+ test_jabber_scram.c \
+- test_oscar_util.c \
+- test_yahoo_util.c \
+ test_util.c \
+ test_xmlnode.c \
+ $(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+
+ check_libpurple_LDADD=\
+ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+- $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+- $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ $(top_builddir)/libpurple/libpurple.la \
+ @CHECK_LIBS@ \
+ $(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in 2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+- test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+- test_yahoo_util.c test_util.c test_xmlnode.c \
++ test_jabber_jutil.c test_jabber_scram.c \
++ test_util.c test_xmlnode.c \
+ $(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS = \
+ @HAVE_CHECK_TRUE@ check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@ check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@ check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@ test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@ test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@ test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@ test_oscar_util.c \
+-@HAVE_CHECK_TRUE@ test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@ test_util.c \
+ @HAVE_CHECK_TRUE@ test_xmlnode.c \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@ @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@ $(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c 2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+- "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++ "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c 2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+
+ START_TEST(test_jabber_id_new)
+ {
+- assert_valid_jid("gmail.com");
+- assert_valid_jid("gmail.com/Test");
+- assert_valid_jid("gmail.com/Test@");
+- assert_valid_jid("gmail.com/@");
+- assert_valid_jid("gmail.com/Test@alkjaweflkj");
+- assert_valid_jid("mark.doliner@gmail.com");
+- assert_valid_jid("mark.doliner@gmail.com/Test12345");
+- assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+- assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++ assert_valid_jid("mail.com");
++ assert_valid_jid("mail.com/Test");
++ assert_valid_jid("mail.com/Test@");
++ assert_valid_jid("mail.com/@");
++ assert_valid_jid("mail.com/Test@alkjaweflkj");
++ assert_valid_jid("mark.doliner@mail.com");
++ assert_valid_jid("mark.doliner@mail.com/Test12345");
++ assert_valid_jid("mark.doliner@mail.com/Test@12345");
++ assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ assert_valid_jid("わいど@conference.jabber.org");
+ assert_valid_jid("まりるーむ@conference.jabber.org");
+- assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+- assert_valid_jid("mark.doliner@gmail/stuff.org");
++ assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++ assert_valid_jid("mark.doliner@mail/stuff.org");
+ assert_valid_jid("stuart@nödåtXäYZ.se");
+ assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ assert_valid_jid("pa=ul@10.0.42.230");
+ assert_valid_jid("pa,ul@10.0.42.230");
+
+- assert_invalid_jid("@gmail.com");
+- assert_invalid_jid("@@gmail.com");
+- assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+- assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+- assert_invalid_jid("@gmail.com/Test@12345");
++ assert_invalid_jid("@mail.com");
++ assert_invalid_jid("@@mail.com");
++ assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++ assert_invalid_jid("mark@doliner@mail.com/Test12345");
++ assert_invalid_jid("@mail.com/Test@12345");
+ assert_invalid_jid("/Test@12345");
+ assert_invalid_jid("mark.doliner@");
+ assert_invalid_jid("mark.doliner/");
+- assert_invalid_jid("mark.doliner@gmail_stuff.org");
+- assert_invalid_jid("mark.doliner@gmail[stuff.org");
+- assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++ assert_invalid_jid("mark.doliner@mail_stuff.org");
++ assert_invalid_jid("mark.doliner@mail[stuff.org");
++ assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ assert_invalid_jid("paul@[::1]124");
+ assert_invalid_jid("paul@2[::1]124/as");
+ assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h 2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c 2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+ * is set to TRUE if this URL is https, otherwise it is set to
+ * FALSE. But that change will break the API.
+ *
+- * This is important for Yahoo! web messenger login. They now
+- * force https login, and if you access the web messenger login
++ * They now force https login, and if you access the web messenger login
+ * page via http then it redirects you to the https version, but
+ * purple_util_fetch_url() ignores the "https" and attempts to
+ * fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ return buf;
+ }
+
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+- if (act && purple_strequal(protocol, "prpl-oscar")) {
+- int i;
+- for (i = 0; act[i] != '\0'; i++)
+- if (!isdigit(act[i]))
+- return "prpl-aim";
+- return "prpl-icq";
+- }
+- return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h 2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+ * Extracts a field of data from HTML.
+ *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+ *
+ * @param str The string to parse.
+ * @param len The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- * removed in 3.0.0. The aim/icq prpl split happened a long
+- * time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+ * Restore default signal handlers for signals which might reasonably have
+ * handlers. This should be called by a fork()'d child process, since child processes
+ * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c 2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ if (value == NULL)
+ value = purple_account_user_split_get_default_value(split);
+
+- /* Google Talk default domain hackery! */
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ item = gtk_menu_get_active(GTK_MENU(menu));
+- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++ if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ !strcmp(purple_account_user_split_get_text(split), _("Domain")))
+- value = "gmail.com";
+-
+- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+- !strcmp(purple_account_user_split_get_text(split), _("Domain")))
+- value = "chat.facebook.com";
++ value = "";
+
+ if (value != NULL)
+ gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+
+- if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+- !strcmp(opt_entry->setting, "connection_security"))
+- str_value = "opportunistic_tls";
+-
+ /* Loop through list of PurpleKeyValuePair items */
+ for (node = list; node != NULL; node = node->next) {
+ if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c 2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ char *temp_vcard;
+ char *s, *c;
+ char *alias = NULL;
+- GList *aims = NULL;
+- GList *icqs = NULL;
+- GList *yahoos = NULL;
+- GList *msns = NULL;
+ GList *jabbers = NULL;
+
+ s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ /* We only want to worry about a few fields here. */
+ if (!strcmp(field, "FN"))
+ alias = g_strdup(value);
+- else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+- !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+- !strcmp(field, "X-JABBER"))
++ else if (!strcmp(field, "X-JABBER"))
+ {
+ char **values = g_strsplit(value, ":", 0);
+ char **im;
+
+ for (im = values; *im != NULL; im++)
+ {
+- if (!strcmp(field, "X-AIM"))
+- aims = g_list_append(aims, g_strdup(*im));
+- else if (!strcmp(field, "X-ICQ"))
+- icqs = g_list_append(icqs, g_strdup(*im));
+- else if (!strcmp(field, "X-YAHOO"))
+- yahoos = g_list_append(yahoos, g_strdup(*im));
+- else if (!strcmp(field, "X-MSN"))
+- msns = g_list_append(msns, g_strdup(*im));
+- else if (!strcmp(field, "X-JABBER"))
++ if (!strcmp(field, "X-JABBER"))
+ jabbers = g_list_append(jabbers, g_strdup(*im));
+ }
+
+@@ -2195,18 +2181,13 @@
+
+ g_free(temp_vcard);
+
+- if (aims == NULL && icqs == NULL && yahoos == NULL &&
+- msns == NULL && jabbers == NULL)
++ if (jabbers == NULL)
+ {
+ g_free(alias);
+
+ return FALSE;
+ }
+
+- add_buddies_from_vcard("prpl-aim", group, aims, alias);
+- add_buddies_from_vcard("prpl-icq", group, icqs, alias);
+- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
+- add_buddies_from_vcard("prpl-msn", group, msns, alias);
+ add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+
+ g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c 2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ g_string_append(str, " <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c 2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+
+
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c 2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ command = g_strdup_printf("xdg-open %s", escaped);
+ g_free(tmp);
+ }
+- else if (purple_running_osx() == TRUE)
+- {
+- command = g_strdup_printf("open %s", escaped);
+- }
+ else if (!strcmp(web_browser, "epiphany") ||
+ !strcmp(web_browser, "galeon"))
+ {
+@@ -1289,30 +1285,31 @@
+ {
+ command = g_strdup_printf("kfmclient openURL %s", escaped);
+ /*
+- * Does Konqueror have options to open in new tab
++ * Does Konqueror-libre have options to open in new tab
+ * and/or current window?
+ */
+ }
+- else if (!strcmp(web_browser, "mozilla") ||
+- !strcmp(web_browser, "mozilla-firebird") ||
+- !strcmp(web_browser, "firefox") ||
+- !strcmp(web_browser, "seamonkey"))
++ else if (!strcmp(web_browser, "iceweasel") ||
++ !strcmp(web_browser, "icecat") ||
++ !strcmp(web_browser, "iceape"))
+ {
+ char *args = "";
+
+ command = g_strdup_printf("%s %s", web_browser, escaped);
+
+ /*
+- * Firefox 0.9 and higher require a "-a firefox" option when
++ * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ * using -remote commands. This breaks older versions of
+ * mozilla. So we include this other handly little string
+- * when calling firefox. If the API for remote calls changes
+- * any more in firefox then firefox should probably be split
++ * when calling iceweasel. If the API for remote calls changes
++ * any more in iceweasel then iceweasel should probably be split
+ * apart from mozilla-firebird and mozilla... but this is good
+ * for now.
+ */
+- if (!strcmp(web_browser, "firefox"))
+- args = "-a firefox";
++ if (!strcmp(web_browser, "iceweasel"))
++ args = "-a iceweasel";
++ else if (!strcmp(web_browser, "icecat"))
++ args = "-a icecat";
+
+ if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ "openURL(%s)",
+ web_browser, args, escaped);
+ }
+- else if (!strcmp(web_browser, "netscape"))
+- {
+- command = g_strdup_printf("netscape %s", escaped);
+-
+- if (place == PIDGIN_BROWSER_NEW_WINDOW)
+- {
+- remote_command = g_strdup_printf("netscape -remote "
+- "openURL(%s,new-window)",
+- escaped);
+- }
+- else if (place == PIDGIN_BROWSER_CURRENT)
+- {
+- remote_command = g_strdup_printf("netscape -remote "
+- "openURL(%s)", escaped);
+- }
+- }
+- else if (!strcmp(web_browser, "opera"))
+- {
+- if (place == PIDGIN_BROWSER_NEW_WINDOW)
+- command = g_strdup_printf("opera -newwindow %s", escaped);
+- else if (place == PIDGIN_BROWSER_NEW_TAB)
+- command = g_strdup_printf("opera -newpage %s", escaped);
+- else if (place == PIDGIN_BROWSER_CURRENT)
+- {
+- remote_command = g_strdup_printf("opera -remote "
+- "openURL(%s)", escaped);
+- command = g_strdup_printf("opera %s", escaped);
+- }
+- else
+- command = g_strdup_printf("opera %s", escaped);
+-
+- }
+- else if (!strcmp(web_browser, "google-chrome"))
+- {
+- /* Google Chrome doesn't have command-line arguments that control the
+- * opening of links from external calls. This is controlled solely from
+- * a preference within Google Chrome. */
+- command = g_strdup_printf("google-chrome %s", escaped);
+- }
+- else if (!strcmp(web_browser, "chrome"))
+- {
+- /* Chromium doesn't have command-line arguments that control the
+- * opening of links from external calls. This is controlled solely from
+- * a preference within Chromium. */
+- command = g_strdup_printf("chrome %s", escaped);
+- }
+- else if (!strcmp(web_browser, "chromium-browser"))
++ else if (!strcmp(web_browser, "chromium"))
+ {
+- /* Chromium doesn't have command-line arguments that control the
++ /* Chromium-libre doesn't have command-line arguments that control the
+ * opening of links from external calls. This is controlled solely from
+- * a preference within Chromium. */
+- command = g_strdup_printf("chromium-browser %s", escaped);
++ * a preference within Chromium-libre. */
++ command = g_strdup_printf("chromium %s", escaped);
+ }
+ else if (!strcmp(web_browser, "custom"))
+ {
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c 2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+
+ /* Sorted reverse alphabetically */
+ static const struct browser possible_browsers[] = {
+- {N_("Seamonkey"), "seamonkey"},
+- {N_("Opera"), "opera"},
+- {N_("Netscape"), "netscape"},
+- {N_("Mozilla"), "mozilla"},
+- {N_("Konqueror"), "kfmclient"},
+- {N_("Google Chrome"), "google-chrome"},
+- /* Do not move the line below. Code below expects gnome-open to be in
+- * this list immediately after xdg-open! */
++ {N_("Iceape-libre"), "iceape"},
++ {N_("Konqueror-libre"), "kfmclient"},
+ {N_("Desktop Default"), "xdg-open"},
+ {N_("GNOME Default"), "gnome-open"},
+- {N_("Galeon"), "galeon"},
+- {N_("Firefox"), "firefox"},
+- {N_("Firebird"), "mozilla-firebird"},
+- {N_("Epiphany"), "epiphany"},
+- /* Translators: please do not translate "chromium-browser" here! */
+- {N_("Chromium (chromium-browser)"), "chromium-browser"},
+- /* Translators: please do not translate "chrome" here! */
+- {N_("Chromium (chrome)"), "chrome"}
++ {N_("Iceweasel-libre"), "iceweasel"},
++ {N_("Icecat"), "icecat"},
++ {N_("Epiphany-libre"), "epiphany"},
++ /* Translators: please do not translate "chromium" here! */
++ {N_("Chromium-libre (chromium)"), "chromium"},
+ };
+ static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300
+@@ -677,7 +677,6 @@
+ GdkPixbuf *pixbuf = NULL;
+ GtkSizeGroup *sg;
+ GList *p;
+- const char *gtalk_name = NULL, *facebook_name = NULL;
+ int i;
+
+ aop_menu = g_malloc0(sizeof(AopMenu));
+@@ -686,55 +685,12 @@
+ gtk_widget_show(aop_menu->menu);
+ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+- if (purple_find_prpl("prpl-jabber")) {
+- gtalk_name = _("Google Talk");
+- facebook_name = _("Facebook (XMPP)");
+- }
+-
+ for (p = purple_plugins_get_protocols(), i = 0;
+ p != NULL;
+ p = p->next, i++) {
+
+ plugin = (PurplePlugin *)p->data;
+
+- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
+- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+- "16", "google-talk.png", NULL);
+- GtkWidget *item;
+-
+- pixbuf = pidgin_pixbuf_new_from_file(filename);
+- g_free(filename);
+-
+- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
+- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
+-
+- if (pixbuf)
+- g_object_unref(pixbuf);
+-
+- gtalk_name = NULL;
+- i++;
+- }
+-
+- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
+- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+- "16", "facebook.png", NULL);
+- GtkWidget *item;
+-
+- pixbuf = pidgin_pixbuf_new_from_file(filename);
+- g_free(filename);
+-
+- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
+- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
+-
+- if (pixbuf)
+- g_object_unref(pixbuf);
+-
+- facebook_name = NULL;
+- i++;
+- }
+-
+ pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
+
+ gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c 2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ */
+ /* XXXX because otherwise gettext will see this string, even though it's
+ * in an #if 0 block. Remove the XXXX if you want to use this code.
+- * But, it really shouldn't be a Yahoo-specific string. ;) */
++ */
+ purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+
+- yahoo_doodle_command_send_request(gc, to);
+- yahoo_doodle_command_send_ready(gc, to);
+-
+ /* Insert this 'session' in the list. At this point, it's only a requested
+ * session.
+ */
+@@ -554,15 +551,13 @@
+ if(event->button == 1 && pixmap != NULL)
+ {
+ /* If the brush was never moved, express two sets of two deltas That's a
+- * 'point,' but not for Yahoo!
++ * 'point,'
+ */
+ /* if((event->x == LastX) && (event->y == LastY)) */
+ if(MotionCount == 0)
+ {
+ int index;
+
+- /* For Yahoo!, a (0 0) indicates the end of drawing */
+- /* FIXME: Yahoo Doodle specific! */
+ for(index = 0; index < 2; index++)
+ {
+ draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h 2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN 1
+ #define BRUSH_STATE_MOTION 2
+
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS 7
+
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am 2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ $(GTK_LIBS) \
+ $(top_builddir)/libpurple/libpurple.la
+
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ $(GTK_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GTKSPELL_CFLAGS) \
+- $(LIBXML_CFLAGS) \
+- $(INTGG_CFLAGS)
++ $(LIBXML_CFLAGS)
+ endif # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in 2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
+
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@ -DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@ -DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png :-!
+ shout.png >:o >:O
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ good.png :yes:
+ bad.png :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png C:-) c:-) C:) c:)
+ ! monkey.png :-(|) :(|) 8-|)
+ ! cyclops.png O-) o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-shout.png >:o
+-excited.png :-D :D
+-moneymouth.png :-$
+-foot-in-mouth.png :-!
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-love-over.png (U) (u)
+-msn.png (M) (m)
+-cat.png (@)
+-dog.png (&)
+-moon.png (S)
+-star.png (*)
+-film.png (~)
+-musical-note.png (8)
+-mail.png (E) (e)
+-rose.png (F) (f)
+-rose-dead.png (W) (w)
+-clock.png (O) (o)
+-kiss.png (K) (k)
+-present.png (G) (g)
+-cake.png (^)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-drink.png (D) (d)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-good.png (Y) (y)
+-bad.png (N) (n)
+-vampire.png :[ :-[
+-goat.png (nah)
+-sun.png (#)
+-rainbow.png (R) (r)
+-quiet.png :-#
+-teeth.png 8o|
+-glasses-nerdy.png 8-|
+-sarcastic.png ^o)
+-secret.png :-*
+-sick.png +o(
+-snail.png (sn)
+-turtle.png (tu)
+-plate.png (pl)
+-bowl.png (||)
+-pizza.png (pi)
+-soccerball.png (so)
+-car.png (au)
+-airplane.png (ap)
+-umbrella.png (um)
+-island.png (ip)
+-computer.png (co)
+-mobile.png (mp)
+-brb.png (brb)
+-rain.png (st)
+-highfive.png (h5)
+-coins.png (mo)
+-sheep.png (bah)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-bunny.png ('.')
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-handcuffs.png (%)
+-console.png (xx) (XX)
+-fingers-crossed.png (yn) (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-curl-lip.png /:~ /pz /curl_lip
+-desire.png /:* /se /desire
+-dazed.png /:| /dazed
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-bashful.png /:$ /hx /bashful
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-weep.png /:'( /dk /weep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-act-up.png /:P /tp /act_up
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-doctor.png /:# /feid /SARS
+-silly.png /:Q /zk /crazy
+-sick.png /:T /tu /vomit
+-snicker.png /;p /tx /titter
+-cute.png /;-D /ka /cute
+-disdain.png /;d /by /disdain
+-arrogant.png /;o /am /arrogant
+-starving.png /:g /jie /starving
+-sleepy.png /|-) /kun /sleepy
+-terror.png /:! /jk /terror
+-hot.png /:L /sweat
+-smirk.png /:> /hanx /smirk
+-soldier.png /:; /db /soldier
+-struggle.png /;f /fendou /struggle
+-curse.png /:-S /zhm /curse
+-question.png /? /yiw /question
+-quiet.png /;x /xu /shh
+-hypnotized.png /;@ /yun /dizzy
+-excruciating.png /:8 /zhem /excrutiating
+-freaked-out.png /;! /shuai /freaked_out
+-skeleton.png /!!! /kl /skeleton
+-hammer.png /xx /qiao /hammer
+-bye.png /bye /zj /bye
+-go-away.png /go /shan /go
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-jump.png /jump /tiao /jump
+-search.png /find /zhao /search
+-lashes.png /& /mm /beautiful_eyebrows
+-pig.png /pig /zt /pig
+-cat.png /cat /mm /cat
+-dog.png /dog /xg /dog
+-hug-left.png /hug /yb /hug
+-coins.png /$ /qianc /money
+-lamp.png /! /dp /lightbulb
+-bowl.png /cup /bei /cup
+-cake.png /cake /dg /cake
+-thunder.png /li /shd /lightning
+-bomb.png /bome /zhd /bomb
+-knife.png /kn /dao /knife
+-soccerball.png /footb /zq /soccer
+-musical-note.png /music /yy /music
+-poop.png /shit /bb /shit
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-pill.png /pill /yw /pill
+-rose.png /rose /mg /rose
+-wilt.png /fade /dx /wilt
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-love-over.png /break /xs /broken_heart
+-meeting.png /meeting /hy /meeting
+-present.png /gift /lw /gift
+-phone.png /phone /dh /phone
+-clock.png /time /sj /time
+-mail.png /email /yj /email
+-tv.png /TV /ds /TV
+-sun.png /sun /ty /sun
+-moon.png /moon /yl /moon
+-good.png /strong /qiang /thumbs_up
+-bad.png /weak /ruo /thumbs_down
+-handshake.png /share /ws /handshake
+-victory.png /v /shl /victory
+-beauty.png /<J> /mn /beauty
+-qq.png /<QQ> /qz /qq
+-blowkiss.png /<L> /fw /blow_kiss
+-angry.png /<O> /oh /angry
+-liquor.png /<B> /bj /baijiu
+-can.png /<U> /qsh /soda
+-watermelon.png /<W> /xigua /watermelon
+-rain.png /<!!> /xy /rain
+-cloudy.png /<~> /duoy /cloudy
+-snowman.png /<Z> /xr /snowman
+-star.png /<*> /xixing /star
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-laugh.png *JOKINGLY*
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kissed.png *KISSED*
+-stop.png *STOP*
+-kiss.png :-{} :-*
+-kissing.png *KISSING*
+-victory.png *YAHOO*
+-silly.png %)
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-bomb.png @=
+-thinking.png :-\\ :-/
+-good.png *THUMBS\ UP*
+-shout.png >:o >:O :-@
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-glasses-nerdy.png B)
+-bulgy-eyes.png %)
+-freaked-out.png :E
+-happy.png :) :-)
+-amorous.png :X
+-laugh.png :))
+-mohawk.png -:
+-mad-tongue.png X(
+-messed.png X)
+-glasses-nerdy.png Q)
+-doh.png :G
+-pirate.png P)
+-shocked.png :O
+-sidefrown.png :{
+-sinister.png :B
+-smirk.png :,
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme 2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme 2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png :-!
+ shout.png >:o >:O
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ good.png :yes:
+ bad.png :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png C:-) c:-) C:) c:)
+ ! monkey.png :-(|) :(|) 8-|)
+ ! cyclops.png O-) o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-shout.png >:o
+-excited.png :-D :D
+-moneymouth.png :-$
+-foot-in-mouth.png :-!
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-love-over.png (U) (u)
+-msn.png (M) (m)
+-cat.png (@)
+-dog.png (&)
+-moon.png (S)
+-star.png (*)
+-film.png (~)
+-musical-note.png (8)
+-mail.png (E) (e)
+-rose.png (F) (f)
+-rose-dead.png (W) (w)
+-clock.png (O) (o)
+-kiss.png (K) (k)
+-present.png (G) (g)
+-cake.png (^)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-drink.png (D) (d)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-good.png (Y) (y)
+-bad.png (N) (n)
+-vampire.png :[ :-[
+-goat.png (nah)
+-sun.png (#)
+-rainbow.png (R) (r)
+-quiet.png :-#
+-teeth.png 8o|
+-glasses-nerdy.png 8-|
+-sarcastic.png ^o)
+-secret.png :-*
+-sick.png +o(
+-snail.png (sn)
+-turtle.png (tu)
+-plate.png (pl)
+-bowl.png (||)
+-pizza.png (pi)
+-soccerball.png (so)
+-car.png (au)
+-airplane.png (ap)
+-umbrella.png (um)
+-island.png (ip)
+-computer.png (co)
+-mobile.png (mp)
+-brb.png (brb)
+-rain.png (st)
+-highfive.png (h5)
+-coins.png (mo)
+-sheep.png (bah)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-bunny.png ('.')
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-handcuffs.png (%)
+-console.png (xx) (XX)
+-fingers-crossed.png (yn) (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-curl-lip.png /:~ /pz /curl_lip
+-desire.png /:* /se /desire
+-dazed.png /:| /dazed
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-bashful.png /:$ /hx /bashful
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-weep.png /:'( /dk /weep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-act-up.png /:P /tp /act_up
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-doctor.png /:# /feid /SARS
+-silly.png /:Q /zk /crazy
+-sick.png /:T /tu /vomit
+-snicker.png /;p /tx /titter
+-cute.png /;-D /ka /cute
+-disdain.png /;d /by /disdain
+-arrogant.png /;o /am /arrogant
+-starving.png /:g /jie /starving
+-sleepy.png /|-) /kun /sleepy
+-terror.png /:! /jk /terror
+-hot.png /:L /sweat
+-smirk.png /:> /hanx /smirk
+-soldier.png /:; /db /soldier
+-struggle.png /;f /fendou /struggle
+-curse.png /:-S /zhm /curse
+-question.png /? /yiw /question
+-quiet.png /;x /xu /shh
+-hypnotized.png /;@ /yun /dizzy
+-excruciating.png /:8 /zhem /excrutiating
+-freaked-out.png /;! /shuai /freaked_out
+-skeleton.png /!!! /kl /skeleton
+-hammer.png /xx /qiao /hammer
+-bye.png /bye /zj /bye
+-go-away.png /go /shan /go
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-jump.png /jump /tiao /jump
+-search.png /find /zhao /search
+-lashes.png /& /mm /beautiful_eyebrows
+-pig.png /pig /zt /pig
+-cat.png /cat /mm /cat
+-dog.png /dog /xg /dog
+-hug-left.png /hug /yb /hug
+-coins.png /$ /qianc /money
+-lamp.png /! /dp /lightbulb
+-bowl.png /cup /bei /cup
+-cake.png /cake /dg /cake
+-thunder.png /li /shd /lightning
+-bomb.png /bome /zhd /bomb
+-knife.png /kn /dao /knife
+-soccerball.png /footb /zq /soccer
+-musical-note.png /music /yy /music
+-poop.png /shit /bb /shit
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-pill.png /pill /yw /pill
+-rose.png /rose /mg /rose
+-wilt.png /fade /dx /wilt
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-love-over.png /break /xs /broken_heart
+-meeting.png /meeting /hy /meeting
+-present.png /gift /lw /gift
+-phone.png /phone /dh /phone
+-clock.png /time /sj /time
+-mail.png /email /yj /email
+-tv.png /TV /ds /TV
+-sun.png /sun /ty /sun
+-moon.png /moon /yl /moon
+-good.png /strong /qiang /thumbs_up
+-bad.png /weak /ruo /thumbs_down
+-handshake.png /share /ws /handshake
+-victory.png /v /shl /victory
+-beauty.png /<J> /mn /beauty
+-qq.png /<QQ> /qz /qq
+-blowkiss.png /<L> /fw /blow_kiss
+-angry.png /<O> /oh /angry
+-liquor.png /<B> /bj /baijiu
+-can.png /<U> /qsh /soda
+-watermelon.png /<W> /xigua /watermelon
+-rain.png /<!!> /xy /rain
+-cloudy.png /<~> /duoy /cloudy
+-snowman.png /<Z> /xr /snowman
+-star.png /<*> /xixing /star
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-laugh.png *JOKINGLY*
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kissed.png *KISSED*
+-stop.png *STOP*
+-kiss.png :-{} :-*
+-kissing.png *KISSING*
+-victory.png *YAHOO*
+-silly.png %)
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-bomb.png @=
+-thinking.png :-\\ :-/
+-good.png *THUMBS\ UP*
+-shout.png >:o >:O :-@
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-glasses-nerdy.png B)
+-bulgy-eyes.png %)
+-freaked-out.png :E
+-happy.png :) :-)
+-amorous.png :X
+-laugh.png :))
+-mohawk.png -:
+-mad-tongue.png X(
+-messed.png X)
+-glasses-nerdy.png Q)
+-doh.png :G
+-pirate.png P)
+-shocked.png :O
+-sidefrown.png :{
+-sinister.png :B
+-smirk.png :,
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -38,7 +37,7 @@
+ angel.png O:-) o:-)
+ shut-mouth.png :-X
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ rose.png @->-- :rose:
+ phone.png :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png :| :-|
+
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-excited.png :-D :D
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-star.png (*)
+-musical-note.png (8)
+-rose.png (F) (f)
+-kiss.png (K) (k)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-sarcastic.png ^o)
+-sick.png +o(
+-plate.png (pl)
+-mobile.png (mp)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-console.png (xx) (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-sick.png /:T /tu /vomit
+-sleepy.png /|-) /kun /sleepy
+-hot.png /:L /sweat
+-question.png /? /yiw /question
+-excruciating.png /:8 /zhem /excrutiating
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-search.png /find /zhao /search
+-hug-left.png /hug /yb /hug
+-lamp.png /! /dp /lightbulb
+-thunder.png /li /shd /lightning
+-musical-note.png /music /yy /music
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-rose.png /rose /mg /rose
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-meeting.png /meeting /hy /meeting
+-phone.png /phone /dh /phone
+-tv.png /TV /ds /TV
+-angry.png /<O> /oh /angry
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kiss.png :-{} :-*
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-thinking.png :-\\ :-/
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-hot.png #:-S #:-s
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-wink.png ;) ;-)
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-party.png <:-P <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-happy.png :) :-)
+-amorous.png :X
+-pirate.png P)
+-shocked.png :O
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme 2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme 2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -38,7 +37,7 @@
+ angel.png O:-) o:-)
+ shut-mouth.png :-X
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ rose.png @->-- :rose:
+ phone.png :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png :| :-|
+
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-excited.png :-D :D
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-star.png (*)
+-musical-note.png (8)
+-rose.png (F) (f)
+-kiss.png (K) (k)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-sarcastic.png ^o)
+-sick.png +o(
+-plate.png (pl)
+-mobile.png (mp)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-console.png (xx) (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-sick.png /:T /tu /vomit
+-sleepy.png /|-) /kun /sleepy
+-hot.png /:L /sweat
+-question.png /? /yiw /question
+-excruciating.png /:8 /zhem /excrutiating
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-search.png /find /zhao /search
+-hug-left.png /hug /yb /hug
+-lamp.png /! /dp /lightbulb
+-thunder.png /li /shd /lightning
+-musical-note.png /music /yy /music
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-rose.png /rose /mg /rose
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-meeting.png /meeting /hy /meeting
+-phone.png /phone /dh /phone
+-tv.png /TV /ds /TV
+-angry.png /<O> /oh /angry
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kiss.png :-{} :-*
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-thinking.png :-\\ :-/
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-hot.png #:-S #:-s
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-wink.png ;) ;-)
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-party.png <:-P <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-happy.png :) :-)
+-amorous.png :X
+-pirate.png P)
+-shocked.png :O
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am 2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ emotes/small/16/scalable/pidgin-emotes.svg
+
+ PROTOCOLS_16_SCALABLE = \
+- protocols/16/scalable/aim.svg \
+ protocols/16/scalable/bonjour.svg \
+- protocols/16/scalable/gadu-gadu.svg \
+- protocols/16/scalable/novell.svg \
+- protocols/16/scalable/icq.svg \
+ protocols/16/scalable/irc.svg \
+ protocols/16/scalable/jabber.svg \
+- protocols/16/scalable/meanwhile.svg \
+- protocols/16/scalable/msn.svg \
+ protocols/16/scalable/silc.svg \
+ protocols/16/scalable/simple.svg \
+- protocols/16/scalable/yahoo.svg \
+ protocols/16/scalable/zephyr.svg
+
+ PROTOCOLS_16 = \
+- protocols/16/aim.png \
+ protocols/16/bonjour.png \
+- protocols/16/facebook.png \
+- protocols/16/gadu-gadu.png \
+- protocols/16/google-talk.png \
+- protocols/16/novell.png \
+- protocols/16/icq.png \
+ protocols/16/irc.png \
+ protocols/16/jabber.png \
+- protocols/16/meanwhile.png \
+- protocols/16/msn.png \
+- protocols/16/mxit.png \
+- protocols/16/myspace.png \
+ protocols/16/silc.png \
+ protocols/16/simple.png \
+- protocols/16/yahoo.png \
+ protocols/16/zephyr.png
+
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+
+ PROTOCOLS_22_SCALABLE = \
+- protocols/22/scalable/aim.svg \
+ protocols/22/scalable/bonjour.svg \
+- protocols/22/scalable/gadu-gadu.svg \
+- protocols/22/scalable/novell.svg \
+- protocols/22/scalable/icq.svg \
+ protocols/22/scalable/irc.svg \
+ protocols/22/scalable/jabber.svg \
+- protocols/22/scalable/meanwhile.svg \
+- protocols/22/scalable/msn.svg \
+ protocols/22/scalable/silc.svg \
+ protocols/22/scalable/simple.svg \
+- protocols/22/scalable/yahoo.svg \
+ protocols/22/scalable/zephyr.svg
+
+ PROTOCOLS_22 = \
+- protocols/22/aim.png \
+ protocols/22/bonjour.png \
+- protocols/22/facebook.png \
+- protocols/22/gadu-gadu.png \
+- protocols/22/google-talk.png \
+- protocols/22/novell.png \
+- protocols/22/icq.png \
+ protocols/22/irc.png \
+ protocols/22/jabber.png \
+- protocols/22/meanwhile.png \
+- protocols/22/msn.png \
+- protocols/22/mxit.png \
+- protocols/22/myspace.png \
+ protocols/22/silc.png \
+ protocols/22/simple.png \
+- protocols/22/yahoo.png \
+ protocols/22/zephyr.png
+
+ PROTOCOLS_48 = \
+- protocols/48/aim.png \
+ protocols/48/bonjour.png \
+- protocols/48/facebook.png \
+- protocols/48/gadu-gadu.png \
+- protocols/48/novell.png \
+- protocols/48/icq.png \
+ protocols/48/irc.png \
+ protocols/48/jabber.png \
+- protocols/48/meanwhile.png \
+- protocols/48/msn.png \
+- protocols/48/mxit.png \
+- protocols/48/myspace.png \
+ protocols/48/silc.png \
+ protocols/48/simple.png \
+- protocols/48/yahoo.png \
+ protocols/48/zephyr.png
+
+ PROTOCOLS_SCALABLE = \
+- protocols/scalable/aim.svg \
+ protocols/scalable/bonjour.svg \
+- protocols/scalable/gadu-gadu.svg \
+- protocols/scalable/google-talk.svg \
+- protocols/scalable/novell.svg \
+- protocols/scalable/icq.svg \
+ protocols/scalable/irc.svg \
+ protocols/scalable/jabber.svg \
+- protocols/scalable/meanwhile.svg \
+- protocols/scalable/msn.svg \
+- protocols/scalable/mxit.svg \
+ protocols/scalable/silc.svg \
+ protocols/scalable/simple.svg \
+- protocols/scalable/yahoo.svg \
+ protocols/scalable/zephyr.svg
+
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in 2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ emblems/scalable/video.svg emblems/scalable/voice.svg \
+- protocols/16/aim.png protocols/16/bonjour.png \
+- protocols/16/facebook.png protocols/16/gadu-gadu.png \
+- protocols/16/google-talk.png protocols/16/novell.png \
+- protocols/16/icq.png protocols/16/irc.png \
+- protocols/16/jabber.png protocols/16/meanwhile.png \
+- protocols/16/msn.png protocols/16/mxit.png \
+- protocols/16/myspace.png protocols/16/silc.png \
+- protocols/16/simple.png protocols/16/yahoo.png \
+- protocols/16/zephyr.png protocols/22/aim.png \
+- protocols/22/bonjour.png protocols/22/facebook.png \
+- protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+- protocols/22/novell.png protocols/22/icq.png \
+- protocols/22/irc.png protocols/22/jabber.png \
+- protocols/22/meanwhile.png protocols/22/msn.png \
+- protocols/22/mxit.png protocols/22/myspace.png \
+- protocols/22/silc.png protocols/22/simple.png \
+- protocols/22/yahoo.png protocols/22/zephyr.png \
+- protocols/48/aim.png protocols/48/bonjour.png \
+- protocols/48/facebook.png protocols/48/gadu-gadu.png \
+- protocols/48/novell.png protocols/48/icq.png \
+- protocols/48/irc.png protocols/48/jabber.png \
+- protocols/48/meanwhile.png protocols/48/msn.png \
+- protocols/48/mxit.png protocols/48/myspace.png \
+- protocols/48/silc.png protocols/48/simple.png \
+- protocols/48/yahoo.png protocols/48/zephyr.png \
+- protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+- protocols/scalable/gadu-gadu.svg \
+- protocols/scalable/google-talk.svg \
+- protocols/scalable/novell.svg protocols/scalable/icq.svg \
+- protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+- protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+- protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+- protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+- protocols/scalable/zephyr.svg status/11/available.png \
++ protocols/16/bonjour.png protocols/16/irc.png \
++ protocols/16/jabber.png protocols/16/silc.png \
++ protocols/16/simple.png protocols/16/zephyr.png \
++ protocols/22/bonjour.png protocols/22/irc.png \
++ protocols/22/jabber.png protocols/22/silc.png \
++ protocols/22/simple.png protocols/22/zephyr.png \
++ protocols/48/bonjour.png protocols/48/irc.png \
++ protocols/48/jabber.png protocols/48/silc.png \
++ protocols/48/simple.png protocols/48/zephyr.png \
++ protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++ protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++ protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++ status/11/available.png \
+ status/11/away.png status/11/busy.png status/11/chat.png \
+ status/11/extended-away.png status/11/invisible.png \
+ status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@ emotes/small/16/scalable/pidgin-emotes.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c 2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ const char *from;
+ const char *to;
+ } disco_type_mappings[] = {
+- { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+- { "sametime", "meanwhile" },
+- { "myspaceim", "myspace" },
+ { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ { NULL, NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ {
+ EContact *contact = E_CONTACT(c->data);
+ const char *name;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++ GList *jabbers;
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
+- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+- if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+- msns == NULL && icqs == NULL && novells == NULL &&
+- ggs == NULL)
++
++ if (jabbers == NULL)
+ {
+ GtkTreeIter iter;
+
+@@ -315,13 +307,7 @@
+ }
+ else
+ {
+- add_ims(dialog, contact, name, aims, "prpl-aim");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+- add_ims(dialog, contact, name, msns, "prpl-msn");
+- add_ims(dialog, contact, name, icqs, "prpl-icq");
+- add_ims(dialog, contact, name, novells, "prpl-novell");
+- add_ims(dialog, contact, name, ggs, "prpl-gg");
+ }
+ }
+
+@@ -367,7 +353,7 @@
+ {
+ EContact *contact = E_CONTACT(l->data);
+ const char *name;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++ GList *jabbers;
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+@@ -377,17 +363,9 @@
+ continue;
+ }
+
+- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
+- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+- if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+- msns == NULL && icqs == NULL && novells == NULL &&
+- ggs == NULL)
++
++ if (jabbers == NULL)
+ {
+ GtkTreeIter iter;
+
+@@ -400,13 +378,7 @@
+ }
+ else
+ {
+- add_ims(dialog, contact, name, aims, "prpl-aim");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+- add_ims(dialog, contact, name, msns, "prpl-msn");
+- add_ims(dialog, contact, name, icqs, "prpl-icq");
+- add_ims(dialog, contact, name, novells, "prpl-novell");
+- add_ims(dialog, contact, name, ggs, "prpl-gg");
+ }
+ }
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c 2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+- update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM);
+ update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
+- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
+- update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ);
+- update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+- update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
+ }
+
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c 2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+
+ protocol_id = purple_account_get_protocol_id(account);
+
+- if (!strcmp(protocol_id, "prpl-aim"))
+- protocol_field = E_CONTACT_IM_AIM;
+- else if (!strcmp(protocol_id, "prpl-icq"))
+- protocol_field = E_CONTACT_IM_ICQ;
+- else if (!strcmp(protocol_id, "prpl-msn"))
+- protocol_field = E_CONTACT_IM_MSN;
+- else if (!strcmp(protocol_id, "prpl-yahoo"))
+- protocol_field = E_CONTACT_IM_YAHOO;
+- else if (!strcmp(protocol_id, "prpl-jabber"))
++ if (!strcmp(protocol_id, "prpl-jabber"))
+ protocol_field = E_CONTACT_IM_JABBER;
+- else if (!strcmp(protocol_id, "prpl-novell"))
+- protocol_field = E_CONTACT_IM_GROUPWISE;
+- else if (!strcmp(protocol_id, "prpl-gg"))
+- protocol_field = E_CONTACT_IM_GADUGADU;
+
+ return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ {
+ PurpleAccount *account = purple_buddy_get_account(buddy);
+ const char *prpl_id = purple_account_get_protocol_id(account);
+-
+- if (!strcmp(prpl_id, "prpl-msn"))
+- {
+- mail = g_strdup(purple_normalize(account,
+- purple_buddy_get_name(buddy)));
+- }
+- else if (!strcmp(prpl_id, "prpl-yahoo"))
+- {
+- mail = g_strdup_printf("%s@yahoo.com",
+- purple_normalize(account,
+- purple_buddy_get_name(buddy)));
+- }
+ }
+
+ return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c 2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ if (*email)
+ e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+
+- if (!strcmp(im_service, "prpl-aim"))
+- field = E_CONTACT_IM_AIM;
+- else if (!strcmp(im_service, "prpl-icq"))
+- field = E_CONTACT_IM_ICQ;
+- else if (!strcmp(im_service, "prpl-yahoo"))
+- field = E_CONTACT_IM_YAHOO;
+- else if (!strcmp(im_service, "prpl-jabber"))
++ if (!strcmp(im_service, "prpl-jabber"))
+ field = E_CONTACT_IM_JABBER;
+- else if (!strcmp(im_service, "prpl-msn"))
+- field = E_CONTACT_IM_MSN;
+- else if (!strcmp(im_service, "prpl-novell"))
+- field = E_CONTACT_IM_GROUPWISE;
+- else if (!strcmp(im_service, "prpl-gg"))
+- field = E_CONTACT_IM_GADUGADU;
+
+ if (field > 0)
+ {
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in 2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in 2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM. Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec 2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec 2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group: Applications/Internet
+ Obsoletes: gaim-silc
+ Obsoletes: gaim-tcl
+-Obsoletes: gaim-gadugadu
+ Obsoletes: pidgin-tcl < 2.0.0
+ Obsoletes: pidgin-silc < 2.0.0
+ Obsoletes: libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires: libpurple >= %{apiver}
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group: Applications/Internet
+-Requires: libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary: Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr. These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin. This package will allow you to write or
+@@ -236,7 +217,6 @@
+ %{!?_with_vv:--disable-vv} \
+ %{!?_with_dbus:--disable-dbus} \
+ %{!?_with_avahi:--disable-avahi} \
+- %{!?_with_meanwhile:--disable-meanwhile} \
+ %{?_without_gstreamer:--disable-gstreamer} \
+ %{?_without_gtkspell:--disable-gtkspell} \
+ %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" | \
+ grep -v /libbonjour.so | \
+- grep -v /libsametime.so | \
+ grep -v /mono.so | \
+ grep -v ".dll$" > %{name}-%{version}-purpleplugins
+
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+
+ * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+- main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+ by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in 2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group: Applications/Internet
+ Obsoletes: gaim-silc
+ Obsoletes: gaim-tcl
+-Obsoletes: gaim-gadugadu
+ Obsoletes: pidgin-tcl < 2.0.0
+ Obsoletes: pidgin-silc < 2.0.0
+ Obsoletes: libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires: libpurple >= %{apiver}
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group: Applications/Internet
+-Requires: libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary: Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr. These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin. This package will allow you to write or
+@@ -236,7 +217,6 @@
+ %{!?_with_vv:--disable-vv} \
+ %{!?_with_dbus:--disable-dbus} \
+ %{!?_with_avahi:--disable-avahi} \
+- %{!?_with_meanwhile:--disable-meanwhile} \
+ %{?_without_gstreamer:--disable-gstreamer} \
+ %{?_without_gtkspell:--disable-gtkspell} \
+ %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" | \
+ grep -v /libbonjour.so | \
+- grep -v /libsametime.so | \
+ grep -v /mono.so | \
+ grep -v ".dll$" > %{name}-%{version}-purpleplugins
+
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+
+ * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+- main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+ by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch
new file mode 100644
index 000000000..485bef3c8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/nonprism.patch
@@ -0,0 +1,4930 @@
+diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in
+--- pidgin-2.10.7/config.h.in 2013-02-11 07:17:16.000000000 -0200
++++ pidgin-2.10.7-nonprism/config.h.in 2013-08-16 22:16:16.833531712 -0300
+@@ -151,9 +151,6 @@
+ /* Define to 1 if you have the `db' library (-ldb). */
+ #undef HAVE_LIBDB
+
+-/* Define to 1 if you have libgadu. */
+-#undef HAVE_LIBGADU
+-
+ /* Define to 1 if you have the `nsl' library (-lnsl). */
+ #undef HAVE_LIBNSL
+
+diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure
+--- pidgin-2.10.7/configure 2013-02-11 07:17:26.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure 2013-08-27 16:47:16.890662082 -0300
+@@ -716,45 +716,23 @@
+ STATIC_LINK_LIBS
+ STATIC_ZEPHYR_FALSE
+ STATIC_ZEPHYR_TRUE
+-STATIC_YAHOO_FALSE
+-STATIC_YAHOO_TRUE
+ STATIC_SIMPLE_FALSE
+ STATIC_SIMPLE_TRUE
+ STATIC_SILC_FALSE
+ STATIC_SILC_TRUE
+-STATIC_SAMETIME_FALSE
+-STATIC_SAMETIME_TRUE
+-STATIC_OSCAR_FALSE
+-STATIC_OSCAR_TRUE
+-STATIC_NOVELL_FALSE
+-STATIC_NOVELL_TRUE
+-STATIC_MXIT_FALSE
+-STATIC_MXIT_TRUE
+-STATIC_MYSPACE_FALSE
+-STATIC_MYSPACE_TRUE
+-STATIC_MSN_FALSE
+-STATIC_MSN_TRUE
+ STATIC_JABBER_FALSE
+ STATIC_JABBER_TRUE
+ STATIC_IRC_FALSE
+ STATIC_IRC_TRUE
+-STATIC_GG_FALSE
+-STATIC_GG_TRUE
+ STATIC_BONJOUR_FALSE
+ STATIC_BONJOUR_TRUE
+ STATIC_PRPLS
+ DISTRIB_FALSE
+ DISTRIB_TRUE
+-USE_INTERNAL_LIBGADU_FALSE
+-USE_INTERNAL_LIBGADU_TRUE
+-GADU_LIBS
+-GADU_CFLAGS
+ SILC_LIBS
+ SILC_CFLAGS
+ AVAHI_LIBS
+ AVAHI_CFLAGS
+-MEANWHILE_LIBS
+-MEANWHILE_CFLAGS
+ IDN_LIBS
+ IDN_CFLAGS
+ USE_VV_FALSE
+@@ -1021,14 +999,11 @@
+ enable_farstream
+ enable_vv
+ enable_idn
+-enable_meanwhile
+ enable_avahi
+ with_avahi_client_includes
+ with_avahi_client_libs
+ with_silc_includes
+ with_silc_libs
+-with_gadu_includes
+-with_gadu_libs
+ enable_distrib
+ with_static_prpls
+ with_dynamic_prpls
+@@ -1100,14 +1075,10 @@
+ FARSTREAM_LIBS
+ IDN_CFLAGS
+ IDN_LIBS
+-MEANWHILE_CFLAGS
+-MEANWHILE_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ SILC_CFLAGS
+ SILC_LIBS
+-GADU_CFLAGS
+-GADU_LIBS
+ DBUS_CFLAGS
+ DBUS_LIBS
+ NETWORKMANAGER_CFLAGS
+@@ -1773,8 +1744,6 @@
+ --disable-farstream compile without farstream support
+ --disable-vv compile without voice and video support
+ --disable-idn compile without IDN support
+- --disable-meanwhile compile without meanwhile (required for Sametime
+- support)
+ --disable-avahi compile without avahi (required for Bonjour support)
+
+ --disable-plugins compile without plugin support
+@@ -1826,9 +1795,6 @@
+ --with-silc-includes=DIR
+ compile the SILC plugin against includes in DIR
+ --with-silc-libs=DIR compile the SILC plugin against the SILC libs in DIR
+- --with-gadu-includes=DIR
+- compile the Gadu-Gadu plugin against includes in DIR
+- --with-gadu-libs=DIR compile the Gadu-Gadu plugin against the libs in DIR
+ --with-static-prpls Link to certain protocols statically
+ --with-dynamic-prpls specify which protocols to build dynamically
+ --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support
+@@ -1905,17 +1871,11 @@
+ linker flags for FARSTREAM, overriding pkg-config
+ IDN_CFLAGS C compiler flags for IDN, overriding pkg-config
+ IDN_LIBS linker flags for IDN, overriding pkg-config
+- MEANWHILE_CFLAGS
+- C compiler flags for MEANWHILE, overriding pkg-config
+- MEANWHILE_LIBS
+- linker flags for MEANWHILE, overriding pkg-config
+ AVAHI_CFLAGS
+ C compiler flags for AVAHI, overriding pkg-config
+ AVAHI_LIBS linker flags for AVAHI, overriding pkg-config
+ SILC_CFLAGS C compiler flags for SILC, overriding pkg-config
+ SILC_LIBS linker flags for SILC, overriding pkg-config
+- GADU_CFLAGS C compiler flags for GADU, overriding pkg-config
+- GADU_LIBS linker flags for GADU, overriding pkg-config
+ DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
+ DBUS_LIBS linker flags for DBUS, overriding pkg-config
+ NETWORKMANAGER_CFLAGS
+@@ -18487,105 +18447,6 @@
+ fi
+ fi
+
+-# Check whether --enable-meanwhile was given.
+-if test "${enable_meanwhile+set}" = set; then :
+- enableval=$enable_meanwhile; enable_meanwhile="$enableval"
+-else
+- enable_meanwhile="yes"
+-fi
+-
+-if test "x$enable_meanwhile" = "xyes"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5
+-$as_echo_n "checking for MEANWHILE... " >&6; }
+-
+-if test -n "$MEANWHILE_CFLAGS"; then
+- pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$MEANWHILE_LIBS"; then
+- pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+- else
+- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$MEANWHILE_PKG_ERRORS" >&5
+-
+-
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+- fi
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- as_fn_error $? "
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-" "$LINENO" 5
+- fi
+-else
+- MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS
+- MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- have_meanwhile="yes"
+-
+-fi
+-fi
+-
+-
+-
+ # Check whether --enable-avahi was given.
+ if test "${enable_avahi+set}" = set; then :
+ enableval=$enable_avahi; enable_avahi="$enableval"
+@@ -19207,267 +19068,6 @@
+ fi
+
+
+-# Check whether --with-gadu-includes was given.
+-if test "${with_gadu_includes+set}" = set; then :
+- withval=$with_gadu_includes; ac_gadu_includes="$withval"
+-else
+- ac_gadu_includes="no"
+-fi
+-
+-
+-# Check whether --with-gadu-libs was given.
+-if test "${with_gadu_libs+set}" = set; then :
+- withval=$with_gadu_libs; ac_gadu_libs="$withval"
+-else
+- ac_gadu_libs="no"
+-fi
+-
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+- gadu_manual_check="yes"
+-else
+- gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+-
+-pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5
+-$as_echo_n "checking for GADU... " >&6; }
+-
+-if test -n "$GADU_CFLAGS"; then
+- pkg_cv_GADU_CFLAGS="$GADU_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-if test -n "$GADU_LIBS"; then
+- pkg_cv_GADU_LIBS="$GADU_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null`
+- test "x$?" != "x0" && pkg_failed=yes
+-else
+- pkg_failed=yes
+-fi
+- else
+- pkg_failed=untried
+-fi
+-
+-
+-
+-if test $pkg_failed = yes; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+- _pkg_short_errors_supported=yes
+-else
+- _pkg_short_errors_supported=no
+-fi
+- if test $_pkg_short_errors_supported = yes; then
+- GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+- else
+- GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1`
+- fi
+- # Put the nasty error message in config.log where it belongs
+- echo "$GADU_PKG_ERRORS" >&5
+-
+-
+- gadu_includes="no"
+-
+-elif test $pkg_failed = untried; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-
+- gadu_includes="no"
+-
+-else
+- GADU_CFLAGS=$pkg_cv_GADU_CFLAGS
+- GADU_LIBS=$pkg_cv_GADU_LIBS
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+- gadu_includes="yes"
+- gadu_libs="yes"
+-
+-fi
+-else
+- if test "$ac_gadu_includes" != "no"; then
+- GADU_CFLAGS="-I$ac_gadu_includes"
+- fi
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default"
+-if test "x$ac_cv_header_libgadu_h" = xyes; then :
+- gadu_includes=yes
+-fi
+-
+-
+- CPPFLAGS="$CPPFLAGS_save"
+-
+- if test "$ac_gadu_libs" != "no"; then
+- GADU_LIBS="-L$ac_gadu_libs"
+- fi
+- GADU_LIBS="$GADU_LIBS -lgadu"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5
+-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; }
+-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lgadu $GADU_LIBS $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gg_libgadu_version ();
+-int
+-main ()
+-{
+-return gg_libgadu_version ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_gadu_gg_libgadu_version=yes
+-else
+- ac_cv_lib_gadu_gg_libgadu_version=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5
+-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; }
+-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then :
+- gadu_libs=yes
+-fi
+-
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5
+-$as_echo_n "checking for libgadu GPL compatibility... " >&6; }
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <libgadu.h>
+-int
+-main ()
+-{
+-
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h
+-
+-
+-else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- echo
+- echo
+- echo "Your supplied copy of libgadu is too old."
+- echo "Install version 1.11.0 or newer."
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-else
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- echo
+- echo
+- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+- echo "To compile against system libgadu, please recompile libgadu using:"
+- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+-
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+- if test "x$gadu_libs" != "xyes"; then
+- USE_INTERNAL_LIBGADU_TRUE=
+- USE_INTERNAL_LIBGADU_FALSE='#'
+-else
+- USE_INTERNAL_LIBGADU_TRUE='#'
+- USE_INTERNAL_LIBGADU_FALSE=
+-fi
+-
+-
+-if test "x$gadu_libs" = "x"; then
+- gadu_libs=no
+-fi
+-
+
+
+
+@@ -19500,10 +19100,7 @@
+ fi
+
+ if test "x$STATIC_PRPLS" = "xall" ; then
+- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19519,46 +19116,22 @@
+ extern_init=
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+- extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+- load_proto="$load_proto purple_init_aim_plugin();"
+- load_proto="$load_proto purple_init_icq_plugin();"
+- elif test "x$i" = "xyahoo"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+- load_proto="$load_proto purple_init_yahoo_plugin();"
+- load_proto="$load_proto purple_init_yahoojp_plugin();"
++ if test "x$i" = "xsilc"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++ elif test "x$i" = "xsilc10"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ else
+- if test "x$i" = "xsilc"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+- elif test "x$i" = "xsilc10"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+- else
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+- fi
+- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+- load_proto="$load_proto purple_init_${i}_plugin();"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ fi
++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++ load_proto="$load_proto purple_init_${i}_plugin();"
+ case $i in
+ bonjour) static_bonjour=yes ;;
+- gg) static_gg=yes ;;
+ irc) static_irc=yes ;;
+ jabber) static_jabber=yes ;;
+- msn) static_msn=yes ;;
+- myspace) static_myspace=yes ;;
+- mxit) static_mxit=yes ;;
+- novell) static_novell=yes ;;
+- oscar) static_oscar=yes ;;
+- aim) static_oscar=yes ;;
+- icq) static_oscar=yes ;;
+- sametime) static_sametime=yes ;;
+ silc) static_silc=yes ;;
+ silc10) static_silc=yes ;;
+ simple) static_simple=yes ;;
+- yahoo) static_yahoo=yes ;;
+ zephyr) static_zephyr=yes ;;
+ *) echo "Invalid static protocol $i!!" ; exit 1 ;;
+ esac
+@@ -19571,14 +19144,6 @@
+ STATIC_BONJOUR_FALSE=
+ fi
+
+- if test "x$static_gg" = "xyes"; then
+- STATIC_GG_TRUE=
+- STATIC_GG_FALSE='#'
+-else
+- STATIC_GG_TRUE='#'
+- STATIC_GG_FALSE=
+-fi
+-
+ if test "x$static_irc" = "xyes"; then
+ STATIC_IRC_TRUE=
+ STATIC_IRC_FALSE='#'
+@@ -19595,54 +19160,6 @@
+ STATIC_JABBER_FALSE=
+ fi
+
+- if test "x$static_msn" = "xyes"; then
+- STATIC_MSN_TRUE=
+- STATIC_MSN_FALSE='#'
+-else
+- STATIC_MSN_TRUE='#'
+- STATIC_MSN_FALSE=
+-fi
+-
+- if test "x$static_myspace" = "xyes"; then
+- STATIC_MYSPACE_TRUE=
+- STATIC_MYSPACE_FALSE='#'
+-else
+- STATIC_MYSPACE_TRUE='#'
+- STATIC_MYSPACE_FALSE=
+-fi
+-
+- if test "x$static_mxit" = "xyes"; then
+- STATIC_MXIT_TRUE=
+- STATIC_MXIT_FALSE='#'
+-else
+- STATIC_MXIT_TRUE='#'
+- STATIC_MXIT_FALSE=
+-fi
+-
+- if test "x$static_novell" = "xyes"; then
+- STATIC_NOVELL_TRUE=
+- STATIC_NOVELL_FALSE='#'
+-else
+- STATIC_NOVELL_TRUE='#'
+- STATIC_NOVELL_FALSE=
+-fi
+-
+- if test "x$static_oscar" = "xyes"; then
+- STATIC_OSCAR_TRUE=
+- STATIC_OSCAR_FALSE='#'
+-else
+- STATIC_OSCAR_TRUE='#'
+- STATIC_OSCAR_FALSE=
+-fi
+-
+- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then
+- STATIC_SAMETIME_TRUE=
+- STATIC_SAMETIME_FALSE='#'
+-else
+- STATIC_SAMETIME_TRUE='#'
+- STATIC_SAMETIME_FALSE=
+-fi
+-
+ if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then
+ STATIC_SILC_TRUE=
+ STATIC_SILC_FALSE='#'
+@@ -19659,14 +19176,6 @@
+ STATIC_SIMPLE_FALSE=
+ fi
+
+- if test "x$static_yahoo" = "xyes"; then
+- STATIC_YAHOO_TRUE=
+- STATIC_YAHOO_FALSE='#'
+-else
+- STATIC_YAHOO_TRUE='#'
+- STATIC_YAHOO_FALSE=
+-fi
+-
+ if test "x$static_zephyr" = "xyes"; then
+ STATIC_ZEPHYR_TRUE=
+ STATIC_ZEPHYR_FALSE='#'
+@@ -19689,10 +19198,7 @@
+ fi
+
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -19707,22 +19213,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ case $i in
+ bonjour) dynamic_bonjour=yes ;;
+- gg) dynamic_gg=yes ;;
+ irc) dynamic_irc=yes ;;
+ jabber) dynamic_jabber=yes ;;
+- msn) dynamic_msn=yes ;;
+- myspace) dynamic_myspace=yes ;;
+- mxit) dynamic_mxit=yes ;;
+- novell) dynamic_novell=yes ;;
+ null) dynamic_null=yes ;;
+- oscar) dynamic_oscar=yes ;;
+- aim) dynamic_oscar=yes ;;
+- icq) dynamic_oscar=yes ;;
+- sametime) dynamic_sametime=yes ;;
+ silc) dynamic_silc=yes ;;
+ silc10) dynamic_silc=yes ;;
+ simple) dynamic_simple=yes ;;
+- yahoo) dynamic_yahoo=yes ;;
+ zephyr) dynamic_zephyr=yes ;;
+ *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ esac
+@@ -21001,7 +20497,7 @@
+ fi
+
+
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ if test "x$enable_gnutls" != "xno"; then
+ enable_gnutls="no"
+@@ -21871,19 +21367,17 @@
+ as_fn_error $? "
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
++
+ " "$LINENO" 5
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ as_fn_error $? "
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ as_fn_error $? "
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ " "$LINENO" 5
+ fi
+
+@@ -23176,7 +22670,7 @@
+ fi
+
+
+-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -23344,10 +22838,6 @@
+ as_fn_error $? "conditional \"USE_VV\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then
+- as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then
+ as_fn_error $? "conditional \"DISTRIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23356,10 +22846,6 @@
+ as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_GG\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_IRC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23368,30 +22854,6 @@
+ as_fn_error $? "conditional \"STATIC_JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MSN\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_MXIT\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_SILC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -23400,10 +22862,6 @@
+ as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then
+- as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then
+ as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24425,20 +23883,12 @@
+ "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;;
+ "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;;
+ "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;;
+- "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;;
+ "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;;
+ "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;;
+- "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;;
+- "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;;
+- "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;;
+- "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;;
+ "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;;
+- "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;;
+- "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;;
+ "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;;
+ "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;;
+ "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;;
+- "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;;
+ "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;;
+ "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;;
+ "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;;
+@@ -25863,7 +25313,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac
+--- pidgin-2.10.7/configure.ac 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/configure.ac 2013-08-16 23:44:41.800496326 -0300
+@@ -854,28 +854,6 @@
+ fi
+
+ dnl #######################################################################
+-dnl # Check for Meanwhile headers (for Sametime)
+-dnl #######################################################################
+-AC_ARG_ENABLE(meanwhile,
+- [AC_HELP_STRING([--disable-meanwhile],
+- [compile without meanwhile (required for Sametime support)])],
+- enable_meanwhile="$enableval", enable_meanwhile="yes")
+-if test "x$enable_meanwhile" = "xyes"; then
+- PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [
+- have_meanwhile="yes"
+- ], [
+- have_meanwhile="no"
+- if test "x$force_deps" = "xyes" ; then
+- AC_MSG_ERROR([
+-Meanwhile development headers not found.
+-Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
+-])
+- fi])
+-fi
+-AC_SUBST(MEANWHILE_CFLAGS)
+-AC_SUBST(MEANWHILE_LIBS)
+-
+-dnl #######################################################################
+ dnl # Check for Native Avahi headers (for Bonjour)
+ dnl #######################################################################
+ AC_ARG_ENABLE(avahi,
+@@ -1020,100 +998,6 @@
+ CPPFLAGS="$CPPFLAGS_save"
+ fi
+
+-dnl #######################################################################
+-dnl # Check for Gadu-Gadu client includes and libraries
+-dnl #######################################################################
+-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
+-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
+-GADU_CFLAGS=""
+-GADU_LIBS=""
+-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
+- gadu_manual_check="yes"
+-else
+- gadu_manual_check="no"
+-fi
+-if test "x$gadu_manual_check" = "xno"; then
+- PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [
+- gadu_includes="yes"
+- gadu_libs="yes"
+- ], [
+- gadu_includes="no"
+- ])
+-else
+- if test "$ac_gadu_includes" != "no"; then
+- GADU_CFLAGS="-I$ac_gadu_includes"
+- fi
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes])
+- CPPFLAGS="$CPPFLAGS_save"
+-
+- if test "$ac_gadu_libs" != "no"; then
+- GADU_LIBS="-L$ac_gadu_libs"
+- fi
+- GADU_LIBS="$GADU_LIBS -lgadu"
+- AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS)
+-fi
+-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'`
+-
+-if test "x$gadu_libs" = "xyes"; then
+- AC_MSG_CHECKING(for libgadu GPL compatibility)
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS"
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL)
+-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+-#endif
+- ]])], [
+- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[
+-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e
+-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher."
+-#endif
+- ]])], [
+- AC_MSG_RESULT(yes)
+- AC_DEFINE([HAVE_LIBGADU], [1],
+- [Define to 1 if you have libgadu.])
+- ], [
+- AC_MSG_RESULT(no)
+- echo
+- echo
+- echo "Your supplied copy of libgadu is too old."
+- echo "Install version 1.11.0 or newer."
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+- ])
+- ], [
+- AC_MSG_RESULT(no)
+- echo
+- echo
+- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support."
+- echo "To compile against system libgadu, please recompile libgadu using:"
+- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared"
+- echo "Then rerun this ./configure"
+- echo
+- echo "Falling back to using our own copy of libgadu"
+- echo
+- GADU_LIBS=""
+- GADU_CFLAGS=""
+- gadu_libs=no
+- ])
+- CPPFLAGS="$CPPFLAGS_save"
+-fi
+-
+-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes")
+-
+-if test "x$gadu_libs" = "x"; then
+- gadu_libs=no
+-fi
+-
+-AC_SUBST(GADU_LIBS)
+-AC_SUBST(GADU_CFLAGS)
+-
+ AC_ARG_ENABLE(distrib,,,enable_distrib=no)
+ AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
+ DYNAMIC_PRPLS=all
+@@ -1123,10 +1007,7 @@
+ fi
+
+ if test "x$STATIC_PRPLS" = "xall" ; then
+- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes" ; then
+- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1143,64 +1024,31 @@
+ load_proto=
+ for i in $STATIC_PRPLS ; do
+ dnl Ugly special case for "libsilcpurple.la":
+- dnl ... and Ugly special case for multi-protocol oscar and yahoo
+- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
+- extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
+- load_proto="$load_proto purple_init_aim_plugin();"
+- load_proto="$load_proto purple_init_icq_plugin();"
+- elif test "x$i" = "xyahoo"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la"
+- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();"
+- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();"
+- load_proto="$load_proto purple_init_yahoo_plugin();"
+- load_proto="$load_proto purple_init_yahoojp_plugin();"
++ if test "x$i" = "xsilc"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
++ elif test "x$i" = "xsilc10"; then
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+ else
+- if test "x$i" = "xsilc"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
+- elif test "x$i" = "xsilc10"; then
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
+- else
+- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+- fi
+- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
+- load_proto="$load_proto purple_init_${i}_plugin();"
++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
+ fi
++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
++ load_proto="$load_proto purple_init_${i}_plugin();"
+ case $i in
+ bonjour) static_bonjour=yes ;;
+- gg) static_gg=yes ;;
+ irc) static_irc=yes ;;
+ jabber) static_jabber=yes ;;
+- msn) static_msn=yes ;;
+- myspace) static_myspace=yes ;;
+- mxit) static_mxit=yes ;;
+- novell) static_novell=yes ;;
+- oscar) static_oscar=yes ;;
+- aim) static_oscar=yes ;;
+- icq) static_oscar=yes ;;
+- sametime) static_sametime=yes ;;
+ silc) static_silc=yes ;;
+ silc10) static_silc=yes ;;
+ simple) static_simple=yes ;;
+- yahoo) static_yahoo=yes ;;
+ zephyr) static_zephyr=yes ;;
+ *) echo "Invalid static protocol $i!!" ; exit 1 ;;
+ esac
+ done
+ AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
+-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
+ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
+ AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
+-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
+-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
+-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
+-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
+-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
+-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
+ AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
+ AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
+-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
+ AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
+ AC_SUBST(STATIC_LINK_LIBS)
+ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
+@@ -1208,10 +1056,7 @@
+
+ AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
+ if test "x$DYNAMIC_PRPLS" = "xall" ; then
+- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr"
+-fi
+-if test "x$have_meanwhile" != "xyes"; then
+- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr"
+ fi
+ if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
+ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
+@@ -1226,22 +1071,12 @@
+ for i in $DYNAMIC_PRPLS ; do
+ case $i in
+ bonjour) dynamic_bonjour=yes ;;
+- gg) dynamic_gg=yes ;;
+ irc) dynamic_irc=yes ;;
+ jabber) dynamic_jabber=yes ;;
+- msn) dynamic_msn=yes ;;
+- myspace) dynamic_myspace=yes ;;
+- mxit) dynamic_mxit=yes ;;
+- novell) dynamic_novell=yes ;;
+ null) dynamic_null=yes ;;
+- oscar) dynamic_oscar=yes ;;
+- aim) dynamic_oscar=yes ;;
+- icq) dynamic_oscar=yes ;;
+- sametime) dynamic_sametime=yes ;;
+ silc) dynamic_silc=yes ;;
+ silc10) dynamic_silc=yes ;;
+ simple) dynamic_simple=yes ;;
+- yahoo) dynamic_yahoo=yes ;;
+ zephyr) dynamic_zephyr=yes ;;
+ *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;;
+ esac
+@@ -1713,7 +1548,7 @@
+ [enable_nss="$enableval"],
+ [enable_nss="yes"])
+
+-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!"
++msg_ssl="None."
+ looked_for_gnutls="no"
+ dnl #
+ dnl # Check for GnuTLS if it's specified.
+@@ -2124,19 +1959,16 @@
+ AC_MSG_ERROR([
+ Neither GnuTLS or NSS SSL development headers found.
+ Use --disable-nss --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
+ ])
+ elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+ GnuTLS SSL development headers not found.
+ Use --disable-gnutls if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
+ NSS SSL development headers not found.
+ Use --disable-nss if you do not need SSL support.
+-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support.
+ ])
+ fi
+
+@@ -2577,20 +2409,12 @@
+ libpurple/Makefile
+ libpurple/protocols/Makefile
+ libpurple/protocols/bonjour/Makefile
+- libpurple/protocols/gg/Makefile
+ libpurple/protocols/irc/Makefile
+ libpurple/protocols/jabber/Makefile
+- libpurple/protocols/msn/Makefile
+- libpurple/protocols/myspace/Makefile
+- libpurple/protocols/mxit/Makefile
+- libpurple/protocols/novell/Makefile
+ libpurple/protocols/null/Makefile
+- libpurple/protocols/oscar/Makefile
+- libpurple/protocols/sametime/Makefile
+ libpurple/protocols/silc/Makefile
+ libpurple/protocols/silc10/Makefile
+ libpurple/protocols/simple/Makefile
+- libpurple/protocols/yahoo/Makefile
+ libpurple/protocols/zephyr/Makefile
+ libpurple/tests/Makefile
+ libpurple/purple.h
+@@ -2635,7 +2459,6 @@
+ echo Build with Cyrus SASL support. : $enable_cyrus_sasl
+ echo Use kerberos 4 with zephyr.... : $kerberos
+ echo Use external libzephyr........ : $zephyr
+-echo Use external libgadu.......... : $gadu_libs
+ echo Install pixmaps............... : $enable_pixmaps
+ echo Old tray icon compatibility... : $enable_traycompat
+ echo Install translations.......... : $enable_i18n
+diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in
+--- pidgin-2.10.7/doc/finch.1.in 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/finch.1.in 2013-08-16 21:01:16.682280145 -0300
+@@ -30,11 +30,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBfinch\fR is a console-based modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+
+ .SH OPTIONS
+ The following options are provided by \fBfinch\fR using the standard GNU
+diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt
+--- pidgin-2.10.7/doc/funniest_home_convos.txt 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt 2013-08-16 23:08:16.148841464 -0300
+@@ -301,8 +301,6 @@
+ ---
+
+ 18:33:26 <NoName> hello there
+-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of
+- unsafe when using GAIM with yahoo messenges accounts
+ 18:34:43 <NoName> Whenever you transfer files between users, no receiving
+ confirmation is requested, the file gets transfered
+ automatically
+diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in
+--- pidgin-2.10.7/doc/pidgin.1.in 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in 2013-08-16 21:00:30.964181946 -0300
+@@ -29,11 +29,8 @@
+ .SH DESCRIPTION
+ .PP
+ \fBpidgin\fR is a graphical modular messaging client based on libpurple
+-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC,
+-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has
++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has
+ many common features found in other clients, as well as many unique features.
+-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or
+-Yahoo.
+ .PP
+ Pidgin can be extended by plugins written in multiple programming languages and
+ controlled through DBus or \fBpurple-remote\fR.
+diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c
+--- pidgin-2.10.7/libpurple/account.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/account.c 2013-08-16 23:31:48.026518940 -0300
+@@ -482,55 +482,6 @@
+ /*********************************************************************
+ * Reading from disk *
+ *********************************************************************/
+-static void
+-migrate_yahoo_japan(PurpleAccount *account)
+-{
+- /* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it
+- * to use the new prpl-yahoojp. Also remove the account-specific settings
+- * we no longer need */
+-
+- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) {
+- if(purple_account_get_bool(account, "yahoojp", FALSE)) {
+- const char *serverjp = purple_account_get_string(account, "serverjp", NULL);
+- const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL);
+-
+- g_return_if_fail(serverjp != NULL);
+- g_return_if_fail(xferjp_host != NULL);
+-
+- purple_account_set_string(account, "server", serverjp);
+- purple_account_set_string(account, "xfer_host", xferjp_host);
+-
+- purple_account_set_protocol_id(account, "prpl-yahoojp");
+- }
+-
+- /* these should always be nuked */
+- purple_account_remove_setting(account, "yahoojp");
+- purple_account_remove_setting(account, "serverjp");
+- purple_account_remove_setting(account, "xferjp_host");
+-
+- }
+-}
+-
+-static void
+-migrate_icq_server(PurpleAccount *account)
+-{
+- /* Migrate the login server setting for ICQ accounts. See
+- * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794'
+- * for details on the change. */
+-
+- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) {
+- const char *tmp = purple_account_get_string(account, "server", NULL);
+-
+- /* Non-secure server */
+- if(purple_strequal(tmp, "login.messaging.aol.com") ||
+- purple_strequal(tmp, "login.oscar.aol.com"))
+- purple_account_set_string(account, "server", "login.icq.com");
+-
+- /* Secure server */
+- if(purple_strequal(tmp, "slogin.oscar.aol.com"))
+- purple_account_set_string(account, "server", "slogin.icq.com");
+- }
+-}
+
+ static void
+ migrate_xmpp_encryption(PurpleAccount *account)
+@@ -615,12 +566,6 @@
+ g_free(data);
+ }
+
+- /* we do this here because we need access to account settings to determine
+- * if we can/should migrate an old Yahoo! JAPAN account */
+- migrate_yahoo_japan(account);
+- /* we do this here because we need access to account settings to determine
+- * if we can/should migrate an ICQ account's server setting */
+- migrate_icq_server(account);
+ /* we do this here because we need to do it before the user views the
+ * Edit Account dialog. */
+ migrate_xmpp_encryption(account);
+@@ -874,7 +819,6 @@
+ return NULL;
+ }
+
+- ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */
+ g_free(name);
+ g_free(protocol_id);
+
+diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c
+--- pidgin-2.10.7/libpurple/blist.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/blist.c 2013-08-16 22:53:19.640535242 -0300
+@@ -466,9 +466,7 @@
+
+ acct_name = xmlnode_get_attrib(bnode, "account");
+ protocol = xmlnode_get_attrib(bnode, "protocol");
+- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ proto = xmlnode_get_attrib(bnode, "proto");
+- proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */
+
+ if (!acct_name || (!proto && !protocol))
+ return;
+diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c
+--- pidgin-2.10.7/libpurple/buddyicon.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c 2013-08-16 23:28:49.244233493 -0300
+@@ -1099,18 +1099,6 @@
+ {
+ PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node);
+ const char *prpl_id = purple_account_get_protocol_id(account);
+-
+- if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp"))
+- {
+- int checksum = purple_blist_node_get_int(node, "icon_checksum");
+- if (checksum != 0)
+- {
+- char *checksum_str = g_strdup_printf("%i", checksum);
+- purple_blist_node_remove_setting(node, "icon_checksum");
+- purple_blist_node_set_string(node, "icon_checksum", checksum_str);
+- g_free(checksum_str);
+- }
+- }
+ }
+ }
+ }
+diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h
+--- pidgin-2.10.7/libpurple/ft.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/ft.h 2013-08-16 22:51:20.590085226 -0300
+@@ -470,8 +470,6 @@
+ * can be used to jump backward in the file if the protocol detects
+ * that some bit of data needs to be resent or has been sent twice.
+ *
+- * It's used for pausing and resuming an oscar file transfer.
+- *
+ * @param xfer The file transfer.
+ * @param bytes_sent The new current position in the file. If we're
+ * sending a file then this is the byte that we will
+diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h
+--- pidgin-2.10.7/libpurple/gaim-compat.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h 2013-08-16 23:33:16.372629159 -0300
+@@ -2302,16 +2302,8 @@
+ #define gaim_init_ssl_plugin purple_init_ssl_plugin
+ #define gaim_init_ssl_openssl_plugin purple_init_ssl_openssl_plugin
+ #define gaim_init_ssl_gnutls_plugin purple_init_ssl_gnutls_plugin
+-#define gaim_init_gg_plugin purple_init_gg_plugin
+ #define gaim_init_jabber_plugin purple_init_jabber_plugin
+-#define gaim_init_sametime_plugin purple_init_sametime_plugin
+-#define gaim_init_msn_plugin purple_init_msn_plugin
+-#define gaim_init_novell_plugin purple_init_novell_plugin
+-#define gaim_init_qq_plugin purple_init_qq_plugin
+ #define gaim_init_simple_plugin purple_init_simple_plugin
+-#define gaim_init_yahoo_plugin purple_init_yahoo_plugin
+ #define gaim_init_zephyr_plugin purple_init_zephyr_plugin
+-#define gaim_init_aim_plugin purple_init_aim_plugin
+-#define gaim_init_icq_plugin purple_init_icq_plugin
+
+ #endif /* _GAIM_COMPAT_H_ */
+diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h
+--- pidgin-2.10.7/libpurple/internal.h 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/internal.h 2013-08-17 00:24:37.244172407 -0300
+@@ -43,7 +43,7 @@
+ *
+ * The Singular/Plural/Number ngettext dummy definition below was
+ * taken from an email to the texinfo mailing list by Manuel Guerrero.
+- * Thank you Manuel, and thank you Alex's good friend Google.
++ * Thank you Manuel.
+ */
+ #ifdef ENABLE_NLS
+ # include <locale.h>
+diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c
+--- pidgin-2.10.7/libpurple/media/backend-fs2.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c 2013-08-17 00:23:19.488440821 -0300
+@@ -1661,18 +1661,6 @@
+ g_object_set(G_OBJECT(session->session),
+ "no-rtcp-timeout", 0, NULL);
+
+- /*
+- * Hack to make x264 work with Gmail video.
+- */
+- if (is_nice && !strcmp(sess_id, "google-video")) {
+- FsElementAddedNotifier *notifier =
+- fs_element_added_notifier_new();
+- g_signal_connect(G_OBJECT(notifier), "element-added",
+- G_CALLBACK(gst_element_added_cb), NULL);
+- fs_element_added_notifier_add(notifier,
+- GST_BIN(priv->conference));
+- }
+-
+ session->id = g_strdup(sess_id);
+ session->backend = self;
+ session->type = type;
+diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c
+--- pidgin-2.10.7/libpurple/plugins/psychic.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c 2013-08-27 21:18:22.251908751 -0300
+@@ -20,8 +20,7 @@
+ #define PLUGIN_NAME N_("Psychic Mode")
+ #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation")
+ #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \
+- " users begin to message you. This works for" \
+- " AIM, ICQ, XMPP, Sametime, and Yahoo!")
++ " users begin to message you. This works for XMPP")
+ #define PLUGIN_AUTHOR "Christopher O'Brien <siege@preoccupied.net>"
+
+
+diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c
+--- pidgin-2.10.7/libpurple/pounce.c 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/pounce.c 2013-08-16 23:02:20.671021669 -0300
+@@ -409,7 +409,6 @@
+ g_free(data->account_name);
+ data->account_name = g_strdup(buffer);
+ tmp = data->protocol_id;
+- data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp));
+ g_free(tmp);
+ }
+ else if (purple_strequal(element_name, "pouncee")) {
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am
+--- pidgin-2.10.7/libpurple/protocols/Makefile.am 2013-02-11 07:16:51.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am 2013-08-16 22:37:55.011207011 -0300
+@@ -1,5 +1,5 @@
+ EXTRA_DIST = Makefile.mingw
+
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in
+--- pidgin-2.10.7/libpurple/protocols/Makefile.in 2013-02-11 07:17:19.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in 2013-08-16 23:50:36.651423353 -0300
+@@ -160,8 +160,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -223,8 +221,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -365,7 +361,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Makefile.mingw
+-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr
++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr
+ SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
+ all: all-recursive
+
+diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h
+--- pidgin-2.10.7/libpurple/prpl.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/prpl.h 2013-08-16 22:29:46.145754932 -0300
+@@ -161,15 +161,11 @@
+
+ /**
+ * Notify on new mail.
+- *
+- * MSN and Yahoo notify you when you have new mail.
+ */
+ OPT_PROTO_MAIL_CHECK = 0x00000020,
+
+ /**
+ * Images in IMs.
+- *
+- * Oscar lets you send images in direct IMs.
+ */
+ OPT_PROTO_IM_IMAGE = 0x00000040,
+
+@@ -184,16 +180,13 @@
+ /**
+ * Allows font size to be specified in sane point size
+ *
+- * Probably just XMPP and Y!M
++ * Probably just XMPP
+ */
+ OPT_PROTO_USE_POINTSIZE = 0x00000100,
+
+ /**
+ * Set the Register button active even when the username has not
+ * been specified.
+- *
+- * Gadu-Gadu doesn't need a username to register new account (because
+- * usernames are assigned by the server).
+ */
+ OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
+
+@@ -467,9 +460,7 @@
+ void (*convo_closed)(PurpleConnection *, const char *who);
+
+ /**
+- * Convert the username @a who to its canonical form. (For example,
+- * AIM treats "fOo BaR" and "foobar" as the same user; this function
+- * should return the same normalized string for both of those.)
++ * Convert the username @a who to its canonical form.
+ */
+ const char *(*normalize)(const PurpleAccount *, const char *who);
+
+@@ -923,7 +914,7 @@
+ * @param who Whose attention to request.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * of the attention request command to send. 0 if prpl only defines one
+- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * , but some protocols define more.
+ *
+ * Note that you can't send arbitrary PurpleAttentionType's, because there is
+ * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler
+--- pidgin-2.10.7/libpurple/purple-url-handler 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler 2013-08-16 21:16:42.951304560 -0300
+@@ -117,70 +117,6 @@
+ def addbuddy(account, screenname, group="", alias=""):
+ cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias)
+
+-
+-def aim(uri):
+- protocol = "prpl-aim"
+- match = re.match(r"^aim:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid aim URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("account", "")
+- screenname = params.get("screenname", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "goim":
+- goim(account, screenname, params.get("message"))
+- elif command.lower() == "gochat":
+- gochat(account, params)
+- elif command.lower() == "addbuddy":
+- addbuddy(account, screenname, params.get("group", ""))
+-
+-def gg(uri):
+- protocol = "prpl-gg"
+- match = re.match(r"^gg:(.*)", uri)
+- if not match:
+- print "Invalid gg URI: %s" % uri
+- return
+-
+- screenname = urllib.unquote_plus(match.group(1))
+- account = findaccount(protocol)
+- goim(account, screenname)
+-
+-def icq(uri):
+- protocol = "prpl-icq"
+- match = re.match(r"^icq:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid icq URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("account", "")
+- screenname = params.get("screenname", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "goim":
+- goim(account, screenname, params.get("message"))
+- elif command.lower() == "gochat":
+- gochat(account, params)
+- elif command.lower() == "addbuddy":
+- addbuddy(account, screenname, params.get("group", ""))
+-
+ def irc(uri):
+ protocol = "prpl-irc"
+ match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
+@@ -221,34 +157,6 @@
+ channel = "#" + channel
+ gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg"))
+
+-def msnim(uri):
+- protocol = "prpl-msn"
+- match = re.match(r"^msnim:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid msnim URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- screenname = params.get("contact", "")
+-
+- account = findaccount(protocol)
+-
+- if command.lower() == "chat":
+- goim(account, screenname)
+- elif command.lower() == "add":
+- addbuddy(account, screenname)
+-
+-def myim(uri):
+- protocol = "prpl-myspace"
+- print "TODO: send uri: ", uri
+- assert False, "Not implemented"
+-
+ def sip(uri):
+ protocol = "prpl-simple"
+ match = re.match(r"^sip:(.*)", uri)
+@@ -300,57 +208,6 @@
+ else:
+ goim(account, screenname)
+
+-def gtalk(uri):
+- protocol = "prpl-jabber"
+- match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri)
+- if not match:
+- print "Invalid gtalk URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- paramstring = match.group(3)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+- accountname = params.get("from_jid", "")
+- jid = params.get("jid", "")
+-
+- account = findaccount(protocol, accountname)
+-
+- if command.lower() == "chat":
+- goim(account, jid)
+- elif command.lower() == "call":
+- # XXX V&V prompt to establish call
+- goim(account, jid)
+-
+-def ymsgr(uri):
+- protocol = "prpl-yahoo"
+- match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri)
+- if not match:
+- print "Invalid ymsgr URI: %s" % uri
+- return
+-
+- command = urllib.unquote_plus(match.group(1))
+- screenname = urllib.unquote_plus(match.group(3))
+- paramstring = match.group(5)
+- params = {}
+- if paramstring:
+- for param in paramstring.split("&"):
+- key, value = extendlist(param.split("=", 1), 2, "")
+- params[key] = urllib.unquote_plus(value)
+-
+- account = findaccount(protocol)
+-
+- if command.lower() == "sendim":
+- goim(account, screenname, params.get("m"))
+- elif command.lower() == "chat":
+- gochat(account, {"room": screenname})
+- elif command.lower() == "addfriend":
+- addbuddy(account, screenname)
+-
+-
+ def main(argv=sys.argv):
+ if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h":
+ print "Usage: %s URI" % argv[0]
+diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c
+--- pidgin-2.10.7/libpurple/savedstatuses.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c 2013-08-16 22:52:44.582754543 -0300
+@@ -387,7 +387,6 @@
+ const char *protocol;
+ acct_name = xmlnode_get_data(node);
+ protocol = xmlnode_get_attrib(node, "protocol");
+- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */
+ if ((acct_name != NULL) && (protocol != NULL))
+ ret->account = purple_accounts_find(acct_name, protocol);
+ g_free(acct_name);
+diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h
+--- pidgin-2.10.7/libpurple/server.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/server.h 2013-08-16 23:30:04.149920853 -0300
+@@ -69,7 +69,7 @@
+ * @param who Whose attention to request.
+ * @param type_code An index into the prpl's attention_types list determining the type
+ * of the attention request command to send. 0 if prpl only defines one
+- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM).
++ * , but some protocols define more.
+ *
+ * Note that you can't send arbitrary PurpleAttentionType's, because there is
+ * only a fixed set of attention commands.
+diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h
+--- pidgin-2.10.7/libpurple/status.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/status.h 2013-08-16 22:52:22.542054119 -0300
+@@ -43,8 +43,7 @@
+ * one of your AIM buddies has set himself as "away." You have a
+ * PurpleBuddy node for this person in your buddy list. Purple wants
+ * to mark this buddy as "away," so it creates a new PurpleStatus.
+- * The PurpleStatus has its PurpleStatusType set to the "away" state
+- * for the oscar PRPL. The PurpleStatus also contains the buddy's
++ * The PurpleStatus also contains the buddy's
+ * away message. PurpleStatuses are sometimes saved, depending on
+ * the context. The current PurpleStatuses associated with each of
+ * your accounts are saved so that the next time you start Purple,
+diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c
+--- pidgin-2.10.7/libpurple/tests/check_libpurple.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c 2013-08-16 22:55:33.731462302 -0300
+@@ -88,8 +88,6 @@
+ srunner_add_suite(sr, jabber_digest_md5_suite());
+ srunner_add_suite(sr, jabber_jutil_suite());
+ srunner_add_suite(sr, jabber_scram_suite());
+- srunner_add_suite(sr, oscar_util_suite());
+- srunner_add_suite(sr, yahoo_util_suite());
+ srunner_add_suite(sr, util_suite());
+ srunner_add_suite(sr, xmlnode_suite());
+
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am
+--- pidgin-2.10.7/libpurple/tests/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am 2013-08-16 22:56:03.189064778 -0300
+@@ -14,8 +14,6 @@
+ test_jabber_digest_md5.c \
+ test_jabber_jutil.c \
+ test_jabber_scram.c \
+- test_oscar_util.c \
+- test_yahoo_util.c \
+ test_util.c \
+ test_xmlnode.c \
+ $(top_builddir)/libpurple/util.h
+@@ -31,8 +29,6 @@
+
+ check_libpurple_LDADD=\
+ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+- $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+- $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ $(top_builddir)/libpurple/libpurple.la \
+ @CHECK_LIBS@ \
+ $(GLIB_LIBS)
+diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in
+--- pidgin-2.10.7/libpurple/tests/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in 2013-08-16 23:53:20.713146759 -0300
+@@ -65,8 +65,8 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \
+ test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \
+- test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \
+- test_yahoo_util.c test_util.c test_xmlnode.c \
++ test_jabber_jutil.c test_jabber_scram.c \
++ test_util.c test_xmlnode.c \
+ $(top_builddir)/libpurple/util.h
+ @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS = \
+ @HAVE_CHECK_TRUE@ check_libpurple-check_libpurple.$(OBJEXT) \
+@@ -75,15 +75,11 @@
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_digest_md5.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_jutil.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_scram.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@ check_libpurple-test_oscar_util.$(OBJEXT) \
+-@HAVE_CHECK_TRUE@ check_libpurple-test_yahoo_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_util.$(OBJEXT) \
+ @HAVE_CHECK_TRUE@ check_libpurple-test_xmlnode.$(OBJEXT)
+ check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -177,8 +173,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -240,8 +234,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -389,8 +381,6 @@
+ @HAVE_CHECK_TRUE@ test_jabber_digest_md5.c \
+ @HAVE_CHECK_TRUE@ test_jabber_jutil.c \
+ @HAVE_CHECK_TRUE@ test_jabber_scram.c \
+-@HAVE_CHECK_TRUE@ test_oscar_util.c \
+-@HAVE_CHECK_TRUE@ test_yahoo_util.c \
+ @HAVE_CHECK_TRUE@ test_util.c \
+ @HAVE_CHECK_TRUE@ test_xmlnode.c \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/util.h
+@@ -406,8 +396,6 @@
+
+ @HAVE_CHECK_TRUE@check_libpurple_LDADD = \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \
+-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \
+ @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \
+ @HAVE_CHECK_TRUE@ @CHECK_LIBS@ \
+ @HAVE_CHECK_TRUE@ $(GLIB_LIBS)
+@@ -471,10 +459,8 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -581,34 +567,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi`
+
+-check_libpurple-test_oscar_util.o: test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c
+-
+-check_libpurple-test_oscar_util.obj: test_oscar_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi`
+-
+-check_libpurple-test_yahoo_util.o: test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c
+-
+-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c
+-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@
+-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi`
+-
+ check_libpurple-test_util.o: test_util.c
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c
+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c 2013-08-17 00:25:08.235128437 -0300
+@@ -33,7 +33,7 @@
+ START_TEST(test_calculate_caps)
+ {
+ assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+- "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
++ "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+ }
+ END_TEST
+
+diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c
+--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c 2013-08-27 22:53:21.524229291 -0300
+@@ -99,19 +99,19 @@
+
+ START_TEST(test_jabber_id_new)
+ {
+- assert_valid_jid("gmail.com");
+- assert_valid_jid("gmail.com/Test");
+- assert_valid_jid("gmail.com/Test@");
+- assert_valid_jid("gmail.com/@");
+- assert_valid_jid("gmail.com/Test@alkjaweflkj");
+- assert_valid_jid("mark.doliner@gmail.com");
+- assert_valid_jid("mark.doliner@gmail.com/Test12345");
+- assert_valid_jid("mark.doliner@gmail.com/Test@12345");
+- assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345");
++ assert_valid_jid("mail.com");
++ assert_valid_jid("mail.com/Test");
++ assert_valid_jid("mail.com/Test@");
++ assert_valid_jid("mail.com/@");
++ assert_valid_jid("mail.com/Test@alkjaweflkj");
++ assert_valid_jid("mark.doliner@mail.com");
++ assert_valid_jid("mark.doliner@mail.com/Test12345");
++ assert_valid_jid("mark.doliner@mail.com/Test@12345");
++ assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345");
+ assert_valid_jid("わいど@conference.jabber.org");
+ assert_valid_jid("まりるーむ@conference.jabber.org");
+- assert_valid_jid("mark.doliner@gmail.com/まりるーむ");
+- assert_valid_jid("mark.doliner@gmail/stuff.org");
++ assert_valid_jid("mark.doliner@mail.com/まりるーむ");
++ assert_valid_jid("mark.doliner@mail/stuff.org");
+ assert_valid_jid("stuart@nödåtXäYZ.se");
+ assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ");
+ assert_valid_jid("mark.doliner@わいど.org");
+@@ -123,17 +123,17 @@
+ assert_valid_jid("pa=ul@10.0.42.230");
+ assert_valid_jid("pa,ul@10.0.42.230");
+
+- assert_invalid_jid("@gmail.com");
+- assert_invalid_jid("@@gmail.com");
+- assert_invalid_jid("mark.doliner@@gmail.com/Test12345");
+- assert_invalid_jid("mark@doliner@gmail.com/Test12345");
+- assert_invalid_jid("@gmail.com/Test@12345");
++ assert_invalid_jid("@mail.com");
++ assert_invalid_jid("@@mail.com");
++ assert_invalid_jid("mark.doliner@@mail.com/Test12345");
++ assert_invalid_jid("mark@doliner@mail.com/Test12345");
++ assert_invalid_jid("@mail.com/Test@12345");
+ assert_invalid_jid("/Test@12345");
+ assert_invalid_jid("mark.doliner@");
+ assert_invalid_jid("mark.doliner/");
+- assert_invalid_jid("mark.doliner@gmail_stuff.org");
+- assert_invalid_jid("mark.doliner@gmail[stuff.org");
+- assert_invalid_jid("mark.doliner@gmail\\stuff.org");
++ assert_invalid_jid("mark.doliner@mail_stuff.org");
++ assert_invalid_jid("mark.doliner@mail[stuff.org");
++ assert_invalid_jid("mark.doliner@mail\\stuff.org");
+ assert_invalid_jid("paul@[::1]124");
+ assert_invalid_jid("paul@2[::1]124/as");
+ assert_invalid_jid("paul@まつ.おおかみ/\x01");
+diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h
+--- pidgin-2.10.7/libpurple/tests/tests.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h 2013-08-16 22:56:18.999567027 -0300
+@@ -13,8 +13,6 @@
+ Suite * jabber_digest_md5_suite(void);
+ Suite * jabber_jutil_suite(void);
+ Suite * jabber_scram_suite(void);
+-Suite * oscar_util_suite(void);
+-Suite * yahoo_util_suite(void);
+ Suite * util_suite(void);
+ Suite * xmlnode_suite(void);
+
+diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c
+--- pidgin-2.10.7/libpurple/util.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.c 2013-08-16 23:29:38.062434329 -0300
+@@ -3451,8 +3451,7 @@
+ * is set to TRUE if this URL is https, otherwise it is set to
+ * FALSE. But that change will break the API.
+ *
+- * This is important for Yahoo! web messenger login. They now
+- * force https login, and if you access the web messenger login
++ * They now force https login, and if you access the web messenger login
+ * page via http then it redirects you to the https version, but
+ * purple_util_fetch_url() ignores the "https" and attempts to
+ * fetch the URL via http again, which gets redirected again.
+@@ -4943,18 +4942,6 @@
+ return buf;
+ }
+
+-const char *_purple_oscar_convert(const char *act, const char *protocol)
+-{
+- if (act && purple_strequal(protocol, "prpl-oscar")) {
+- int i;
+- for (i = 0; act[i] != '\0'; i++)
+- if (!isdigit(act[i]))
+- return "prpl-aim";
+- return "prpl-icq";
+- }
+- return protocol;
+-}
+-
+ void purple_restore_default_signal_handlers(void)
+ {
+ #ifndef _WIN32
+diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h
+--- pidgin-2.10.7/libpurple/util.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/libpurple/util.h 2013-08-16 23:31:12.535403448 -0300
+@@ -456,8 +456,7 @@
+ /**
+ * Extracts a field of data from HTML.
+ *
+- * This is a scary function. See protocols/msn/msn.c and
+- * protocols/yahoo/yahoo_profile.c for example usage.
++ * This is a scary function.
+ *
+ * @param str The string to parse.
+ * @param len The size of str.
+@@ -1450,16 +1449,6 @@
+ const char *purple_escape_filename(const char *str);
+
+ /**
+- * This is added temporarily to assist the split of oscar into aim and icq.
+- * This should not be used by plugins.
+- *
+- * @deprecated This function should not be used in new code and should be
+- * removed in 3.0.0. The aim/icq prpl split happened a long
+- * time ago, and we don't need to keep migrating old data.
+- */
+-const char *_purple_oscar_convert(const char *act, const char *protocol);
+-
+-/**
+ * Restore default signal handlers for signals which might reasonably have
+ * handlers. This should be called by a fork()'d child process, since child processes
+ * inherit the handlers of the parent.
+diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c
+--- pidgin-2.10.7/pidgin/gtkaccount.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c 2013-08-27 22:45:35.495576079 -0300
+@@ -563,16 +563,11 @@
+ if (value == NULL)
+ value = purple_account_user_split_get_default_value(split);
+
+- /* Google Talk default domain hackery! */
+ menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu));
+ item = gtk_menu_get_active(GTK_MENU(menu));
+- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") &&
++ if (value == NULL && g_object_get_data(G_OBJECT(item), "") &&
+ !strcmp(purple_account_user_split_get_text(split), _("Domain")))
+- value = "gmail.com";
+-
+- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+- !strcmp(purple_account_user_split_get_text(split), _("Domain")))
+- value = "chat.facebook.com";
++ value = "";
+
+ if (value != NULL)
+ gtk_entry_set_text(GTK_ENTRY(entry), value);
+@@ -925,10 +920,6 @@
+ model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
+
+- if (g_object_get_data(G_OBJECT(item), "fakefacebook") &&
+- !strcmp(opt_entry->setting, "connection_security"))
+- str_value = "opportunistic_tls";
+-
+ /* Loop through list of PurpleKeyValuePair items */
+ for (node = list; node != NULL; node = node->next) {
+ if (node->data != NULL) {
+diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c
+--- pidgin-2.10.7/pidgin/gtkblist.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c 2013-08-16 23:10:16.549286879 -0300
+@@ -2126,10 +2126,6 @@
+ char *temp_vcard;
+ char *s, *c;
+ char *alias = NULL;
+- GList *aims = NULL;
+- GList *icqs = NULL;
+- GList *yahoos = NULL;
+- GList *msns = NULL;
+ GList *jabbers = NULL;
+
+ s = temp_vcard = g_strdup(vcard);
+@@ -2168,24 +2164,14 @@
+ /* We only want to worry about a few fields here. */
+ if (!strcmp(field, "FN"))
+ alias = g_strdup(value);
+- else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") ||
+- !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") ||
+- !strcmp(field, "X-JABBER"))
++ else if (!strcmp(field, "X-JABBER"))
+ {
+ char **values = g_strsplit(value, ":", 0);
+ char **im;
+
+ for (im = values; *im != NULL; im++)
+ {
+- if (!strcmp(field, "X-AIM"))
+- aims = g_list_append(aims, g_strdup(*im));
+- else if (!strcmp(field, "X-ICQ"))
+- icqs = g_list_append(icqs, g_strdup(*im));
+- else if (!strcmp(field, "X-YAHOO"))
+- yahoos = g_list_append(yahoos, g_strdup(*im));
+- else if (!strcmp(field, "X-MSN"))
+- msns = g_list_append(msns, g_strdup(*im));
+- else if (!strcmp(field, "X-JABBER"))
++ if (!strcmp(field, "X-JABBER"))
+ jabbers = g_list_append(jabbers, g_strdup(*im));
+ }
+
+@@ -2195,18 +2181,13 @@
+
+ g_free(temp_vcard);
+
+- if (aims == NULL && icqs == NULL && yahoos == NULL &&
+- msns == NULL && jabbers == NULL)
++ if (jabbers == NULL)
+ {
+ g_free(alias);
+
+ return FALSE;
+ }
+
+- add_buddies_from_vcard("prpl-aim", group, aims, alias);
+- add_buddies_from_vcard("prpl-icq", group, icqs, alias);
+- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias);
+- add_buddies_from_vcard("prpl-msn", group, msns, alias);
+ add_buddies_from_vcard("prpl-jabber", group, jabbers, alias);
+
+ g_free(alias);
+diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c
+--- pidgin-2.10.7/pidgin/gtkdialogs.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c 2013-08-16 21:37:21.863154130 -0300
+@@ -615,16 +615,6 @@
+ #endif
+ #endif
+
+-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU)
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Internal<br/>");
+-#else
+-#ifdef HAVE_LIBGADU
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>");
+-#else
+- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>");
+-#endif
+-#endif
+-
+ #ifdef USE_GTKSPELL
+ g_string_append(str, " <b>GtkSpell:</b> Enabled<br/>");
+ #else
+diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c
+--- pidgin-2.10.7/pidgin/gtkimhtml.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c 2013-08-16 22:59:51.862994429 -0300
+@@ -2440,7 +2440,6 @@
+ static gboolean smooth_scroll_cb(gpointer data);
+
+ /*
+- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming
+
+
+ [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :)
+diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c
+--- pidgin-2.10.7/pidgin/gtknotify.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c 2013-08-27 23:37:23.037593200 -0300
+@@ -1263,10 +1263,6 @@
+ command = g_strdup_printf("xdg-open %s", escaped);
+ g_free(tmp);
+ }
+- else if (purple_running_osx() == TRUE)
+- {
+- command = g_strdup_printf("open %s", escaped);
+- }
+ else if (!strcmp(web_browser, "epiphany") ||
+ !strcmp(web_browser, "galeon"))
+ {
+@@ -1289,30 +1285,31 @@
+ {
+ command = g_strdup_printf("kfmclient openURL %s", escaped);
+ /*
+- * Does Konqueror have options to open in new tab
++ * Does Konqueror-libre have options to open in new tab
+ * and/or current window?
+ */
+ }
+- else if (!strcmp(web_browser, "mozilla") ||
+- !strcmp(web_browser, "mozilla-firebird") ||
+- !strcmp(web_browser, "firefox") ||
+- !strcmp(web_browser, "seamonkey"))
++ else if (!strcmp(web_browser, "iceweasel") ||
++ !strcmp(web_browser, "icecat") ||
++ !strcmp(web_browser, "iceape"))
+ {
+ char *args = "";
+
+ command = g_strdup_printf("%s %s", web_browser, escaped);
+
+ /*
+- * Firefox 0.9 and higher require a "-a firefox" option when
++ * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when
+ * using -remote commands. This breaks older versions of
+ * mozilla. So we include this other handly little string
+- * when calling firefox. If the API for remote calls changes
+- * any more in firefox then firefox should probably be split
++ * when calling iceweasel. If the API for remote calls changes
++ * any more in iceweasel then iceweasel should probably be split
+ * apart from mozilla-firebird and mozilla... but this is good
+ * for now.
+ */
+- if (!strcmp(web_browser, "firefox"))
+- args = "-a firefox";
++ if (!strcmp(web_browser, "iceweasel"))
++ args = "-a iceweasel";
++ else if (!strcmp(web_browser, "icecat"))
++ args = "-a icecat";
+
+ if (place == PIDGIN_BROWSER_NEW_WINDOW)
+ remote_command = g_strdup_printf("%s %s -remote "
+@@ -1327,58 +1324,12 @@
+ "openURL(%s)",
+ web_browser, args, escaped);
+ }
+- else if (!strcmp(web_browser, "netscape"))
+- {
+- command = g_strdup_printf("netscape %s", escaped);
+-
+- if (place == PIDGIN_BROWSER_NEW_WINDOW)
+- {
+- remote_command = g_strdup_printf("netscape -remote "
+- "openURL(%s,new-window)",
+- escaped);
+- }
+- else if (place == PIDGIN_BROWSER_CURRENT)
+- {
+- remote_command = g_strdup_printf("netscape -remote "
+- "openURL(%s)", escaped);
+- }
+- }
+- else if (!strcmp(web_browser, "opera"))
+- {
+- if (place == PIDGIN_BROWSER_NEW_WINDOW)
+- command = g_strdup_printf("opera -newwindow %s", escaped);
+- else if (place == PIDGIN_BROWSER_NEW_TAB)
+- command = g_strdup_printf("opera -newpage %s", escaped);
+- else if (place == PIDGIN_BROWSER_CURRENT)
+- {
+- remote_command = g_strdup_printf("opera -remote "
+- "openURL(%s)", escaped);
+- command = g_strdup_printf("opera %s", escaped);
+- }
+- else
+- command = g_strdup_printf("opera %s", escaped);
+-
+- }
+- else if (!strcmp(web_browser, "google-chrome"))
+- {
+- /* Google Chrome doesn't have command-line arguments that control the
+- * opening of links from external calls. This is controlled solely from
+- * a preference within Google Chrome. */
+- command = g_strdup_printf("google-chrome %s", escaped);
+- }
+- else if (!strcmp(web_browser, "chrome"))
+- {
+- /* Chromium doesn't have command-line arguments that control the
+- * opening of links from external calls. This is controlled solely from
+- * a preference within Chromium. */
+- command = g_strdup_printf("chrome %s", escaped);
+- }
+- else if (!strcmp(web_browser, "chromium-browser"))
++ else if (!strcmp(web_browser, "chromium"))
+ {
+- /* Chromium doesn't have command-line arguments that control the
++ /* Chromium-libre doesn't have command-line arguments that control the
+ * opening of links from external calls. This is controlled solely from
+- * a preference within Chromium. */
+- command = g_strdup_printf("chromium-browser %s", escaped);
++ * a preference within Chromium-libre. */
++ command = g_strdup_printf("chromium %s", escaped);
+ }
+ else if (!strcmp(web_browser, "custom"))
+ {
+diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c
+--- pidgin-2.10.7/pidgin/gtkprefs.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c 2013-08-27 22:55:58.523782666 -0300
+@@ -1851,24 +1851,15 @@
+
+ /* Sorted reverse alphabetically */
+ static const struct browser possible_browsers[] = {
+- {N_("Seamonkey"), "seamonkey"},
+- {N_("Opera"), "opera"},
+- {N_("Netscape"), "netscape"},
+- {N_("Mozilla"), "mozilla"},
+- {N_("Konqueror"), "kfmclient"},
+- {N_("Google Chrome"), "google-chrome"},
+- /* Do not move the line below. Code below expects gnome-open to be in
+- * this list immediately after xdg-open! */
++ {N_("Iceape-libre"), "iceape"},
++ {N_("Konqueror-libre"), "kfmclient"},
+ {N_("Desktop Default"), "xdg-open"},
+ {N_("GNOME Default"), "gnome-open"},
+- {N_("Galeon"), "galeon"},
+- {N_("Firefox"), "firefox"},
+- {N_("Firebird"), "mozilla-firebird"},
+- {N_("Epiphany"), "epiphany"},
+- /* Translators: please do not translate "chromium-browser" here! */
+- {N_("Chromium (chromium-browser)"), "chromium-browser"},
+- /* Translators: please do not translate "chrome" here! */
+- {N_("Chromium (chrome)"), "chrome"}
++ {N_("Iceweasel-libre"), "iceweasel"},
++ {N_("Icecat"), "icecat"},
++ {N_("Epiphany-libre"), "epiphany"},
++ /* Translators: please do not translate "chromium" here! */
++ {N_("Chromium-libre (chromium)"), "chromium"},
+ };
+ static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers);
+
+diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c
+--- pidgin-2.10.7/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300
+@@ -677,7 +677,6 @@
+ GdkPixbuf *pixbuf = NULL;
+ GtkSizeGroup *sg;
+ GList *p;
+- const char *gtalk_name = NULL, *facebook_name = NULL;
+ int i;
+
+ aop_menu = g_malloc0(sizeof(AopMenu));
+@@ -686,55 +685,12 @@
+ gtk_widget_show(aop_menu->menu);
+ sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+
+- if (purple_find_prpl("prpl-jabber")) {
+- gtalk_name = _("Google Talk");
+- facebook_name = _("Facebook (XMPP)");
+- }
+-
+ for (p = purple_plugins_get_protocols(), i = 0;
+ p != NULL;
+ p = p->next, i++) {
+
+ plugin = (PurplePlugin *)p->data;
+
+- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) {
+- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+- "16", "google-talk.png", NULL);
+- GtkWidget *item;
+-
+- pixbuf = pidgin_pixbuf_new_from_file(filename);
+- g_free(filename);
+-
+- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol"));
+- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1));
+-
+- if (pixbuf)
+- g_object_unref(pixbuf);
+-
+- gtalk_name = NULL;
+- i++;
+- }
+-
+- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) {
+- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols",
+- "16", "facebook.png", NULL);
+- GtkWidget *item;
+-
+- pixbuf = pidgin_pixbuf_new_from_file(filename);
+- g_free(filename);
+-
+- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol"));
+- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1));
+-
+- if (pixbuf)
+- g_object_unref(pixbuf);
+-
+- facebook_name = NULL;
+- i++;
+- }
+-
+ pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL);
+
+ gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu),
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.c 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c 2013-08-16 23:25:21.614375960 -0300
+@@ -339,13 +339,10 @@
+ */
+ /* XXXX because otherwise gettext will see this string, even though it's
+ * in an #if 0 block. Remove the XXXX if you want to use this code.
+- * But, it really shouldn't be a Yahoo-specific string. ;) */
++ */
+ purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."),
+ PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL));
+
+- yahoo_doodle_command_send_request(gc, to);
+- yahoo_doodle_command_send_ready(gc, to);
+-
+ /* Insert this 'session' in the list. At this point, it's only a requested
+ * session.
+ */
+@@ -554,15 +551,13 @@
+ if(event->button == 1 && pixmap != NULL)
+ {
+ /* If the brush was never moved, express two sets of two deltas That's a
+- * 'point,' but not for Yahoo!
++ * 'point,'
+ */
+ /* if((event->x == LastX) && (event->y == LastY)) */
+ if(MotionCount == 0)
+ {
+ int index;
+
+- /* For Yahoo!, a (0 0) indicates the end of drawing */
+- /* FIXME: Yahoo Doodle specific! */
+ for(index = 0; index < 2; index++)
+ {
+ draw_list = g_list_append(draw_list, 0);
+diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h
+--- pidgin-2.10.7/pidgin/gtkwhiteboard.h 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h 2013-08-27 23:28:41.018759351 -0300
+@@ -37,8 +37,7 @@
+ #define BRUSH_STATE_DOWN 1
+ #define BRUSH_STATE_MOTION 2
+
+-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code.
+- * XXX: How should they work together? */
++/* XXX: How should they work together? */
+ #define PALETTE_NUM_COLORS 7
+
+ /**
+diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am
+--- pidgin-2.10.7/pidgin/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am 2013-08-16 21:03:34.936610745 -0300
+@@ -160,10 +160,6 @@
+ $(GTK_LIBS) \
+ $(top_builddir)/libpurple/libpurple.la
+
+-if USE_INTERNAL_LIBGADU
+-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+-endif
+-
+ AM_CPPFLAGS = \
+ -DDATADIR=\"$(datadir)\" \
+ -DLIBDIR=\"$(libdir)/pidgin/\" \
+@@ -179,6 +175,5 @@
+ $(GTK_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GTKSPELL_CFLAGS) \
+- $(LIBXML_CFLAGS) \
+- $(INTGG_CFLAGS)
++ $(LIBXML_CFLAGS)
+ endif # ENABLE_GTK
+diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in
+--- pidgin-2.10.7/pidgin/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in 2013-08-16 23:56:44.729405978 -0300
+@@ -286,8 +286,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -349,8 +347,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -645,7 +641,6 @@
+ @ENABLE_GTK_TRUE@ $(GTK_LIBS) \
+ @ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la
+
+-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU
+ @ENABLE_GTK_TRUE@AM_CPPFLAGS = \
+ @ENABLE_GTK_TRUE@ -DDATADIR=\"$(datadir)\" \
+ @ENABLE_GTK_TRUE@ -DLIBDIR=\"$(libdir)/pidgin/\" \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-08-16 23:13:41.759061988 -0300
+@@ -28,8 +28,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png :-!
+ shout.png >:o >:O
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ good.png :yes:
+ bad.png :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png C:-) c:-) C:) c:)
+ ! monkey.png :-(|) :(|) 8-|)
+ ! cyclops.png O-) o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-shout.png >:o
+-excited.png :-D :D
+-moneymouth.png :-$
+-foot-in-mouth.png :-!
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-love-over.png (U) (u)
+-msn.png (M) (m)
+-cat.png (@)
+-dog.png (&)
+-moon.png (S)
+-star.png (*)
+-film.png (~)
+-musical-note.png (8)
+-mail.png (E) (e)
+-rose.png (F) (f)
+-rose-dead.png (W) (w)
+-clock.png (O) (o)
+-kiss.png (K) (k)
+-present.png (G) (g)
+-cake.png (^)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-drink.png (D) (d)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-good.png (Y) (y)
+-bad.png (N) (n)
+-vampire.png :[ :-[
+-goat.png (nah)
+-sun.png (#)
+-rainbow.png (R) (r)
+-quiet.png :-#
+-teeth.png 8o|
+-glasses-nerdy.png 8-|
+-sarcastic.png ^o)
+-secret.png :-*
+-sick.png +o(
+-snail.png (sn)
+-turtle.png (tu)
+-plate.png (pl)
+-bowl.png (||)
+-pizza.png (pi)
+-soccerball.png (so)
+-car.png (au)
+-airplane.png (ap)
+-umbrella.png (um)
+-island.png (ip)
+-computer.png (co)
+-mobile.png (mp)
+-brb.png (brb)
+-rain.png (st)
+-highfive.png (h5)
+-coins.png (mo)
+-sheep.png (bah)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-bunny.png ('.')
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-handcuffs.png (%)
+-console.png (xx) (XX)
+-fingers-crossed.png (yn) (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-curl-lip.png /:~ /pz /curl_lip
+-desire.png /:* /se /desire
+-dazed.png /:| /dazed
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-bashful.png /:$ /hx /bashful
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-weep.png /:'( /dk /weep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-act-up.png /:P /tp /act_up
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-doctor.png /:# /feid /SARS
+-silly.png /:Q /zk /crazy
+-sick.png /:T /tu /vomit
+-snicker.png /;p /tx /titter
+-cute.png /;-D /ka /cute
+-disdain.png /;d /by /disdain
+-arrogant.png /;o /am /arrogant
+-starving.png /:g /jie /starving
+-sleepy.png /|-) /kun /sleepy
+-terror.png /:! /jk /terror
+-hot.png /:L /sweat
+-smirk.png /:> /hanx /smirk
+-soldier.png /:; /db /soldier
+-struggle.png /;f /fendou /struggle
+-curse.png /:-S /zhm /curse
+-question.png /? /yiw /question
+-quiet.png /;x /xu /shh
+-hypnotized.png /;@ /yun /dizzy
+-excruciating.png /:8 /zhem /excrutiating
+-freaked-out.png /;! /shuai /freaked_out
+-skeleton.png /!!! /kl /skeleton
+-hammer.png /xx /qiao /hammer
+-bye.png /bye /zj /bye
+-go-away.png /go /shan /go
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-jump.png /jump /tiao /jump
+-search.png /find /zhao /search
+-lashes.png /& /mm /beautiful_eyebrows
+-pig.png /pig /zt /pig
+-cat.png /cat /mm /cat
+-dog.png /dog /xg /dog
+-hug-left.png /hug /yb /hug
+-coins.png /$ /qianc /money
+-lamp.png /! /dp /lightbulb
+-bowl.png /cup /bei /cup
+-cake.png /cake /dg /cake
+-thunder.png /li /shd /lightning
+-bomb.png /bome /zhd /bomb
+-knife.png /kn /dao /knife
+-soccerball.png /footb /zq /soccer
+-musical-note.png /music /yy /music
+-poop.png /shit /bb /shit
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-pill.png /pill /yw /pill
+-rose.png /rose /mg /rose
+-wilt.png /fade /dx /wilt
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-love-over.png /break /xs /broken_heart
+-meeting.png /meeting /hy /meeting
+-present.png /gift /lw /gift
+-phone.png /phone /dh /phone
+-clock.png /time /sj /time
+-mail.png /email /yj /email
+-tv.png /TV /ds /TV
+-sun.png /sun /ty /sun
+-moon.png /moon /yl /moon
+-good.png /strong /qiang /thumbs_up
+-bad.png /weak /ruo /thumbs_down
+-handshake.png /share /ws /handshake
+-victory.png /v /shl /victory
+-beauty.png /<J> /mn /beauty
+-qq.png /<QQ> /qz /qq
+-blowkiss.png /<L> /fw /blow_kiss
+-angry.png /<O> /oh /angry
+-liquor.png /<B> /bj /baijiu
+-can.png /<U> /qsh /soda
+-watermelon.png /<W> /xigua /watermelon
+-rain.png /<!!> /xy /rain
+-cloudy.png /<~> /duoy /cloudy
+-snowman.png /<Z> /xr /snowman
+-star.png /<*> /xixing /star
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-laugh.png *JOKINGLY*
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kissed.png *KISSED*
+-stop.png *STOP*
+-kiss.png :-{} :-*
+-kissing.png *KISSING*
+-victory.png *YAHOO*
+-silly.png %)
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-bomb.png @=
+-thinking.png :-\\ :-/
+-good.png *THUMBS\ UP*
+-shout.png >:o >:O :-@
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-glasses-nerdy.png B)
+-bulgy-eyes.png %)
+-freaked-out.png :E
+-happy.png :) :-)
+-amorous.png :X
+-laugh.png :))
+-mohawk.png -:
+-mad-tongue.png X(
+-messed.png X)
+-glasses-nerdy.png Q)
+-doh.png :G
+-pirate.png P)
+-shocked.png :O
+-sidefrown.png :{
+-sinister.png :B
+-smirk.png :,
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme 2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme 2013-08-16 23:15:55.929941297 -0300
+@@ -28,8 +28,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -47,7 +46,7 @@
+ foot-in-mouth.png :-!
+ shout.png >:o >:O
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ good.png :yes:
+ bad.png :no:
+@@ -75,515 +74,3 @@
+ ! skywalker.png C:-) c:-) C:) c:)
+ ! monkey.png :-(|) :(|) 8-|)
+ ! cyclops.png O-) o-)
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-shout.png >:o
+-excited.png :-D :D
+-moneymouth.png :-$
+-foot-in-mouth.png :-!
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-love-over.png (U) (u)
+-msn.png (M) (m)
+-cat.png (@)
+-dog.png (&)
+-moon.png (S)
+-star.png (*)
+-film.png (~)
+-musical-note.png (8)
+-mail.png (E) (e)
+-rose.png (F) (f)
+-rose-dead.png (W) (w)
+-clock.png (O) (o)
+-kiss.png (K) (k)
+-present.png (G) (g)
+-cake.png (^)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-drink.png (D) (d)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-good.png (Y) (y)
+-bad.png (N) (n)
+-vampire.png :[ :-[
+-goat.png (nah)
+-sun.png (#)
+-rainbow.png (R) (r)
+-quiet.png :-#
+-teeth.png 8o|
+-glasses-nerdy.png 8-|
+-sarcastic.png ^o)
+-secret.png :-*
+-sick.png +o(
+-snail.png (sn)
+-turtle.png (tu)
+-plate.png (pl)
+-bowl.png (||)
+-pizza.png (pi)
+-soccerball.png (so)
+-car.png (au)
+-airplane.png (ap)
+-umbrella.png (um)
+-island.png (ip)
+-computer.png (co)
+-mobile.png (mp)
+-brb.png (brb)
+-rain.png (st)
+-highfive.png (h5)
+-coins.png (mo)
+-sheep.png (bah)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-bunny.png ('.')
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-handcuffs.png (%)
+-console.png (xx) (XX)
+-fingers-crossed.png (yn) (YN)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-curl-lip.png /:~ /pz /curl_lip
+-desire.png /:* /se /desire
+-dazed.png /:| /dazed
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-bashful.png /:$ /hx /bashful
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-weep.png /:'( /dk /weep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-act-up.png /:P /tp /act_up
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-doctor.png /:# /feid /SARS
+-silly.png /:Q /zk /crazy
+-sick.png /:T /tu /vomit
+-snicker.png /;p /tx /titter
+-cute.png /;-D /ka /cute
+-disdain.png /;d /by /disdain
+-arrogant.png /;o /am /arrogant
+-starving.png /:g /jie /starving
+-sleepy.png /|-) /kun /sleepy
+-terror.png /:! /jk /terror
+-hot.png /:L /sweat
+-smirk.png /:> /hanx /smirk
+-soldier.png /:; /db /soldier
+-struggle.png /;f /fendou /struggle
+-curse.png /:-S /zhm /curse
+-question.png /? /yiw /question
+-quiet.png /;x /xu /shh
+-hypnotized.png /;@ /yun /dizzy
+-excruciating.png /:8 /zhem /excrutiating
+-freaked-out.png /;! /shuai /freaked_out
+-skeleton.png /!!! /kl /skeleton
+-hammer.png /xx /qiao /hammer
+-bye.png /bye /zj /bye
+-go-away.png /go /shan /go
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-jump.png /jump /tiao /jump
+-search.png /find /zhao /search
+-lashes.png /& /mm /beautiful_eyebrows
+-pig.png /pig /zt /pig
+-cat.png /cat /mm /cat
+-dog.png /dog /xg /dog
+-hug-left.png /hug /yb /hug
+-coins.png /$ /qianc /money
+-lamp.png /! /dp /lightbulb
+-bowl.png /cup /bei /cup
+-cake.png /cake /dg /cake
+-thunder.png /li /shd /lightning
+-bomb.png /bome /zhd /bomb
+-knife.png /kn /dao /knife
+-soccerball.png /footb /zq /soccer
+-musical-note.png /music /yy /music
+-poop.png /shit /bb /shit
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-pill.png /pill /yw /pill
+-rose.png /rose /mg /rose
+-wilt.png /fade /dx /wilt
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-love-over.png /break /xs /broken_heart
+-meeting.png /meeting /hy /meeting
+-present.png /gift /lw /gift
+-phone.png /phone /dh /phone
+-clock.png /time /sj /time
+-mail.png /email /yj /email
+-tv.png /TV /ds /TV
+-sun.png /sun /ty /sun
+-moon.png /moon /yl /moon
+-good.png /strong /qiang /thumbs_up
+-bad.png /weak /ruo /thumbs_down
+-handshake.png /share /ws /handshake
+-victory.png /v /shl /victory
+-beauty.png /<J> /mn /beauty
+-qq.png /<QQ> /qz /qq
+-blowkiss.png /<L> /fw /blow_kiss
+-angry.png /<O> /oh /angry
+-liquor.png /<B> /bj /baijiu
+-can.png /<U> /qsh /soda
+-watermelon.png /<W> /xigua /watermelon
+-rain.png /<!!> /xy /rain
+-cloudy.png /<~> /duoy /cloudy
+-snowman.png /<Z> /xr /snowman
+-star.png /<*> /xixing /star
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-laugh.png *JOKINGLY*
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kissed.png *KISSED*
+-stop.png *STOP*
+-kiss.png :-{} :-*
+-kissing.png *KISSING*
+-victory.png *YAHOO*
+-silly.png %)
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-bomb.png @=
+-thinking.png :-\\ :-/
+-good.png *THUMBS\ UP*
+-shout.png >:o >:O :-@
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-hypnotized.png @-)
+-on-the-phone.png :)]
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-glasses-nerdy.png :-B :-b
+-quiet.png :-$
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-call-me.png :-c
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-laugh.png :)) :-))
+-bye.png =;
+-arrogant.png [-(
+-thinking.png :-?
+-waiting.png :-w :-W
+-at-wits-end.png ~x( ~X(
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-clown.png :o) :O)
+-doh.png #-o #-O
+-weep.png :-<
+-go-away.png :-h
+-lashes.png ;;)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-silly.png 8-}
+-clap.png =D> =d>
+-mad-tongue.png >:P >:p
+-time-out.png :-t :-T
+-hug-left.png >:D< >:d<
+-love-over.png =((
+-hot.png #:-S #:-s
+-rotfl.png =)) :-j :-J
+-loser.png L-) l-)
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-cowboy.png <):)
+-desire.png 8->
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|)
+-
+-# Hidden Yahoo emotes
+-alien.png =:) >-)
+-beat-up.png b-( B-(
+-chicken.png ~:>
+-coffee.png ~o) ~O)
+-cow.png 3:-O 3:-o
+-dance.png \\:D/ \\:d/
+-rose.png @};-
+-dont-know.png :-L :-l
+-skeleton.png 8-X 8-x
+-lamp.png *-:)
+-monkey.png :(|)
+-coins.png $-)
+-peace.png :)>-
+-pig.png :@)
+-pray.png [-o< [-O<
+-pumpkin.png (~~)
+-shame.png [-X [-x
+-flag.png **==
+-clover.png %%-
+-musical-note.png :-"
+-giggle.png ;))
+-worship.png ^:)^
+-star.png (*)
+-waving.png >:/
+-talktohand.png :-@
+-
+-# Only available after activating the Yahoo! Fighter IMVironment
+-male-fighter1.png o-> O->
+-male-fighter2.png o=> O=>
+-female-fighter.png o-+ O-+
+-yin-yang.png (%)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-glasses-nerdy.png B)
+-bulgy-eyes.png %)
+-freaked-out.png :E
+-happy.png :) :-)
+-amorous.png :X
+-laugh.png :))
+-mohawk.png -:
+-mad-tongue.png X(
+-messed.png X)
+-glasses-nerdy.png Q)
+-doh.png :G
+-pirate.png P)
+-shocked.png :O
+-sidefrown.png :{
+-sinister.png :B
+-smirk.png :,
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-! skywalker.png C:-) c:-) C:) c:)
+-! monkey.png :-(|) :(|) 8-|)
+-! cyclops.png O-) o-)
+-
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-08-16 23:19:01.815778718 -0300
+@@ -22,8 +22,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -38,7 +37,7 @@
+ angel.png O:-) o:-)
+ shut-mouth.png :-X
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ rose.png @->-- :rose:
+ phone.png :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png :| :-|
+
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-excited.png :-D :D
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-star.png (*)
+-musical-note.png (8)
+-rose.png (F) (f)
+-kiss.png (K) (k)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-sarcastic.png ^o)
+-sick.png +o(
+-plate.png (pl)
+-mobile.png (mp)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-console.png (xx) (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-sick.png /:T /tu /vomit
+-sleepy.png /|-) /kun /sleepy
+-hot.png /:L /sweat
+-question.png /? /yiw /question
+-excruciating.png /:8 /zhem /excrutiating
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-search.png /find /zhao /search
+-hug-left.png /hug /yb /hug
+-lamp.png /! /dp /lightbulb
+-thunder.png /li /shd /lightning
+-musical-note.png /music /yy /music
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-rose.png /rose /mg /rose
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-meeting.png /meeting /hy /meeting
+-phone.png /phone /dh /phone
+-tv.png /TV /ds /TV
+-angry.png /<O> /oh /angry
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kiss.png :-{} :-*
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-thinking.png :-\\ :-/
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-hot.png #:-S #:-s
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-wink.png ;) ;-)
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-party.png <:-P <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-happy.png :) :-)
+-amorous.png :X
+-pirate.png P)
+-shocked.png :O
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme
+--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme 2013-02-11 07:17:58.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme 2013-08-16 23:17:03.828740061 -0300
+@@ -22,8 +22,7 @@
+
+
+ [XMPP]
+-# Following XEP-0038 + GTalk + our default set, in default set order
+-# The GTalk strings come from ticket #3307.
++# Following XEP-0038 + our default set, in default set order
+ happy.png :) :-) =)
+ excited.png :-D :-d :D :d =D =d
+ sad.png :-( :(
+@@ -38,7 +37,7 @@
+ angel.png O:-) o:-)
+ shut-mouth.png :-X
+
+-# Following XEP-0038 + GTalk
++# Following XEP-0038
+ angry.png >:-( >:( X-( x-(
+ rose.png @->-- :rose:
+ phone.png :telephone:
+@@ -53,269 +52,3 @@
+ neutral.png :| :-|
+
+ # Hidden icons from the default set.
+-
+-
+-# Following AIM 6.1
+-[AIM]
+-happy.png :-) :)
+-wink.png ;-) ;)
+-sad.png :-( :(
+-tongue.png :P :p :-P :-p
+-shocked.png =-O
+-kiss.png :-*
+-excited.png :-D :D
+-embarrassed.png :-[
+-angel.png O:-)
+-thinking.png :-\\ :-/
+-crying.png :'(
+-shut-mouth.png :-X
+-glasses-cool.png 8-)
+-
+-
+-# Following Windows Live Messenger 8.1
+-[MSN]
+-happy.png :) :-)
+-excited.png :D :d :-D :-d
+-wink.png ;) ;-)
+-shocked.png :-O :-o :O :o
+-tongue.png :-P :P :-p :p
+-glasses-cool.png (H) (h)
+-angry.png :@ :-@
+-embarrassed.png :$ :-$
+-confused.png :S :s :-S :-s
+-sad.png :( :-(
+-crying.png :'(
+-neutral.png :| :-|
+-devil.png (6)
+-angel.png (A) (a)
+-in_love.png (L) (l)
+-star.png (*)
+-musical-note.png (8)
+-rose.png (F) (f)
+-kiss.png (K) (k)
+-camera.png (P) (p)
+-lamp.png (I) (i)
+-coffee.png (C) (c)
+-phone.png (T) (t)
+-hug-left.png ({)
+-hug-right.png (})
+-beer.png (B) (b)
+-boy.png (Z) (z)
+-girl.png (X) (x)
+-sarcastic.png ^o)
+-sick.png +o(
+-plate.png (pl)
+-mobile.png (mp)
+-dont-know.png :^)
+-thinking.png *-)
+-thunder.png (li)
+-party.png <:o)
+-eyeroll.png 8-)
+-sleepy.png |-)
+-
+-# Hidden MSN emotes
+-cigarette.png (ci) (CI)
+-console.png (xx) (XX)
+-
+-
+-# Following QQ 2006
+-[QQ]
+-shocked.png /:O /jy /surprised
+-party.png /8-) /dy /revel
+-crying.png /:< /ll /cry
+-shut-mouth.png /:X /bz /shut_mouth
+-sleeping.png /:Z /shui /sleep
+-embarrassed.png /:-| /gg /embarassed
+-pissed-off.png /:@ /fn /pissed_off
+-excited.png /:D /cy /toothy_smile
+-happy.png /:) /wx /small_smile
+-sad.png /:( /ng /sad
+-glasses-cool.png /:+ /kuk /cool
+-sick.png /:T /tu /vomit
+-sleepy.png /|-) /kun /sleepy
+-hot.png /:L /sweat
+-question.png /? /yiw /question
+-excruciating.png /:8 /zhem /excrutiating
+-afraid.png /shake /fad /shake
+-amorous.png /love /aiq /love
+-search.png /find /zhao /search
+-hug-left.png /hug /yb /hug
+-lamp.png /! /dp /lightbulb
+-thunder.png /li /shd /lightning
+-musical-note.png /music /yy /music
+-coffee.png /coffee /kf /coffee
+-hungry.png /eat /fan /eat
+-rose.png /rose /mg /rose
+-kiss.png /kiss /wen /kiss
+-in_love.png /heart /xin /heart
+-meeting.png /meeting /hy /meeting
+-phone.png /phone /dh /phone
+-tv.png /TV /ds /TV
+-angry.png /<O> /oh /angry
+-girl.png /<00> /nv /woman
+-boy.png /<11> /nan /man
+-
+-
+-# Following ICQ 6.0
+-[ICQ]
+-happy.png :-) :)
+-neutral.png :-$
+-sad.png :-( :(
+-shocked.png =-O
+-wink.png ;-) ;)
+-tongue.png :-P :P :-p :p
+-music.png [:-}
+-sleeping.png *TIRED*
+-crying.png :'( :'-(
+-sick.png :-!
+-kiss.png :-{} :-*
+-embarrassed.png :-[
+-devil.png ]:->
+-angel.png O:-)
+-rose.png @}->--
+-shut-mouth.png :-X :X :-x :x
+-thinking.png :-\\ :-/
+-beer.png *DRINK*
+-excited.png :-D :D
+-glasses-cool.png 8-)
+-amorous.png *IN\ LOVE*
+-
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-drool.png =P~ =p~
+-lying.png :^O :^o
+-wink.png ;) ;-)
+-embarrassed.png :">
+-mean.png :-> :>
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-hot.png #:-S #:-s
+-party.png <:-P <:-p
+-nervous.png :-SS :-Ss :-sS :-ss
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-# Following Yahoo! Messenger 8.1
+-[Yahoo JAPAN]
+-happy.png :) :-)
+-question.png :-/ :-\\
+-shocked.png :-O :O :-o :o
+-devil.png >:)
+-angel.png O:-) o:-) 0:-)
+-sick.png :-&
+-sleepy.png (:|
+-sad.png :( :-(
+-amorous.png :x :-x :X :-X
+-angry.png X-( x-( X( x(
+-crying.png :((
+-wink.png ;) ;-)
+-thinking.png :-?
+-excited.png :D :-D :d :-d
+-tongue.png :-P :P :-p :p
+-glasses-cool.png B-) b-)
+-neutral.png :| :-|
+-sleeping.png I-) i-) |-)
+-kiss.png :-* :*
+-confused.png :-S :-s
+-sarcastic.png /:)
+-eyeroll.png 8-|
+-hug-left.png >:D< >:d<
+-party.png <:-P <:-p
+-
+-# Hidden Yahoo emotes
+-coffee.png ~o) ~O)
+-rose.png @};-
+-dont-know.png :-L :-l
+-lamp.png *-:)
+-shame.png [-X [-x
+-musical-note.png :-"
+-star.png (*)
+-
+-
+-# Following MySpaceIM Beta 1.0.697.0
+-[MySpaceIM]
+-excited.png :D :-D
+-devil.png }:)
+-confused.png :Z
+-happy.png :) :-)
+-amorous.png :X
+-pirate.png P)
+-shocked.png :O
+-neutral.png :|
+-tongue.png :P :p
+-pissed-off.png B|
+-wink.png ;-) ;)
+-sad.png :[
+-kiss.png :x
+-
+-# MXit standard emoticons
+-[MXit]
+-happy.png :-) :)
+-sad.png :-( :(
+-wink.png ;-) ;)
+-excited.png :-D :D :-> :>
+-neutral.png :-| :|
+-shocked.png :-O :O
+-tongue.png :-P :P
+-embarrassed.png :-$ :$
+-glasses-cool.png 8-)
+-in_love.png (H)
+-rose.png (F)
+-### Added in v3.0
+-boy.png (m)
+-girl.png (f)
+-star.png (*)
+-chilli.png (c)
+-kiss.png (x)
+-lamp.png (i)
+-pissed-off.png :e :-e
+-shut-mouth.png :-x :x
+-thunder.png (z)
+-coffee.png (U)
+-mrgreen.png (G)
+-### Added in v5.0
+-sick.png :o(
+-excruciating.png :-{ :{
+-amorous.png :-} :}
+-eyeroll.png 8-o 8o
+-crying.png :'(
+-thinking.png :-? :?
+-drool.png :-~ :~
+-sleeping.png :-z :z
+-lying.png :L)
+-glasses-nerdy.png 8-| 8|
+-pirate.png P-)
+-### Added in v5.9.7
+-bored.png :-[ :[
+-cold.png :-< :<
+-confused.png :-, :,
+-hungry.png :-C :C
+-stressed.png :-s :s
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am 2013-08-17 00:00:17.335924146 -0300
+@@ -204,37 +204,19 @@
+ emotes/small/16/scalable/pidgin-emotes.svg
+
+ PROTOCOLS_16_SCALABLE = \
+- protocols/16/scalable/aim.svg \
+ protocols/16/scalable/bonjour.svg \
+- protocols/16/scalable/gadu-gadu.svg \
+- protocols/16/scalable/novell.svg \
+- protocols/16/scalable/icq.svg \
+ protocols/16/scalable/irc.svg \
+ protocols/16/scalable/jabber.svg \
+- protocols/16/scalable/meanwhile.svg \
+- protocols/16/scalable/msn.svg \
+ protocols/16/scalable/silc.svg \
+ protocols/16/scalable/simple.svg \
+- protocols/16/scalable/yahoo.svg \
+ protocols/16/scalable/zephyr.svg
+
+ PROTOCOLS_16 = \
+- protocols/16/aim.png \
+ protocols/16/bonjour.png \
+- protocols/16/facebook.png \
+- protocols/16/gadu-gadu.png \
+- protocols/16/google-talk.png \
+- protocols/16/novell.png \
+- protocols/16/icq.png \
+ protocols/16/irc.png \
+ protocols/16/jabber.png \
+- protocols/16/meanwhile.png \
+- protocols/16/msn.png \
+- protocols/16/mxit.png \
+- protocols/16/myspace.png \
+ protocols/16/silc.png \
+ protocols/16/simple.png \
+- protocols/16/yahoo.png \
+ protocols/16/zephyr.png
+
+ ICONS_16_SCALABLE = \
+@@ -259,72 +241,35 @@
+ ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+
+ PROTOCOLS_22_SCALABLE = \
+- protocols/22/scalable/aim.svg \
+ protocols/22/scalable/bonjour.svg \
+- protocols/22/scalable/gadu-gadu.svg \
+- protocols/22/scalable/novell.svg \
+- protocols/22/scalable/icq.svg \
+ protocols/22/scalable/irc.svg \
+ protocols/22/scalable/jabber.svg \
+- protocols/22/scalable/meanwhile.svg \
+- protocols/22/scalable/msn.svg \
+ protocols/22/scalable/silc.svg \
+ protocols/22/scalable/simple.svg \
+- protocols/22/scalable/yahoo.svg \
+ protocols/22/scalable/zephyr.svg
+
+ PROTOCOLS_22 = \
+- protocols/22/aim.png \
+ protocols/22/bonjour.png \
+- protocols/22/facebook.png \
+- protocols/22/gadu-gadu.png \
+- protocols/22/google-talk.png \
+- protocols/22/novell.png \
+- protocols/22/icq.png \
+ protocols/22/irc.png \
+ protocols/22/jabber.png \
+- protocols/22/meanwhile.png \
+- protocols/22/msn.png \
+- protocols/22/mxit.png \
+- protocols/22/myspace.png \
+ protocols/22/silc.png \
+ protocols/22/simple.png \
+- protocols/22/yahoo.png \
+ protocols/22/zephyr.png
+
+ PROTOCOLS_48 = \
+- protocols/48/aim.png \
+ protocols/48/bonjour.png \
+- protocols/48/facebook.png \
+- protocols/48/gadu-gadu.png \
+- protocols/48/novell.png \
+- protocols/48/icq.png \
+ protocols/48/irc.png \
+ protocols/48/jabber.png \
+- protocols/48/meanwhile.png \
+- protocols/48/msn.png \
+- protocols/48/mxit.png \
+- protocols/48/myspace.png \
+ protocols/48/silc.png \
+ protocols/48/simple.png \
+- protocols/48/yahoo.png \
+ protocols/48/zephyr.png
+
+ PROTOCOLS_SCALABLE = \
+- protocols/scalable/aim.svg \
+ protocols/scalable/bonjour.svg \
+- protocols/scalable/gadu-gadu.svg \
+- protocols/scalable/google-talk.svg \
+- protocols/scalable/novell.svg \
+- protocols/scalable/icq.svg \
+ protocols/scalable/irc.svg \
+ protocols/scalable/jabber.svg \
+- protocols/scalable/meanwhile.svg \
+- protocols/scalable/msn.svg \
+- protocols/scalable/mxit.svg \
+ protocols/scalable/silc.svg \
+ protocols/scalable/simple.svg \
+- protocols/scalable/yahoo.svg \
+ protocols/scalable/zephyr.svg
+
+ STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in
+--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in 2013-02-11 07:17:23.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in 2013-08-16 23:59:52.918508551 -0300
+@@ -240,40 +240,19 @@
+ emblems/scalable/male.svg emblems/scalable/not-authorized.svg \
+ emblems/scalable/secure.svg emblems/scalable/unavailable.svg \
+ emblems/scalable/video.svg emblems/scalable/voice.svg \
+- protocols/16/aim.png protocols/16/bonjour.png \
+- protocols/16/facebook.png protocols/16/gadu-gadu.png \
+- protocols/16/google-talk.png protocols/16/novell.png \
+- protocols/16/icq.png protocols/16/irc.png \
+- protocols/16/jabber.png protocols/16/meanwhile.png \
+- protocols/16/msn.png protocols/16/mxit.png \
+- protocols/16/myspace.png protocols/16/silc.png \
+- protocols/16/simple.png protocols/16/yahoo.png \
+- protocols/16/zephyr.png protocols/22/aim.png \
+- protocols/22/bonjour.png protocols/22/facebook.png \
+- protocols/22/gadu-gadu.png protocols/22/google-talk.png \
+- protocols/22/novell.png protocols/22/icq.png \
+- protocols/22/irc.png protocols/22/jabber.png \
+- protocols/22/meanwhile.png protocols/22/msn.png \
+- protocols/22/mxit.png protocols/22/myspace.png \
+- protocols/22/silc.png protocols/22/simple.png \
+- protocols/22/yahoo.png protocols/22/zephyr.png \
+- protocols/48/aim.png protocols/48/bonjour.png \
+- protocols/48/facebook.png protocols/48/gadu-gadu.png \
+- protocols/48/novell.png protocols/48/icq.png \
+- protocols/48/irc.png protocols/48/jabber.png \
+- protocols/48/meanwhile.png protocols/48/msn.png \
+- protocols/48/mxit.png protocols/48/myspace.png \
+- protocols/48/silc.png protocols/48/simple.png \
+- protocols/48/yahoo.png protocols/48/zephyr.png \
+- protocols/scalable/aim.svg protocols/scalable/bonjour.svg \
+- protocols/scalable/gadu-gadu.svg \
+- protocols/scalable/google-talk.svg \
+- protocols/scalable/novell.svg protocols/scalable/icq.svg \
+- protocols/scalable/irc.svg protocols/scalable/jabber.svg \
+- protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \
+- protocols/scalable/mxit.svg protocols/scalable/silc.svg \
+- protocols/scalable/simple.svg protocols/scalable/yahoo.svg \
+- protocols/scalable/zephyr.svg status/11/available.png \
++ protocols/16/bonjour.png protocols/16/irc.png \
++ protocols/16/jabber.png protocols/16/silc.png \
++ protocols/16/simple.png protocols/16/zephyr.png \
++ protocols/22/bonjour.png protocols/22/irc.png \
++ protocols/22/jabber.png protocols/22/silc.png \
++ protocols/22/simple.png protocols/22/zephyr.png \
++ protocols/48/bonjour.png protocols/48/irc.png \
++ protocols/48/jabber.png protocols/48/silc.png \
++ protocols/48/simple.png protocols/48/zephyr.png \
++ protocols/scalable/bonjour.svg protocols/scalable/irc.svg \
++ protocols/scalable/jabber.svg protocols/scalable/silc.svg \
++ protocols/scalable/simple.svg protocols/scalable/zephyr.svg \
++ status/11/available.png \
+ status/11/away.png status/11/busy.png status/11/chat.png \
+ status/11/extended-away.png status/11/invisible.png \
+ status/11/log-in.png status/11/log-out.png \
+@@ -443,8 +422,6 @@
+ FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@
+ FARSTREAM_LIBS = @FARSTREAM_LIBS@
+ FGREP = @FGREP@
+-GADU_CFLAGS = @GADU_CFLAGS@
+-GADU_LIBS = @GADU_LIBS@
+ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+@@ -506,8 +483,6 @@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
+ MANIFEST_TOOL = @MANIFEST_TOOL@
+-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@
+-MEANWHILE_LIBS = @MEANWHILE_LIBS@
+ MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MONO_CFLAGS = @MONO_CFLAGS@
+@@ -850,37 +825,19 @@
+ @INSTALL_PIXMAPS_TRUE@ emotes/small/16/scalable/pidgin-emotes.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/16/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/16/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \
+@@ -899,72 +856,35 @@
+ @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png
+ @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/msn.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/google-talk.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/22/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/22/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/aim.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/bonjour.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/facebook.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/gadu-gadu.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/novell.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/icq.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/irc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/jabber.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/meanwhile.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/msn.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/mxit.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/myspace.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/silc.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/simple.png \
+-@INSTALL_PIXMAPS_TRUE@ protocols/48/yahoo.png \
+ @INSTALL_PIXMAPS_TRUE@ protocols/48/zephyr.png
+
+ @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/aim.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/bonjour.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/gadu-gadu.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/google-talk.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/novell.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/icq.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/irc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/jabber.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/meanwhile.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/msn.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/mxit.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/silc.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/simple.svg \
+-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/yahoo.svg \
+ @INSTALL_PIXMAPS_TRUE@ protocols/scalable/zephyr.svg
+
+ @INSTALL_PIXMAPS_TRUE@STATUS_11 = \
+diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c
+--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c 2013-08-16 23:39:46.921427463 -0300
+@@ -250,9 +250,6 @@
+ const char *from;
+ const char *to;
+ } disco_type_mappings[] = {
+- { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */
+- { "sametime", "meanwhile" },
+- { "myspaceim", "myspace" },
+ { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */
+ { NULL, NULL }
+ };
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-08-16 21:26:56.293625899 -0300
+@@ -288,21 +288,13 @@
+ {
+ EContact *contact = E_CONTACT(c->data);
+ const char *name;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++ GList *jabbers;
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
+- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+- if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+- msns == NULL && icqs == NULL && novells == NULL &&
+- ggs == NULL)
++
++ if (jabbers == NULL)
+ {
+ GtkTreeIter iter;
+
+@@ -315,13 +307,7 @@
+ }
+ else
+ {
+- add_ims(dialog, contact, name, aims, "prpl-aim");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+- add_ims(dialog, contact, name, msns, "prpl-msn");
+- add_ims(dialog, contact, name, icqs, "prpl-icq");
+- add_ims(dialog, contact, name, novells, "prpl-novell");
+- add_ims(dialog, contact, name, ggs, "prpl-gg");
+ }
+ }
+
+@@ -367,7 +353,7 @@
+ {
+ EContact *contact = E_CONTACT(l->data);
+ const char *name;
+- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs;
++ GList *jabbers;
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+@@ -377,17 +363,9 @@
+ continue;
+ }
+
+- aims = e_contact_get(contact, E_CONTACT_IM_AIM);
+ jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER);
+- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO);
+- msns = e_contact_get(contact, E_CONTACT_IM_MSN);
+- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ);
+- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE);
+- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU);
+-
+- if (aims == NULL && jabbers == NULL && yahoos == NULL &&
+- msns == NULL && icqs == NULL && novells == NULL &&
+- ggs == NULL)
++
++ if (jabbers == NULL)
+ {
+ GtkTreeIter iter;
+
+@@ -400,13 +378,7 @@
+ }
+ else
+ {
+- add_ims(dialog, contact, name, aims, "prpl-aim");
+ add_ims(dialog, contact, name, jabbers, "prpl-jabber");
+- add_ims(dialog, contact, name, yahoos, "prpl-yahoo");
+- add_ims(dialog, contact, name, msns, "prpl-msn");
+- add_ims(dialog, contact, name, icqs, "prpl-icq");
+- add_ims(dialog, contact, name, novells, "prpl-novell");
+- add_ims(dialog, contact, name, ggs, "prpl-gg");
+ }
+ }
+ }
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c 2013-08-16 21:14:05.483056049 -0300
+@@ -119,13 +119,7 @@
+
+ name = e_contact_get_const(contact, E_CONTACT_FULL_NAME);
+
+- update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM);
+ update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER);
+- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO);
+- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN);
+- update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ);
+- update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE);
+- update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU);
+ }
+
+ static void
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c 2013-08-16 23:20:45.692374640 -0300
+@@ -99,20 +99,8 @@
+
+ protocol_id = purple_account_get_protocol_id(account);
+
+- if (!strcmp(protocol_id, "prpl-aim"))
+- protocol_field = E_CONTACT_IM_AIM;
+- else if (!strcmp(protocol_id, "prpl-icq"))
+- protocol_field = E_CONTACT_IM_ICQ;
+- else if (!strcmp(protocol_id, "prpl-msn"))
+- protocol_field = E_CONTACT_IM_MSN;
+- else if (!strcmp(protocol_id, "prpl-yahoo"))
+- protocol_field = E_CONTACT_IM_YAHOO;
+- else if (!strcmp(protocol_id, "prpl-jabber"))
++ if (!strcmp(protocol_id, "prpl-jabber"))
+ protocol_field = E_CONTACT_IM_JABBER;
+- else if (!strcmp(protocol_id, "prpl-novell"))
+- protocol_field = E_CONTACT_IM_GROUPWISE;
+- else if (!strcmp(protocol_id, "prpl-gg"))
+- protocol_field = E_CONTACT_IM_GADUGADU;
+
+ return protocol_field;
+ }
+@@ -169,18 +157,6 @@
+ {
+ PurpleAccount *account = purple_buddy_get_account(buddy);
+ const char *prpl_id = purple_account_get_protocol_id(account);
+-
+- if (!strcmp(prpl_id, "prpl-msn"))
+- {
+- mail = g_strdup(purple_normalize(account,
+- purple_buddy_get_name(buddy)));
+- }
+- else if (!strcmp(prpl_id, "prpl-yahoo"))
+- {
+- mail = g_strdup_printf("%s@yahoo.com",
+- purple_normalize(account,
+- purple_buddy_get_name(buddy)));
+- }
+ }
+
+ return mail;
+diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c
+--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c 2013-02-11 07:16:54.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c 2013-08-16 21:23:26.207116339 -0300
+@@ -141,20 +141,8 @@
+ if (*email)
+ e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email);
+
+- if (!strcmp(im_service, "prpl-aim"))
+- field = E_CONTACT_IM_AIM;
+- else if (!strcmp(im_service, "prpl-icq"))
+- field = E_CONTACT_IM_ICQ;
+- else if (!strcmp(im_service, "prpl-yahoo"))
+- field = E_CONTACT_IM_YAHOO;
+- else if (!strcmp(im_service, "prpl-jabber"))
++ if (!strcmp(im_service, "prpl-jabber"))
+ field = E_CONTACT_IM_JABBER;
+- else if (!strcmp(im_service, "prpl-msn"))
+- field = E_CONTACT_IM_MSN;
+- else if (!strcmp(im_service, "prpl-novell"))
+- field = E_CONTACT_IM_GROUPWISE;
+- else if (!strcmp(im_service, "prpl-gg"))
+- field = E_CONTACT_IM_GADUGADU;
+
+ if (field > 0)
+ {
+diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in
+--- pidgin-2.10.7/pidgin.apspec.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.apspec.in 2013-08-16 20:53:14.523862926 -0300
+@@ -14,17 +14,13 @@
+
+ [Description]
+ Pidgin allows you to talk to anyone using a variety of messaging protocols,
+-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
+-Gadu-Gadu, and Zephyr. These protocols are implemented using a
++including IRC, XMPP and Zephyr. These protocols are implemented using a
+ modular, easy to use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many unique
+ features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft
+-Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ [BuildPrepare]
+ APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv --disable-fortify
+ #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv
+diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in
+--- pidgin-2.10.7/pidgin.desktop.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.desktop.in 2013-08-16 23:07:34.874212867 -0300
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ _Name=Pidgin Internet Messenger
+ _GenericName=Internet Messenger
+-_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more
++_Comment=Chat over IM. Supports IRC, Jabber/XMPP and more
+ Exec=pidgin
+ Icon=pidgin
+ StartupNotify=true
+diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec
+--- pidgin-2.10.7/pidgin.spec 2013-02-11 07:17:59.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec 2013-08-17 00:03:18.474815955 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group: Applications/Internet
+ Obsoletes: gaim-silc
+ Obsoletes: gaim-tcl
+-Obsoletes: gaim-gadugadu
+ Obsoletes: pidgin-tcl < 2.0.0
+ Obsoletes: pidgin-silc < 2.0.0
+ Obsoletes: libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires: libpurple >= %{apiver}
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group: Applications/Internet
+-Requires: libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary: Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr. These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin. This package will allow you to write or
+@@ -236,7 +217,6 @@
+ %{!?_with_vv:--disable-vv} \
+ %{!?_with_dbus:--disable-dbus} \
+ %{!?_with_avahi:--disable-avahi} \
+- %{!?_with_meanwhile:--disable-meanwhile} \
+ %{?_without_gstreamer:--disable-gstreamer} \
+ %{?_without_gtkspell:--disable-gtkspell} \
+ %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" | \
+ grep -v /libbonjour.so | \
+- grep -v /libsametime.so | \
+ grep -v /mono.so | \
+ grep -v ".dll$" > %{name}-%{version}-purpleplugins
+
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+
+ * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+- main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+ by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
+diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in
+--- pidgin-2.10.7/pidgin.spec.in 2013-02-11 07:16:53.000000000 -0200
++++ pidgin-2.10.7-nonprism/pidgin.spec.in 2013-08-17 00:07:12.251996234 -0300
+@@ -34,7 +34,6 @@
+ %{!?_without_startupnotification:BuildRequires: startup-notification-devel}
+ %{?_with_avahi:BuildRequires: avahi-glib-devel}
+ %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
+-%{?_with_meanwhile:BuildRequires: meanwhile-devel}
+ %{?_with_mono:BuildRequires: mono-devel}
+ %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
+ %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
+@@ -105,7 +104,6 @@
+ Group: Applications/Internet
+ Obsoletes: gaim-silc
+ Obsoletes: gaim-tcl
+-Obsoletes: gaim-gadugadu
+ Obsoletes: pidgin-tcl < 2.0.0
+ Obsoletes: pidgin-silc < 2.0.0
+ Obsoletes: libpurple-perl < %{version}
+@@ -131,13 +129,6 @@
+ Requires: libpurple >= %{apiver}
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%package -n libpurple-meanwhile
+-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library
+-Group: Applications/Internet
+-Requires: libpurple >= %{apiver}
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %package -n libpurple-mono
+ Summary: Mono .NET plugin support for Pidgin
+@@ -161,18 +152,14 @@
+
+ %description
+ Pidgin allows you to talk to anyone using a variety of messaging
+-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+-Zephyr. These protocols are implemented using a modular, easy to
++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr.
++These protocols are implemented using a modular, easy to
+ use design. To use a protocol, just add an account using the
+ account editor.
+
+ Pidgin supports many common features of other clients, as well as many
+ unique features, such as perl scripting, TCL scripting and C plugins.
+
+-Pidgin is not affiliated with or endorsed by America Online, Inc.,
+-Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
+-
+ %description devel
+ The pidgin-devel package contains the header files, developer
+ documentation, and libraries required for development of Pidgin scripts
+@@ -182,9 +169,8 @@
+ libpurple contains the core IM support for IM clients such as Pidgin
+ and Finch.
+
+-libpurple supports a variety of messaging protocols including AIM, MSN,
+-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+-Lotus Sametime, SILC, Simple and Zephyr.
++libpurple supports a variety of messaging protocols including XMPP,
++Bonjour, IRC, SILC, Simple and Zephyr.
+
+ %description -n libpurple-devel
+ The libpurple-devel package contains the header files, developer
+@@ -196,11 +182,6 @@
+ Bonjour plugin for Pidgin.
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%description -n libpurple-meanwhile
+-Lotus Sametime plugin for Pidgin using the Meanwhile library.
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %description -n libpurple-mono
+ Mono plugin loader for Pidgin. This package will allow you to write or
+@@ -236,7 +217,6 @@
+ %{!?_with_vv:--disable-vv} \
+ %{!?_with_dbus:--disable-dbus} \
+ %{!?_with_avahi:--disable-avahi} \
+- %{!?_with_meanwhile:--disable-meanwhile} \
+ %{?_without_gstreamer:--disable-gstreamer} \
+ %{?_without_gtkspell:--disable-gtkspell} \
+ %{?_without_nm:--disable-nm} \
+@@ -258,9 +238,7 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
+ find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
+@@ -271,10 +249,6 @@
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so
+ %endif
+
+-%if 0%{!?_with_meanwhile:1}
+-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so
+-%endif
+-
+ %if 0%{!?_with_mono:1}
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so
+ rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll
+@@ -299,7 +273,6 @@
+ find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" | \
+ grep -v /libbonjour.so | \
+- grep -v /libsametime.so | \
+ grep -v /mono.so | \
+ grep -v ".dll$" > %{name}-%{version}-purpleplugins
+
+@@ -435,13 +408,6 @@
+ %{_libdir}/purple-2/libbonjour.*
+ %endif
+
+-%if 0%{?_with_meanwhile:1}
+-%files -n libpurple-meanwhile
+-%defattr(-, root, root)
+-
+-%{_libdir}/purple-2/libsametime.*
+-%endif
+-
+ %if 0%{?_with_mono:1}
+ %files -n libpurple-mono
+ %defattr(-, root, root)
+@@ -492,9 +458,6 @@
+ * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com>
+ - Update to reflect changes in perl module installation directories
+
+-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+-- Fix building without meanwhile support
+-
+ * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+ - Add "--without nm" support to build without NetworkManager
+
+@@ -586,8 +549,6 @@
+ - Update to reflect renaming to pidgin/libpurple
+
+ * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com>
+-- We can build with internal gadu gadu again, so bring it back into the
+- main package
+ - Deal with gconf schame uninstallation on package upgrade and removal
+
+ * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com>
+@@ -606,19 +567,14 @@
+ - Source RPM uses tar.bz2 now to save space
+ - Update BuildRequires for new intltool dependencies
+ - Add a --with perlmakehack option to allow builds to succeed on RH9
+-- Add a --with gadugadu to build (separate) gaim-gadugadu package
+
+ * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add support for beta versions so the subsequent releases are seen as newer
+ by RPM
+-- Split of sametime support to gaim-meanwhile
+ - Use make DESTDIR=... instead of overloading prefix etc. when installing
+ - Default build to include cyrus-sasl support in Jabber
+ - Add --with dbus to build with DBUS support
+
+-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net>
+-- Added obsoletes gaim-meanwhile
+-
+ * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com>
+ - Add separate gaim-bonjour package if built with --with-howl
+ - Add separate gaim-mono package if built with --with-mono
diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
new file mode 100644
index 000000000..abffa20b8
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch
@@ -0,0 +1,12 @@
+diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am
+--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200
++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200
+@@ -27,7 +27,7 @@ else
+ st =
+ pkg_LTLIBRARIES = libirc.la
+ libirc_la_SOURCES = $(IRCSOURCES)
+-libirc_la_LIBADD = $(GLIB_LIBS)
++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS)
+
+ endif
+
diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin-nonprism/pidgin.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/nonprism/pidgin-nonprism/pidgin.install
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index d5a45b5b1..e4f4ef65e 100644
--- a/pcr/debootstrap/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -1,23 +1,29 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-pkgname=debootstrap
-pkgver=1.0.52
+_pkgname=debootstrap
+pkgname=debootstrap-libre
+pkgver=1.0.53
pkgrel=3
-pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt"
+pkgdesc="A tool used to create a gNewSense or Trisquel base system from scratch, without requiring the availability of dpkg or apt (Debian support removed)"
arch=('any')
license=('GPL')
url="http://packages.debian.org/sid/debootstrap"
depends=('wget')
-source=("http://ftp.debian.org/debian/pool/main/d/${pkgname}/${pkgname}_${pkgver}_all.deb"
- 'metad'
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://ftp.debian.org/debian/pool/main/d/${_pkgname}/${_pkgname}_${pkgver}_all.deb"
+ 'gnewsense'
'trisquel')
install="debootstrap.install"
-md5sums=('97ac467bf63cf066f52d0dd7fcf77e9a'
- '4425300ca68d60fb60a6d699e153a519'
+md5sums=('1ea9c87d54b6cf9349d602406bf43e5a'
+ '13978bdd1d877a0dd2c3c874ecd54f03'
'b020aa8426e70a6024c8e76312c17d78')
package(){
tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+ # remove Debian scripts
+ rm -v "${pkgdir}/usr/share/debootstrap/scripts"/*
# move the executables to /usr/bin
mkdir -p ${pkgdir}/usr/bin
mv "${pkgdir}/usr/sbin"/* "${pkgdir}/usr/bin/"
@@ -25,14 +31,13 @@ package(){
# patch the path to use gNewSense or Trisquel defaults (prevents error in chrooted environment)
sed -i 's|export PATH|export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/java/jre/bin:/usr/bin/vendor_perl:/usr/bin/core_perl"|' ${pkgdir}/usr/bin/debootstrap
# doesn't work with gpg 2.x, patch to point to gpg1v
- sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+ sed 's/gpgv/gpg1v/g;' -i "${pkgdir}/usr/bin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
# add gNewSense script
- install -m644 metad "$pkgdir/usr/share/debootstrap/scripts"
+ install -m644 gnewsense "$pkgdir/usr/share/debootstrap/scripts"
# create gNewSense symlinks
- ln -s metad "$pkgdir/usr/share/debootstrap/scripts/deltah"
- ln -s metad "$pkgdir/usr/share/debootstrap/scripts/parkes"
+ ln -s gnewsense "$pkgdir/usr/share/debootstrap/scripts/parkes"
# add Trisquel script
install -m644 trisquel "$pkgdir/usr/share/debootstrap/scripts"
diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap-libre/debootstrap.install
index 85a99f160..3da2f1d22 100644
--- a/pcr/debootstrap/debootstrap.install
+++ b/pcr/debootstrap-libre/debootstrap.install
@@ -1,7 +1,7 @@
post_install() {
if [ "$(uname -m)" = "x86_64" ]; then
darch="amd64"
- elif [ "$(uname -m)" = "i386" ]; then
+ elif [ "$(uname -m)" = "i686" ]; then
darch="i386"
else
darch="mips64el"
diff --git a/pcr/debootstrap/metad b/pcr/debootstrap-libre/gnewsense
index 8d14c0ed9..884ac88a0 100644
--- a/pcr/debootstrap/metad
+++ b/pcr/debootstrap-libre/gnewsense
@@ -1,13 +1,4 @@
-case $SUITE in
- parkes|metad)
- default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense/
- ;;
- deltah)
- default_mirror http://archive.gnewsense.org/gnewsense
- ;;
-esac
-
-
+default_mirror http://archive.gnewsense.org/gnewsense-three/gnewsense
mirror_style release
download_style apt
finddebs_style from-indices
diff --git a/pcr/debootstrap/trisquel b/pcr/debootstrap-libre/trisquel
index 7efa062f9..7efa062f9 100644
--- a/pcr/debootstrap/trisquel
+++ b/pcr/debootstrap-libre/trisquel
diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD
new file mode 100644
index 000000000..9dc9c4cb2
--- /dev/null
+++ b/pcr/imagemagick-srv/PKGBUILD
@@ -0,0 +1,80 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+
+pkgbase=imagemagick
+pkgname=imagemagick-srv
+pkgver=6.8.6.8
+pkgrel=1
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.imagemagick.org/"
+license=('custom')
+provides=("$pkgbase=$pkgver")
+conflicts=$pkgbase
+replaces=$pkgbase
+makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \
+ 'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \
+ 'libwebp') # libcl opencl-headers
+#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+ perlmagick.rpath.patch)
+sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61'
+ 'e143cf9d530fabf3b58023899b5cc544ba93daec')
+
+prepare() {
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+ sed '/AC_PATH_XTRA/d' -i configure.ac
+ autoreconf --force --install
+ patch -p0 -i "${srcdir}/perlmagick.rpath.patch"
+}
+
+build() {
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+ ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+ --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
+ --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
+ --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
+ --disable-opencl --without-gvc --without-djvu --without-autotrace \
+ --without-jbig --without-fpx --without-dps --without-fftw
+ make
+}
+
+check() {
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+ make check
+}
+
+package_imagemagick-srv() {
+ pkgdesc="An image viewing/manipulation program (for web servers)"
+ depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl')
+ optdepends=('ghostscript-libre: for Ghostscript support'
+ 'openexr-libre: for OpenEXR support'
+ 'libwmf: for WMF support'
+ 'librsvg: for SVG support'
+ 'libxml2: for XML support'
+ 'jasper: for JPEG-2000 support'
+ 'libpng: for PNG support'
+ 'libwebp: for WEBP support')
+ backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
+ "etc/ImageMagick-${pkgver%%.*}/colors.xml"
+ "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
+ "etc/ImageMagick-${pkgver%%.*}/log.xml"
+ "etc/ImageMagick-${pkgver%%.*}/magic.xml"
+ "etc/ImageMagick-${pkgver%%.*}/mime.xml"
+ "etc/ImageMagick-${pkgver%%.*}/policy.xml"
+ "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml"
+ "etc/ImageMagick-${pkgver%%.*}/thresholds.xml"
+ "etc/ImageMagick-${pkgver%%.*}/type.xml"
+ "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml"
+ "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
+ "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
+ options=('!docs' 'libtool' '!emptydirs')
+
+ cd ImageMagick-${pkgver%.*}-${pkgver##*.}
+ make -j1 DESTDIR="${pkgdir}" install
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
+ install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
+
+#Cleaning
+ rm -f "${pkgdir}"/usr/lib/*.la
+}
diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch
new file mode 100644
index 000000000..a5b1a82e2
--- /dev/null
+++ b/pcr/imagemagick-srv/perlmagick.rpath.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2013-02-21 03:26:56.785156600 -0500
++++ Makefile.in 2013-02-21 03:39:03.102411457 -0500
+@@ -10469,6 +10469,8 @@
+
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
+
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
+ @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
new file mode 100644
index 000000000..ed6aa3a03
--- /dev/null
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 188870 2013-06-23 17:45:51Z heftig $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+
+pkgname=libquvi-scripts-current
+_pkgname=libquvi-scripts
+provides=(libquvi-scripts)
+pkgver=0.4.17
+pkgrel=1
+pkgdesc='Library for parsing video download links.'
+arch=('any')
+url='http://quvi.sourceforge.net/'
+license=('LGPL')
+depends=('curl' 'lua')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig})
+md5sums=('8a887905a368bf31e0ace28e49b5c800'
+ 'SKIP')
+
+build() {
+ cd "${_pkgname}-${pkgver}"
+ ./configure --prefix=/usr --with-nsfw --with-nlfy
+ make
+}
+
+package() {
+ cd "${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index ac73b6637..a4c1c4674 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=youtube-dl-current
_pkgname=youtube-dl
provides=(youtube-dl)
-pkgver=2013.08.17
+pkgver=2013.08.28.1
pkgrel=1
pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
arch=('any')
@@ -14,7 +14,7 @@ license=('custom')
depends=('python')
makedepends=('python-distribute')
source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3fd78626b19ac128f15f1bbfee578011'
+md5sums=('c57a46fe394e5c9cd9484f59f9ae029f'
'SKIP')
prepare() {
diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE
deleted file mode 100644
index aab8c3624..000000000
--- a/~fauno/afew/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright (c) Justus Winter <4winter@informatik.uni-hamburg.de>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD
deleted file mode 100644
index 1256ad4d3..000000000
--- a/~fauno/afew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
-pkgname=afew
-pkgver=2012.07.11
-_gitver=20120711
-pkgrel=1
-pkgdesc="afew is an initial tagging script for notmuch mail"
-arch=(any)
-url="https://github.com/teythoon/afew"
-license=('custom:BSD')
-depends=('python2' 'notmuch' 'dbacl')
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${_gitver}-${pkgrel}-any.src.tar.gz"
- 'LICENSE')
-
-build() {
- cd "$srcdir/$pkgname"
-
- python2 setup.py build
-}
-
-package() {
- cd "$srcdir/$pkgname"
- python2 setup.py install --prefix="$pkgdir/usr"
-
- install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('99e501fb8f99ec58eccf8c08d572dab2'
- '295b245540aa61538f9a3556c4be846c')
diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD
deleted file mode 100644
index 0ac3b5d75..000000000
--- a/~fauno/afew/SRCBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
-pkgname=afew
-pkgver=20120711
-pkgrel=1
-pkgdesc="afew is an initial tagging script for notmuch mail"
-arch=(any)
-url="https://github.com/teythoon/afew"
-license=('custom:BSD')
-makedepends=('git')
-
-_gitroot='https://github.com/teythoon/afew.git'
-_gitname='afew'
-
-build() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
- msg "The local files are updated."
- else
- git clone "$_gitroot" "$_gitname"
- fi
-
- msg "GIT checkout done or server timeout"
-
-}
-
-package() {
- PKGEXT=${SRCEXT}
- PKGDEST=${SRCDEST}
- cp -a ${srcdir}/* ${pkgdir}/
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/~fauno/bibutils-dynamic/PKGBUILD b/~fauno/bibutils-dynamic/PKGBUILD
deleted file mode 100644
index cc8f371a6..000000000
--- a/~fauno/bibutils-dynamic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us>
-
-pkgname=bibutils-dynamic
-_basename=bibutils
-pkgver=4.12
-pkgrel=1
-pkgdesc="Bibliography conversion tools, with dynamic libs"
-arch=("i686" "x86_64")
-url="http://www.scripps.edu/~cdputnam/software/bibutils"
-license=('GPL2')
-makedepends=('tcsh')
-provides=('bibutils')
-source=("${url}/${_basename}_${pkgver}_src.tgz")
-md5sums=('395f46393eca8e184652c5e8e1ae83b6')
-
-build() {
- cd "${srcdir}/${_basename}_$pkgver"
- ./configure --dynamic \
- --install-dir ${pkgdir}/usr/bin \
- --install-lib ${pkgdir}/usr/lib
- make
-}
-
-package() {
- install -d ${pkgdir}/usr/{bin,lib}
- cd "${srcdir}/${_basename}_$pkgver"
- make install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD
deleted file mode 100644
index a92679444..000000000
--- a/~fauno/dbacl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com?
-pkgname=dbacl
-pkgver=1.12
-pkgrel=1
-pkgdesc="Digramic Bayesian classifier"
-arch=('i686' 'x86_64')
-url="http://dbacl.sourceforge.net/"
-license=('GPL')
-depends=('gawk' 'perl')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('048d8cf68e277ba2ab5d159dc395a65d')
-sha256sums=('9fcb05a0951527c7b33aeb20735747f84bca88a4e122c93537120d1014f650e9')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-check()
-{
- cd "$srcdir/$pkgname-$pkgver"
- make -k check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
- mv "$pkgdir/usr/man" "$pkgdir/usr/share"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD
deleted file mode 100644
index 2faf6acb3..000000000
--- a/~fauno/distccd-zeroconf/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=distcc-zeroconf
-_pkgname=distcc
-pkgver=3.1
-pkgrel=1
-pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/distcc/"
-license=('GPL')
-depends=('gcc' 'popt' 'avahi')
-makedepends=('gtk2' 'pkgconfig')
-optdepends=('gtk2: for distccmon-gnome')
-provides=('distcc')
-conflicts=('distcc')
-replaces=('distcc')
-backup=(etc/conf.d/distccd)
-options=(!distcc)
-source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
- distccd
- distccd.conf.d)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
- '1c918474372c09304772c20c4de484fa'
- '89aaf6e9072092e283465a14e83f0f94')
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --with-gtk \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --disable-Werror
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}/" install
- install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
- install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd
-
- install -d ${pkgdir}/usr/lib/${_pkgname}/bin
- ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc
- ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc
- ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++
- ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp
- ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
-}
diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd
deleted file mode 100755
index 4702d6820..000000000
--- a/~fauno/distccd-zeroconf/distccd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/distccd`
-case "$1" in
- start)
- stat_busy "Starting distcc Daemon"
- [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon distccd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping distcc Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon distccd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d
deleted file mode 100644
index 8f90cb503..000000000
--- a/~fauno/distccd-zeroconf/distccd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Parameters to be passed to distccd
-#
-# You must explicitly add IPs (or subnets) that are allowed to connect,
-# using the --allow switch. See the distccd manpage for more info.
-#
-DISTCC_ARGS="--user nobody --allow 127.0.0.1"
-
diff --git a/~fauno/emerillon/PKGBUILD b/~fauno/emerillon/PKGBUILD
deleted file mode 100644
index 621ed04bb..000000000
--- a/~fauno/emerillon/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Isaac Dupree <id@isaac.cedarswampstudios.org>
-# Contributor: yannsen <ynnsen@gmail.com>
-pkgname=emerillon
-arch=('i686' 'x86_64')
-pkgver=0.1.90
-pkgrel=2
-pkgdesc="OpenStreetMap viewer"
-url="http://projects.gnome.org/emerillon/"
-license=('GPL2')
-depends=('libpeas' 'geoclue' 'libsoup-gnome' 'libchamplain>=0.12.0' 'librest' 'ethos')
-makedepends=('intltool' 'gnome-common' 'vala' 'gtk-doc')
-options=(!libtool)
-install=${pkgname}.install
-source=(http://download.gnome.org/sources/emerillon/0.1/${pkgname}-${pkgver}.tar.xz)
-md5sums=('d740ee4d5fcd7b39fde15e75b4ee7a3a')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr
- make
-}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=$pkgdir install
-}
diff --git a/~fauno/emerillon/emerillon.install b/~fauno/emerillon/emerillon.install
deleted file mode 100644
index 77c7018ea..000000000
--- a/~fauno/emerillon/emerillon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
-
diff --git a/~fauno/ethos/PKGBUILD b/~fauno/ethos/PKGBUILD
deleted file mode 100644
index f05c8fa8b..000000000
--- a/~fauno/ethos/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: yannsen <ynnsen@gmail.com>
-pkgname=ethos
-pkgver=0.2.2
-pkgrel=6
-arch=('i686' 'x86_64')
-pkgdesc="Plugin framework for GLib"
-url="http://git.dronelabs.com/ethos/about/"
-license="LGPL"
-depends=(python2 gtk2)
-makedepends=(intltool pygtk)
-source=(http://ftp.dronelabs.com/sources/$pkgname/0.2/$pkgname-$pkgver.tar.gz)
-md5sums=('36cf1ef444a224556bba4d441c400300')
-options=(!libtool)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
diff --git a/~fauno/faenza-icon-theme/PKGBUILD b/~fauno/faenza-icon-theme/PKGBUILD
deleted file mode 100644
index 484764c73..000000000
--- a/~fauno/faenza-icon-theme/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Elia Notarangelo <elia.notarangelo AT gmail DOT com>
-# Contributor: Frikilinux <frikilinux at frikilinux.com.ar>
-# Contributor: graysky <graysky AT archlinux DOT us>
-# Contributor: Samsagax <samsagax AT gmail DOT com>
-# Contributor: simongmzlj <simongmzlj AT gmail DOT com>
-
-pkgname=faenza-icon-theme
-pkgver=1.3
-pkgrel=1
-pkgdesc="Icon theme designed for Equinox GTK theme"
-url="http://gnome-look.org/content/show.php/Faenza?content=128143"
-license=('GPL3')
-arch=('any')
-makedepends=()
-options=(!strip)
-source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz")
-md5sums=('763e0450b0853bd11f04c970ba3fd49f')
-
-package() {
- cd "${srcdir}"
- mkdir -p "${pkgdir}"/usr/share/icons
- cp -rf Faenza{,-Dark,-Darkest,-Darker} "${pkgdir}"/usr/share/icons/
-
-}
-
diff --git a/~fauno/geoclue/PKGBUILD b/~fauno/geoclue/PKGBUILD
deleted file mode 100644
index e370197c7..000000000
--- a/~fauno/geoclue/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# mAINTAIner: Isaac Dupree <id@isaac.cedarswampstudios.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Kurama <kurama_luka@yahoo.it>
-
-pkgname=geoclue
-pkgver=0.12
-pkgrel=2
-pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
-arch=('i686' 'x86_64')
-url="http://geoclue.freedesktop.org"
-license=('LGPL')
-depends=('gconf')
-makedepends=('gtk-doc' 'libtool')
-source=(http://cgit.freedesktop.org/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz)
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-# unset LDFLAGS
- ./autogen.sh --prefix=/usr --libexecdir=/usr/lib
- find -name 'Makefile' -print0 | xargs -0 sed -i "s/-Werror //"
- make
-}
-
-package(){
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
-md5sums=('684e24d1ff3683953c968fed210b2982')
diff --git a/~fauno/haskell-base64-bytestring/PKGBUILD b/~fauno/haskell-base64-bytestring/PKGBUILD
deleted file mode 100644
index 9943e7e15..000000000
--- a/~fauno/haskell-base64-bytestring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# custom variables
-_hkgname=base64-bytestring
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-base64-bytestring
-pkgver=0.1.0.3
-pkgrel=1
-pkgdesc="Fast base64 encoding and deconding for ByteStrings"
-url="https://github.com/bos/base64-bytestring"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-bytestring=0.9.1.10")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("a3d76d27f2271c603990d909fed0a4f175628e9c6e19427cc8387dd4c2429234")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
deleted file mode 100644
index 55a35b6d2..000000000
--- a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-base64-bytestring
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-citeproc-hs/PKGBUILD b/~fauno/haskell-citeproc-hs/PKGBUILD
deleted file mode 100644
index 32f06094b..000000000
--- a/~fauno/haskell-citeproc-hs/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# custom variables
-_hkgname=citeproc-hs
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-citeproc-hs
-pkgver=0.3.3
-pkgrel=1
-pkgdesc="A Citation Style Language implementation in Haskell"
-url="http://gorgias.mine.nu/repos/citeproc-hs/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-http=4000.1.1"
- "haskell-bytestring=0.9.1.10"
- "haskell-containers=0.4.0.0"
- "haskell-directory=1.1.0.0"
- "haskell-filepath=1.2.0.0"
- "haskell-hs-bibutils=4.12"
- "haskell-json=0.4.4"
- "haskell-mtl=2.0.1.0"
- "haskell-network=2.3.0.2"
- "haskell-old-locale=1.0.0.2"
- "haskell-pandoc-types=1.8.2"
- "haskell-parsec=3.1.1"
- "haskell-syb=0.3"
- "haskell-time=1.2.0.3"
- "haskell-utf8-string=0.3.6"
- "haskell-xml=1.3.9")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("249bc0ec589fc79b098867502732c3c47ce032ad32f82d3280c1ca9373c71f7a")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
deleted file mode 100644
index 6bf4872f1..000000000
--- a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-citeproc-hs
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-digest/PKGBUILD b/~fauno/haskell-digest/PKGBUILD
deleted file mode 100644
index 724a600af..000000000
--- a/~fauno/haskell-digest/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# custom variables
-_hkgname=digest
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-digest
-pkgver=0.0.1.0
-pkgrel=1
-pkgdesc="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-bytestring=0.9.1.10"
- "zlib")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("40319762afc05823920126f13cba02b06544ba039e08c3f63db2ed084a9a4edc")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-digest/haskell-digest.install b/~fauno/haskell-digest/haskell-digest.install
deleted file mode 100644
index 7aa8e0003..000000000
--- a/~fauno/haskell-digest/haskell-digest.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-digest
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-dlist/PKGBUILD b/~fauno/haskell-dlist/PKGBUILD
deleted file mode 100644
index 6b68c97c3..000000000
--- a/~fauno/haskell-dlist/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# custom variables
-_hkgname=dlist
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-dlist
-pkgver=0.5
-pkgrel=18
-pkgdesc="Differences lists"
-url="http://code.haskell.org/~dons/code/dlist/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2" "sh")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-dlist/haskell-dlist.install b/~fauno/haskell-dlist/haskell-dlist.install
deleted file mode 100644
index f20fb2952..000000000
--- a/~fauno/haskell-dlist/haskell-dlist.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-dlist
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-hs-bibutils/PKGBUILD b/~fauno/haskell-hs-bibutils/PKGBUILD
deleted file mode 100644
index 46816e9c2..000000000
--- a/~fauno/haskell-hs-bibutils/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Ivy Foster <joyfulgirl (at) archlinux (dot) # us>
-# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com>
-
-_hkgname=hs-bibutils
-pkgname=haskell-hs-bibutils
-pkgver=4.12
-pkgrel=4
-pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=()
-depends=('ghc' 'haskell-syb=0.3' 'bibutils-dynamic')
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('4c4647b34246a4d35f1d1cfb10e6720a')
-
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- runhaskell Setup configure -O \
- --enable-split-objs \
- --enable-shared \
- --prefix=/usr \
- --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid \
- --enable-library-profiling
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r \
- -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \
- unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh \
- ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh \
- ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 \
- ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html \
- ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
deleted file mode 100644
index 454c6ff37..000000000
--- a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hs-bibutils
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-json/PKGBUILD b/~fauno/haskell-json/PKGBUILD
deleted file mode 100644
index 2a1da8a47..000000000
--- a/~fauno/haskell-json/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# custom variables
-_hkgname=json
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-json
-pkgver=0.4.4
-pkgrel=18
-pkgdesc="Support for serialising Haskell to and from JSON"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-array=0.3.0.2"
- "haskell-bytestring=0.9.1.10"
- "haskell-containers=0.4.0.0"
- "haskell-mtl=2.0.1.0"
- "haskell-parsec=3.1.1"
- "haskell-pretty=1.0.1.2"
- "haskell-syb=0.3")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("010157c267e156489771a3a9466f9de74393d9bc82053c1463af8a55caaf5880")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-json/haskell-json.install b/~fauno/haskell-json/haskell-json.install
deleted file mode 100644
index 10d6b7279..000000000
--- a/~fauno/haskell-json/haskell-json.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-json
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-pandoc-types/PKGBUILD b/~fauno/haskell-pandoc-types/PKGBUILD
deleted file mode 100644
index 954514ebe..000000000
--- a/~fauno/haskell-pandoc-types/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# custom variables
-_hkgname=pandoc-types
-_licensefile=COPYING
-
-# PKGBUILD options/directives
-pkgname=haskell-pandoc-types
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="Types for representing a structured document"
-url="http://johnmacfarlane.net/pandoc"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-containers=0.4.0.0"
- "haskell-syb=0.3")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("6a580be1ec25a747db2ee9df1c98b1f3a778493b98e5148bf8ce5ed1289e9013")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
deleted file mode 100644
index 34622807c..000000000
--- a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-pandoc-types
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-tagsoup/PKGBUILD b/~fauno/haskell-tagsoup/PKGBUILD
deleted file mode 100644
index 0de1f165b..000000000
--- a/~fauno/haskell-tagsoup/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# custom variables
-_hkgname=tagsoup
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-tagsoup
-pkgver=0.12.3
-pkgrel=1
-pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents"
-url="http://community.haskell.org/~ndm/tagsoup/"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-bytestring=0.9.1.10"
- "haskell-containers=0.4.0.0"
- "haskell-text=0.11.0.5")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("8bed50b3958a794422563ad93d82fb6d4e806d1884623f35f454ff360d9b8138")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-tagsoup/haskell-tagsoup.install b/~fauno/haskell-tagsoup/haskell-tagsoup.install
deleted file mode 100644
index dc61b4049..000000000
--- a/~fauno/haskell-tagsoup/haskell-tagsoup.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-tagsoup
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-texmath/PKGBUILD b/~fauno/haskell-texmath/PKGBUILD
deleted file mode 100644
index 95e88912a..000000000
--- a/~fauno/haskell-texmath/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# custom variables
-_hkgname=texmath
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-texmath
-pkgver=0.5.0.1
-pkgrel=19
-pkgdesc="Conversion of LaTeX math formulas to MathML."
-url="http://github.com/jgm/texmath"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-containers=0.4.0.0"
- "haskell-parsec=3.1.1"
- "haskell-syb=0.3"
- "haskell-xml=1.3.9")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("bedd883728fbd84bf07c1d1c851440db6d8be6b9e221024533851cd7c21a824f")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-texmath/haskell-texmath.install b/~fauno/haskell-texmath/haskell-texmath.install
deleted file mode 100644
index b95fd0d9f..000000000
--- a/~fauno/haskell-texmath/haskell-texmath.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-texmath
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-xml/PKGBUILD b/~fauno/haskell-xml/PKGBUILD
deleted file mode 100644
index fc42941b3..000000000
--- a/~fauno/haskell-xml/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# custom variables
-_hkgname=xml
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-xml
-pkgver=1.3.9
-pkgrel=1
-pkgdesc="A simple XML library."
-url="http://code.galois.com"
-license=("BSD3")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "sh"
- "haskell-bytestring=0.9.1.10")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("821b368d5b06e695f9a3d35e92b3159c500dbe03f0bc04b0229e5da65b99a6eb")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-xml/haskell-xml.install b/~fauno/haskell-xml/haskell-xml.install
deleted file mode 100644
index 741ef9ee0..000000000
--- a/~fauno/haskell-xml/haskell-xml.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-xml
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD
deleted file mode 100644
index 0d0d91a11..000000000
--- a/~fauno/haskell-zip-archive/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# custom variables
-_hkgname=zip-archive
-_licensefile=LICENSE
-
-# PKGBUILD options/directives
-pkgname=haskell-zip-archive
-pkgver=0.1.1.7
-pkgrel=20
-pkgdesc="Library for creating and modifying zip archives."
-url="http://github.com/jgm/zip-archive"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=()
-depends=("ghc=7.0.3-2"
- "haskell-binary=0.5.0.2-8"
- "haskell-digest=0.0.1.0-1"
- "haskell-mtl=2.0.1.0-3.1"
- "haskell-unix=2.4.2.0-2"
- "haskell-utf8-string=0.3.6-7.2"
- "haskell-zlib=0.5.3.1-2.1")
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install="${pkgname}.install"
-sha256sums=("88c096d469d8b4d816dbe15571f2c1e61e31c1cd67f931672240063a51d8a2e0")
-
-# PKGBUILD functions
-build() {
- cd ${srcdir}/${_hkgname}-${pkgver}
-
- runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
- --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
- --libsubdir=\$compiler/site-local/\$pkgid
- runhaskell Setup build
- runhaskell Setup haddock
- runhaskell Setup register --gen-script
- runhaskell Setup unregister --gen-script
- sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
- cd ${srcdir}/${_hkgname}-${pkgver}
- install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
- install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
- install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
- ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
- runhaskell Setup copy --destdir=${pkgdir}
- install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
- rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile}
-}
diff --git a/~fauno/haskell-zip-archive/haskell-zip-archive.install b/~fauno/haskell-zip-archive/haskell-zip-archive.install
deleted file mode 100644
index c19836db7..000000000
--- a/~fauno/haskell-zip-archive/haskell-zip-archive.install
+++ /dev/null
@@ -1,26 +0,0 @@
-# custom variables
-pkgname=haskell-zip-archive
-HS_DIR=usr/share/haskell/${pkgname}
-
-# functions
-post_install() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
- ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
- ${HS_DIR}/register.sh
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
- ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
- (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/~fauno/kyotocabinet/PKGBUILD b/~fauno/kyotocabinet/PKGBUILD
deleted file mode 100644
index 1636bfda0..000000000
--- a/~fauno/kyotocabinet/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Alexander Duscheleit <jinks@archlinux.us>
-# Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com>
-pkgname=kyotocabinet
-pkgver=1.2.76
-pkgrel=1
-pkgdesc="a modern implementation of DBM in C++"
-arch=('i686' 'x86_64')
-url="http://fallabs.com/kyotocabinet"
-license=('LGPL3')
-makedepends=('gcc>=3.1' 'make' 'pkgconfig' 'zlib')
-depends=('zlib' 'gcc-libs')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make install DESTDIR="$pkgdir/"
-}
-sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a')
diff --git a/~fauno/kyototycoon/PKGBUILD b/~fauno/kyototycoon/PKGBUILD
deleted file mode 100644
index af88f6020..000000000
--- a/~fauno/kyototycoon/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Alexander Duscheleit <jinks@archlinux.us>
-pkgname=kyototycoon
-pkgver=0.9.56
-pkgrel=1
-pkgdesc="A lightweight conncurent remote frontend for Kyoto Cabinet."
-arch=('i686' 'x86_64')
-url="http://fallabs.com/kyototycoon"
-license=('GPL3')
-depends=('zlib' 'kyotocabinet')
-source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('553e4ea83237d9153cc5e17881092cefe0b224687f7ebcc406b061b2f31c75c6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make install DESTDIR="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/ldapscripts/PKGBUILD b/~fauno/ldapscripts/PKGBUILD
deleted file mode 100644
index 59080b1cf..000000000
--- a/~fauno/ldapscripts/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ldapscripts
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="Shell scripts that allow to manage POSIX accounts (users, groups, machines) in an LDAP directory"
-arch=('any')
-url="http://contribs.martymac.org/"
-license=('GPL')
-depends=('sharutils')
-source=(http://contribs.martymac.org/ldapscripts/${pkgname}-${pkgver}.tgz)
-md5sums=('212a62b3e808faf8d347429ccd2cef09')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" \
- ETCDIR=/etc/ldapscripts \
- MANDIR=/usr/share/man \
- LIBDIR=/usr/share/ldapscripts \
- PREFIX=/usr install
-}
diff --git a/~fauno/librest/PKGBUILD b/~fauno/librest/PKGBUILD
deleted file mode 100644
index a66c4559e..000000000
--- a/~fauno/librest/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Berseker <berseker86 at gmail dot com>
-
-pkgname=librest
-_realname=rest
-
-pkgver=0.7.10
-pkgrel=1
-pkgdesc="a library to access 'RESTful' web services"
-arch=('i686' 'x86_64')
-url="http://moblin.org/projects/librest/"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/GNOME/sources/rest/0.7/${_realname}-${pkgver}.tar.bz2)
-options=('!libtool')
-depends=('libsoup-gnome' 'libxml2')
-makedepends=('gtk-doc')
-
-build() {
- cd "$srcdir/${_realname}-${pkgver}"
-
- ./configure --prefix=/usr #--without-gnome
- make
-}
-
-package() {
- cd "$srcdir/${_realname}-${pkgver}"
- make DESTDIR="$pkgdir/" install
-}
-md5sums=('f47850d26bfb6148d1a3db9e74426e20')
diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD
deleted file mode 100644
index 263776a01..000000000
--- a/~fauno/localepurge/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Francesco Groccia <frgroccia gmail.com>
-# Contributor: Dincer Celik <dincer@bornovali.com>
-
-pkgname=localepurge
-pkgver=0.6.3
-pkgrel=2
-pkgdesc="Script to remove disk space wasted for unneeded localizations."
-arch=('any')
-url="http://packages.debian.org/source/sid/localepurge"
-license=('GPL')
-backup=('etc/locale.nopurge')
-source=("http://ftp.de.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.gz"
- "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.patch"
- "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.8.patch"
- "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.config.patch"
- "http://fgr.bitbucket.org/im/localepurge-arch/locale.nopurge")
-sha256sums=('02f7e4a8b5919221a736abb3a937dffc48ffd275f0968e56612d518e1e69c30b'
- '3958818b2d54c9ca32a1974d757c3303b6e8e1b81d4302dfaec8b8a7af54d17d'
- '3d45b1da93a0fc30dd3ae28d4ef7b319340c5ebaa302f4e375793934262e61fc'
- '1cf4c0e9651589502f953ae25654e5b5347de18995055adfb7a6d183a1c4c912'
- 'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8')
-
-build()
-{
- patch -uN ${srcdir}/${pkgname}/usr/sbin/localepurge < ${srcdir}/localepurge.patch
- patch -uN ${srcdir}/${pkgname}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch
- patch -uN ${srcdir}/${pkgname}/debian/localepurge.config < ${srcdir}/localepurge.config.patch
- install -D -m755 ${srcdir}/${pkgname}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge
- install -D -m644 ${srcdir}/${pkgname}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8
- install -D -m755 ${srcdir}/${pkgname}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config
- install -D -m644 locale.nopurge ${pkgdir}/etc/locale.nopurge
- if [ ! -e /var/cache/localepurge/localelist ]; then
- find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > ${srcdir}/localelist
- else
- cp /var/cache/localepurge/localelist ${srcdir}/localelist
- fi
- install -D -m644 ${srcdir}/localelist ${pkgdir}/var/cache/localepurge/localelist
-}
diff --git a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
deleted file mode 100644
index 6fc5b1f16..000000000
--- a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_cross=mips64el-unknown-linux-gnu
-pkgname=${_cross}-binutils
-pkgver=2.22
-pkgrel=1
-_date=20111227
-_xprefix=/usr
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=(i686 x86_64)
-group=('mips64el-devel')
-license=(GPL)
-options=(!libtool)
-url="http://www.gnu.org/software/binutils/"
-depends=('glibc' 'zlib')
-#makedepends=("${_cross}-libtool")
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
- cd $srcdir/binutils
-
- #export PATH=/usr/${_cross}/bin/:$PATH
-
- [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \
- --program-prefix=${_cross}- \
- --enable-shared \
- --disable-multilib \
- --with-lib-path=${_xprefix}/lib/binutils/${_cross} \
- --disable-nls \
- --target=${_cross} \
- --host=${CHOST} \
- --build=${CHOST} \
- --with-sysroot=/usr/${CHOST}/${_cross} \
-
- make configure-host
- make tooldir=$pkgdir/${_xprefix}
-
-}
-
-package() {
- cd $srcdir/binutils
-
- make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install
-
- mkdir -p $pkgdir/${_xprefix}/lib/binutils/${_cross}
- cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/${_cross}
-
- rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}*
-
- rm -f $pkgdir/usr/bin/ar
- rm -f $pkgdir/usr/bin/as
- rm -f $pkgdir/usr/bin/ld
- rm -f $pkgdir/usr/bin/nm
- rm -f $pkgdir/usr/bin/objdump
- rm -f $pkgdir/usr/bin/ranlib
- rm -f $pkgdir/usr/bin/strip
- rm -f $pkgdir/usr/bin/objcopy
- rm -f $pkgdir/usr/lib/libiberty.a
- rm -rf $pkgdir/usr/share
-}
diff --git a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
deleted file mode 100644
index becc02cfe..000000000
--- a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 60837 2011-12-18 22:34:22Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_cross=mips64el-unknown-linux-gnu
-pkgname=${_cross}-gcc-base
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=("${_cross}-binutils" 'libmpc' 'libelf')
-options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
-md5sums=('780f614ab18c7a9066dec6387d7490b2')
-
-build() {
- cd $srcdir/gcc-$pkgver
-
- export CFLAGS="-O2 -pipe"
- export CXXFLAGS="-O2 -pipe"
-
- [ $NOEXTRACT -eq 1 ] || rm -rf build
- mkdir build
- cd build
-
- [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
- --target=${_cross} \
- --host=${CHOST} \
- --build=${CHOST} \
- --enable-shared --disable-nls --enable-languages=c --enable-multilib \
- --with-local-prefix=/usr/lib/${_cross} \
- --with-as=/usr/bin/${_cross}-as --with-ld=/usr/bin/${_cross}-ld \
- --with-sysroot=/usr/$CHOST/${_cross}
-
- make all-gcc all-target-libgcc
-}
-
-package() {
- cd $srcdir/gcc-$pkgver/build
-
- export CFLAGS="-O2 -pipe"
- export CXXFLAGS="-O2 -pipe"
-
- make DESTDIR=$pkgdir install-gcc install-target-libgcc
-
- rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
- rm -f $pkgdir/usr/share/man/man7/gfdl.7*
- rm -f $pkgdir/usr/share/man/man7/gpl.7*
- rm -rf $pkgdir/usr/share/info
-
- cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
- rm -rf $pkgdir/usr/libexec
-
- # strip it manually
- strip $pkgdir/usr/bin/* 2>/dev/null || true
- find $pkgdir/usr/lib -type f -exec ${_cross}-strip {} \; 2>/dev/null || true
-}
diff --git a/~fauno/spawn-fcgi-php/PKGBUILD b/~fauno/spawn-fcgi-php/PKGBUILD
deleted file mode 100644
index a49858417..000000000
--- a/~fauno/spawn-fcgi-php/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com>
-pkgname=spawn-fcgi-php
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="script to provide simple cgi-php support for nginx http daemon"
-arch=('any')
-url="http://aur.archlinux.org/packages.php?ID=37439"
-license=('GPL')
-depends=('php-cgi' 'spawn-fcgi')
-backup=('etc/conf.d/spawn-fcgi-php.conf')
-source=(
- 'spawn-fcgi-php'
- 'spawn-fcgi-php.conf'
- 'server.conf.example'
- 'nginx.conf.example'
- 'public_html.conf.example'
-)
-
-build() {
- # Install script and configuration file
- install -Dm775 spawn-fcgi-php \
- ${pkgdir}/etc/rc.d/spawn-fcgi-php || return 1
- install -Dm664 spawn-fcgi-php.conf \
- ${pkgdir}/etc/conf.d/spawn-fcgi-php.conf || return 1
-
- # Install examples of configuration
- install -Dm664 public_html.conf.example \
- ${pkgdir}/etc/nginx/conf/public_html.conf.example || return 1
- install -Dm644 server.conf.example \
- ${pkgdir}/etc/nginx/conf/server.conf.example || return 1
- install -Dm664 nginx.conf.example \
- ${pkgdir}/etc/nginx/conf/nginx.conf.example || return 1
-}
-
-# vim:set ts=2 sw=2 et ft=sh:
-md5sums=('9088c130caebf43902f958c985200811'
- 'a8bfb0b50120c91449c8a08144706c9b'
- 'c02189e88531386cd67d3401924c18ae'
- '00bf49fc8a0d8c9f6c96305fae8471d4'
- '9202545dc3701d5933804890312667e6')
diff --git a/~fauno/spawn-fcgi-php/nginx.conf.example b/~fauno/spawn-fcgi-php/nginx.conf.example
deleted file mode 100644
index 35d0868f3..000000000
--- a/~fauno/spawn-fcgi-php/nginx.conf.example
+++ /dev/null
@@ -1,34 +0,0 @@
-user http;
-worker_processes 1;
-
-error_log logs/error.log;
-
-#pid logs/nginx.pid;
-
-events {
- worker_connections 1024;
-}
-
-
-http {
- include mime.types;
- default_type application/octet-stream;
-
- sendfile on;
- #tcp_nopush on;
-
- #keepalive_timeout 0;
- keepalive_timeout 65;
-
- #gzip on;
-
- # the file with mapping username per port
- include /etc/nginx/conf/map_user2port.conf;
- #or only
- #include map_user2port.conf
-
- # Servers configurations ...
- include server.conf.example;
-
- }
-}
diff --git a/~fauno/spawn-fcgi-php/public_html.conf.example b/~fauno/spawn-fcgi-php/public_html.conf.example
deleted file mode 100644
index 74f6c2b4b..000000000
--- a/~fauno/spawn-fcgi-php/public_html.conf.example
+++ /dev/null
@@ -1,16 +0,0 @@
-location ~ ^/~([^/]+)(/?.*)$ {
- set $username $1;
- alias /home/$1/public_html/$2;
- autoindex on;
- location ~ \.php {
- #fastcgi_pass 127.0.0.1:9000;
- # or for multiusers, one port per user
- fastcgi_pass 127.0.0.1:$port;
- # or for unix domain sockets
- #fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.$username.sock;
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- include /etc/nginx/conf/fastcgi_params;
- }
-}
-# vi: ft=nginx
diff --git a/~fauno/spawn-fcgi-php/server.conf.example b/~fauno/spawn-fcgi-php/server.conf.example
deleted file mode 100644
index 06160cfb2..000000000
--- a/~fauno/spawn-fcgi-php/server.conf.example
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
- listen 80;
- server_name domain.tld;
- root /srv/http/domain.tld;
-
- index index.php index.html;
-
- access_log logs/access.log;
- error_log logs/error.log;
-
- location ~ \.php {
- # TCP
- fastcgi_pass 127.0.0.1:9000;
- # or SOCKET
- #fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.sock;
- fastcgi_index index.php;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- include /etc/nginx/conf/fastcgi_params;
- }
- include public_html.conf.example;
-}
-# vi: ft=nginx
diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php b/~fauno/spawn-fcgi-php/spawn-fcgi-php
deleted file mode 100755
index 607ebab8c..000000000
--- a/~fauno/spawn-fcgi-php/spawn-fcgi-php
+++ /dev/null
@@ -1,460 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-NAME=spawn-fcgi-php
-CONF="/etc/conf.d/spawn-fcgi-php.conf"
-#-------------------------------------------------------------------------------
-# Return value for:
-# for check_process
-PROCNOPIDEXIST=-1 # none process is running and pidfile exist
-PROCNOPIDNO=0 # none process is running
-PROCRUNPIDEXIST=1 # process is running, pidfile exist and has size >0b
-PROCRUNPID0=2 # process is running, pidfile has size 0b
-PROCRUNPIDNO=3 # process is running, pidfile doesn't exist
-OTHERERROR=255
-# check_daemon
-DAEMONEXIST=0
-DAEMONNOEXIST=1
-#-------------------------------------------------------------------------------
-
-# Reading configuration
-if [ -r "$CONF" ]; then
- . $CONF
-else
- stat_fail
- stat_busy "File $CONF not found"
- stat_die
-fi
-check_config(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: check_config
-# DESCRIPTION: Check configuration file
-# PARAMETERS:
-# RETURNS: 0 if all right
-#===============================================================================
- # testing DAEMON
- if [ ! -x "$DAEMON" ]; then
- stat_fail
- stat_busy "File $DAEMON isn't executable"
- stat_die
- fi
- # testing USER and GROUP
- if [ -z "$USER" -o -z "$GROUP" ]; then
- stat_fail
- stat_busy "The variable USER/GROUP isn't defined. I cann't run process $PHPCGI as root."
- stat_die
- fi
- # testing directory of socket
- if [ -n "$SOCKET" ]; then
- local sockdir=$(dirname "$SOCKET")
- if [ ! -d "$sockdir" ]; then
- mkdir -p "$sockdir"
- fi
- fi
- # testing directory for user's socket
- if [ -n "$USERSOCKET" ]; then
- local socksdir=$(dirname "$USERSOCKET")
- if [ ! -d "$socksdir" ]; then
- mkdir -p "$socksdir"
- fi
- fi
- # testing directory of pidfile
- if [ -n "$PIDFILE" ]; then
- if [ ! -d $(dirname $PIDFILE) ]; then
- mkdir -p $(dirname $PIDFILE)
- fi
- fi
- # testing the program php-cgi
- if [ -z "$PHPCGI" ]; then
- stat_fail
- stat_busy "The variable PHPCGI isn't defined"
- stat_die
- else
- if [ ! -x "$PHPCGI" ]; then
- stat_fail
- stat_busy "The program $PHPCGI isn't executable"
- stat_die
- fi
- fi
- return 0
-} #}}}
-check_process(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: check_process
-# DESCRIPTION: Check that process is alive
-# PARAMETERS: name of process and/or pidfile
-# RETURNS: look at the beginning of the script
-#===============================================================================
- local process
- local pidfile
- if [ $# -eq 2 ]; then
- process=$1
- pidfile=$2
- elif [ $# -eq 1 ]; then
- process=$1
- else
- return $OTHERERROR
- fi
-
- if get_pid $process >/dev/null; then
- # process is running
- if [ -s "$pidfile" ]; then
- return $PROCRUNPIDEXIST
- elif [ -r "$pidfile" ]; then
- return $PROCRUNPID0
- else
- return $PROCRUNPIDNO
- fi
- else
- # process doesn't runnig
- if [ -r "$pidfile" ]; then
- return $PROCNOPIDEXIST
- else
- return $PROCNOPIDNO
- fi
- fi
-} #}}}
-get_userpid(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: get_userpid
-# DESCRIPTION: looking for pid of process belong to user
-# PARAMETERS: name of user, name of process
-# RETURNS: pid of process or 1 if error
-#===============================================================================
- local user=$1
- local process=$2
- if [ -n "$user" -a -n "$process" ]; then
- local pid=$(ps aux | \
- awk -vuser=$user -vprocess=$process \
- '$1 == user && $8 ~ "s" && $11 == process {print $2}')
- if [[ "$pid" =~ ^[0-9]+$ ]]; then
- echo $pid
- else
- return 1
- fi
- else
- return 1
- fi
-} #}}}
-check_daemon(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: check_daemon
-# DESCRIPTION: check that daemon exist in directory
-# PARAMETERS: name of daemon
-# RETURNS: look at the beginning of the script
-#===============================================================================
- if ck_daemon $NAME; then
- return $DAEMONEXIST
- else
- return $DAEMONEXIST
- fi
-} #}}}
-start(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: start
-# DESCRIPTION: check configuration, if a process is already running and running php-cgi daemon
-# PARAMETERS: -
-# RETURNS: -
-#===============================================================================
- stat_busy "Checking configuration"
- check_config &&
- stat_done || \
- stat_die
-
- stat_busy "Starting server $NAME" #{{{
- check_process $PHPCGI $PIDFILE
- local error=$?
- if [ $error -ge $PROCRUNPIDEXIST -a $error -le $PROCRUNPIDNO ]; then
- stat_fail
- case $error in
- $PROCRUNPIDEXIST)
- stat_busy "The process $PHP is running"
- ;;
- $PROCRUNPID0)
- stat_busy "The process $PHP is running and pidfile has size 0b"
- ;;
- $PROCRUNPIDNO)
- stat_busy "The process $PHP is running and pidfile doesn't exist"
- ;;
- esac
- stat_die $error
- elif [ $error -eq $OTHERERROR ]; then
- stat_fail
- stat_busy "Something went wrong..."
- stat_die $returnvalue
- fi
-
- # run the main daemon
- $DAEMON $OPTIONS >/dev/null
- if [ $? -eq 0 ]; then
- add_daemon $NAME
- stat_done
- else
- stat_die
- fi
- #}}}
- #{{{ start daemons for multiusers
- if [ -n "$STARTMULTI" ]; then
- stat_busy "Starting server $NAME for multiusers"
- gen_all_uid
- if [ -z "$USERSOCKET" ]; then
- # Generate file map user 2 port
- :>$MAPUSER2PORT
- cat >> $MAPUSER2PORT <<- EOF
- # Map username to port
- map \$username \$port {
- default $PORT;
-
- EOF
- local userport=$PORT
- local uid
- for uid in ${ALLUID[@]}; do
- local login=$(uid2login $uid)
- if [ $? -eq 0 ]; then
- userport=$((userport+1))
- echo -e "$login $userport;" >> $MAPUSER2PORT
- local gid=$(id -g $login)
- local group=$(gid2group $gid)
- if [ -n "$USERPIDFILE" ]; then
- local userpidfile=${USERPIDFILE}.${login}.pid
- fi
- USEROPTIONS="-a $IPADDR -p $userport -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}"
- $DAEMON $USEROPTIONS &>/dev/null
- if [ $? -ne 0 ]; then
- stat_die
- fi
- fi
- done
- echo '}' >> $MAPUSER2PORT
- stat_done
- elif [ -n "$USERSOCKET" ]; then
- local uid
- for uid in ${ALLUID[@]}; do
- local login=$(uid2login $uid)
- if [ $? -eq 0 ]; then
- local gid=$(id -g $login)
- local group=$(gid2group $gid)
- if [ -n "$USERPIDFILE" ]; then
- local userpidfile=${USERPIDFILE}.${login}.pid
- fi
- local usersocket=${USERSOCKET}.${login}.sock
- USEROPTIONS="-s ${usersocket} -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}"
- $DAEMON $USEROPTIONS &>/dev/null
- if [ $? -ne 0 ]; then
- stat_die
- fi
- fi
- done
- stat_done
- fi
- fi
- #}}}
-} #}}}
-stop(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: stop
-# DESCRIPTION: check whether a process is running, stop the daemon php-cgi
-# PARAMETERS: -
-# RETURNS: -
-#===============================================================================
- stat_busy "Stopping server $NAME" #{{{
- # for main daemon
- if ! get_pid $PHPCGI &>/dev/null; then
- stat_fail
- stat_busy "None process $PHPCGI isn't running"
- stat_die
- else
- #process php-cgi is running
- if [ -s "$PIDFILE" ]; then
- # pidfile exists
- kill $(<$PIDFILE)
- if [ $? -eq 0 ]; then
- rm -f $PIDFILE
- rm_daemon $NAME
- stat_done
- else
- stat_die
- fi
- else #pidfile doesn't exist
- if [ -r "$PIDFILE" ]; then
- #pidfile exists and has size 0b
- stat_busy "Pidfile $PIDFILE exists and has size 0b.Removing it"
- rm -f "$PIDFILE" && \
- stat_done || \
- stat_fail
- fi
- killall -9 $PHPCGI
- if [ $? -eq 0 ]; then
- stat_done
- rm_daemon $NAME
- else
- stat_die
- fi
- fi
- fi
- #}}}
- #{{{ for multiusers
- if [ -n "$STARTMULTI" ]; then
- # waiting to kill the main daemon
- sleep 1
- if get_pid $PHPCGI &>/dev/null; then
- stat_busy "Stopping server $NAME for multiusers"
- killall $PHPCGI
- # cleaning pidfiles
- if [ -n "$USERPIDFILE" ]; then
- gen_all_uid
- for UserID in ${ALLUID[@]}; do
- local login=$(uid2login $UserID)
- if [ $? -eq 0 ]; then
- rm -f ${USERPIDFILE}.${login}.pid
- fi
- done
- fi #$USERPIDFILE
- stat_done
- fi
- fi
- #}}}
-} #}}}
-restart(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: restart
-# DESCRIPTION: stop and start service
-# PARAMETERS: -
-# RETURNS: -
-#===============================================================================
- stat_busy "Restarting server $NAME"
- stop
- sleep 1
- start
-} #}}}
-status(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: status
-# DESCRIPTION: check status of service
-# PARAMETERS: -
-# RETURNS: -
-#===============================================================================
- if ! get_pid $PHPCGI>/dev/null; then
- stat_busy "None process $PHPCGI isn't running"
- stat_done
- else
- stat_busy "Process $PHPCGI is running"
- stat_done
- if [ -s "$PIDFILE" ]; then
- stat_busy "It's spawned by process: $(cat $PIDFILE|tr '\n' ' ')";
- stat_done
- elif [ -r "$PIDFILE" ]; then
- stat_fail
- stat_busy "Pidfile $PIDFILE exists but has size 0b"
- else
- stat_busy "Pidfile $PIDFILE doesn't exist"
- stat_done
- fi
- if [ -n "$STARTMULTI" -a -n "$USERSSTATUS" ]; then
- gen_all_uid
- local uid
- for uid in ${ALLUID[@]}; do
- local login=$(uid2login $uid)
- if [ $? -eq 0 ]; then
- if [ -n "$USERPIDFILE" ]; then
- # USERPIDFILE defined
- local userpidfile=${USERPIDFILE}.${login}.pid
- if [ -s "$userpidfile" ]; then
- stat_busy "Process $PHPCGI of user $login is spawned by process: $(cat $userpidfile|tr '\n' ' ')";
- stat_done
- fi
- else
- local pid=$(get_userpid $login $PHPCGI)
- if [ $? -eq 0 ]; then
- stat_busy "Process $PHPCGI for user $login is running and it's spawned by: $pid";
- stat_done
- fi
- fi
- fi
- done
- fi
- fi
-} #}}}
-uid2login(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: uid2login
-# DESCRIPTION: convert uid to username
-# PARAMETERS: uid
-# RETURNS: name of user for uid
-#===============================================================================
- local uid=$1
- if [ ! $uid -gt 0 ]; then
- return 1
- fi
- local username=$(getent passwd | awk -vuid=$uid -F: '$3 == uid {print $1}')
- if [ -z "$username" ]; then
- return 1
- else
- echo $username
- fi
-} #}}}
-gid2group(){ #{{{
- #=== FUNCTION ================================================================
- # NAME: uid2group
- # DESCRIPTION: convert gid to name of group
- # PARAMETERS: gid
- # RETURNS: name of group for gid
- #===============================================================================
- local gid=$1
- if [ ! $gid -gt 0 ]; then
- return 1
- fi
- local groupname=$(getent group | awk -vgid=$1 -F: '$3 == gid {print $1}')
- if [ -z "$groupname" ]; then
- return 1
- else
- echo $groupname
- fi
-} #}}}
-gen_all_uid(){ #{{{
-#=== FUNCTION ================================================================
-# NAME: gen_all_uid
-# DESCRIPTION: Generate array of all UID
-# PARAMETERS: -
-# RETURNS: -
-#===============================================================================
- ALLUID=()
- if [ -n "$RANGEUID" -a ${#RANGEUID[@]} -gt 0 ]; then
- for line in ${RANGEUID[@]/,/ }; do
- (( line )) || stat_die # not a number
- if [[ ${line/-/} != $line ]]; then
- for ((i=${line%-*}; i<=${line#*-}; i++)); do
- ALLUID+=($i)
- done
- else
- ALLUID+=($line)
- fi
- done
- elif [ $FIRSTUID -gt 1 -a $LASTUID -gt 1 -a $LASTUID -ge $FIRSTUID ]; then
- for ((line=FIRSTUID; line<=LASTUID; line++)); do
- (( line )) || stat_die #not a number
- ALLUID+=($line)
- done
- else
- echo "Error: Wrong range UID. Change RANGEUID or FIRSTUID and LASTUID"
- exit 1
- fi
-} #}}}
-case $1 in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- restart
- ;;
- status)
- status
- ;;
- *)
- echo "Usage: $0 start|stop|restart|status"
-esac
diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf b/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf
deleted file mode 100644
index d87520c1d..000000000
--- a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# vi: ft=sh
-# run PHPCGI as
-USER=http
-GROUP=http
-
-# Name of daemon
-DAEMON="/usr/bin/spawn-fcgi"
-PIDFILE="/var/run/spawn-fcgi-php.pid"
-# spawn the process
-PHPCGI="/usr/bin/php-cgi"
-
-#-------------------------------------------------------------------------------
-# Options for php-cgi
-#-------------------------------------------------------------------------------
-# (PHP only) Number of children to spawn
-PHP_FCGI_CHILDREN=4
-# or export PHP_FCGI_CHILDREN
-# PHP FastCGI proccess exit after requests:
-export PHP_FCGI_MAX_REQUESTS=1000
-# Choose ONE of PORT/IPADDR (for TCP) OR SOCKET (for unix domain sockets)
-IPADDR=127.0.0.1
-PORT=9000
-#SOCKET=/var/run/spawn-fcgi/spawn-fcgi.sock
-# Options only for socket
-#MODE=0644
-#SOCKET_USER=other
-#SOCKET_GROUP=other
-
-#-------------------------------------------------------------------------------
-# Options for spawn-fcgi
-#-------------------------------------------------------------------------------
-# Number of children to fork, defaults to 1.
-SPAWN_FCGI_CHILDREN=1
-
-
-#-------------------------------------------------------------------------------
-# For many users
-#-------------------------------------------------------------------------------
-# Run separate processes for users with UIDs from the range RANGEUID
-# uncomment STARTMULTI if you want this
-STARTMULTI=yes
-# Base user's socket, uncomment to use socket instead IPADDR:USERPORT
-USERSOCKET='/var/run/spawn-fcgi/spawn-fcgi'
-# file with mapping user to port
-MAPUSER2PORT='/etc/nginx/conf/map_user2port.conf'
-# Base user's pidfile
-#USERPIDFILE='/var/run/spawn-fcgi-php'
-# range for UIDs, use the dash for range and split groups by spaces e.g. 1000-1003 1005 1010-1020, use parenthis for all
-RANGEUID=(1000-1001)
-# (PHP only) Number of children to spawn
-USER_PHP_FCGI_CHILDREN=1
-# for status, comment if you don't want print status for users
-#USERSSTATUS=yes
-
-OPTIONS="-u $USER -g $GROUP -f $PHPCGI -C ${PHP_FCGI_CHILDREN:-4} ${PIDFILE:+-P $PIDFILE} -F ${SPAWN_FCGI_CHILDREN:-1} "
-if [ -n "$SOCKET" ]; then
- OPTIONS+="-s $SOCKET ${MODE:+-M $MODE} ${SOCKET_USER:+-U $SOCKET_USER} ${SOCKET_GROUP:+-G $SOCKET_GROUP} "
-else
- OPTIONS+="-a $IPADDR -p $PORT "
-fi
diff --git a/~fauno/sphinx/PKGBUILD b/~fauno/sphinx/PKGBUILD
deleted file mode 100644
index fa5a7935e..000000000
--- a/~fauno/sphinx/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: dryes <joswiseman@gmail>
-# Contributor: Dan Serban
-# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-pkgname='sphinx'
-pkgver=2.0.5
-pkgrel=2
-pkgdesc='Free open-source SQL full-text search engine.'
-arch=('i686' 'x86_64')
-url='http://www.sphinxsearch.com/'
-license=('GPL')
-depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs')
-optdepends=('postgresql')
-backup=('etc/conf.d/sphinx')
-source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" 'sphinx.conf.d' 'sphinx.rc.d')
-
-build() {
- sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp"
-
- cd "${srcdir}/${pkgname}-${pkgver}-release"
- ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \
- --sysconfdir=/etc/sphinx --with-pgsql --enable-id64
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-release"
-
- make DESTDIR="${pkgdir}" install
-
- for _f in "${pkgdir}/usr/bin/"*; do
- ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}"
- done
-
- install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx"
- install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx"
-}
-
-md5sums=('e71fdb5b0c2911247d48fb30550b9584'
- '48e3e1857919d26d5104a48caffb531b'
- 'd886222593c6bba891fd3ce982c90c00')
diff --git a/~fauno/sphinx/sphinx.conf.d b/~fauno/sphinx/sphinx.conf.d
deleted file mode 100644
index c809e56fa..000000000
--- a/~fauno/sphinx/sphinx.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Arguments to be passed to the sphinx daemon
-#
-
-SPHINX_ARGS=""
diff --git a/~fauno/sphinx/sphinx.rc.d b/~fauno/sphinx/sphinx.rc.d
deleted file mode 100644
index 64c8f01e7..000000000
--- a/~fauno/sphinx/sphinx.rc.d
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sphinx
-
-PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
-case $1 in
-start)
- stat_busy "Starting Sphinx Daemon"
-
- if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then
-
- PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
- echo "$PID" > /var/run/sphinx-searchd.pid
- add_daemon sphinx
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
-stop)
- stat_busy "Stopping Sphinx Daemon"
- if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then
- rm_daemon sphinx
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
-
-restart)
- $0 stop
- $0 start
- ;;
-
-*)
- echo "Usage: $0 {start|stop|restart}" >&2
- exit 1
-
-esac
diff --git a/~fauno/vala-notmuch/PKGBUILD b/~fauno/vala-notmuch/PKGBUILD
deleted file mode 100644
index 0e97683a4..000000000
--- a/~fauno/vala-notmuch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk
-
-pkgname=vala-notmuch
-pkgver=20120112
-pkgrel=1
-pkgdesc="a notmuch address book in vala"
-url="https://github.com/spaetz/vala-notmuch"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-makedepends=('vala')
-depends=('notmuch')
-install=vala-notmuch.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz")
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}/src"
-
- ./make
-
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- install -D -m755 src/addrlookup ${pkgdir}/usr/bin/addrlookup
-
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('99e264c0cb36e0a0f18048fb2ebd07e0')
-md5sums=('ca73980225368309119cf17ff5b3f3c4')
diff --git a/~fauno/vala-notmuch/SRCBUILD b/~fauno/vala-notmuch/SRCBUILD
deleted file mode 100644
index 89b6c67ba..000000000
--- a/~fauno/vala-notmuch/SRCBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk
-
-pkgname=vala-notmuch
-pkgver=20120112
-pkgrel=1
-pkgdesc="A notmuch address book in vala"
-url="https://github.com/spaetz/vala-notmuch"
-arch=('any')
-license=('GPL2')
-makedepends=('git')
-
-_gitroot="https://github.com/spaetz/vala-notmuch.git"
-_gitname="${pkgname}"
-
-build() {
- cd "$srcdir"
- msg 'Connecting to GIT server...'
-
- if [ -d $_gitname ] ; then
- cd $_gitname; git pull origin
- msg 'The local files are updated.'
- else
- git clone $_gitroot $_gitname
- fi
-
- msg "GIT checkout done or server timeout"
-
-}
-
-package() {
- cd ${pkgdir}
- export PKGDEST=${SRCDEST}
- export PKGEXT=.src.tar.xz
-
- git clone ${srcdir}/${pkgname} ${pkgname}-${pkgver}
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/vala-notmuch/vala-notmuch.install b/~fauno/vala-notmuch/vala-notmuch.install
deleted file mode 100644
index d1ce89da6..000000000
--- a/~fauno/vala-notmuch/vala-notmuch.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install() {
-echo "To use within emacs, add the following to your .emacs:"
-echo "(require 'notmuch-address)"
-echo "(setq notmuch-address-command "/usr/bin/addrlookup")"
-echo "(notmuch-address-message-insinuate)"
-}