Index: head/deskutils/xfce4-notification-daemon/Makefile =================================================================== --- head/deskutils/xfce4-notification-daemon/Makefile (revision 419840) +++ head/deskutils/xfce4-notification-daemon/Makefile (revision 419841) @@ -1,71 +1,76 @@ # Created by: Emanuel Haupt # $FreeBSD$ PORTNAME= notification-daemon PORTVERSION= 0.3.7 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= deskutils xfce MASTER_SITES= LOCAL/ehaupt/ PKGNAMEPREFIX= xfce4- DISTNAME= ${PORTNAME}-xfce-${PORTVERSION} DIST_SUBDIR= xfce4 MAINTAINER= ehaupt@FreeBSD.org COMMENT= Port of Gnome's notification-daemon for the Xfce desktop LICENSE= GPLv2 BUILD_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser LIB_DEPENDS= libsexy.so:x11-toolkits/libsexy \ - libdbus-glib-1.so:devel/dbus-glib + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 RUN_DEPENDS= dbus-daemon:devel/dbus GNU_CONFIGURE= yes INSTALLS_ICONS= yes USES= gmake libtool pkgconfig gettext-tools xfce tar:bzip2 -USE_GNOME= librsvg2 +USE_GNOME= librsvg2 gtk20 cairo USE_LDCONFIG= yes USE_XFCE= libgui +USE_XORG= x11 + +INSTALL_TARGET= install-strip CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/xfce4 \ --libexecdir=${PREFIX}/libexec/xfce4 \ --with-dbus-services=${PREFIX}/share/dbus-1/services CONFLICTS= notify-osd-[0-9]* OPTIONS_DEFINE= GRADIENT CLOSE NLS GRADIENT_DESC= Show a gradient look in the default theme CLOSE_DESC= Show the close button in the default theme OPTIONS_DEFAULT=CLOSE .include .if ${PORT_OPTIONS:MNLS} USES+= gettext-runtime PLIST_SUB+= NLS="" .else PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MGRADIENT} CONFIGURE_ARGS+= --enable-gradient-look .endif .if ${PORT_OPTIONS:MCLOSE} CONFIGURE_ARGS+= --disable-close-button .endif post-patch: @${REINPLACE_CMD} -e 's|\(notification-daemon-xfce\)-1.0|\1|' \ ${WRKSRC}/src/daemon/Makefile.in \ ${WRKSRC}/src/themes/bubble/Makefile.in \ ${WRKSRC}/src/themes/standard/Makefile.in @${REINPLACE_CMD} '/GTK_LIBS =/s/$$/ -lgmodule-2.0 -lX11/' \ ${WRKSRC}/src/daemon/Makefile.in .if empty(PORT_OPTIONS:MNLS) @${REINPLACE_CMD} -e 's|\(USE_NLS=\)yes|\1no|' ${WRKSRC}/configure .endif .include Index: head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__daemon.c =================================================================== --- head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__daemon.c (revision 419840) +++ head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__daemon.c (revision 419841) @@ -1,13 +1,13 @@ ---- ./src/daemon/daemon.c.orig 2010-05-05 10:54:14.000000000 +0200 -+++ ./src/daemon/daemon.c 2010-05-05 10:54:50.000000000 +0200 -@@ -1091,10 +1091,6 @@ +--- src/daemon/daemon.c.orig 2007-05-26 09:52:28 UTC ++++ src/daemon/daemon.c +@@ -1091,10 +1091,6 @@ main(int argc, char **argv) g_set_application_name ("notification-daemon-xfce"); -#ifdef G_ENABLE_DEBUG - g_log_set_always_fatal(G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL); -#endif - gtk_init(&argc, &argv); error = NULL; Index: head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__stack.c =================================================================== --- head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__stack.c (revision 419840) +++ head/deskutils/xfce4-notification-daemon/files/patch-src__daemon__stack.c (revision 419841) @@ -1,62 +1,62 @@ ---- ./src/daemon/stack.c.orig 2007-05-26 11:52:28.000000000 +0200 -+++ ./src/daemon/stack.c 2010-05-05 10:54:02.000000000 +0200 -@@ -40,51 +40,18 @@ +--- src/daemon/stack.c.orig 2007-05-26 09:52:28 UTC ++++ src/daemon/stack.c +@@ -40,51 +40,18 @@ struct _NotifyStack static gboolean get_work_area(GtkWidget *nw, GdkRectangle *rect) { - Atom workarea = XInternAtom(GDK_DISPLAY(), "_NET_WORKAREA", True); - Atom type; - Window win; - int format; - gulong num, leftovers; - gulong max_len = 4 * 32; - guchar *ret_workarea; - long *workareas; - int result; GdkScreen *screen; - int disp_screen; + /* It would be best to allow the user to configure this, but the first + * monitor is a good default for now (the first monitor is likely the + * primary monitor). */ + + guint monitor = 0; + gtk_widget_realize(nw); screen = gdk_drawable_get_screen(GDK_DRAWABLE(nw->window)); - disp_screen = GDK_SCREEN_XNUMBER(screen); - - /* Defaults in case of error */ - rect->x = 0; - rect->y = 0; - rect->width = gdk_screen_get_width(screen); - rect->height = gdk_screen_get_height(screen); - - if (workarea == None) - return FALSE; - - win = XRootWindow(GDK_DISPLAY(), disp_screen); - result = XGetWindowProperty(GDK_DISPLAY(), win, workarea, 0, - max_len, False, AnyPropertyType, - &type, &format, &num, &leftovers, - &ret_workarea); - - if (result != Success || type == None || format == 0 || leftovers || - num % 4) - { - return FALSE; - } - - workareas = (long *)ret_workarea; - rect->x = workareas[disp_screen * 4]; - rect->y = workareas[disp_screen * 4 + 1]; - rect->width = workareas[disp_screen * 4 + 2]; - rect->height = workareas[disp_screen * 4 + 3]; - - XFree(ret_workarea); - + + gdk_screen_get_monitor_geometry(screen, monitor, rect); return TRUE; } Index: head/deskutils/xfce4-notification-daemon/files/patch-src__settings__main.c =================================================================== --- head/deskutils/xfce4-notification-daemon/files/patch-src__settings__main.c (revision 419840) +++ head/deskutils/xfce4-notification-daemon/files/patch-src__settings__main.c (revision 419841) @@ -1,12 +1,12 @@ ---- ./src/settings/main.c.orig 2012-05-29 15:07:41.000000000 +0200 -+++ ./src/settings/main.c 2012-05-29 15:08:08.000000000 +0200 -@@ -187,8 +187,7 @@ +--- src/settings/main.c.orig 2007-05-26 09:52:28 UTC ++++ src/settings/main.c +@@ -187,8 +187,7 @@ notification_settings_preview (GtkWidget /* create new preview notification */ preview = notify_notification_new (_("Preview notification"), _("Lorem Ipsum is simply dummy text of the printing and typesetting industry."), - "notification-settings", - NULL); + "notification-settings"); notify_notification_set_urgency (preview, NOTIFY_URGENCY_NORMAL); notify_notification_set_category(preview, "preview");