diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2011-08-23 18:39:19 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2011-08-23 18:39:19 +0000 |
| commit | fe61bf1eb4f2758636a3c065686a833eb412df25 (patch) | |
| tree | 1474457ea487adcafec2ab29e99ab61897a3e479 | |
| parent | 5732783897145621b6af3ab08fba8d9af40f338b (diff) | |
| download | ports-fe61bf1eb4f2758636a3c065686a833eb412df25.tar.gz ports-fe61bf1eb4f2758636a3c065686a833eb412df25.zip | |
Chase libnotify, libproxy and webkit-gtk2 shlib changes, and fix build where needed.
Notes
Notes:
svn path=/head/; revision=280300
150 files changed, 1326 insertions, 168 deletions
diff --git a/audio/Makefile b/audio/Makefile index 1f31894159f0..e8c5732b174e 100644 --- a/audio/Makefile +++ b/audio/Makefile @@ -360,6 +360,7 @@ SUBDIR += libbpm SUBDIR += libbs2b SUBDIR += libcanberra + SUBDIR += libcanberra-gtk3 SUBDIR += libcdaudio SUBDIR += libcddb SUBDIR += libcddb-doc diff --git a/audio/ario/Makefile b/audio/ario/Makefile index 484a290d6351..26f717e5b429 100644 --- a/audio/ario/Makefile +++ b/audio/ario/Makefile @@ -7,6 +7,7 @@ PORTNAME= ario PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/ario-player/ario-player/${PORTVERSION} @@ -17,6 +18,7 @@ LICENSE= GPLv2 LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ gcrypt:${PORTSDIR}/security/libgcrypt \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ curl:${PORTSDIR}/ftp/curl \ notify:${PORTSDIR}/devel/libnotify \ soup:${PORTSDIR}/devel/libsoup22 \ diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile index d05c8cc606d0..db64fa53575c 100644 --- a/audio/clementine-player/Makefile +++ b/audio/clementine-player/Makefile @@ -7,6 +7,7 @@ PORTNAME= clementine PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -player @@ -16,7 +17,7 @@ COMMENT= A cross-platform music player based on Amarok 1.4 LIB_DEPENDS= lastfm.0:${PORTSDIR}/audio/liblastfm \ tag.1:${PORTSDIR}/audio/taglib \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ xine.1:${PORTSDIR}/multimedia/libxine \ mtp:${PORTSDIR}/audio/libmtp BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs diff --git a/audio/cueplayer/Makefile b/audio/cueplayer/Makefile index 722d70d6765a..5f3bdb8be83b 100644 --- a/audio/cueplayer/Makefile +++ b/audio/cueplayer/Makefile @@ -7,13 +7,14 @@ PORTNAME= cueplayer PORTVERSION= 0.28 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE MAINTAINER= g.veniamin@googlemail.com COMMENT= CUE player -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify USE_QT_VER= 4 QT_COMPONENTS= gui xml qmake_build uic_build moc_build rcc_build network diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile index 76f9ef312cfa..3cf49e201c88 100644 --- a/audio/gmpc-libnotify/Makefile +++ b/audio/gmpc-libnotify/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmpc-libnotify PORTVERSION= 0.20.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \ http://freebsd.unixfreunde.de/sources/ @@ -15,7 +16,7 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= A libnotify for gmpc LIB_DEPENDS= mpd.3:${PORTSDIR}/audio/libmpd \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc diff --git a/audio/gmpc-libnotify/files/patch-src_plugin.c b/audio/gmpc-libnotify/files/patch-src_plugin.c new file mode 100644 index 000000000000..3e4a485aad56 --- /dev/null +++ b/audio/gmpc-libnotify/files/patch-src_plugin.c @@ -0,0 +1,20 @@ +--- src/plugin.c.orig 2011-08-15 20:17:11.000000000 +0200 ++++ src/plugin.c 2011-08-15 20:18:35.000000000 +0200 +@@ -149,16 +149,13 @@ static void libnotify_song_changed(MpdOb + if(not == NULL) + { + // notify_notification_close(not, NULL); +- not = notify_notification_new(summary, buffer,NULL, NULL); ++ not = notify_notification_new(summary, buffer,NULL); + } + else{ + notify_notification_update(not, summary, buffer, NULL); + } + notify_notification_set_urgency(not, NOTIFY_URGENCY_LOW); + +- if(cfg_get_single_value_as_int_with_default(config, "libnotify-plugin", "attach-to-tray", TRUE)) +- notify_notification_attach_to_status_icon(not, tray_icon2_gsi); +- + g_free(summary); + /* Add the song to the widget */ + g_object_set_data_full(G_OBJECT(not), "mpd-song", mpd_songDup(song), (GDestroyNotify)mpd_freeSong); diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile index 8e57c2dc5558..fe631dfbbd49 100644 --- a/audio/gmpc-wikipedia/Makefile +++ b/audio/gmpc-wikipedia/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmpc-wikipedia PORTVERSION= 0.20.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \ http://freebsd.unixfreunde.de/sources/ @@ -16,7 +17,7 @@ COMMENT= Wikipedia info for gmpc LIB_DEPENDS= mpd.3:${PORTSDIR}/audio/libmpd \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc RUN_DEPENDS= gmpc:${PORTSDIR}/audio/gmpc diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile index d64af3c1fe65..aa429d30c49c 100644 --- a/audio/goobox/Makefile +++ b/audio/goobox/Makefile @@ -8,7 +8,7 @@ PORTNAME= goobox PORTVERSION= 1.9.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -38,7 +38,7 @@ OPTIONS= NOTIFY "Enable libnotify support" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-notification .else CONFIGURE_ARGS+= --disable-notification diff --git a/audio/goobox/files/patch-src_main.c b/audio/goobox/files/patch-src_main.c new file mode 100644 index 000000000000..aabcd8b783c5 --- /dev/null +++ b/audio/goobox/files/patch-src_main.c @@ -0,0 +1,11 @@ +--- src/main.c.orig 2011-08-15 20:09:01.000000000 +0200 ++++ src/main.c 2011-08-15 20:09:22.000000000 +0200 +@@ -698,7 +698,7 @@ system_notify (GooWindow *window, + } + + if (notification == NULL) { +- notification = notify_notification_new (title, msg, "goobox", NULL); ++ notification = notify_notification_new (title, msg, "goobox"); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, + GTK_STOCK_MEDIA_NEXT, diff --git a/audio/padevchooser/Makefile b/audio/padevchooser/Makefile index 1cd295f67b91..1781c1eca8ed 100644 --- a/audio/padevchooser/Makefile +++ b/audio/padevchooser/Makefile @@ -7,7 +7,7 @@ PORTNAME= padevchooser PORTVERSION= 0.9.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -16,7 +16,7 @@ COMMENT= GTK icon tray for PulseAudio LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ pulse.0:${PORTSDIR}/audio/pulseaudio \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ avahi-core:${PORTSDIR}/net/avahi RUN_DEPENDES= dbus-daemon:${PORTSDIR}/devel/dbus diff --git a/audio/padevchooser/files/patch-src_padevchooser.c b/audio/padevchooser/files/patch-src_padevchooser.c new file mode 100644 index 000000000000..c2f3046e8f69 --- /dev/null +++ b/audio/padevchooser/files/patch-src_padevchooser.c @@ -0,0 +1,11 @@ +--- src/padevchooser.c.orig 2011-08-11 21:41:17.000000000 +0200 ++++ src/padevchooser.c 2011-08-11 21:41:42.000000000 +0200 +@@ -162,7 +162,7 @@ static void notify_event(const char *tit + + if (!notification) { + s = g_strdup_printf("<i>%s</i>\n%s", title, text); +- notification = notify_notification_new(title, s, "audio-card", GTK_WIDGET(tray_icon)); ++ notification = notify_notification_new(title, s, "audio-card"); + notify_notification_set_category(notification, "device.added"); + notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW); + g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL); diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 72b23765e856..500823bc373e 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/audio/rhythmbox/Makefile,v 1.111 2010/09/28 15:55:46 kwm Exp $ +# $MCom: ports/audio/rhythmbox/Makefile,v 1.115 2011/05/04 18:44:36 kwm Exp $ # PORTNAME= rhythmbox PORTVERSION= 0.12.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -27,6 +27,8 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \ brasero-media.3:${PORTSDIR}/sysutils/brasero +CONFLICTS= rhythmbox-2.[0-9]* rhythmbox-3.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes INSTALLS_OMF= yes @@ -89,7 +91,7 @@ PLIST_SUB+= MTP="@comment " .if defined(WITH_DAAP) CONFIGURE_ARGS+= --enable-daap --with-mdns=avahi LIB_DEPENDS+= avahi-client:${PORTSDIR}/net/avahi-app \ - gnome-keyring:${PORTSDIR}/security/gnome-keyring + gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring PLIST_SUB+= DAAP="" .else .if exists(${LOCALBASE}/lib/libavahi-client.a) @@ -100,7 +102,7 @@ PLIST_SUB+= DAAP="@comment " .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS+= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/audio/rhythmbox/files/patch-plugins_status-icon_rb-status-icon-plugin.c b/audio/rhythmbox/files/patch-plugins_status-icon_rb-status-icon-plugin.c new file mode 100644 index 000000000000..923a00e94618 --- /dev/null +++ b/audio/rhythmbox/files/patch-plugins_status-icon_rb-status-icon-plugin.c @@ -0,0 +1,11 @@ +--- plugins/status-icon/rb-status-icon-plugin.c.orig 2011-08-21 21:46:27.000000000 +0200 ++++ plugins/status-icon/rb-status-icon-plugin.c 2011-08-21 21:46:43.000000000 +0200 +@@ -394,7 +394,7 @@ do_notify (RBStatusIconPlugin *plugin, + icon_name = NULL; + + if (plugin->priv->notification == NULL) { +- plugin->priv->notification = notify_notification_new (primary, secondary, icon_name, NULL); ++ plugin->priv->notification = notify_notification_new (primary, secondary, icon_name); + + g_signal_connect_object (plugin->priv->notification, + "closed", diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile index 4e2d0541bd07..bb856dd9bf0b 100644 --- a/audio/vagalume/Makefile +++ b/audio/vagalume/Makefile @@ -7,6 +7,7 @@ PORTNAME= vagalume PORTVERSION= 0.8.5 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://vagalume.igalia.com/files/source/ \ ${MASTER_SITE_DEBIAN_POOL} @@ -53,7 +54,7 @@ PLIST_SUB+= DBUS="@comment " .if !defined(WITHOUT_TRAY) CONFIGURE_ARGS+=--enable-tray-icon BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-tray-icon .endif diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile index 2a8269051062..6d2155659d4a 100644 --- a/deskutils/cairo-dock-plugins/Makefile +++ b/deskutils/cairo-dock-plugins/Makefile @@ -7,7 +7,7 @@ PORTNAME= cairo-dock-plugins DISTVERSION= 2.3.0~3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://launchpadlibrarian.net/73753265/ @@ -71,7 +71,7 @@ PLIST_SUB+= TERMINAL="@comment " .endif .if defined(WITH_WEBLETS) -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 CMAKE_ARGS+= -Denable_weblets:STRING=yes PLIST_SUB+= WEBLETS="" .else diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile index 01e7d2545c44..b3fb780c96b2 100644 --- a/deskutils/global-menu/Makefile +++ b/deskutils/global-menu/Makefile @@ -7,13 +7,14 @@ PORTNAME= gnome-globalmenu PORTVERSION= 0.7.10 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/ MAINTAINER= gustau.perez@gmail.com COMMENT= Global menu for gnome -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify USE_GNOME= gnomepanel gnomedesktop diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile index aca38cba12a9..3d806f8e1793 100644 --- a/deskutils/google-gadgets/Makefile +++ b/deskutils/google-gadgets/Makefile @@ -7,7 +7,7 @@ PORTNAME= google-gadgets PORTVERSION= 0.11.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/ DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION} @@ -58,7 +58,7 @@ QT_COMPONENTS= webkit opengl gui corelib script network moc_build .if defined(WITH_GTKWEBKIT) BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2 -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 .endif .if defined(WITH_MOZILLA) diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index d6c275e41786..b791d2c038d3 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -7,7 +7,7 @@ PORTNAME= lightning DISTVERSION= 1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}b2/source @@ -65,7 +65,7 @@ EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif post-patch: diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile index 00a418882c3e..3d7957bd830b 100644 --- a/deskutils/notify-osd/Makefile +++ b/deskutils/notify-osd/Makefile @@ -7,6 +7,7 @@ PORTNAME= notify-osd PORTVERSION= 0.9.29 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://launchpadlibrarian.net/43419242/ \ CRITICAL @@ -15,7 +16,7 @@ MAINTAINER= ehaupt@FreeBSD.org COMMENT= On-screen-display notification agent using libnotify LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus GNU_CONFIGURE= yes diff --git a/deskutils/notify-osd/files/patch-tests_test-synchronous.c b/deskutils/notify-osd/files/patch-tests_test-synchronous.c new file mode 100644 index 000000000000..bf7bac0a995a --- /dev/null +++ b/deskutils/notify-osd/files/patch-tests_test-synchronous.c @@ -0,0 +1,21 @@ +--- tests/test-synchronous.c.orig 2011-08-16 13:55:36.000000000 +0200 ++++ tests/test-synchronous.c 2011-08-16 13:56:05.000000000 +0200 +@@ -38,7 +38,7 @@ send_normal (const gchar *message) + NotifyNotification *n; + n = notify_notification_new ("Test notification", + g_strdup (message), +- "", NULL); ++ ""); + notify_notification_show (n, NULL); + g_object_unref(G_OBJECT(n)); + } +@@ -53,8 +53,7 @@ send_synchronous (const char *type, + if (n == NULL) + n = notify_notification_new (" ", + "", +- g_strdup (icon), +- NULL); ++ g_strdup (icon)); + else + notify_notification_update (n, + " ", diff --git a/deskutils/notify-osd/files/patch-tests_test-withlib.c b/deskutils/notify-osd/files/patch-tests_test-withlib.c new file mode 100644 index 000000000000..1b4230fddc60 --- /dev/null +++ b/deskutils/notify-osd/files/patch-tests_test-withlib.c @@ -0,0 +1,113 @@ +--- tests/test-withlib.c.orig 2011-08-16 13:52:38.000000000 +0200 ++++ tests/test-withlib.c 2011-08-16 13:54:51.000000000 +0200 +@@ -94,7 +94,7 @@ test_withlib_show_notification (void) + + n = notify_notification_new ("Test", + "You should see a normal notification", +- "", NULL); ++ ""); + notify_notification_show (n, NULL); + sleep (3); + +@@ -109,7 +109,7 @@ test_withlib_update_notification (void) + + n = notify_notification_new ("Test", + "New notification", +- "", NULL); ++ ""); + res = notify_notification_show (n, NULL); + g_assert (res); + sleep (1); +@@ -135,7 +135,7 @@ test_withlib_pass_icon_data (void) + + n = notify_notification_new ("Image Test", + "You should see an image", +- "", NULL); ++ ""); + g_print ("iconpath: %s\n", SRCDIR"/icons/avatar.png"); + pixbuf = gdk_pixbuf_new_from_file_at_scale (SRCDIR"/icons/avatar.png", + 64, 64, TRUE, NULL); +@@ -157,22 +157,22 @@ test_withlib_priority (void) + + n1 = notify_notification_new ("Dummy Notification", + "This is a test notification", +- "", NULL); ++ ""); + notify_notification_show (n1, NULL); + n2 = notify_notification_new ("Normal Notification", + "You should see this *after* the urgent notification.", +- "", NULL); ++ ""); + notify_notification_set_urgency (n2, NOTIFY_URGENCY_LOW); + notify_notification_show (n2, NULL); + n3 = notify_notification_new ("Synchronous Notification", + "You should immediately see this notification.", +- "", NULL); ++ ""); + notify_notification_set_hint_string (n3, "synchronous", "test"); + notify_notification_set_urgency (n3, NOTIFY_URGENCY_NORMAL); + notify_notification_show (n3, NULL); + n4 = notify_notification_new ("Urgent Notification", + "You should see a dialog box, and after, a normal notification.", +- "", NULL); ++ ""); + notify_notification_set_urgency (n4, NOTIFY_URGENCY_CRITICAL); + notify_notification_show (n4, NULL); + +@@ -207,7 +207,7 @@ test_withlib_actions (void) + + n1 = notify_notification_new ("Notification with an action", + "You should see that in a dialog box. Click the 'Action' button for the test to succeed.", +- "", NULL); ++ ""); + notify_notification_add_action (n1, + "action", + "Action", +@@ -231,7 +231,7 @@ test_withlib_close_notification (void) + + n = notify_notification_new ("Test Title", + "This notification will be closed prematurely...", +- "", NULL); ++ ""); + notify_notification_show (n, NULL); + + loop = g_main_loop_new(NULL, FALSE); +@@ -256,8 +256,7 @@ test_withlib_append_hint (void) + /* init notification, supply first line of body-text */ + n = notify_notification_new ("Test (append-hint)", + "The quick brown fox jumps over the lazy dog.", +- SRCDIR"/icons/avatar.png", +- NULL); ++ SRCDIR"/icons/avatar.png"); + res = notify_notification_show (n, NULL); + g_assert (res); + sleep (1); +@@ -296,8 +295,7 @@ test_withlib_icon_only_hint (void) + /* init notification, supply first line of body-text */ + n = notify_notification_new (" ", /* needs this to be non-NULL */ + NULL, +- "notification-audio-play", +- NULL); ++ "notification-audio-play"); + notify_notification_set_hint_string (n, "icon-only", "allowed"); + res = notify_notification_show (n, NULL); + g_assert (res); +@@ -314,8 +312,7 @@ test_withlib_swallow_markup (void) + + n = notify_notification_new ("Swallow markup test", + "This text is hopefully neither <b>bold</b>, <i>italic</i> nor <u>underlined</u>.\n\nA little math-notation:\n\n\ta > b < c = 0", +- SRCDIR"/icons/avatar.png", +- NULL); ++ SRCDIR"/icons/avatar.png"); + res = notify_notification_show (n, NULL); + g_assert (res); + sleep (2); +@@ -341,7 +338,7 @@ test_withlib_throttle (void) + + // create dummy notification + snprintf (buf, 19, "Test #%.2d", i); +- n = notify_notification_new (buf, buf, "", NULL); ++ n = notify_notification_new (buf, buf, ""); + + // inject it into the queue + res = notify_notification_show (n, &error); diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile index 7108fbef4019..06acdbc4b4c5 100644 --- a/deskutils/osmo/Makefile +++ b/deskutils/osmo/Makefile @@ -7,7 +7,7 @@ PORTNAME= osmo PORTVERSION= 0.2.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}/ diff --git a/deskutils/osmo/files/patch-src__check_events.c b/deskutils/osmo/files/patch-src__check_events.c new file mode 100644 index 000000000000..24f53e87349d --- /dev/null +++ b/deskutils/osmo/files/patch-src__check_events.c @@ -0,0 +1,48 @@ +--- src/check_events.c.orig 2011-08-12 15:17:59.000000000 +0200 ++++ src/check_events.c 2011-08-12 15:20:36.000000000 +0200 +@@ -454,9 +454,9 @@ + a->date = 0; + + if (textdesc != NULL) +- a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING, NULL); ++ a->notify = notify_notification_new (item->summary, textdesc, GTK_STOCK_DIALOG_WARNING); + else +- a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING, NULL); ++ a->notify = notify_notification_new (item->summary, text, GTK_STOCK_DIALOG_WARNING); + + g_free (textdesc); + g_free (text); +@@ -483,9 +483,7 @@ + #endif /* HAVE_LIBNOTIFY */ + + if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) { +-#ifdef HAVE_LIBNOTIFY +- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon); +-#endif /* HAVE_LIBNOTIFY */ ++ + gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK); + + if (config.blink_on_events) { +@@ -532,9 +530,9 @@ + a->time = -1; + a->date = 0; + if (textdesc != NULL) +- a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO, NULL); ++ a->notify = notify_notification_new (_("Alarm warning!"), textdesc, GTK_STOCK_DIALOG_INFO); + else +- a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO, NULL); ++ a->notify = notify_notification_new (_("Alarm warning!"), text, GTK_STOCK_DIALOG_INFO); + + notify_notification_set_timeout (a->notify, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (a->notify, NOTIFY_URGENCY_NORMAL); +@@ -545,9 +543,7 @@ + #endif /* HAVE_LIBNOTIFY */ + + if (gtk_status_icon_get_visible (appGUI->osmo_trayicon)) { +-#ifdef HAVE_LIBNOTIFY +- notify_notification_attach_to_status_icon (a->notify, appGUI->osmo_trayicon); +-#endif /* HAVE_LIBNOTIFY */ ++ + gtk_status_icon_set_from_stock (appGUI->osmo_trayicon, OSMO_STOCK_SYSTRAY_TASK); + + if (config.blink_on_events) { diff --git a/deskutils/rubrica/Makefile b/deskutils/rubrica/Makefile index 7ba0b320e75e..7e08ef38d55a 100644 --- a/deskutils/rubrica/Makefile +++ b/deskutils/rubrica/Makefile @@ -7,7 +7,7 @@ PORTNAME= rubrica PORTVERSION= 2.0.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= BERLIOS DISTNAME= ${PORTNAME}2-${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= An addressbook for the GNOME 2 desktop LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes diff --git a/deskutils/rubrica/files/patch-src_app.c b/deskutils/rubrica/files/patch-src_app.c new file mode 100644 index 000000000000..f40a1a0c509f --- /dev/null +++ b/deskutils/rubrica/files/patch-src_app.c @@ -0,0 +1,12 @@ +--- src/app.c.orig 2011-08-12 15:55:03.000000000 +0200 ++++ src/app.c 2011-08-12 15:55:26.000000000 +0200 +@@ -1269,8 +1269,7 @@ rubrica_app_init(RubricaApp* self) + self->priv->cutted = NULL; + self->priv->notify = notify_notification_new("Rubrica Addressbook", + NULL, +- "info", +- NULL); ++ "info"); + self->priv->show_card = TRUE; + + g_object_set(self->priv->notebook, "homogeneous", FALSE, NULL); diff --git a/deskutils/steadyflow/Makefile b/deskutils/steadyflow/Makefile index 649a835ff9f9..d9ea6511bf18 100644 --- a/deskutils/steadyflow/Makefile +++ b/deskutils/steadyflow/Makefile @@ -7,6 +7,7 @@ PORTNAME= steadyflow PORTVERSION= 0.1.7 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ \ https://launchpadlibrarian.net/72208624/ @@ -16,7 +17,7 @@ COMMENT= Simple download manager LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gee.2:${PORTSDIR}/devel/libgee \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile index c89ab632eb09..4a02523125a2 100644 --- a/deskutils/xfce4-notifyd/Makefile +++ b/deskutils/xfce4-notifyd/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfce4-notifyd PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= deskutils xfce MASTER_SITES= XFCE MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -18,7 +19,7 @@ COMMENT= Visually-appealing notification daemon for Xfce LICENSE= GPLv3 LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile index 056e4a21e064..c25d8cf2459b 100644 --- a/deskutils/xneur/Makefile +++ b/deskutils/xneur/Makefile @@ -7,6 +7,7 @@ PORTNAME= xneur PORTVERSION= 0.13.0 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \ http://mirror.amdmi3.ru/distfiles/ @@ -14,7 +15,7 @@ MASTER_SITES= http://dists.xneur.ru/release-${DISTVERSION}/tgz/ \ MAINTAINER= admin@lissyara.su COMMENT= Auto keyboard switcher -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index c76505fcc9c1..aa1772c43222 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -7,6 +7,7 @@ PORTNAME= devhelp PORTVERSION= 2.32.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME @@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Developer help browser for GNOME 2 -LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ +LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique USE_BZIP2= yes diff --git a/devel/libnotifymm/Makefile b/devel/libnotifymm/Makefile index 3ea684c855b0..d3c2a9a76a7d 100644 --- a/devel/libnotifymm/Makefile +++ b/devel/libnotifymm/Makefile @@ -15,10 +15,14 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= C++ wrappers for libnotify -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 +BROKEN= doesn't build with notify 0.7. +DEPRECATED= Doesn't build and isn't used by anything. +EXPIRATION_DATE=2011-09-23 + USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GNOME= pkgconfig gnomehack gnomeprefix ltverhack diff --git a/devel/notify-sharp/Makefile b/devel/notify-sharp/Makefile index f05d779d0e5e..46216a446f8a 100644 --- a/devel/notify-sharp/Makefile +++ b/devel/notify-sharp/Makefile @@ -15,7 +15,7 @@ COMMENT= C\# client library for notification-daemon BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \ - ${LOCALBASE}/share/dbus-1/services/org.freedesktop.Notifications.service:${PORTSDIR}/deskutils/notification-daemon + ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile index 4198a41ef1a1..4847a9738b9c 100644 --- a/devel/py-notify/Makefile +++ b/devel/py-notify/Makefile @@ -8,7 +8,7 @@ PORTNAME= notify PORTVERSION= 0.1.1 DISTVERSIONPREFIX=python- -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel python MASTER_SITES= http://www.galago-project.org/files/releases/source/notify-python/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= A python bindings for libnotify -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify USE_BZIP2= yes USE_GMAKE= yes diff --git a/devel/py-notify/files/patch-src_pynotify.defs b/devel/py-notify/files/patch-src_pynotify.defs new file mode 100644 index 000000000000..e0645c40f736 --- /dev/null +++ b/devel/py-notify/files/patch-src_pynotify.defs @@ -0,0 +1,35 @@ +--- src/pynotify.defs.orig 2011-07-30 20:46:04.000000000 +0200 ++++ src/pynotify.defs 2011-07-30 20:46:45.000000000 +0200 +@@ -38,7 +38,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "message" (null-ok) (default "NULL")) + '("const-gchar*" "icon" (null-ok) (default "NULL")) +- '("GtkWidget*" "attach" (null-ok) (default "NULL")) + ) + ) + +@@ -53,24 +52,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "attach") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") diff --git a/devel/seed/Makefile b/devel/seed/Makefile index 6220b2403fee..94ebad53e7c5 100644 --- a/devel/seed/Makefile +++ b/devel/seed/Makefile @@ -11,6 +11,7 @@ PORTNAME= seed PORTVERSION= 2.31.91 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +21,7 @@ COMMENT= GObject JavaScriptCore bridge BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ diff --git a/devel/upp/Makefile b/devel/upp/Makefile index 57b51d9a241a..6f0675162ad5 100644 --- a/devel/upp/Makefile +++ b/devel/upp/Makefile @@ -7,6 +7,7 @@ PORTNAME= upp PORTVERSION= 3211 +PORTREVISION= 1 CATEGORIES= devel x11-toolkits MASTER_SITES= SF DISTNAME= ${PORTNAME}-x11-src-${PORTVERSION} @@ -16,7 +17,7 @@ COMMENT= Ultimate++, a BSD-licensed, cross-platform, C/C++ RAD suite LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ expat.6:${PORTSDIR}/textproc/expat2 \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify USE_XORG= xft USE_GNOME= gtk20 diff --git a/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp b/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp new file mode 100644 index 000000000000..f1909b176c30 --- /dev/null +++ b/devel/upp/files/patch-uppsrc_CtrlLib_TrayIconX11.cpp @@ -0,0 +1,11 @@ +--- uppsrc/CtrlLib/TrayIconX11.cpp.orig 2011-08-12 16:13:23.000000000 +0200 ++++ uppsrc/CtrlLib/TrayIconX11.cpp 2011-08-12 16:14:01.000000000 +0200 +@@ -106,7 +106,7 @@ void TrayIcon::Message(int type, const c + NotifyNotification *notification = notify_notification_new (title, text + , type == 1 ? "gtk-dialog-info" + : type == 2 ? "gtk-dialog-warning" +- : "gtk-dialog-error", NULL); ++ : "gtk-dialog-error"); + notify_notification_set_timeout(notification, timeout * 1000); + notify_notification_show (notification, &error); + #endif diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile index cff449f55bad..344b627b924a 100644 --- a/emulators/open-vm-tools/Makefile +++ b/emulators/open-vm-tools/Makefile @@ -7,7 +7,7 @@ PORTNAME= open-vm-tools PORTVERSION= ${BUILD_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators kld MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE} DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER} @@ -32,7 +32,7 @@ PLIST_SUB+= X11="@comment " CONFLICTS= open-vm-tools-[0-9]* .else .if !defined(WITHOUT_LIBNOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .endif .if defined(WITH_UNITY) CONFIGURE_ENV+= CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser" diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile index 975fbb5fe833..b7da8a7f96bb 100644 --- a/finance/gnucash/Makefile +++ b/finance/gnucash/Makefile @@ -106,7 +106,7 @@ CONFIGURE_ARGS+=--enable-locale-specific-tax .if defined(WITH_WEBKIT) CONFIGURE_ARGS+=--with-html-engine=webkit -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 .else USE_GNOME+= gtkhtml3 .endif diff --git a/ftp/gwget/Makefile b/ftp/gwget/Makefile index 921e892f1e14..760bedad7565 100644 --- a/ftp/gwget/Makefile +++ b/ftp/gwget/Makefile @@ -7,7 +7,7 @@ PORTNAME= gwget PORTVERSION= 1.0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ftp gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -36,7 +36,7 @@ GCONF_SCHEMAS= ${PORTNAME}.schemas .include <bsd.port.pre.mk> .if !defined(WITHOUT_LIBNOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS+= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/ftp/gwget/files/patch-src_systray.c b/ftp/gwget/files/patch-src_systray.c new file mode 100644 index 000000000000..038269360272 --- /dev/null +++ b/ftp/gwget/files/patch-src_systray.c @@ -0,0 +1,11 @@ +--- src/systray.c.orig 2011-08-16 13:49:31.000000000 +0200 ++++ src/systray.c 2011-08-16 13:49:44.000000000 +0200 +@@ -224,7 +224,7 @@ gwget_tray_notify (gchar *primary, gchar + if (!notify_is_initted ()) + if (!notify_init ("gwget")) + return; +- NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name,NULL); ++ NotifyNotification *notification = notify_notification_new(primary,secondary,icon_name); + notify_notification_show(notification,NULL); + #endif + diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 9cfda395f487..b84dbcc38799 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -8,7 +8,7 @@ PORTNAME= gimp-app DISTVERSION= 2.6.11 -PORTREVISION?= 3 +PORTREVISION?= 4 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -132,7 +132,7 @@ CONFIGURE_ARGS+= --without-gvfs .endif .if defined(WITH_HELPBROWSER) -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+= --with-webkit PLIST_SUB+= HELPBROWSER="" .else @@ -155,7 +155,7 @@ CONFIGURE_ARGS+= --disable-mp .endif .if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk PLIST_SUB+= POPPLER="" .else CONFIGURE_ARGS+= --without-poppler diff --git a/graphics/shotwell/Makefile b/graphics/shotwell/Makefile index 19426dd1fa57..7b1a92f85cba 100644 --- a/graphics/shotwell/Makefile +++ b/graphics/shotwell/Makefile @@ -7,6 +7,7 @@ PORTNAME= shotwell PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -22,7 +23,7 @@ LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 \ gexiv2.0:${PORTSDIR}/graphics/gexiv2 \ exif.12:${PORTSDIR}/graphics/libexif \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ - webkit:${PORTSDIR}/www/webkit-gtk2 \ + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ raw.2:${PORTSDIR}/graphics/libraw diff --git a/graphics/solang/Makefile b/graphics/solang/Makefile index 38f493b2eb94..84bd7bcc2380 100644 --- a/graphics/solang/Makefile +++ b/graphics/solang/Makefile @@ -7,7 +7,7 @@ PORTNAME= solang PORTVERSION= 0.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= http://rishi.fedorapeople.org/solang/ @@ -22,7 +22,7 @@ LIB_DEPENDS= gegl-0.1.105:${PORTSDIR}/graphics/gegl \ exiv2.10:${PORTSDIR}/graphics/exiv2 \ flickcurl.0:${PORTSDIR}/www/flickcurl \ gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ gdl-1.3:${PORTSDIR}/x11-toolkits/gdl \ diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index 8c59f58402c6..7bd3af38a661 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -7,7 +7,7 @@ PORTNAME= xchat PORTVERSION= 0.26.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= irc gnome ipv6 MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/xchat-gnome/${PORTVERSION:R} diff --git a/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c b/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c new file mode 100644 index 000000000000..330ea57e8040 --- /dev/null +++ b/irc/xchat-gnome/files/patch-plugins_notify-osd_notify-osd.c @@ -0,0 +1,11 @@ +--- plugins/notify-osd/notify-osd.c.orig 2011-06-26 13:22:24.000000000 +0200 ++++ plugins/notify-osd/notify-osd.c 2011-06-26 13:22:41.000000000 +0200 +@@ -67,7 +67,7 @@ + gchar *escaped; + + escaped = g_markup_escape_text (message, strlen(message)); +- notify = notify_notification_new (summary, escaped, NULL, NULL); ++ notify = notify_notification_new (summary, escaped, NULL); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_icon_from_pixbuf (notify, notify_icon); + if (!notify_notification_show (notify, &error)) { diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 925a77cb8e73..85c77399cc47 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -8,7 +8,7 @@ PORTNAME= balsa PORTVERSION= 2.4.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= http://pawsa.fedorapeople.org/balsa/ DISTNAME= balsa-${PORTVERSION} @@ -74,7 +74,7 @@ CONFIGURE_ARGS+=--with-gtksourceview=2 .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--with-libnotify=yes .else CONFIGURE_ARGS+=--with-libnotify=no diff --git a/mail/balsa/files/patch-libbalsa_information.c b/mail/balsa/files/patch-libbalsa_information.c new file mode 100644 index 000000000000..7d37e182935f --- /dev/null +++ b/mail/balsa/files/patch-libbalsa_information.c @@ -0,0 +1,11 @@ +--- libbalsa/information.c.orig 2011-08-16 13:30:24.000000000 +0200 ++++ libbalsa/information.c 2011-08-16 13:30:48.000000000 +0200 +@@ -122,7 +122,7 @@ libbalsa_information_varg(GtkWindow *par + g_free(msg); + + note = +- notify_notification_new("Balsa", escaped->str, icon_str, NULL); ++ notify_notification_new("Balsa", escaped->str, icon_str); + g_string_free(escaped, TRUE); + + notify_notification_set_timeout(note, 7000); /* 7 seconds */ diff --git a/mail/balsa/files/patch-src_main-window.c b/mail/balsa/files/patch-src_main-window.c new file mode 100644 index 000000000000..b376b7260ddc --- /dev/null +++ b/mail/balsa/files/patch-src_main-window.c @@ -0,0 +1,11 @@ +--- src/main-window.c.orig 2011-08-16 13:32:27.000000000 +0200 ++++ src/main-window.c 2011-08-16 13:33:10.000000000 +0200 +@@ -3406,7 +3406,7 @@ bw_display_new_mail_notification(int num + } else { + num_total = num_new; + balsa_app.main_window->new_mail_note = +- notify_notification_new("Balsa", NULL, NULL, NULL); ++ notify_notification_new("Balsa", NULL, NULL); + g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window-> + new_mail_note), + (gpointer) & balsa_app.main_window-> diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile index c6c77b479405..874b1be9d4bc 100644 --- a/mail/claws-mail-fancy/Makefile +++ b/mail/claws-mail-fancy/Makefile @@ -7,6 +7,7 @@ PORTNAME= fancy PORTVERSION= 0.9.13 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ PKGNAMEPREFIX= claws-mail- @@ -15,7 +16,7 @@ MAINTAINER= pawel@FreeBSD.org COMMENT= Webkit based HTML renderer plugin for claws-mail LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - webkit:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 BUILD_DEPENDS= claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail RUN_DEPENDS= claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile index b57aad680db2..60b17e5e9820 100644 --- a/mail/claws-mail-notification/Makefile +++ b/mail/claws-mail-notification/Makefile @@ -7,6 +7,7 @@ PORTNAME= notification PORTVERSION= 0.27 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ PKGNAMEPREFIX= claws-mail- diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index ef6ed6f3081b..6bc63ffda7d7 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -3,12 +3,12 @@ # Whom: Ade Lovett <ade@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/mail/evolution/Makefile,v 1.232 2010/11/15 20:40:29 kwm Exp $ +# $MCom: ports/mail/evolution/Makefile,v 1.237 2011/04/30 20:43:20 mezz Exp $ # PORTNAME= evolution PORTVERSION= 2.32.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -21,13 +21,14 @@ LIB_DEPENDS= nss3.1:${PORTSDIR}/security/nss \ gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview RUN_DEPENDS= ${LOCALBASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSDIR}/textproc/gnome-spell +CONFLICTS= evolution-3.[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ desktopfileutils gnomedocutils ltasneededhack gnomedesktop -GNOME_DESKTOP_VERSION=2 USE_AUTOTOOLS= libtool USE_GSTREAMER= yes INSTALLS_OMF= yes diff --git a/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c b/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c new file mode 100644 index 000000000000..e713de004f69 --- /dev/null +++ b/mail/evolution/files/patch-calendar_gui_alarm-notify_alarm-queue.c @@ -0,0 +1,11 @@ +--- calendar/gui/alarm-notify/alarm-queue.c.orig 2011-03-07 20:53:40.000000000 +0100 ++++ calendar/gui/alarm-notify/alarm-queue.c 2011-03-07 20:53:50.000000000 +0100 +@@ -1606,7 +1606,7 @@ popup_notification (time_t trigger, Comp + body = g_strdup_printf ("%s %s", start_str, time_str); + } + +- n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); ++ n = notify_notification_new (summary, body, "stock_appointment-reminder"); + if (!notify_notification_show(n, NULL)) + g_warning ("Could not send notification to daemon\n"); + diff --git a/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c b/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c new file mode 100644 index 000000000000..adddf1b38a77 --- /dev/null +++ b/mail/evolution/files/patch-plugins_mail-notification_mail-notification.c @@ -0,0 +1,13 @@ +--- plugins/mail-notification/mail-notification.c.orig 2011-03-07 21:24:25.000000000 +0100 ++++ plugins/mail-notification/mail-notification.c 2011-03-07 21:24:40.000000000 +0100 +@@ -564,9 +564,7 @@ new_notify_status (EMEventTargetFolder * + + notify = notify_notification_new ( + _("New email"), safetext, +- "mail-unread", NULL); +- notify_notification_attach_to_status_icon ( +- notify, status_icon); ++ "mail-unread"); + + /* Check if actions are supported */ + if (can_support_actions ()) { diff --git a/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c b/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c new file mode 100644 index 000000000000..55120db4c19c --- /dev/null +++ b/mail/evolution/files/patch-plugins_publish-calendar_publish-calendar.c @@ -0,0 +1,12 @@ +--- plugins/publish-calendar/publish-calendar.c.orig 2011-03-07 21:12:59.000000000 +0100 ++++ plugins/publish-calendar/publish-calendar.c 2011-03-07 21:14:23.000000000 +0100 +@@ -150,8 +150,7 @@ update_publish_notification (GtkMessageT + return; + } + +- notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL); +- notify_notification_attach_to_status_icon (notify, status_icon); ++ notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); + g_timeout_add (500, show_notify_cb, NULL); diff --git a/mail/gnome-gmail-notifier/Makefile b/mail/gnome-gmail-notifier/Makefile index 053a90b69c10..fafe71278a6b 100644 --- a/mail/gnome-gmail-notifier/Makefile +++ b/mail/gnome-gmail-notifier/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnome-gmail-notifier PORTVERSION= 0.10.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail deskutils MASTER_SITES= GOOGLE_CODE MAINTAINER= avl@FreeBSD.org COMMENT= A Gmail Inbox Monitor for the GNOME2 desktop -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ soup-2.4:${PORTSDIR}/devel/libsoup \ gnome-keyring.0:${PORTSDIR}/security/gnome-keyring diff --git a/mail/gnome-gmail-notifier/files/patch-src_ggn-icon.c b/mail/gnome-gmail-notifier/files/patch-src_ggn-icon.c new file mode 100644 index 000000000000..59bae8fbc5f3 --- /dev/null +++ b/mail/gnome-gmail-notifier/files/patch-src_ggn-icon.c @@ -0,0 +1,16 @@ +--- src/ggn-icon.c.orig 2011-08-16 13:36:23.000000000 +0200 ++++ src/ggn-icon.c 2011-08-16 13:37:27.000000000 +0200 +@@ -566,12 +566,7 @@ gpointer ggn_icon_show_notification_thre + /* create a new notification. */ + icon->priv->note = notify_notification_new (icon->priv->title, + icon->priv->summary, +- icon->priv->icon_file, +- NULL); +- +- /* attach the notification to our icon. */ +- notify_notification_attach_to_status_icon (icon->priv->note, +- icon->priv->icon); ++ icon->priv->icon_file); + + /* set the notification timeout. */ + notify_notification_set_timeout (icon->priv->note, (4 * 1000)); diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index c0a0e22f0904..f5b815fa8add 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -7,6 +7,7 @@ PORTNAME= thunderbird DISTVERSION= 6.0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -80,7 +81,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index c0a0e22f0904..f5b815fa8add 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -7,6 +7,7 @@ PORTNAME= thunderbird DISTVERSION= 6.0 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -80,7 +81,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index 8edb298e7339..0306eabb0040 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -7,7 +7,7 @@ PORTNAME= thunderbird DISTVERSION= 3.1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -80,7 +80,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif post-extract: diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile index a5ab41560c9c..2f230acbe538 100644 --- a/multimedia/audacious-plugins/Makefile +++ b/multimedia/audacious-plugins/Makefile @@ -7,6 +7,7 @@ PORTNAME= audacious-plugins PORTVERSION= 2.5.4 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://distfiles.atheme.org/ @@ -80,7 +81,7 @@ CONFIGURE_ARGS+=--disable-sdlout .endif .if defined(WITH_NOTIFY) || exists(${LOCALBASE}/lib/libnotify.so.1) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-notify PLIST_SUB+= NOTIFY="" .else diff --git a/multimedia/gnome-mplayer/Makefile b/multimedia/gnome-mplayer/Makefile index 07ed73a7145b..58c5b639076f 100644 --- a/multimedia/gnome-mplayer/Makefile +++ b/multimedia/gnome-mplayer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnome-mplayer PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia gnome MASTER_SITES= GOOGLE_CODE @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-gconf --disable-schemas-install .endif .if defined(WITH_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS+= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon CONFIGURE_ARGS+= --with-libnotify .else diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile index 64ccd40df14c..ad3b4af9a107 100644 --- a/multimedia/ogmrip/Makefile +++ b/multimedia/ogmrip/Makefile @@ -7,6 +7,7 @@ PORTNAME= ogmrip PORTVERSION= 0.13.6 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION} @@ -57,7 +58,7 @@ PLIST_SUB+= GUI_SUPPORT="@comment " CONFIGURE_ARGS+= --enable-gtk-support --enable-dbus-support \ --enable-libnotify-support LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify USE_GNOME+= gconf2 libglade2 GCONF_SCHEMAS= ogmrip.schemas PLIST_SUB+= GUI_SUPPORT="" diff --git a/multimedia/ogmrip/files/patch-src_ogmrip-progress-dialog.c b/multimedia/ogmrip/files/patch-src_ogmrip-progress-dialog.c new file mode 100644 index 000000000000..263b4226554d --- /dev/null +++ b/multimedia/ogmrip/files/patch-src_ogmrip-progress-dialog.c @@ -0,0 +1,13 @@ +--- src/ogmrip-progress-dialog.c.orig 2011-08-12 13:44:15.000000000 +0200 ++++ src/ogmrip-progress-dialog.c 2011-08-12 14:16:35.000000000 +0200 +@@ -418,8 +418,8 @@ ogmrip_progress_dialog_init (OGMRipProgr + g_signal_connect_swapped (dialog->priv->status_icon, "popup_menu", + G_CALLBACK (ogmrip_progress_dialog_status_icon_popup_menu), dialog); + +- dialog->priv->notification = notify_notification_new_with_status_icon ("Dummy", "Dummy", +- OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE, dialog->priv->status_icon); ++ dialog->priv->notification = notify_notification_new ("Dummy", "Dummy", ++ OGMRIP_DATA_DIR G_DIR_SEPARATOR_S OGMRIP_ICON_FILE); + g_signal_connect (dialog, "window-state-event", + G_CALLBACK (ogmrip_progress_dialog_state_changed), NULL); + diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 7820c0d053a0..85bb802ce561 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -7,6 +7,7 @@ PORTNAME= vlc DISTVERSION= 1.1.11 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -21,7 +22,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= avcodec.1:${PORTSDIR}/multimedia/ffmpeg \ gcrypt.18:${PORTSDIR}/security/libgcrypt \ - proxy.0:${PORTSDIR}/net/libproxy + proxy.1:${PORTSDIR}/net/libproxy OPTIONS= A52 "A52 DVD audio decoder" On \ AALIB "Aalib Console Graphics Support" Off \ @@ -454,7 +455,7 @@ USE_GETTEXT= yes .if defined(WITH_NOTIFY) CONFIGURE_ARGS+=--enable-notify -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-notify .endif diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile index d6dabf9258a9..4458a4a599aa 100644 --- a/multimedia/xfce4-parole/Makefile +++ b/multimedia/xfce4-parole/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-parole PORTVERSION= 0.2.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR=/src/apps/parole/0.2 @@ -20,7 +20,7 @@ COMMENT= Lightweight media player for Xfce4 based on the gstreamer engine DATADIR= ${PREFIX}/share/${PORTNAME:S/xfce4-//} LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_AUTOTOOLS= libtool diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 2909e4630a4a..614eff0d117c 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -7,7 +7,7 @@ PORTNAME= empathy PORTVERSION= 2.32.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -23,6 +23,8 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \ telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \ folks-telepathy.16:${PORTSDIR}/net-im/folks \ + gcr.0:${PORTSDIR}/security/gnome-keyring \ + notify.4:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ @@ -81,7 +83,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-h .endif .if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+=--enable-webkit PLIST_SUB+= ADIUM="" .else diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure index 054f1a3e5c15..9bf98699b386 100644 --- a/net-im/empathy/files/patch-configure +++ b/net-im/empathy/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2010-11-18 17:41:43.000000000 +0100 -+++ configure 2010-11-18 17:41:43.000000000 +0100 +--- configure.orig 2011-08-16 16:19:02.000000000 +0200 ++++ configure 2011-08-16 16:19:59.000000000 +0200 @@ -13390,8 +13390,8 @@ .SECONDARY: $(gsettings_SCHEMAS) @@ -11,6 +11,62 @@ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) @$(NORMAL_INSTALL) +@@ -14771,14 +14771,14 @@ + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED +- libnotify < 0.7\""; } >&5 ++ libnotify < 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7") 2>&5 ++ libnotify < 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7" 2>/dev/null` ++ libnotify < 0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14790,14 +14790,14 @@ + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED +- libnotify < 0.7\""; } >&5 ++ libnotify < 0.9\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7") 2>&5 ++ libnotify < 0.9") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7" 2>/dev/null` ++ libnotify < 0.9" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -14818,16 +14818,16 @@ + fi + if test $_pkg_short_errors_supported = yes; then + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7" 2>&1` ++ libnotify < 0.9" 2>&1` + else + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7" 2>&1` ++ libnotify < 0.9" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED +- libnotify < 0.7) were not met: ++ libnotify < 0.9) were not met: + + $LIBNOTIFY_PKG_ERRORS + @@ -15049,11 +15049,11 @@ fi diff --git a/net-im/empathy/files/patch-src_empathy-chat-window.c b/net-im/empathy/files/patch-src_empathy-chat-window.c new file mode 100644 index 000000000000..a01730405e99 --- /dev/null +++ b/net-im/empathy/files/patch-src_empathy-chat-window.c @@ -0,0 +1,11 @@ +--- src/empathy-chat-window.c.orig 2011-08-16 16:23:38.000000000 +0200 ++++ src/empathy-chat-window.c 2011-08-16 16:24:00.000000000 +0200 +@@ -1300,7 +1300,7 @@ chat_window_show_or_update_notification + 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, NULL); ++ notification = notify_notification_new (header, escaped, NULL); + + if (priv->notification == NULL) { + priv->notification = notification; diff --git a/net-im/empathy/files/patch-src_empathy-status-icon.c b/net-im/empathy/files/patch-src_empathy-status-icon.c new file mode 100644 index 000000000000..354fa5a4e037 --- /dev/null +++ b/net-im/empathy/files/patch-src_empathy-status-icon.c @@ -0,0 +1,13 @@ +--- src/empathy-status-icon.c.orig 2011-08-16 16:25:07.000000000 +0200 ++++ src/empathy-status-icon.c 2011-08-16 16:25:32.000000000 +0200 +@@ -206,8 +206,8 @@ status_icon_update_notification (Empathy + 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_with_status_icon +- (priv->event->header, message_esc, NULL, priv->icon); ++ notification = notify_notification_new ++ (priv->event->header, message_esc, NULL); + + if (priv->notification == NULL) { + priv->notification = notification; diff --git a/net-im/gossip/Makefile b/net-im/gossip/Makefile index 2b33b745fccc..62452f08a0f1 100644 --- a/net-im/gossip/Makefile +++ b/net-im/gossip/Makefile @@ -8,7 +8,7 @@ PORTNAME= gossip PORTVERSION= 0.31 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-im gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -44,7 +44,7 @@ OPTIONS= NOTIFY "Enable libnotify support" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+= --enable-libnotify=no .endif diff --git a/net-im/gossip/files/patch-src_gossip-notify.c b/net-im/gossip/files/patch-src_gossip-notify.c new file mode 100644 index 000000000000..3d5451a53c28 --- /dev/null +++ b/net-im/gossip/files/patch-src_gossip-notify.c @@ -0,0 +1,93 @@ +--- src/gossip-notify.c.orig 2011-08-15 19:59:28.000000000 +0200 ++++ src/gossip-notify.c 2011-08-15 20:03:01.000000000 +0200 +@@ -225,7 +225,7 @@ notify_contact_online (GossipContact *co + gossip_contact_get_name (contact), + notify_get_default_status_from_presence (presence)); + +- notify = notify_notification_new (_("Contact Online"), body, NULL, NULL); ++ notify = notify_notification_new (_("Contact Online"), body, NULL); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_LOW); + notify_notification_set_icon_from_pixbuf (notify, pixbuf); + +@@ -234,10 +234,6 @@ notify_contact_online (GossipContact *co + G_CALLBACK (notify_closed_cb), + NULL); + +- if (attach_status_icon) { +- notify_notification_attach_to_status_icon (notify, attach_status_icon); +- } +- + notify_notification_add_action (notify, "default", _("Default"), + (NotifyActionCallback) notify_online_action_cb, + g_object_ref (contact), NULL); +@@ -330,14 +326,9 @@ notify_subscription_request_show (Gossip + + notify = notify_notification_new (_("Subscription Request"), + message, +- NULL, + NULL); + g_free (message); + +- if (attach_status_icon) { +- notify_notification_attach_to_status_icon (notify, attach_status_icon); +- } +- + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout (notify, NOTIFY_SUBSCRIPTION_TIME); + +@@ -377,15 +368,10 @@ notify_file_transfer_request (GossipFT * + gossip_ft_get_file_name (ft)); + notification = notify_notification_new (_("File Transfer"), + notification_body, +- NULL, + NULL); + + g_free (notification_body); + +- if (attach_status_icon) { +- notify_notification_attach_to_status_icon (notification, attach_status_icon); +- } +- + notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); + + error = NULL; +@@ -546,7 +532,7 @@ notify_new_message (GossipEventManager * + str = g_markup_printf_escaped (_("“%s”"), body_stripped); + } + +- notify = notify_notification_new (title, str, NULL, NULL); ++ notify = notify_notification_new (title, str, NULL); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_icon_from_pixbuf (notify, pixbuf); + notify_notification_set_timeout (notify, NOTIFY_MESSAGE_TIME); +@@ -556,10 +542,6 @@ notify_new_message (GossipEventManager * + G_CALLBACK (notify_closed_cb), + NULL); + +- if (attach_status_icon) { +- notify_notification_attach_to_status_icon (notify, attach_status_icon); +- } +- + notify_notification_add_action (notify, "default", _("Default"), + (NotifyActionCallback) notify_new_message_default_cb, + g_object_ref (event_manager), NULL); +@@ -901,7 +883,7 @@ gossip_notify_hint_show (const gchar + return FALSE; + } + +- notify = notify_notification_new (summary, message, NULL, NULL); ++ notify = notify_notification_new (summary, message, NULL); + g_object_set_data_full (G_OBJECT (notify), "conf_path", g_strdup (conf_path), g_free); + g_object_set_data (G_OBJECT (notify), "func", func); + g_signal_connect (notify, +@@ -909,10 +891,6 @@ gossip_notify_hint_show (const gchar + G_CALLBACK (notify_hint_closed_cb), + user_data); + +- if (attach_status_icon) { +- notify_notification_attach_to_status_icon (notify, attach_status_icon); +- } +- + if (!notify_notification_show (notify, &error)) { + g_warning ("Failed to send notification: %s", + error->message); diff --git a/net-im/openfetion/Makefile b/net-im/openfetion/Makefile index 6168abfcac97..c7993f332aa5 100644 --- a/net-im/openfetion/Makefile +++ b/net-im/openfetion/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS+=--disable-gst .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-libnotify .else CONFIGURE_ARGS+=--disable-libnotify diff --git a/net-im/openfetion/files/patch-src_fx_main.c b/net-im/openfetion/files/patch-src_fx_main.c new file mode 100644 index 000000000000..60073de2457b --- /dev/null +++ b/net-im/openfetion/files/patch-src_fx_main.c @@ -0,0 +1,13 @@ +--- src/fx_main.c.orig 2011-08-12 14:28:22.000000000 +0200 ++++ src/fx_main.c 2011-08-12 14:28:39.000000000 +0200 +@@ -124,8 +124,8 @@ void fx_main_initialize(FxMain* fxmain) + SKIN_DIR"offline.svg"); + gtk_status_icon_set_tooltip(fxmain->trayIcon, "OpenFetion"); + #ifdef USE_LIBNOTIFY +- fxmain->notify = notify_notification_new_with_status_icon("welcome" +- , "" , NULL , fxmain->trayIcon); ++ fxmain->notify = notify_notification_new("welcome" ++ , "" , NULL); + notify_notification_set_timeout(fxmain->notify , 2500); + #endif + diff --git a/net-im/pidgin-libnotify/Makefile b/net-im/pidgin-libnotify/Makefile index 07c8a17a2e4f..822202e4d3a6 100644 --- a/net-im/pidgin-libnotify/Makefile +++ b/net-im/pidgin-libnotify/Makefile @@ -7,7 +7,7 @@ PORTNAME= libnotify PORTVERSION= 0.14 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-im MASTER_SITES= SF/gaim-${PORTNAME}/pidgin-${PORTNAME}/pidgin-${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= pidgin- @@ -18,7 +18,7 @@ COMMENT= This plugin adds a libnotify interface to Pidgin BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin \ ${LOCALBASE}/libdata/pkgconfig/libnotify.pc:${PORTSDIR}/devel/libnotify -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ purple.9:${PORTSDIR}/net-im/libpurple GNU_CONFIGURE= yes diff --git a/net-im/pidgin-libnotify/files/patch-src_pidgin-libnotify.c b/net-im/pidgin-libnotify/files/patch-src_pidgin-libnotify.c new file mode 100644 index 000000000000..d5346d7c2b4a --- /dev/null +++ b/net-im/pidgin-libnotify/files/patch-src_pidgin-libnotify.c @@ -0,0 +1,11 @@ +--- src/pidgin-libnotify.c.orig 2011-08-12 15:51:55.000000000 +0200 ++++ src/pidgin-libnotify.c 2011-08-12 15:53:28.000000000 +0200 +@@ -286,7 +286,7 @@ + g_free (tr_body); + return; + } +- notification = notify_notification_new (title, tr_body, NULL, NULL); ++ notification = notify_notification_new (title, tr_body, NULL); + purple_debug_info (PLUGIN_ID, "notify(), new: " + "title: '%s', body: '%s', buddy: '%s'\n", + title, tr_body, best_name (buddy)); diff --git a/net-im/pino/Makefile b/net-im/pino/Makefile index 33169ad2dab6..fb7a22de2bc4 100644 --- a/net-im/pino/Makefile +++ b/net-im/pino/Makefile @@ -7,7 +7,7 @@ PORTNAME= pino PORTVERSION= 0.2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= GOOGLE_CODE @@ -17,10 +17,10 @@ COMMENT= A simple and fast Twitter and Identi.ca client BUILD_DEPENDS= ${LOCALBASE}/bin/valac:${PORTSDIR}/lang/vala LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \ gtkspell.0:${PORTSDIR}/textproc/gtkspell \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 BROKEN= Doesn't build with vala-0.10 diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile index 72485e51604b..cd3bf20f9068 100644 --- a/net-p2p/eiskaltdcpp-gtk/Makefile +++ b/net-p2p/eiskaltdcpp-gtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= eiskaltdcpp-gtk PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= GOOGLE_CODE DISTNAME= eiskaltdcpp-${DISTVERSION} diff --git a/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc new file mode 100644 index 000000000000..ae4fd4637498 --- /dev/null +++ b/net-p2p/eiskaltdcpp-gtk/files/patch-eiskaltdcpp-gtk_src_notify.cc @@ -0,0 +1,11 @@ +--- eiskaltdcpp-gtk/src/notify.cc.orig 2011-08-12 11:54:13.000000000 +0200 ++++ eiskaltdcpp-gtk/src/notify.cc 2011-08-12 11:54:24.000000000 +0200 +@@ -69,7 +69,7 @@ void Notify::init() + { + #ifdef USE_LIBNOTIFY + notify_init(g_get_application_name()); +- notification = notify_notification_new("template", "template", NULL, NULL); ++ notification = notify_notification_new("template", "template", NULL); + #endif // USE_LIBNOTIFY + action = FALSE; + } diff --git a/net-p2p/transmission-gtk2/Makefile b/net-p2p/transmission-gtk2/Makefile index f173d1f944e6..bc62edd95848 100644 --- a/net-p2p/transmission-gtk2/Makefile +++ b/net-p2p/transmission-gtk2/Makefile @@ -5,14 +5,14 @@ # $FreeBSD$ # -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -gtk2 MAINTAINER= crees@FreeBSD.org COMMENT= A fast and lightweight GTK+2 BitTorrent client LIB_DEPENDS= ${GEN_LIB_DEPENDS} \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${GEN_RUN_DEPENDS} \ xdg-open:${PORTSDIR}/devel/xdg-utils diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile index 7346c4d340bb..6a00dbf8b701 100644 --- a/net/ekiga3/Makefile +++ b/net/ekiga3/Makefile @@ -7,7 +7,7 @@ PORTNAME= ekiga3 PORTVERSION= 3.2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/ DISTNAME= ekiga-${PORTVERSION} @@ -88,7 +88,7 @@ CONFIGURE_ARGS+= --disable-h323 .endif .if defined(WITH_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-notify .else CONFIGURE_ARGS+= --disable-notify diff --git a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp index a6ac603c4ef4..5b5f5c23b63e 100644 --- a/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp +++ b/net/ekiga3/files/patch-lib_engine_components_libnotify_libnotify-main.cpp @@ -1,5 +1,5 @@ ---- lib/engine/components/libnotify/libnotify-main.cpp.orig 2010-08-28 15:04:11.000000000 -0400 -+++ lib/engine/components/libnotify/libnotify-main.cpp 2010-08-28 15:01:22.000000000 -0400 +--- lib/engine/components/libnotify/libnotify-main.cpp.orig 2009-09-22 16:27:35.000000000 +0200 ++++ lib/engine/components/libnotify/libnotify-main.cpp 2011-03-08 22:11:18.000000000 +0100 @@ -38,6 +38,7 @@ #include <map> #include <tr1/memory> @@ -8,3 +8,12 @@ #include <libnotify/notify.h> #include "services.h" +@@ -158,7 +159,7 @@ LibNotify::on_notification_added (gmref_ + + notif = notify_notification_new (notification->get_title ().c_str (), + notification->get_body ().c_str (), +- urgency, NULL); ++ urgency); + + g_signal_connect (notif, "closed", + G_CALLBACK (on_notif_closed), notification.get ()); diff --git a/net/ekiga3/files/patch-src_gui_main.cpp b/net/ekiga3/files/patch-src_gui_main.cpp new file mode 100644 index 000000000000..3982ef64fb96 --- /dev/null +++ b/net/ekiga3/files/patch-src_gui_main.cpp @@ -0,0 +1,16 @@ +--- src/gui/main.cpp.orig 2011-03-08 22:31:52.000000000 +0100 ++++ src/gui/main.cpp 2011-03-08 22:47:35.000000000 +0100 +@@ -2807,12 +2807,11 @@ ekiga_main_window_incoming_call_notify ( + + body = g_strdup_printf ("%s\n%s\n%s", uri, app, account); + +- notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL); ++ notify = notify_notification_new (title, body, GM_ICON_LOGO); + notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL); + notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL); +- notify_notification_attach_to_status_icon (notify, statusicon); + if (!notify_notification_show (notify, NULL)) { + ekiga_main_window_incoming_call_dialog_show (mw, call); + } diff --git a/net/liferea/Makefile b/net/liferea/Makefile index 463f9d37dadc..b596d8608ece 100644 --- a/net/liferea/Makefile +++ b/net/liferea/Makefile @@ -14,7 +14,7 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Simple RSS/RDF feed reader LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 USE_GNOME= gnomeprefix gnomehack libglade2 gconf2 USE_GMAKE= yes diff --git a/net/twitux/Makefile b/net/twitux/Makefile index f4be6b91fe13..99fe516205c2 100644 --- a/net/twitux/Makefile +++ b/net/twitux/Makefile @@ -7,7 +7,7 @@ PORTNAME= twitux PORTVERSION= 0.69 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net MASTER_SITES= SF @@ -16,7 +16,7 @@ COMMENT= GNOME client for Twitter LIB_DEPENDS= soup-2.4.1:${PORTSDIR}/devel/libsoup \ sexy.2:${PORTSDIR}/x11-toolkits/libsexy \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ canberra:${PORTSDIR}/audio/libcanberra USE_XORG= x11 diff --git a/net/twitux/files/patch-src_twitux-app.c b/net/twitux/files/patch-src_twitux-app.c new file mode 100644 index 000000000000..588eddf8b73f --- /dev/null +++ b/net/twitux/files/patch-src_twitux-app.c @@ -0,0 +1,12 @@ +--- src/twitux-app.c.orig 2011-08-16 15:27:29.000000000 +0200 ++++ src/twitux-app.c 2011-08-16 15:27:54.000000000 +0200 +@@ -1446,8 +1446,7 @@ twitux_app_notify (gchar *msg) + + notification = notify_notification_new (PACKAGE_NAME, + msg, +- "twitux", +- NULL); ++ "twitux"); + + notify_notification_set_timeout (notification, 8 * 1000); + notify_notification_show (notification, &error); diff --git a/net/vino/Makefile b/net/vino/Makefile index 0015cdc47cd0..c4d2501f1abc 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -8,7 +8,7 @@ PORTNAME= vino PORTVERSION= 2.32.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -34,7 +34,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= vino-server.schemas .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-libnotify=yes .else CONFIGURE_ARGS+=--enable-libnotify=no diff --git a/palm/synce-trayicon/Makefile b/palm/synce-trayicon/Makefile index 5148a67a8e11..3603230d8619 100644 --- a/palm/synce-trayicon/Makefile +++ b/palm/synce-trayicon/Makefile @@ -6,7 +6,7 @@ PORTNAME= synce-trayicon PORTVERSION= 0.14 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= palm MASTER_SITES= SF/synce/SynCE-GNOME/${PORTVERSION} @@ -17,7 +17,7 @@ LIB_DEPENDS= rra.0:${PORTSDIR}/palm/synce-librra \ gtop-2.0.7:${PORTSDIR}/devel/libgtop \ unshield.0:${PORTSDIR}/archivers/unshield \ orange.0:${PORTSDIR}/archivers/liborange \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs \ ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon diff --git a/palm/synce-trayicon/files/patch-src_synce-trayicon.c b/palm/synce-trayicon/files/patch-src_synce-trayicon.c new file mode 100644 index 000000000000..1ece6b82dd0b --- /dev/null +++ b/palm/synce-trayicon/files/patch-src_synce-trayicon.c @@ -0,0 +1,11 @@ +--- src/synce-trayicon.c.orig 2011-08-16 14:13:49.000000000 +0200 ++++ src/synce-trayicon.c 2011-08-16 14:14:40.000000000 +0200 +@@ -204,7 +204,7 @@ + } + + if (gtk_status_icon_is_embedded(GTK_STATUS_ICON(self))) { +- priv->notification = notify_notification_new_with_status_icon (summary, body, NULL, GTK_STATUS_ICON(self)); ++ priv->notification = notify_notification_new (summary, body, NULL); + notify_notification_show (priv->notification, NULL); + } else { + g_debug("%s: not embedded", G_STRFUNC); diff --git a/ports-mgmt/gnome-packagekit/Makefile b/ports-mgmt/gnome-packagekit/Makefile index 0be30d39aa62..c50afa0ccbde 100644 --- a/ports-mgmt/gnome-packagekit/Makefile +++ b/ports-mgmt/gnome-packagekit/Makefile @@ -3,11 +3,11 @@ # Whom: Anders F Bjorklund <afb@users.sourceforge.net> # # $FreeBSD$ -# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.19 2010/10/04 20:40:36 kwm Exp $ +# $MCom: ports/ports-mgmt/gnome-packagekit/Makefile,v 1.25 2011/06/14 20:18:46 mezz Exp $ PORTNAME= gnome-packagekit PORTVERSION= 2.32.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ports-mgmt sysutils gnome MASTER_SITES= GNOME @@ -17,7 +17,7 @@ COMMENT= PackageKit client programs for the GNOME desktop BUILD_DEPENDS= ${LOCALBASE}/bin/docbook2man:${PORTSDIR}/textproc/docbook-utils LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit \ - notify:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ unique-1.0:${PORTSDIR}/x11-toolkits/unique \ upower-glib.1:${PORTSDIR}/sysutils/upower \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c new file mode 100644 index 000000000000..36c7b72583a3 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c @@ -0,0 +1,66 @@ +--- src/gpk-check-update.c.orig 2010-09-22 17:20:47.000000000 +0200 ++++ src/gpk-check-update.c 2011-03-07 18:27:18.000000000 +0100 +@@ -388,9 +388,8 @@ gpk_check_update_finished_notify (GpkChe + } + + /* TRANSLATORS: title: system update completed all okay */ +- notification = notify_notification_new_with_status_icon (_("The system update has completed"), +- message_text->str, "help-browser", +- cupdate->priv->status_icon); ++ notification = notify_notification_new (_("The system update has completed"), ++ message_text->str, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + if (restart == PK_RESTART_ENUM_SYSTEM) { +@@ -456,7 +455,7 @@ gpk_check_update_show_error (GpkCheckUpd + + /* do the bubble */ + egg_debug ("title=%s, message=%s", title, message); +- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, message, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to get bubble"); + goto out; +@@ -656,7 +655,7 @@ gpk_check_update_critical_updates_warnin + + /* do the bubble */ + egg_debug ("title=%s, message=%s", title, message); +- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, message, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to get bubble"); + return; +@@ -782,9 +781,8 @@ gpk_check_update_check_on_battery (GpkCh + /* TRANSLATORS: policy says update, but we are on battery and so prompt */ + message = _("Automatic updates are not being installed as the computer is running on battery power"); + /* TRANSLATORS: informs user will not install by default */ +- notification = notify_notification_new_with_status_icon (_("Updates not installed"), +- message, "help-browser", +- cupdate->priv->status_icon); ++ notification = notify_notification_new (_("Updates not installed"), ++ message, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + // notify_notification_add_action (notification, "do-not-show-update-not-battery", +@@ -839,10 +837,10 @@ gpk_check_update_notify_doing_updates (G + goto out; + + /* TRANSLATORS: title: notification when we scheduled an automatic update */ +- notification = notify_notification_new_with_status_icon (_("Updates are being installed"), ++ notification = notify_notification_new (_("Updates are being installed"), + /* TRANSLATORS: tell the user why the hard disk is grinding... */ + _("Updates are being automatically installed on your computer"), +- "software-update-urgent", cupdate->priv->status_icon); ++ "software-update-urgent"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + /* TRANSLATORS: button: cancel the update system */ +@@ -1328,7 +1326,7 @@ gpk_check_update_get_distro_upgrades_fin + + /* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */ + title = _("Distribution upgrades available"); +- notification = notify_notification_new_with_status_icon (title, string->str, "help-browser", cupdate->priv->status_icon); ++ notification = notify_notification_new (title, string->str, "help-browser"); + if (notification == NULL) { + egg_warning ("failed to make bubble"); + goto out; diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c new file mode 100644 index 000000000000..78c8ceaa5742 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c @@ -0,0 +1,11 @@ +--- src/gpk-dbus-task.c.orig 2011-03-07 18:28:01.000000000 +0100 ++++ src/gpk-dbus-task.c 2011-03-07 18:28:10.000000000 +0100 +@@ -377,7 +377,7 @@ gpk_dbus_task_handle_error (GpkDbusTask + dtask->priv->cached_error_code = g_object_ref (error_code); + + /* do the bubble */ +- notification = notify_notification_new (title, message, "help-browser", NULL); ++ notification = notify_notification_new (title, message, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "show-error-details", diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c new file mode 100644 index 000000000000..2fb06857631f --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c @@ -0,0 +1,38 @@ +--- src/gpk-firmware.c.orig 2011-03-07 18:20:16.000000000 +0100 ++++ src/gpk-firmware.c 2011-03-07 18:20:38.000000000 +0100 +@@ -268,7 +268,7 @@ gpk_firmware_require_restart (GpkFirmwar + message = _("You will need to restart this computer before the hardware will work correctly."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -303,7 +303,7 @@ gpk_firmware_require_replug (GpkFirmware + message = _("You will need to remove and then reinsert the hardware before it will work correctly."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -330,7 +330,7 @@ gpk_firmware_require_nothing (GpkFirmwar + message = _("Your hardware has been set up and is now ready to use."); + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +@@ -624,7 +624,7 @@ gpk_firmware_timeout_cb (gpointer data) + } + + /* TRANSLATORS: title of libnotify bubble */ +- notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser", NULL); ++ notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "install-firmware", diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c new file mode 100644 index 000000000000..51cc104ea83c --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c @@ -0,0 +1,11 @@ +--- src/gpk-hardware.c.orig 2011-03-07 18:21:23.000000000 +0100 ++++ src/gpk-hardware.c 2011-03-07 18:21:32.000000000 +0100 +@@ -183,7 +183,7 @@ gpk_hardware_what_provides_cb (GObject * + message = g_strdup_printf ("%s\n\t%s", _("Additional packages can be installed to support this hardware"), package); + /* TRANSLATORS: a new bit of hardware has been plugged in */ + body = g_strdup_printf ("%s", _("New hardware attached")); +- notification = notify_notification_new (body, message, "help-browser", NULL); ++ notification = notify_notification_new (body, message, "help-browser"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, GPK_HARDWARE_INSTALL_ACTION, diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c new file mode 100644 index 000000000000..f724d7845c77 --- /dev/null +++ b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c @@ -0,0 +1,29 @@ +--- src/gpk-watch.c.orig 2010-09-22 17:20:31.000000000 +0200 ++++ src/gpk-watch.c 2011-03-07 09:32:41.000000000 +0100 +@@ -1153,7 +1153,7 @@ gpk_watch_process_messages_cb (PkMessage + } + + /* do the bubble */ +- notification = notify_notification_new_with_status_icon (gpk_message_enum_to_localised_text (type), details, "emblem-important", watch->priv->status_icon); ++ notification = notify_notification_new (gpk_message_enum_to_localised_text (type), details, "emblem-important"); + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + ret = notify_notification_show (notification, &error); +@@ -1213,7 +1213,7 @@ gpk_watch_process_error_code (GpkWatch * + title_prefix = g_strdup_printf ("%s: %s", _("Package Manager"), title); + + /* do the bubble */ +- notification = notify_notification_new (title_prefix, message, "help-browser", NULL); ++ notification = notify_notification_new (title_prefix, message, "help-browser"); + notify_notification_set_timeout (notification, 15000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "show-error-details", +@@ -1392,7 +1392,7 @@ gpk_watch_adopt_cb (PkClient *client, GA + goto out; + + /* TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble */ +- notification = notify_notification_new (_("Task completed"), message, "help-browser", NULL); ++ notification = notify_notification_new (_("Task completed"), message, "help-browser"); + notify_notification_set_timeout (notification, 5000); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_add_action (notification, "do-not-show-notify-complete", diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile index bad3af7cb24a..6b3d5a1f59cf 100644 --- a/security/seahorse-plugins/Makefile +++ b/security/seahorse-plugins/Makefile @@ -3,12 +3,12 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse-plugins/Makefile,v 1.25 2010/04/27 22:22:07 kwm Exp $ +# $MCom: ports/security/seahorse-plugins/Makefile,v 1.28 2011/07/03 11:57:45 kwm Exp $ # PORTNAME= seahorse-plugins PORTVERSION= 2.30.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -83,7 +83,7 @@ PLIST_SUB+= APPLET="@comment " .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-libnotify .endif diff --git a/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c b/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c new file mode 100644 index 000000000000..7ddf0bb3fe00 --- /dev/null +++ b/security/seahorse-plugins/files/patch-libseahorse_seahorse-notification.c @@ -0,0 +1,11 @@ +--- libseahorse/seahorse-notification.c.orig 2011-03-07 09:25:10.000000000 +0100 ++++ libseahorse/seahorse-notification.c 2011-03-07 09:25:57.000000000 +0100 +@@ -213,7 +213,7 @@ + heading = format_key_text (snotif->heading); + message = format_key_text (snotif->message); + +- notif = notify_notification_new (heading, message, snotif->icon, attachto); ++ notif = notify_notification_new (heading, message, snotif->icon); + + g_free (heading); + g_free (message); diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile index d7a2d00aa0f0..6a9dd20e316f 100644 --- a/security/seahorse/Makefile +++ b/security/seahorse/Makefile @@ -3,12 +3,12 @@ # Whom: Dave McKay <dave@mu.org> # # $FreeBSD$ -# $MCom: ports/security/seahorse/Makefile,v 1.99 2010/09/28 09:01:33 kwm Exp $ +# $MCom: ports/security/seahorse/Makefile,v 1.104 2011/07/03 11:57:45 kwm Exp $ # PORTNAME= seahorse PORTVERSION= 2.32.0 -PORTREVISION= 4 +PORTREVISION= 6 CATEGORIES= security gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,10 +20,12 @@ BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - gnome-keyring:${PORTSDIR}/security/gnome-keyring \ + gcr.0:${PORTSDIR}/security/gnome-keyring \ gcrypt.18:${PORTSDIR}/security/libgcrypt \ soup-2.4.1:${PORTSDIR}/devel/libsoup +CONFLICTS= seahorse-3.[0-9]* + USE_XORG= sm USE_LDCONFIG= yes USE_BZIP2= yes @@ -53,7 +55,7 @@ CONFIGURE_ARGS+=--disable-ldap .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .else CONFIGURE_ARGS+=--disable-libnotify .endif diff --git a/security/seahorse/files/patch-libseahorse_seahorse-notification.c b/security/seahorse/files/patch-libseahorse_seahorse-notification.c new file mode 100644 index 000000000000..7cf855253009 --- /dev/null +++ b/security/seahorse/files/patch-libseahorse_seahorse-notification.c @@ -0,0 +1,11 @@ +--- libseahorse/seahorse-notification.c.orig 2011-03-06 21:03:39.000000000 +0100 ++++ libseahorse/seahorse-notification.c 2011-03-06 21:03:58.000000000 +0100 +@@ -231,7 +231,7 @@ setup_libnotify_notification (SeahorseNo + heading = format_key_text (snotif->heading); + message = format_key_text (snotif->message); + +- notif = notify_notification_new (heading, message, snotif->icon, attachto); ++ notif = notify_notification_new (heading, message, snotif->icon); + + g_free (heading); + g_free (message); diff --git a/security/tuntun/Makefile b/security/tuntun/Makefile index 0f517482f7f8..4adc200146f6 100644 --- a/security/tuntun/Makefile +++ b/security/tuntun/Makefile @@ -7,13 +7,15 @@ PORTNAME= tuntun PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security gnome MASTER_SITES= http://tuntun.googlecode.com/files/ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= A Gnome applet gui for OpenVPN +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify + GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \ LIBS="`pkg-config --libs libgnomeui-2.0`" diff --git a/security/tuntun/files/patch-src_tuntun-applet.c b/security/tuntun/files/patch-src_tuntun-applet.c new file mode 100644 index 000000000000..5f98a4fa65b8 --- /dev/null +++ b/security/tuntun/files/patch-src_tuntun-applet.c @@ -0,0 +1,19 @@ +--- src/tuntun-applet.c.orig 2011-08-16 15:08:48.000000000 +0200 ++++ src/tuntun-applet.c 2011-08-16 15:32:49.000000000 +0200 +@@ -705,14 +705,14 @@ static void tuntun_panel_applet_on_conne + NotifyNotification* _tmp2_; + char* _tmp1_; + char* _tmp0_; +- notification = (_tmp2_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _tmp0_ = g_strdup_printf (_ ("connection established\nassigned ip: %s"), tuntun_connection_info_get_assigned_ip (tuntun_connection_get_info (connection))), _tmp1_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_CONNECTED), (GtkWidget*) self), _g_object_unref0 (notification), _tmp2_); ++ notification = (_tmp2_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _tmp0_ = g_strdup_printf (_ ("connection established\nassigned ip: %s"), tuntun_connection_info_get_assigned_ip (tuntun_connection_get_info (connection))), _tmp1_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_CONNECTED)), _g_object_unref0 (notification), _tmp2_); + _g_free0 (_tmp1_); + _g_free0 (_tmp0_); + } else { + if (tuntun_connection_get_status (connection) == TUNTUN_CONNECTION_STATES_DISCONNECTED) { + NotifyNotification* _tmp4_; + char* _tmp3_; +- notification = (_tmp4_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _ ("connection closed"), _tmp3_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_DISCONNECTED), (GtkWidget*) self), _g_object_unref0 (notification), _tmp4_); ++ notification = (_tmp4_ = notify_notification_new (tuntun_connection_info_get_name (tuntun_connection_get_info (connection)), _ ("connection closed"), _tmp3_ = tuntun_utils_get_image_path (TUNTUN_CONSTANTS_IMAGES_CONNECTION_STATUS_DISCONNECTED)), _g_object_unref0 (notification), _tmp4_); + _g_free0 (_tmp3_); + } + } diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index c8f2546bbdb0..53bf64e1bc36 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -7,7 +7,7 @@ PORTNAME= brasero PORTVERSION= 2.32.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils audio multimedia gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= CD/DVD mastering tool for the GNOME desktop -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ totem-plparser.17:${PORTSDIR}/multimedia/totem-pl-parser \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile index 2ac81de1a8bc..603aeaf248c0 100644 --- a/sysutils/gnome-mount/Makefile +++ b/sysutils/gnome-mount/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.24 2008/02/04 23:18:46 mezz Exp $ +# $MCom: ports/sysutils/gnome-mount/Makefile,v 1.28 2011/03/08 19:25:20 kwm Exp $ # PORTNAME= gnome-mount PORTVERSION= 0.8 -PORTREVISION= 7 +PORTREVISION= 9 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ @@ -16,8 +16,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A front-end to mount, umount, and eject using HAL LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \ - notify.1:${PORTSDIR}/devel/libnotify \ - gnome-keyring:${PORTSDIR}/security/gnome-keyring + notify.4:${PORTSDIR}/devel/libnotify \ + gnome-keyring:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/polkit-gnome.pc:${PORTSDIR}/sysutils/policykit-gnome USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtk20 diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c new file mode 100644 index 000000000000..fb1a6719263d --- /dev/null +++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c @@ -0,0 +1,21 @@ +--- src/gnome-mount.c.orig 2010-12-26 14:53:42.000000000 +0100 ++++ src/gnome-mount.c 2010-12-26 18:19:30.000000000 +0100 +@@ -38,7 +38,7 @@ + + #include <glib/gi18n.h> + #include <gconf/gconf-client.h> +-#include <gdk/gdkx.h> ++#include <gtk/gtk.h> + #include "copy-paste/gnome-password-dialog.h" + #include <gnome-keyring.h> + #include <libnotify/notify.h> +@@ -1577,8 +1577,7 @@ + message = g_strdup_printf (_("There is data that needs to be written to the device %s before it can be removed. Please do not remove the media or disconnect the drive."), unmount_note_drive_name); + unmount_note = notify_notification_new (summary, + message, +- "gnome-dev-harddisk", /* TODO: use appropriate icon */ +- NULL); ++ "gnome-dev-harddisk"); + if (unmount_note == NULL) { + g_warning ("Cannot create note for unmount cache sync"); + } else { diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index fd13bee4c29f..093254d5f728 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.69 2010/09/27 18:49:22 kwm Exp $ +# $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.73 2011/04/30 20:43:26 mezz Exp $ # PORTNAME= gnome-power-manager PORTVERSION= 2.32.0 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,11 +18,13 @@ COMMENT= Power management system for the GNOME Desktop LIB_DEPENDS= upower-glib.1:${PORTSDIR}/sysutils/upower \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ execinfo:${PORTSDIR}/devel/libexecinfo \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= pkexec:${PORTSDIR}/sysutils/polkit +CONFLICTS= gnome-power-manager-3.[0-9]* + USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/gnome-power-manager/files/patch-src_gpm-manager.c b/sysutils/gnome-power-manager/files/patch-src_gpm-manager.c new file mode 100644 index 000000000000..a71c447da691 --- /dev/null +++ b/sysutils/gnome-power-manager/files/patch-src_gpm-manager.c @@ -0,0 +1,15 @@ +--- src/gpm-manager.c.orig 2011-03-07 12:49:54.000000000 +0100 ++++ src/gpm-manager.c 2011-03-07 12:51:08.000000000 +0100 +@@ -481,11 +481,7 @@ gpm_manager_notify (GpmManager *manager, + gpm_manager_notify_close (manager, *notification_class); + + /* if the status icon is hidden, don't point at it */ +- if (manager->priv->status_icon != NULL && +- gtk_status_icon_is_embedded (manager->priv->status_icon)) +- notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon); +- else +- notification = notify_notification_new (title, message, icon, NULL); ++ notification = notify_notification_new (title, message, icon); + notify_notification_set_timeout (notification, timeout); + notify_notification_set_urgency (notification, urgency); + g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class); diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile index 588bb471cf16..82a7702e639e 100644 --- a/sysutils/gnome-settings-daemon/Makefile +++ b/sysutils/gnome-settings-daemon/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.72 2010/11/15 13:50:07 kwm Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon/Makefile,v 1.75 2011/04/25 19:56:57 mezz Exp $ # PORTNAME= gnome-settings-daemon PORTVERSION= 2.32.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,10 +17,12 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 settings daemon LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ nss3.1:${PORTSDIR}/security/nss RUN_DEPENDS= xrdb:${PORTSDIR}/x11/xrdb +CONFLICTS= gnome-settings-daemon-3.[0-9]* + USE_XORG= xxf86misc USE_BZIP2= yes USE_GMAKE= yes diff --git a/sysutils/gnome-settings-daemon/files/patch-libnotify b/sysutils/gnome-settings-daemon/files/patch-libnotify new file mode 100644 index 000000000000..1166875bf74b --- /dev/null +++ b/sysutils/gnome-settings-daemon/files/patch-libnotify @@ -0,0 +1,58 @@ +From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001 +From: William Jon McCann <jmccann@redhat.com> +Date: Tue, 12 Oct 2010 03:35:45 +0000 +Subject: Require libnotify 0.6.0 + +--- +diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c +index 9ca820a..f5964b9 100644 +--- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c ++++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c +@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager, + gsd_a11y_keyboard_manager_ensure_status_icon (manager); + manager->priv->notification = notify_notification_new (title, + message, +- "preferences-desktop-accessibility", +- NULL); +- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); ++ "preferences-desktop-accessibility"); + notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); + + notify_notification_add_action (manager->priv->notification, +@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager, + gsd_a11y_keyboard_manager_ensure_status_icon (manager); + manager->priv->notification = notify_notification_new (title, + message, +- "preferences-desktop-accessibility", +- NULL); +- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); ++ "preferences-desktop-accessibility"); + notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); + + notify_notification_add_action (manager->priv->notification, +diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c +index 02536a3..ef57d5b 100644 +--- plugins/xrandr/gsd-xrandr-manager.c ++++ plugins/xrandr/gsd-xrandr-manager.c +@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to + + g_assert (error_to_display == NULL || secondary_text == NULL); + +- if (priv->status_icon) +- notification = notify_notification_new_with_status_icon (primary_text, +- error_to_display ? error_to_display->message : secondary_text, +- GSD_XRANDR_ICON_NAME, +- priv->status_icon); +- else +- notification = notify_notification_new (primary_text, +- error_to_display ? error_to_display->message : secondary_text, +- GSD_XRANDR_ICON_NAME, +- NULL); ++ notification = notify_notification_new (primary_text, ++ error_to_display ? error_to_display->message : secondary_text, ++ GSD_XRANDR_ICON_NAME); + + notify_notification_show (notification, NULL); /* NULL-GError */ + #else +-- +cgit v0.8.3.4 diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index e9877fa7676a..6d59314e5962 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -8,7 +8,7 @@ PORTNAME= tracker PORTVERSION= 0.6.95 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= sysutils gnome MASTER_SITES= GNOME PKGNAMESUFFIX?= -client @@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - poppler-glib.5:${PORTSDIR}/graphics/poppler-gtk \ + poppler-glib.6:${PORTSDIR}/graphics/poppler-gtk \ exif.12:${PORTSDIR}/graphics/libexif \ wv-1.2.4:${PORTSDIR}/textproc/wv \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ diff --git a/sysutils/tracker-client/files/patch-src_tracker-applet_tracker-applet.c b/sysutils/tracker-client/files/patch-src_tracker-applet_tracker-applet.c new file mode 100644 index 000000000000..7bd62bb23bf1 --- /dev/null +++ b/sysutils/tracker-client/files/patch-src_tracker-applet_tracker-applet.c @@ -0,0 +1,28 @@ +--- src/tracker-applet/tracker-applet.c.orig 2011-08-16 14:59:30.000000000 +0200 ++++ src/tracker-applet/tracker-applet.c 2011-08-16 15:00:25.000000000 +0200 +@@ -2074,10 +2074,9 @@ tray_icon_show_message (TrayIcon *ico + } + + notification = +- notify_notification_new_with_status_icon ("Tracker", ++ notify_notification_new ("Tracker", + msg, +- NULL, +- priv->icon); ++ NULL); + + notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); + notify_notification_show (notification, NULL); +@@ -2125,10 +2124,9 @@ tray_icon_show_error (TrayIcon *icon, + va_end (args); + + error_notification = +- notify_notification_new_with_status_icon ("Tracker", ++ notify_notification_new ("Tracker", + msg, +- NULL, +- priv->icon); ++ NULL); + + notify_notification_set_timeout (error_notification, NOTIFY_EXPIRES_NEVER); + notify_notification_set_urgency (error_notification, NOTIFY_URGENCY_CRITICAL); diff --git a/sysutils/tracker-gnome/Makefile b/sysutils/tracker-gnome/Makefile index 81e51d8ddf37..6b05f23391db 100644 --- a/sysutils/tracker-gnome/Makefile +++ b/sysutils/tracker-gnome/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # $MCom: ports/sysutils/tracker-gnome/Makefile,v 1.4 2009/08/08 18:46:42 ahze Exp $ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Tracker GNOME applet, search tool, and preference programs diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile index b709e25df996..d76b5054ecc9 100644 --- a/sysutils/xfce4-power-manager/Makefile +++ b/sysutils/xfce4-power-manager/Makefile @@ -7,6 +7,7 @@ PORTNAME= xfce4-power-manager PORTVERSION= 1.0.10 +PORTREVISION= 1 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -15,7 +16,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= ports@FreeBSD.org COMMENT= XFce4 power manager -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/sysutils/xfce4-power-manager/files/patch-src__xfpm-notify.c b/sysutils/xfce4-power-manager/files/patch-src__xfpm-notify.c new file mode 100644 index 000000000000..07191d7eff4a --- /dev/null +++ b/sysutils/xfce4-power-manager/files/patch-src__xfpm-notify.c @@ -0,0 +1,12 @@ +--- src/xfpm-notify.c.orig 2011-02-15 21:52:35.000000000 +0100 ++++ src/xfpm-notify.c 2011-08-14 10:44:28.000000000 +0200 +@@ -233,9 +233,6 @@ xfpm_notify_new_notification_internal (c + #if !NOTIFY_CHECK_VERSION (0, 7, 0) + if ( icon ) + notify_notification_attach_to_status_icon (n, icon); +-#else +- if ( icon ) +- notify_notification_attach_to_status_icon (n, icon); + #endif + #endif + diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index 9399a392728a..5e0a0bbb1808 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R} @@ -63,7 +63,7 @@ PLIST_SUB+= XRANDR="@comment " .endif .if defined(WITH_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-libnotify .else CONFIGURE_ARGS+=--disable-libnotify diff --git a/textproc/artha/Makefile b/textproc/artha/Makefile index ab6b8433867b..cdd7107b8c5f 100644 --- a/textproc/artha/Makefile +++ b/textproc/artha/Makefile @@ -7,6 +7,7 @@ PORTNAME= artha PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF @@ -35,7 +36,7 @@ OPTIONS= NOTIFY "Popup word definition as notification" On .include <bsd.port.options.mk> .if defined(WITH_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .endif .include <bsd.port.mk> diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 770393fa2e1d..76960b127143 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -8,7 +8,7 @@ PORTNAME= epiphany-extensions PORTVERSION= 2.30.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -18,7 +18,7 @@ COMMENT= A set of add-ons for the Epiphany web browser BUILD_DEPENDS= epiphany:${PORTSDIR}/www/epiphany LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= epiphany:${PORTSDIR}/www/epiphany USE_GETTEXT= yes diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index d1cc19002abe..82eff476205c 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.240 2010/10/10 19:16:00 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.246 2011/04/30 20:43:27 mezz Exp $ # PORTNAME= epiphany PORTVERSION= 2.30.6 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= www gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -19,20 +19,21 @@ COMMENT?= An extremely lightweight and simple web browser for GNOME 2 BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ + webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/share/icons/HighContrastLargePrint/index.theme:${PORTSDIR}/x11-themes/gnome-themes +CONFLICTS= epiphany-3.[0-9]* + USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes USE_BZIP2= yes USE_PYTHON= yes -GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils WANT_GNOME= yes GNU_CONFIGURE= yes diff --git a/www/epiphany/files/patch-embed_downloader-view.c b/www/epiphany/files/patch-embed_downloader-view.c new file mode 100644 index 000000000000..d15de3c6a3cc --- /dev/null +++ b/www/epiphany/files/patch-embed_downloader-view.c @@ -0,0 +1,20 @@ +--- embed/downloader-view.c.orig 2011-03-07 10:49:18.000000000 +0100 ++++ embed/downloader-view.c 2011-03-07 10:56:01.000000000 +0100 +@@ -337,7 +337,7 @@ show_notification (DownloaderView *dv, c + g_object_ref (dv); + + notification = notify_notification_new (title, msg, +- GTK_STOCK_INFO, NULL); ++ GTK_STOCK_INFO); + + g_signal_connect_after (notification, "closed", + G_CALLBACK (notification_closed_cb), dv); +@@ -346,8 +346,6 @@ show_notification (DownloaderView *dv, c + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + +- notify_notification_attach_to_status_icon (notification, status_icon); +- + /* There are some visual glitches when the notification is shown and + * the GtkStatusIcon is still not visible. To avoid that, we delay the + * popup a bit. */ diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index 5c107b94cbab..8aa1ff587dad 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 6.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -67,7 +68,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif .if defined(WITH_PGO) diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 5c107b94cbab..8aa1ff587dad 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 6.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -67,7 +68,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif .if defined(WITH_PGO) diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index 3b4d382e43d6..36e4ab554f7a 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 3.6.20 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -82,7 +83,7 @@ MOZ_OPTIONS+= --disable-gnomeui MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif post-extract: diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile index 657d8fa9b1b4..ebd00c733283 100644 --- a/www/gnome-user-share/Makefile +++ b/www/gnome-user-share/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/gnome-user-share/Makefile,v 1.23 2010/09/28 08:52:36 kwm Exp $ +# $MCom: ports/www/gnome-user-share/Makefile,v 1.26 2011/04/30 20:43:27 mezz Exp $ # PORTNAME= gnome-user-share PORTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= www deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -17,7 +18,7 @@ COMMENT= Personal file-sharing service for the GNOME Desktop LIB_DEPENDS= avahi-client:${PORTSDIR}/net/avahi-app \ canberra.0:${PORTSDIR}/audio/libcanberra \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_dnssd.so:${PORTSDIR}/www/mod_dnssd \ console-kit-daemon:${PORTSDIR}/sysutils/consolekit diff --git a/www/gnome-user-share/files/patch-src_obexpush.c b/www/gnome-user-share/files/patch-src_obexpush.c new file mode 100644 index 000000000000..7b71c8d8ecca --- /dev/null +++ b/www/gnome-user-share/files/patch-src_obexpush.c @@ -0,0 +1,15 @@ +--- src/obexpush.c.orig 2011-03-07 20:11:04.000000000 +0100 ++++ src/obexpush.c 2011-03-07 20:11:34.000000000 +0100 +@@ -139,10 +139,9 @@ + /* Translators: %s is the name of the filename received */ + notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); + g_free (display); +- notification = notify_notification_new_with_status_icon (_("You received a file"), ++ notification = notify_notification_new (_("You received a file"), + notification_text, +- "dialog-information", +- GTK_STATUS_ICON (statusicon)); ++ "dialog-information"); + + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); + diff --git a/www/gnome-web-photo/Makefile b/www/gnome-web-photo/Makefile index c3044a3da8e6..139385b10d1b 100644 --- a/www/gnome-web-photo/Makefile +++ b/www/gnome-web-photo/Makefile @@ -9,13 +9,14 @@ PORTNAME= gnome-web-photo PORTVERSION= 0.10.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= GNOME MAINTAINER= ports@FreeBSD.org COMMENT= Tool to generate full-size image files and thumbnails -LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index c41f8c9aae2e..fdb71907146a 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -8,7 +8,7 @@ PORTNAME= kazehakase PORTVERSION= 0.5.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} MASTER_SITE_SUBDIR= ${PORTNAME}/43802 @@ -47,7 +47,7 @@ BROKEN= does not build on 6.x .endif .if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 PLIST_SUB+= WEBKIT="" .else PLIST_SUB+= WEBKIT="@comment " diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 19851191afc5..85a4946e47dc 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -7,6 +7,7 @@ PORTNAME= libxul DISTVERSION= 1.9.2.17 +PORTREVISION= 1 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${DISTVERSION}/source @@ -71,7 +72,7 @@ CFLAGS+= -mminimal-toc MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif post-patch: diff --git a/www/midori/Makefile b/www/midori/Makefile index 96d7f3d828b4..9b4af07626e6 100644 --- a/www/midori/Makefile +++ b/www/midori/Makefile @@ -8,6 +8,7 @@ PORTNAME= midori PORTVERSION= 0.3.6 +PORTREVISION= 1 CATEGORIES= www xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -16,9 +17,9 @@ DIST_SUBDIR= xfce4 MAINTAINER= kwm@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine -LIB_DEPENDS= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \ +LIB_DEPENDS= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \ sqlite3.8:${PORTSDIR}/databases/sqlite3 \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ valac:${PORTSDIR}/lang/vala RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss diff --git a/www/neon29/Makefile b/www/neon29/Makefile index 1d59097b9987..2a6cd1d09a45 100644 --- a/www/neon29/Makefile +++ b/www/neon29/Makefile @@ -7,7 +7,7 @@ PORTNAME= neon29 PORTVERSION= 0.29.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://www.webdav.org/neon/ DISTNAME= neon-${PORTVERSION} @@ -68,7 +68,7 @@ CONFIGURE_ARGS+=--without-gssapi .if defined(WITH_PROXY) CONFIGURE_ARGS+=--with-libproxy -LIB_DEPENDS+= proxy.0:${PORTSDIR}/net/libproxy +LIB_DEPENDS+= proxy.1:${PORTSDIR}/net/libproxy .else CONFIGURE_ARGS+=--without-libproxy .endif diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile index 81049260d13c..396942ddb860 100644 --- a/www/py-jswebkit/Makefile +++ b/www/py-jswebkit/Makefile @@ -7,6 +7,7 @@ PORTNAME= jswebkit PORTVERSION= 0.0.3 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +17,7 @@ MAINTAINER= jupengfei@gmail.com COMMENT= WebKit/JavaScriptCore Python bindings BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython -LIB_DEPENDS= webkit:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= ${BUILD_DEPENDS} PLIST_FILES= %%PYTHON_SITELIBDIR%%/jswebkit.so diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile index c67c91a0ce18..3c7c9a4eb5f4 100644 --- a/www/py-webkitgtk/Makefile +++ b/www/py-webkitgtk/Makefile @@ -7,6 +7,7 @@ PORTNAME= webkitgtk PORTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +19,7 @@ COMMENT= Python bindings for the WebKit GTK+ port LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= webkit:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 PROJECTHOST= pywebkitgtk diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index edfc6ac407cc..4eac90ab5f86 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -7,7 +7,7 @@ PORTNAME= seamonkey DISTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source @@ -106,7 +106,7 @@ MOZ_OPTIONS+= --disable-composer MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify .endif .if ${ARCH} == amd64 || ${ARCH} == i386 diff --git a/www/surf/Makefile b/www/surf/Makefile index 6f93a167e3dd..93152d31b17d 100644 --- a/www/surf/Makefile +++ b/www/surf/Makefile @@ -7,13 +7,14 @@ PORTNAME= surf PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://dl.suckless.org/${PORTNAME}/ MAINTAINER= davide.italiano@gmail.com COMMENT= A simple Web browser based on WebKit/Gtk+ -LIB_DEPENDS= webkit-1.0:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= dmenu:${PORTSDIR}/x11/dmenu USE_GNOME= gtk20 pkgconfig diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile index 248740d625bf..0c26c4590a50 100644 --- a/www/uzbl/Makefile +++ b/www/uzbl/Makefile @@ -7,13 +7,14 @@ PORTNAME= uzbl DISTVERSION= 0.0.0.${GITDATE} +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.linta.de/distfiles/ MAINTAINER= aehlig@linta.de COMMENT= Web interface tools which adhere to the unix philosophy -LIB_DEPENDS= webkit:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 RUN_DEPENDS= socat:${PORTSDIR}/net/socat \ ${PYTHON_PKGNAMEPREFIX}gtk>=2:${PORTSDIR}/x11-toolkits/py-gtk2 diff --git a/www/webkit-sharp/Makefile b/www/webkit-sharp/Makefile index 19302386e2eb..c1593bc178f8 100644 --- a/www/webkit-sharp/Makefile +++ b/www/webkit-sharp/Makefile @@ -7,6 +7,7 @@ PORTNAME= webkit-sharp PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://ftp.novell.com/pub/mono/sources/${PORTNAME}/ diff --git a/www/xxxterm/Makefile b/www/xxxterm/Makefile index 55c3e6368771..d70a13520719 100644 --- a/www/xxxterm/Makefile +++ b/www/xxxterm/Makefile @@ -7,6 +7,7 @@ PORTNAME= xxxterm PORTVERSION= 1.425 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://opensource.conformal.com/snapshots/xxxterm/ EXTRACT_SUFX= .tgz @@ -16,7 +17,7 @@ COMMENT= Minimalists vi-like web browser based on webkit and GTK+ LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \ soup-2.4:${PORTSDIR}/devel/libsoup \ - webkit-1.0:${PORTSDIR}/www/webkit-gtk2 + webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 USE_GNOME= gtk20 pkgconfig USE_PERL5_BUILD=YES diff --git a/x11-clocks/alarm-clock/Makefile b/x11-clocks/alarm-clock/Makefile index 261d38cdcadf..a95d413d5588 100644 --- a/x11-clocks/alarm-clock/Makefile +++ b/x11-clocks/alarm-clock/Makefile @@ -7,6 +7,7 @@ PORTNAME= alarm-clock PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11-clocks deskutils MASTER_SITES= http://www.alarm-clock.pl/media/distfiles/ @@ -14,7 +15,7 @@ MAINTAINER= romain@FreeBSD.org COMMENT= Alarm Clock for the GNOME desktop LIB_DEPENDS= unique-1:${PORTSDIR}/x11-toolkits/unique \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/x11-clocks/alarm-clock/files/patch-src__alarm_runner.c b/x11-clocks/alarm-clock/files/patch-src__alarm_runner.c new file mode 100644 index 000000000000..a5cd46a75348 --- /dev/null +++ b/x11-clocks/alarm-clock/files/patch-src__alarm_runner.c @@ -0,0 +1,11 @@ +--- src/alarm_runner.c.orig 2011-08-12 17:00:32.000000000 +0200 ++++ src/alarm_runner.c 2011-08-12 17:01:09.000000000 +0200 +@@ -210,7 +210,7 @@ show_popup(gchar *name) + text = g_key_file_get_string(loaded_alarms, name, "PassivePopupText", NULL); + + if (notify != NULL) notify_notification_close(notify, NULL); +- notify = notify_notification_new_with_status_icon(title, text, NULL, status_icon); ++ notify = notify_notification_new(title, text, NULL); + + notify_notification_set_urgency(notify, type); + notify_notification_set_timeout(notify, timeout * 1000); diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index 13bf1d1df069..7114316c99be 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -7,7 +7,7 @@ PORTNAME= Thunar PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME:L}/${PORTVERSION:R} @@ -70,7 +70,7 @@ PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+=--enable-notifications .else CONFIGURE_ARGS+=--disable-notifications diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile index 3460dbb3cdf7..ac28b95bbbab 100644 --- a/x11-toolkits/gnocl/Makefile +++ b/x11-toolkits/gnocl/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnocl DISTVERSION= ${BASE_VERSION}-${NIGHTLY_BUILD} +PORTREVISION= 1 CATEGORIES= x11-toolkits devel MASTER_SITES= SF/${PORTNAME}/Gnocl-Nightly-Build/ @@ -14,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= GTK+ and Gnome extension for Tcl LIB_DEPENDS= canberra.0:${PORTSDIR}/audio/libcanberra \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify USE_GMAKE= yes USE_BZIP2= yes diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 49c473f773ba..b9390dc6d045 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -7,14 +7,15 @@ PORTNAME= compiz-plugins-extra PORTVERSION= 0.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm MASTER_SITES= http://releases.compiz.org/${PORTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Plugins for Compiz Composite Window Manager -LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ + notify.4:${PORTSDIR}/devel/libnotify BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz \ ${LOCALBASE}/libdata/pkgconfig/bcop.pc:${PORTSDIR}/devel/compiz-bcop \ ${LOCALBASE}/libdata/pkgconfig/compiz-text.pc:${PORTSDIR}/x11-wm/compiz-plugins-main diff --git a/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c b/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c new file mode 100644 index 000000000000..a7489f11d058 --- /dev/null +++ b/x11-wm/compiz-plugins-extra/files/patch-src_notification_notification.c @@ -0,0 +1,11 @@ +--- src/notification/notification.c.orig 2011-08-15 19:54:26.000000000 +0200 ++++ src/notification/notification.c 2011-08-15 19:54:44.000000000 +0200 +@@ -103,7 +103,7 @@ notifyLogMessage (const char *componen + + n = notify_notification_new (logLevel, + message, +- iconUri, NULL); ++ iconUri); + + notify_notification_set_timeout (n, nd->timeout); + diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 6d64a2884fb9..7c4bb70df513 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-desktop PORTVERSION= 4.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-wm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R} @@ -21,7 +21,7 @@ DOCSDIR= ${PREFIX}/share/doc/xfdesktop LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \ - notify.1:${PORTSDIR}/devel/libnotify + notify.4:${PORTSDIR}/devel/libnotify GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/x11/florence/Makefile b/x11/florence/Makefile index c45afb5b7e70..dbcdc03cf242 100644 --- a/x11/florence/Makefile +++ b/x11/florence/Makefile @@ -7,13 +7,14 @@ PORTNAME= florence PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/florence/florence/${PORTVERSION} MAINTAINER= kmoore@FreeBSD.org COMMENT= Florence OnScreen Keyboard -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \ cspi.10:${PORTSDIR}/accessibility/at-spi USE_XORG= xtst diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 03727ebbdf25..0b692899a299 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-applets/Makefile,v 1.216 2010/09/27 10:14:28 kwm Exp $ +# $MCom: ports/x11/gnome-applets/Makefile,v 1.219 2011/04/10 19:41:38 mezz Exp $ # PORTNAME= gnome-applets PORTVERSION= 2.32.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -29,7 +29,6 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes -GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes @@ -58,7 +57,7 @@ WITH_GNOME= yes .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \ !defined(WITHOUT_LIBNOTIFY) -LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify .endif .if ${ARCH} != "i386" && ${ARCH} != "amd64" diff --git a/x11/gnome-applets/files/patch-battstat_battstat_applet.c b/x11/gnome-applets/files/patch-battstat_battstat_applet.c index a95b7b569a09..05f2171440bb 100644 --- a/x11/gnome-applets/files/patch-battstat_battstat_applet.c +++ b/x11/gnome-applets/files/patch-battstat_battstat_applet.c @@ -1,6 +1,15 @@ ---- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 -+++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 -@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) +--- battstat/battstat_applet.c.orig 2010-11-22 15:38:27.000000000 +0100 ++++ battstat/battstat_applet.c 2011-03-07 19:09:55.000000000 +0100 +@@ -435,7 +435,7 @@ battery_full_notify (GtkWidget *applet) + GTK_ICON_LOOKUP_USE_BUILTIN, + NULL); + +- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet); ++ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL); + + /* XXX: it would be nice to pass this as a named icon */ + notify_notification_set_icon_from_pixbuf (n, icon); +@@ -462,14 +462,14 @@ battery_full_notify (GtkWidget *applet) static void battery_full_dialog (GtkWidget *applet) { diff --git a/x11/gnome-applets/files/patch-gweather_gweather-applet.c b/x11/gnome-applets/files/patch-gweather_gweather-applet.c new file mode 100644 index 000000000000..9472c7b9e5fd --- /dev/null +++ b/x11/gnome-applets/files/patch-gweather_gweather-applet.c @@ -0,0 +1,12 @@ +--- gweather/gweather-applet.c.orig 2011-03-07 17:35:07.000000000 +0100 ++++ gweather/gweather-applet.c 2011-03-07 17:35:33.000000000 +0100 +@@ -471,8 +471,7 @@ update_finish (WeatherInfo *info, gpoint + if (icon == NULL) + icon = "stock-unknown"; + +- n = notify_notification_new (message, detail, icon, +- gw_applet->container); ++ n = notify_notification_new (message, detail, icon); + + notify_notification_show (n, &error); + if (error) diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 53db051654d3..55cb5c7ea4a1 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.121 2010/09/30 19:51:41 kwm Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.124 2011/04/09 16:54:20 mezz Exp $ # PORTNAME= gnome-screensaver PORTVERSION= 2.30.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,9 +16,11 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME screen saver and locker -LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks +CONFLICTS= gnome-screensaver-3.[0-9]* + USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c b/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c new file mode 100644 index 000000000000..af5d39f8e346 --- /dev/null +++ b/x11/gnome-screensaver/files/patch-src_gs-lock-plug.c @@ -0,0 +1,11 @@ +--- src/gs-lock-plug.c.orig 2011-03-06 21:27:00.000000000 +0100 ++++ src/gs-lock-plug.c 2011-03-06 21:27:36.000000000 +0100 +@@ -1090,7 +1090,7 @@ submit_note (GtkButton *button, + strftime (summary, 128, "%X", tmp); + + notify_init ("gnome-screensaver-dialog"); +- note = notify_notification_new (summary, escaped_text, NULL, NULL); ++ note = notify_notification_new (summary, escaped_text, NULL); + notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER); + notify_notification_show (note, NULL); + g_object_unref (note); diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 98cb2522d845..6a6783ab652c 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -8,6 +8,7 @@ PORTNAME= gnome-session PORTVERSION= 2.32.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -20,7 +21,7 @@ CONFLICTS= gnome-session-2.31.* gnome-session-2.90.* gnome-session-3.* BUILD_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \ - notify.1:${PORTSDIR}/devel/libnotify \ + notify.4:${PORTSDIR}/devel/libnotify \ execinfo:${PORTSDIR}/devel/libexecinfo \ upower-glib.1:${PORTSDIR}/sysutils/upower RUN_DEPENDS= ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index aae55592f2bc..03ccc5ea658d 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -8,6 +8,7 @@ PORTNAME= zenity PORTVERSION= 2.32.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -36,7 +37,7 @@ OPTIONS= NOTIFY "Enable libnotify support" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_NOTIFY) -LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify +LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify CONFIGURE_ARGS+= --enable-libnotify .else CONFIGURE_ARGS+= --disable-libnotify diff --git a/x11/zenity/files/patch-src_notification.c b/x11/zenity/files/patch-src_notification.c new file mode 100644 index 000000000000..2acdb9b30bf2 --- /dev/null +++ b/x11/zenity/files/patch-src_notification.c @@ -0,0 +1,15 @@ +--- src/notification.c.orig 2011-08-11 11:03:46.000000000 +0200 ++++ src/notification.c 2011-08-11 11:05:21.000000000 +0200 +@@ -184,10 +184,10 @@ + icon = freeme = g_filename_to_uri (icon_file, NULL, NULL); + } + +- notif = notify_notification_new_with_status_icon ( ++ notif = notify_notification_new ( + message[0] /* title */, + message[1] /* summary */, +- icon, status_icon); ++ icon); + + g_strfreev (message); + g_free (freeme); |