Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

4 files changed, 25 insertions, 21 deletions

diff --git a/extra/pidgin/.footprint.i686 b/extra/pidgin/.footprint.i686
index ab552e588..352cc4ce1 100644
--- a/extra/pidgin/.footprint.i686
+++ b/extra/pidgin/.footprint.i686
@@ -1,7 +1,3 @@
-drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/gconf/
-drwxr-xr-x	root/root	etc/gconf/schemas/
--rw-r--r--	root/root	etc/gconf/schemas/purple.schemas
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/finch
@@ -199,9 +195,9 @@ lrwxrwxrwx	root/root	usr/lib/libgnt.so -> libgnt.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgnt.so.0 -> libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpurple.la
-lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.5
-lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.5
--rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.5
+lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.11
+lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.11
+-rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.11
 drwxr-xr-x	root/root	usr/lib/pidgin/
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.so
@@ -235,8 +231,6 @@ drwxr-xr-x	root/root	usr/lib/pidgin/
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp_format.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp_format.so
--rwxr-xr-x	root/root	usr/lib/pidgin/vvconfig.la
--rwxr-xr-x	root/root	usr/lib/pidgin/vvconfig.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppconsole.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppconsole.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppdisco.la
@@ -750,6 +744,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/16/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/google-talk.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/icq.png
@@ -768,6 +763,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/16/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/22/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/google-talk.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/icq.png
@@ -785,6 +781,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/22/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/48/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/icq.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/irc.png
@@ -982,6 +979,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/tray/hicolor/48x48/status/
 drwxr-xr-x	root/root	usr/share/purple/
 drwxr-xr-x	root/root	usr/share/purple/ca-certs/
 -rw-r--r--	root/root	usr/share/purple/ca-certs/AOL_Member_CA.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/AddTrust_External_Root.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Class3.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Root.pem
@@ -992,7 +990,9 @@ drwxr-xr-x	root/root	usr/share/purple/ca-certs/
 -rw-r--r--	root/root	usr/share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Go_Daddy_Class_2_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Internet_Authority.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Internet_Authority_2010.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Certification_Authority.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Thawte_Premium_Server_CA.pem
diff --git a/extra/pidgin/.footprint.x86_64 b/extra/pidgin/.footprint.x86_64
index ab552e588..352cc4ce1 100644
--- a/extra/pidgin/.footprint.x86_64
+++ b/extra/pidgin/.footprint.x86_64
@@ -1,7 +1,3 @@
-drwxr-xr-x	root/root	etc/
-drwxr-xr-x	root/root	etc/gconf/
-drwxr-xr-x	root/root	etc/gconf/schemas/
--rw-r--r--	root/root	etc/gconf/schemas/purple.schemas
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/finch
@@ -199,9 +195,9 @@ lrwxrwxrwx	root/root	usr/lib/libgnt.so -> libgnt.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libgnt.so.0 -> libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libgnt.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libpurple.la
-lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.5
-lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.5
--rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.5
+lrwxrwxrwx	root/root	usr/lib/libpurple.so -> libpurple.so.0.7.11
+lrwxrwxrwx	root/root	usr/lib/libpurple.so.0 -> libpurple.so.0.7.11
+-rwxr-xr-x	root/root	usr/lib/libpurple.so.0.7.11
 drwxr-xr-x	root/root	usr/lib/pidgin/
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/convcolors.so
@@ -235,8 +231,6 @@ drwxr-xr-x	root/root	usr/lib/pidgin/
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp_format.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/timestamp_format.so
--rwxr-xr-x	root/root	usr/lib/pidgin/vvconfig.la
--rwxr-xr-x	root/root	usr/lib/pidgin/vvconfig.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppconsole.la
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppconsole.so
 -rwxr-xr-x	root/root	usr/lib/pidgin/xmppdisco.la
@@ -750,6 +744,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/16/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/google-talk.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/16/icq.png
@@ -768,6 +763,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/16/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/22/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/google-talk.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/22/icq.png
@@ -785,6 +781,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/22/
 drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/protocols/48/
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/aim.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/bonjour.png
+-rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/facebook.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/gadu-gadu.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/icq.png
 -rw-r--r--	root/root	usr/share/pixmaps/pidgin/protocols/48/irc.png
@@ -982,6 +979,7 @@ drwxr-xr-x	root/root	usr/share/pixmaps/pidgin/tray/hicolor/48x48/status/
 drwxr-xr-x	root/root	usr/share/purple/
 drwxr-xr-x	root/root	usr/share/purple/ca-certs/
 -rw-r--r--	root/root	usr/share/purple/ca-certs/AOL_Member_CA.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/AddTrust_External_Root.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/America_Online_Root_Certification_Authority_1.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Class3.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/CAcert_Root.pem
@@ -992,7 +990,9 @@ drwxr-xr-x	root/root	usr/share/purple/ca-certs/
 -rw-r--r--	root/root	usr/share/purple/ca-certs/GTE_CyberTrust_Global_Root.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Go_Daddy_Class_2_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Internet_Authority.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Internet_Authority_2010.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Secure_Server_Authority.pem
+-rw-r--r--	root/root	usr/share/purple/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Certification_Authority.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/StartCom_Free_SSL_CA.pem
 -rw-r--r--	root/root	usr/share/purple/ca-certs/Thawte_Premium_Server_CA.pem
diff --git a/extra/pidgin/.md5sum.x86_64 b/extra/pidgin/.md5sum.x86_64
index e89c0bf35..291a23194 100644
--- a/extra/pidgin/.md5sum.x86_64
+++ b/extra/pidgin/.md5sum.x86_64
@@ -1 +1 @@
-f055cc137cff02a925c3d2ea08ca4978  pidgin-2.7.5.tar.bz2
+07c2a2535b4d7436b5ec7685fe063fec  pidgin-2.7.11.tar.bz2
diff --git a/extra/pidgin/Pkgfile b/extra/pidgin/Pkgfile
index 02573a332..469a65325 100644
--- a/extra/pidgin/Pkgfile
+++ b/extra/pidgin/Pkgfile
@@ -2,16 +2,18 @@
 # URL:  http://www.pidgin.im
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: gtkspell, gtk, libxml2, p5-xml-parser, gnutls, nss, nspr, xorg-libxscrnsaver, gstreamer, startup-notification, hicolor-icon-theme, libidn, farsight2
+# Depends on: gtkspell, gtk, libxml2, p5-xml-parser, gnutls, nss, nspr, xorg-libxscrnsaver, xorg-libsm, gstreamer, startup-notification, hicolor-icon-theme, libidn
 # Run on: gtkspell,gtk,libxml2,gnutls,nss,nspr,xorg-libxscrnsaver,gstreamer,startup-notification,hicolor-icon-theme,libidn,farsight2
 
 name=pidgin
-version=2.7.5
+version=2.7.11
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
+	sed -i "s#env python#env python2#" */plugins/*.py
+	sed -i "s#env python#env python2#" libpurple/purple-{remote,notifications-example,url-handler}
 	./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--disable-gevolution \
@@ -26,6 +28,8 @@ build() {
 	--disable-tk \
 	--enable-gnutls=yes \
 	--disable-dbus \
+	--disable-vv \
+	--with-python=/usr/bin/python2
 	 
 	make
 	make DESTDIR=$PKG install