diff options
| -rw-r--r-- | empathy/.md5sum.i686 | 3 | ||||
| -rw-r--r-- | empathy/.md5sum.x86_64 | 3 | ||||
| -rwxr-xr-x | empathy/Pkgfile | 7 | ||||
| -rw-r--r-- | empathy/champlain0.11.patch | 25 |
4 files changed, 4 insertions, 34 deletions
diff --git a/empathy/.md5sum.i686 b/empathy/.md5sum.i686 index 78d6f7e..93f9e9e 100644 --- a/empathy/.md5sum.i686 +++ b/empathy/.md5sum.i686 @@ -1,2 +1 @@ -7adaf9a827b26162c555e8eee9c19be8 champlain0.11.patch -f1ce6bd6fbf22972e9de6463e043db41 empathy-3.1.91.tar.xz +41e11d8254b0f14e68cc1aabea4d1386 empathy-3.1.92.tar.xz diff --git a/empathy/.md5sum.x86_64 b/empathy/.md5sum.x86_64 index 78d6f7e..93f9e9e 100644 --- a/empathy/.md5sum.x86_64 +++ b/empathy/.md5sum.x86_64 @@ -1,2 +1 @@ -7adaf9a827b26162c555e8eee9c19be8 champlain0.11.patch -f1ce6bd6fbf22972e9de6463e043db41 empathy-3.1.91.tar.xz +41e11d8254b0f14e68cc1aabea4d1386 empathy-3.1.92.tar.xz diff --git a/empathy/Pkgfile b/empathy/Pkgfile index 8b79e3b..9324f65 100755 --- a/empathy/Pkgfile +++ b/empathy/Pkgfile @@ -6,15 +6,12 @@ # 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,iso-codes,nautilus-sendto name=empathy -version=3.1.91 +version=3.1.92 release=1 -source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$version.tar.xz - champlain0.11.patch) +source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version%.*}/$name-$version.tar.xz) 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 \ diff --git a/empathy/champlain0.11.patch b/empathy/champlain0.11.patch deleted file mode 100644 index 43d141a..0000000 --- a/empathy/champlain0.11.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 |