[107299] trunk/dports/gnome/empathy
devans at macports.org
devans at macports.org
Tue Jun 25 07:57:19 PDT 2013
Revision: 107299
https://trac.macports.org/changeset/107299
Author: devans at macports.org
Date: 2013-06-25 07:57:18 -0700 (Tue, 25 Jun 2013)
Log Message:
-----------
empathy: update to version 2.34.0.
Modified Paths:
--------------
trunk/dports/gnome/empathy/Portfile
trunk/dports/gnome/empathy/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff
Modified: trunk/dports/gnome/empathy/Portfile
===================================================================
--- trunk/dports/gnome/empathy/Portfile 2013-06-25 14:54:28 UTC (rev 107298)
+++ trunk/dports/gnome/empathy/Portfile 2013-06-25 14:57:18 UTC (rev 107299)
@@ -4,8 +4,7 @@
PortSystem 1.0
name empathy
-version 2.30.3
-revision 15
+version 2.34.0
license {GPL-2 GFDL-1.3 Attribution-ShareAlike-3}
set branch [join [lrange [split ${version} .] 0 1] .]
description Empathy is an instant-messaging(chat) program for GNOME
@@ -19,68 +18,100 @@
homepage http://live.gnome.org/Empathy
master_sites gnome:sources/${name}/${branch}/
-checksums md5 d797f30219da87d4564fb92705626cd3 \
- sha1 1a438198469f623e7051a521ef2590f0da518075 \
- rmd160 57d558c81b166b8e008ee236a258d592b3ac50a3
+use_bzip2 yes
+checksums rmd160 a76e9633d88dbd48c5d494d3393566a88a5b35c4 \
+ sha256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1
+
depends_build port:pkgconfig \
port:intltool \
port:gnome-doc-utils \
- port:gtk-doc
+ port:gtk-doc \
+ port:desktop-file-utils
depends_lib port:gconf \
+ port:dbus-glib \
+ port:farsight2 \
+ port:folks \
+ port:gnome-keyring \
+ port:libgnome-keyring \
+ port:gnutls \
+ port:gstreamer010 \
+ port:libxml2 \
+ port:telepathy-glib \
+ port:telepathy-farsight \
+ port:telepathy-logger \
port:enchant \
- port:evolution-data-server \
- port:gstreamer010 \
port:icu \
port:iso-codes \
port:jpeg \
port:libcanberra \
- port:libgnome-keyring \
port:libnotify \
- port:libunique \
- port:telepathy-farsight \
- port:webkit-gtk
+ port:libunique
depends_run port:telepathy-mission-control \
- port:telepathy-logger \
port:telepathy-gabble \
port:telepathy-haze \
port:telepathy-salut \
- port:gnome-settings-daemon
+ port:gnome-settings-daemon \
+ port:yelp
-use_bzip2 yes
+patchfiles patch-configure.diff \
+ patch-libnotify-api-0.5.1.diff
-patchfiles patch-configure.diff
-
-configure.args --mandir=${prefix}/share/man \
- --x-includes=${prefix}/include \
+configure.args --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib \
- --enable-webkit=yes \
--enable-spell=yes \
+ --enable-webkit=no \
--enable-map=no \
--enable-location=no \
- --enable-favourite-contacts=no \
--enable-nautilus-sendto=no \
--enable-control-center-embedding=no \
+ --enable-call=no \
+ --enable-debug \
--with-connectivity=no \
+ --without-ca-file \
+ --without-eds \
--disable-coding-style-checks \
+ --disable-Werror \
--disable-silent-rules \
--disable-scrollkeeper \
- --disable-schemas-install
+ --disable-schemas-compile
+post-destroot {
+ set gsettingsschemadir ${prefix}/share/glib-2.0/schemas
+ file mkdir ${destroot}${gsettingsschemadir}
+ file copy [glob ${worksrcpath}/data/*.gschema.xml] ${destroot}${gsettingsschemadir}
+}
+
#
# enable build on Tiger by disabling map
# support which indirectly depends on mesa
# see #24393.
#
-platform darwin 8 {
- depends_lib-delete port:libchamplain
- configure.args-delete --enable-map=yes
- configure.args-append --enable-map=no
+if {${os.major} > 8 && ${os.platform} == "darwin"} {
+ variant map description {Enable maps using libchamplain} {
+ depends_lib-append port:libchamplain
+ configure.args-replace --enable-map=no --enable-map=yes
+ }
}
+variant location description {Enable location awareness using geoclue} {
+ depends_lib-append port:geoclue
+ 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 eds description {Enable E-D-S support with telepathy-salut} {
+ depends_lib-append port:evolution-data-server
+ configure.args-replace --without-eds --with-eds
+}
+
#
# telepathy-haze -> pidgin is not universal
#
@@ -102,10 +133,10 @@
}
post-activate {
- system "scrollkeeper-update"
+ system "${prefix}/bin/scrollkeeper-update"
system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
- system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
- gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
+ system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
}
livecheck.type gnome
Modified: trunk/dports/gnome/empathy/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/empathy/files/patch-configure.diff 2013-06-25 14:54:28 UTC (rev 107298)
+++ trunk/dports/gnome/empathy/files/patch-configure.diff 2013-06-25 14:57:18 UTC (rev 107299)
@@ -1,6 +1,6 @@
---- configure.orig 2010-08-24 07:24:03.000000000 -0700
-+++ configure 2010-09-14 02:58:56.000000000 -0700
-@@ -13555,9 +13555,9 @@
+--- configure.orig 2011-03-24 08:18:52.000000000 -0700
++++ configure 2013-05-15 08:18:48.000000000 -0700
+@@ -13763,9 +13763,9 @@
Added: trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff
===================================================================
--- trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff (rev 0)
+++ trunk/dports/gnome/empathy/files/patch-libnotify-api-0.5.1.diff 2013-06-25 14:57:18 UTC (rev 107299)
@@ -0,0 +1,44 @@
+--- 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/20130625/1681ec07/attachment.html>
More information about the macports-changes
mailing list