empathy 3.1.91-1 màj port

6 files changed, 44 insertions, 7 deletions

diff --git a/empathy/.footprint.i686 b/empathy/.footprint.i686
index 5199481..c14b017 100644
--- a/empathy/.footprint.i686
+++ b/empathy/.footprint.i686
@@ -9,6 +9,10 @@ drwxr-xr-x	root/root	usr/lib/empathy/
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-av
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-call
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-chat
+drwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/
+-rw-r--r--	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.a
+-rwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.la
+-rwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.so
 drwxr-xr-x	root/root	usr/lib/nautilus-sendto/
 drwxr-xr-x	root/root	usr/lib/nautilus-sendto/plugins/
 -rw-r--r--	root/root	usr/lib/nautilus-sendto/plugins/libnstempathy.a
diff --git a/empathy/.footprint.x86_64 b/empathy/.footprint.x86_64
index 5199481..c14b017 100644
--- a/empathy/.footprint.x86_64
+++ b/empathy/.footprint.x86_64
@@ -9,6 +9,10 @@ drwxr-xr-x	root/root	usr/lib/empathy/
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-av
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-call
 -rwxr-xr-x	root/root	usr/lib/empathy/empathy-chat
+drwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/
+-rw-r--r--	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.a
+-rwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.la
+-rwxr-xr-x	root/root	usr/lib/mission-control-plugins.0/mcp-account-manager-goa.so
 drwxr-xr-x	root/root	usr/lib/nautilus-sendto/
 drwxr-xr-x	root/root	usr/lib/nautilus-sendto/plugins/
 -rw-r--r--	root/root	usr/lib/nautilus-sendto/plugins/libnstempathy.a
diff --git a/empathy/.md5sum.i686 b/empathy/.md5sum.i686
index 4053745..78d6f7e 100644
--- a/empathy/.md5sum.i686
+++ b/empathy/.md5sum.i686
@@ -1 +1,2 @@
-7a63591b04feb41c0569d20b1426c151  empathy-3.1.90.1.tar.xz
+7adaf9a827b26162c555e8eee9c19be8  champlain0.11.patch
+f1ce6bd6fbf22972e9de6463e043db41  empathy-3.1.91.tar.xz
diff --git a/empathy/.md5sum.x86_64 b/empathy/.md5sum.x86_64
index 4053745..78d6f7e 100644
--- a/empathy/.md5sum.x86_64
+++ b/empathy/.md5sum.x86_64
@@ -1 +1,2 @@
-7a63591b04feb41c0569d20b1426c151  empathy-3.1.90.1.tar.xz
+7adaf9a827b26162c555e8eee9c19be8  champlain0.11.patch
+f1ce6bd6fbf22972e9de6463e043db41  empathy-3.1.91.tar.xz
diff --git a/empathy/Pkgfile b/empathy/Pkgfile
index cae30f6..720fd36 100755
--- a/empathy/Pkgfile
+++ b/empathy/Pkgfile
@@ -2,16 +2,19 @@
 # URL: http://live.gnome.org/Empathy
 # Maintainer: NuTyX core team
 # Packager: piernov <piernov@piernov.org>
-# Depends on: telepathy-glib, telepathy-mission-control, folks, telepathy-logger, telepathy-farsight, gnome-keyring, gnutls, evolution-data-server, libcanberra, libnotify, enchant, webkit, dconf, ca-certificates, nautilus, gnome-control-center, intltool, gnome-doc-utils, cheese, clutter, clutter-gst, clutter-gtk, telepathy-farstream, libchamplain, geocode-glib, geoclue, telepathy-salut
-# Run on: telepathy-glib,telepathy-mission-control,folks,telepathy-logger,telepathy-farsight,gnome-keyring,gnutls,evolution-data-server,libcanberra,libnotify,enchant,webkit,dconf,ca-certificates,nautilus,gnome-control-center,cheese,clutter,clutter-gst,clutter-gtk,telepathy-farstream,libchamplain,geocode-glib,geoclue,telepathy-salut
+# Depends on: telepathy-glib, telepathy-mission-control, folks, telepathy-logger, telepathy-farsight, gnome-keyring, gnutls, evolution-data-server, libcanberra, libnotify, enchant, webkit, dconf, ca-certificates, nautilus, intltool, gnome-doc-utils, cheese, clutter, clutter-gst, clutter-gtk, telepathy-farstream, libchamplain, geocode-glib, geoclue, telepathy-salut, gnome-common
+# Run on: telepathy-glib,telepathy-mission-control,folks,telepathy-logger,telepathy-farsight,gnome-keyring,gnutls,evolution-data-server,libcanberra,libnotify,enchant,webkit,dconf,ca-certificates,nautilus,cheese,clutter,clutter-gst,clutter-gtk,telepathy-farstream,libchamplain,geocode-glib,geoclue,telepathy-salut
 
 name=empathy
-version=3.1.90.1
+version=3.1.91
 release=1
-source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*.*}/$name-$version.tar.xz)
+source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$version.tar.xz
+	champlain0.11.patch)
 
 build() {
         cd $name-$version
+	patch -p1 < ../champlain0.11.patch
+	NOCONFIGURE=1 gnome-autogen.sh
 	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
 		--sysconfdir=/etc  \
 		--libexecdir=/usr/lib/empathy \
@@ -30,7 +33,6 @@ build() {
 		--enable-location=yes \
 		--enable-geocode=yes \
 		--enable-spell=yes
-#		--enable-control-center-embedding=yes \
 	make
 	make DESTDIR=$PKG install
 }
diff --git a/empathy/champlain0.11.patch b/empathy/champlain0.11.patch
new file mode 100644
index 0000000..43d141a
--- /dev/null
+++ b/empathy/champlain0.11.patch
@@ -0,0 +1,25 @@
+diff -up ./configure.ac.orig ./configure.ac
+--- ./configure.ac.orig	2011-09-03 09:35:04.200582985 +0000
++++ ./configure.ac	2011-09-03 09:35:45.340081967 +0000
+@@ -53,8 +53,8 @@ CLUTTER_GTK_REQUIRED=0.90.3
+ ENCHANT_REQUIRED=1.2.0
+ GEOCLUE_REQUIRED=0.11
+ ISO_CODES_REQUIRED=0.35
+-LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
+-LIBCHAMPLAIN_REQUIRED=0.9
++LIBCHAMPLAIN_GTK_REQUIRED=0.11.0
++LIBCHAMPLAIN_REQUIRED=0.11.0
+ NAUTILUS_SENDTO_REQUIRED=2.90.0
+ NETWORK_MANAGER_REQUIRED=0.7.0
+ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
+@@ -441,8 +441,8 @@ if test "x$enable_map" != "xno"; then
+    PKG_CHECK_MODULES(LIBCHAMPLAIN,
+     [
+        clutter-gtk-1.0
+-       champlain-gtk-0.10
+-       champlain-0.10
++       champlain-gtk-0.12
++       champlain-0.12
+     ], have_libchamplain="yes", have_libchamplain="no")
+ 
+    if test "x$have_libchamplain" = "xyes"; then