[113283] trunk/dports/gnome/empathy
devans at macports.org
devans at macports.org
Wed Nov 13 02:41:36 PST 2013
Revision: 113283
https://trac.macports.org/changeset/113283
Author: devans at macports.org
Date: 2013-11-13 02:41:36 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
empathy: merge version 3.8.4 from GNOME-3 test branch.
Modified Paths:
--------------
trunk/dports/gnome/empathy/Portfile
trunk/dports/gnome/empathy/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff
Property Changed:
----------------
trunk/dports/gnome/empathy/
Property changes on: trunk/dports/gnome/empathy
___________________________________________________________________
Added: svn:mergeinfo
+ /users/devans/GNOME-3/stable/dports/gnome/empathy:108269-113174
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2013-11-13 10:38:27 UTC (rev 113282)
+++ trunk/dports/gnome/empathy/Portfile 2013-11-13 10:41:36 UTC (rev 113283)
@@ -4,9 +4,8 @@
PortSystem 1.0
name empathy
-version 2.34.0
-revision 1
-license {GPL-2 GFDL-1.3 Attribution-ShareAlike-3}
+version 3.8.4
+license GPL-2+ LGPL-2.1+ GFDL-1.3+ Attribution-ShareAlike-3.0
set branch [join [lrange [split ${version} .] 0 1] .]
description Empathy is an instant-messaging(chat) program for GNOME
long_description \
@@ -19,71 +18,73 @@
homepage http://live.gnome.org/Empathy
master_sites gnome:sources/${name}/${branch}/
-use_bzip2 yes
+use_xz yes
-checksums rmd160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 \
- sha256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
+checksums rmd160 8412f9facb5c6e73341faced553077cb036b5285 \
+ sha256 cbc4934ce838e3d697616b5c36b070d2fc4fc57f84fd654c2f2cb2b8b650f5c9
depends_build port:pkgconfig \
port:intltool \
- port:gnome-doc-utils \
- port:gtk-doc
+ port:itstool
depends_lib port:desktop-file-utils \
- port:gconf \
+ port:gnome-icon-theme \
+ port:gnome-icon-theme-symbolic \
+ port:gtk3 \
port:dbus-glib \
- port:farsight2 \
port:folks \
- port:gnome-keyring \
- port:libgnome-keyring \
+ port:libsecret \
port:gnutls \
- port:gstreamer010 \
- port:gstreamer010-gst-plugins-base \
+ port:gsettings-desktop-schemas \
port:libxml2 \
port:telepathy-glib \
- port:telepathy-farsight \
port:telepathy-logger \
+ port:libcanberra \
+ port:libnotify \
+ port:gcr \
+ port:pulseaudio \
+ port:webkit-gtk3 \
+ port:libsoup \
+ port:libgee \
+ port:telepathy-farstream \
+ port:clutter-gtk \
+ port:clutter-gst \
+ port:gstreamer1 \
port:enchant \
- port:icu \
port:iso-codes \
- port:jpeg \
- port:libcanberra \
- port:libnotify \
- port:libunique
+ port:xorg-libX11
depends_run port:telepathy-mission-control \
+ port:telepathy-idle \
port:telepathy-gabble \
port:telepathy-haze \
port:telepathy-salut \
port:gnome-settings-daemon \
port:yelp
-patchfiles patch-configure.diff \
- patch-libnotify-api-0.5.1.diff
+patchfiles patch-configure.diff
configure.args --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
+ --enable-gst-1.0=yes \
+ --enable-debug \
+ --enable-gudev=no \
--enable-spell=yes \
- --enable-webkit=no \
--enable-map=no \
--enable-location=no \
+ --enable-geocode=no \
--enable-nautilus-sendto=no \
- --enable-control-center-embedding=no \
- --enable-call=no \
- --enable-debug \
- --with-connectivity=no \
- --without-ca-file \
- --without-eds \
+ --enable-goa=no \
+ --without-cheese \
+ --enable-ubuntu-online-accounts=no \
--disable-coding-style-checks \
- --disable-Werror \
+ --disable-schemas-compile \
--disable-silent-rules \
- --disable-scrollkeeper \
- --disable-schemas-compile
+ --disable-Werror
-post-destroot {
- set gsettingsschemadir ${prefix}/share/glib-2.0/schemas
- file mkdir ${destroot}${gsettingsschemadir}
- file copy [glob ${worksrcpath}/data/*.gschema.xml] ${destroot}${gsettingsschemadir}
+variant map description {Enable map view} {
+ depends_lib-append port:libchamplain
+ configure.args-replace --enable-map=no --enable-map=yes
}
variant location description {Enable location awareness using geoclue} {
@@ -91,18 +92,16 @@
configure.args-replace --enable-location=no --enable-location=yes
}
-variant webkit description {Enable support Adium themes using webkit} {
- depends_lib-append port:webkit-gtk
- configure.args-replace --enable-webkit=no --enable-webkit=yes
+variant goa description {Enable GNOME online accounts plugin for mission control} {
+ depends_lib-append port:gnome-online-accounts \
+ port:telepathy-mission-control
+ configure.args-replace --enable-goa=no --enable-goa=yes
}
-variant eds description {Enable E-D-S support with telepathy-salut} {
- depends_lib-append port:evolution-data-server
- configure.args-replace --without-eds --with-eds
-}
+default_variants +map +location +goa
#
-# telepathy-haze -> pidgin is not universal
+# folks is not universal
#
universal_variant no
@@ -117,12 +116,15 @@
depends_build-append port:python27
}
+default_variants +map +location +goa
+
if {![variant_isset python26]} {
default_variants +python27
}
+
post-activate {
- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
+ system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
Modified: trunk/dports/gnome/empathy/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/empathy/files/patch-configure.diff 2013-11-13 10:38:27 UTC (rev 113282)
+++ trunk/dports/gnome/empathy/files/patch-configure.diff 2013-11-13 10:41:36 UTC (rev 113283)
@@ -1,6 +1,6 @@
---- configure.orig 2011-03-24 08:18:52.000000000 -0700
-+++ configure 2013-05-15 08:18:48.000000000 -0700
-@@ -13763,9 +13763,9 @@
+--- configure.orig 2013-09-09 06:40:52.000000000 -0700
++++ configure 2013-09-09 09:05:49.000000000 -0700
+@@ -13611,9 +13611,9 @@
Deleted: trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff
===================================================================
--- trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff 2013-11-13 10:38:27 UTC (rev 113282)
+++ trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff 2013-11-13 10:41:36 UTC (rev 113283)
@@ -1,44 +0,0 @@
---- configure.orig 2013-05-15 11:40:32.000000000 -0700
-+++ configure 2013-05-15 11:41:24.000000000 -0700
-@@ -2659,7 +2659,7 @@
- GTK_REQUIRED=2.22.0
- KEYRING_REQUIRED=2.26.0
- LIBCANBERRA_GTK_REQUIRED=0.4
--LIBNOTIFY_REQUIRED=0.7.0
-+LIBNOTIFY_REQUIRED=0.5.1
- TELEPATHY_FARSIGHT_REQUIRED=0.0.14
- TELEPATHY_GLIB_REQUIRED=0.14.1
- TELEPATHY_LOGGER=0.2.0
---- src/empathy-call-observer.c 2013-05-15 11:28:28.000000000 -0700
-+++ src/empathy-call-observer.c 2013-05-15 11:30:55.000000000 -0700
-@@ -135,7 +135,7 @@
- _("%s just tried to call you, but you were in another call."),
- tp_contact_get_alias (contact));
-
-- notification = notify_notification_new (summary, body, NULL);
-+ notification = notify_notification_new (summary, body, NULL, NULL);
-
- emp_contact = empathy_contact_dup_from_tp_contact (contact);
- pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
---- src/empathy-chat-window.c 2013-05-15 11:28:28.000000000 -0700
-+++ src/empathy-chat-window.c 2013-05-15 11:33:37.000000000 -0700
-@@ -1325,7 +1325,7 @@
- to an existing notification with the same title.
- In this way the previous message will not be lost: the new
- message will appear below it, in the same notification */
-- notification = notify_notification_new (header, escaped, NULL);
-+ notification = notify_notification_new (header, escaped, NULL, NULL);
-
- if (priv->notification == NULL) {
- priv->notification = notification;
---- src/empathy-status-icon.c 2013-05-15 11:28:28.000000000 -0700
-+++ src/empathy-status-icon.c 2013-05-15 11:36:27.000000000 -0700
-@@ -241,7 +241,7 @@
- In this way the previous message will not be lost: the new
- message will appear below it, in the same notification */
- notification = notify_notification_new
-- (priv->event->header, message_esc, NULL);
-+ (priv->event->header, message_esc, NULL, NULL);
-
- if (priv->notification == NULL) {
- priv->notification = notification;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131113/36d91e60/attachment.html>
More information about the macports-changes
mailing list