Date: Sat, 28 Oct 2006 09:47:11 +0200 (CEST) From: Jean-Yves Lefort <jylefort@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/104876: Update libnotify and notification-daemon Message-ID: <20061028074711.4B5FD2C@jsite.lefort.net> Resent-Message-ID: <200610280750.k9S7oJVn009575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104876 >Category: ports >Synopsis: Update libnotify and notification-daemon >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Oct 28 07:50:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jean-Yves Lefort >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD jsite.lefort.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Oct 24 19:03:08 CEST 2006 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386 >Description: Note that I'd like to take the maintainership because libnotify is used by core GNOME modules. >How-To-Repeat: >Fix: diff -ruN /usr/ports/devel/libnotify/Makefile libnotify/Makefile --- /usr/ports/devel/libnotify/Makefile Sat Oct 14 10:52:50 2006 +++ libnotify/Makefile Sat Oct 28 09:30:00 2006 @@ -6,21 +6,20 @@ # PORTNAME= libnotify -PORTVERSION= 0.4.2 -PORTREVISION= 2 +PORTVERSION= 0.4.3 CATEGORIES= devel gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/libnotify/ -MAINTAINER= andreas@syndrom23.de +MAINTAINER= gnome@FreeBSD.org COMMENT= A library for desktop notifications LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ popt.0:${PORTSDIR}/devel/popt -USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 +USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack USE_GMAKE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --without-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff -ruN /usr/ports/devel/libnotify/distinfo libnotify/distinfo --- /usr/ports/devel/libnotify/distinfo Thu Jun 29 06:45:57 2006 +++ libnotify/distinfo Sat Oct 28 09:25:39 2006 @@ -1,3 +1,3 @@ -MD5 (libnotify-0.4.2.tar.gz) = 25585318503079a513af7064bb59c04d -SHA256 (libnotify-0.4.2.tar.gz) = 9e95499badd1b0da67b1422caa4198dbe61c961300b7001173eace18b8b2c38e -SIZE (libnotify-0.4.2.tar.gz) = 388355 +MD5 (libnotify-0.4.3.tar.gz) = 5c81a26b461b2abd4c02a918b8486539 +SHA256 (libnotify-0.4.3.tar.gz) = 15b0492ac252f6e8ce57c106bda0722413196d16d198c97f20a05908d1b977af +SIZE (libnotify-0.4.3.tar.gz) = 389402 diff -ruN /usr/ports/devel/libnotify/files/patch-libnotify-notification.c libnotify/files/patch-libnotify-notification.c --- /usr/ports/devel/libnotify/files/patch-libnotify-notification.c Mon Jul 17 14:23:54 2006 +++ libnotify/files/patch-libnotify-notification.c Thu Jan 1 01:00:00 1970 @@ -1,21 +0,0 @@ -diff -Naur libnotify-0.4.2.orig/libnotify/notification.c libnotify-0.4.2/libnotify/notification.c ---- libnotify/notification.c 2006-06-15 11:14:03.000000000 +0200 -+++ libnotify/notification.c 2006-06-18 05:09:08.000000000 +0200 -@@ -901,7 +901,7 @@ - return FALSE; - } - -- g_value_init(value, dbus_g_type_get_collection("GArray", G_TYPE_CHAR)); -+ g_value_init(value, DBUS_TYPE_G_UCHAR_ARRAY); - g_value_set_boxed_take_ownership(value, byte_array); - g_value_array_append(array, value); - -@@ -961,7 +961,7 @@ - - value = g_new0(GValue, 1); - g_value_init(value, G_TYPE_VALUE_ARRAY); -- g_value_set_boxed(value, image_struct); -+ g_value_set_boxed_take_ownership(value, image_struct); - - g_hash_table_insert(notification->priv->hints, - g_strdup("icon_data"), value); diff -ruN /usr/ports/devel/libnotify/pkg-plist libnotify/pkg-plist --- /usr/ports/devel/libnotify/pkg-plist Fri Aug 25 22:57:26 2006 +++ libnotify/pkg-plist Sat Oct 28 09:29:34 2006 @@ -5,7 +5,7 @@ lib/libnotify.a lib/libnotify.la lib/libnotify.so -lib/libnotify.so.2 +lib/libnotify.so.1 libdata/pkgconfig/libnotify.pc share/gtk-doc/html/libnotify/NotifyNotification.html share/gtk-doc/html/libnotify/ch01.html diff -ruN /usr/ports/deskutils/notification-daemon/Makefile notification-daemon/Makefile --- /usr/ports/deskutils/notification-daemon/Makefile Sat Oct 14 10:52:44 2006 +++ notification-daemon/Makefile Sat Oct 28 09:19:01 2006 @@ -6,12 +6,11 @@ # PORTNAME= notification-daemon -PORTVERSION= 0.3.5 -PORTREVISION= 3 +PORTVERSION= 0.3.6 CATEGORIES= deskutils gnome MASTER_SITES= http://www.galago-project.org/files/releases/source/notification-daemon/ -MAINTAINER= andreas@syndrom23.de +MAINTAINER= gnome@FreeBSD.org COMMENT= Send small notifications to your desktop LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ diff -ruN /usr/ports/deskutils/notification-daemon/distinfo notification-daemon/distinfo --- /usr/ports/deskutils/notification-daemon/distinfo Mon Jun 12 16:38:32 2006 +++ notification-daemon/distinfo Sat Oct 28 09:19:22 2006 @@ -1,3 +1,3 @@ -MD5 (notification-daemon-0.3.5.tar.gz) = 7977c4c15139f9d53ddbfa8af707270f -SHA256 (notification-daemon-0.3.5.tar.gz) = 83a15eb99bb7a895d52e31be1c1548789a8bc29e83d30e758cf034a6627a1184 -SIZE (notification-daemon-0.3.5.tar.gz) = 383582 +MD5 (notification-daemon-0.3.6.tar.gz) = a5a9aa63205e624da8468e35722b08bf +SHA256 (notification-daemon-0.3.6.tar.gz) = a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13 +SIZE (notification-daemon-0.3.6.tar.gz) = 402426 diff -ruN /usr/ports/deskutils/notification-daemon/files/patch-src-daemon.c notification-daemon/files/patch-src-daemon.c --- /usr/ports/deskutils/notification-daemon/files/patch-src-daemon.c Mon Jul 17 14:08:13 2006 +++ notification-daemon/files/patch-src-daemon.c Thu Jan 1 01:00:00 1970 @@ -1,62 +0,0 @@ -diff -Naur notification-daemon-0.3.5.orig/src/daemon.c notification-daemon-0.3.5/src/daemon.c ---- src/daemon.c 2006-04-26 10:32:50.000000000 +0200 -+++ src/daemon.c 2006-06-18 05:07:47.000000000 +0200 -@@ -399,14 +399,54 @@ - GValueArray *image_struct; - GValue *value; - GArray *tmp_array; -+ GType type = G_VALUE_TYPE (icon_data); -+ -+ static const GType types[] = { -+ G_TYPE_INT, -+ G_TYPE_INT, -+ G_TYPE_INT, -+ G_TYPE_BOOLEAN, -+ G_TYPE_INT, -+ G_TYPE_INT -+ }; -+ -+ -+ if (dbus_g_type_is_struct (type)) -+ { -+ int n; -+ -+ if (dbus_g_type_get_struct_size (type) < 7) -+ { -+ g_warning("_notify_daemon_process_icon_data expected 7 data members, got only %d", dbus_g_type_get_struct_size (type)); -+ return FALSE; -+ } -+ -+ for (n = 0; n < G_N_ELEMENTS (types); ++n) -+ { -+ GType check = dbus_g_type_get_struct_member_type (type, n); -+ if (check != types[n]) -+ { -+ g_warning("_notify_daemon_process_icon_data expected '%s' at position %d, but got '%s'", -+ g_type_name (types[n]), n, g_type_name (check)); -+ return FALSE; -+ } - -- if (!G_VALUE_HOLDS(icon_data, G_TYPE_VALUE_ARRAY)) -+ /* We must check this separately as it's not a constant and can't be part of the types[] array */ -+ if (dbus_g_type_get_struct_member_type (type, 6) != DBUS_TYPE_G_UCHAR_ARRAY) -+ { -+ g_warning("_notify_daemon_process_icon_data expected '%s' at position %d, but got '%s'", -+ g_type_name (DBUS_TYPE_G_UCHAR_ARRAY), 6, g_type_name (dbus_g_type_get_struct_member_type (type,6))); -+ return FALSE; -+ } -+ } -+ } -+ else - { -- g_warning("_notify_daemon_process_icon_data expected a " -- "GValue of type GValueArray"); -- return FALSE; -+ g_warning("_notify_daemon_process_icon_data got wrong data"); -+ return FALSE; - } - -+ - image_struct = (GValueArray *)g_value_get_boxed(icon_data); - value = g_value_array_get_nth(image_struct, 0); - diff -ruN /usr/ports/deskutils/notification-daemon/pkg-plist notification-daemon/pkg-plist --- /usr/ports/deskutils/notification-daemon/pkg-plist Mon Jun 12 16:38:32 2006 +++ notification-daemon/pkg-plist Sat Oct 28 09:44:46 2006 @@ -3,5 +3,6 @@ lib/notification-daemon-1.0/engines/libstandard.so libexec/notification-daemon share/dbus-1/services/org.freedesktop.Notifications.service +share/locale/nl/LC_MESSAGES/notification-daemon.mo @dirrm lib/notification-daemon-1.0/engines @dirrm lib/notification-daemon-1.0 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061028074711.4B5FD2C>