pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/gnome2-applets Update to 2.4.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/2f3839ca8c06
branches: trunk
changeset: 466378:2f3839ca8c06
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Sat Jan 17 01:12:43 2004 +0000
description:
Update to 2.4.2
Changes:
Overall
+ Help updates
AccessX applet
+ Fix memory management and pixbuf handling
Battstat
+ Leak fixes
+ Distribute the soundlist file
+ Major improvements in cpu usage with ACPI
+ Fix event handling after above patch
Cdplayer
+ Clean up and fix leaks
+ Dist file for NetBSD
Charpick
+ Remove unneeded include that broke build on
some platforms
Gweather
+ Fix a whole bunch of locations and add some new ones
+ Fix warning on help invocation
Mailcheck
+ Remove duplicate definitions causing build time
warnings
Mini-commander
+ Remove compiler warning
Mixer
+ Leak fixes
Modemlights
+ Leak fixes
Multiload
+ Fix memory reporting
diffstat:
x11/gnome2-applets/Makefile | 8 +-
x11/gnome2-applets/PLIST | 4 +-
x11/gnome2-applets/distinfo | 14 +-
x11/gnome2-applets/patches/patch-aa | 22 +-
x11/gnome2-applets/patches/patch-ab | 25 +-
x11/gnome2-applets/patches/patch-ac | 352 ------------------------------------
x11/gnome2-applets/patches/patch-ad | 13 -
x11/gnome2-applets/patches/patch-ae | 13 -
x11/gnome2-applets/patches/patch-af | 13 -
9 files changed, 34 insertions(+), 430 deletions(-)
diffs (truncated from 536 to 300 lines):
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/Makefile
--- a/x11/gnome2-applets/Makefile Sat Jan 17 01:08:31 2004 +0000
+++ b/x11/gnome2-applets/Makefile Sat Jan 17 01:12:43 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/01/04 17:30:55 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/17 01:12:43 xtraeme Exp $
#
-DISTNAME= gnome-applets-2.4.1
-PKGREVISION= 2
+DISTNAME= gnome-applets-2.4.2
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/2.4/}
EXTRACT_SUFX= .tar.bz2
@@ -52,7 +51,7 @@
CONFIGURE_ARGS+= --enable-ipv6
.endif
-.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD"
+.if ${OPSYS} == "Linux"
GCONF2_SCHEMAS+= battstat.schemas
PLIST_SUBST+= BATTSTAT=""
CONF_FILES+= ${EGDIR}/sound/events/batt_stat_applet.soundlist \
@@ -74,4 +73,5 @@
.include "../../x11/gnome-panel/buildlink2.mk"
.include "../../x11/gtk2/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/PLIST
--- a/x11/gnome2-applets/PLIST Sat Jan 17 01:08:31 2004 +0000
+++ b/x11/gnome2-applets/PLIST Sat Jan 17 01:12:43 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
bin/gkb_xmmap
bin/gnome-keyboard-layout
lib/bonobo/servers/GNOME_AccessxStatusApplet.server
@@ -813,12 +813,12 @@
share/omf/gnome-applets/gweather-de.omf
share/omf/gnome-applets/gweather-es.omf
share/omf/gnome-applets/gweather-fr.omf
+share/omf/gnome-applets/gweather-it.omf
share/omf/gnome-applets/gweather-ja.omf
share/omf/gnome-applets/gweather-ko.omf
share/omf/gnome-applets/gweather-sv.omf
share/omf/gnome-applets/gweather-zh_CN.omf
share/omf/gnome-applets/gweather-zh_TW.omf
-share/omf/gnome-applets/gweather_applet-it.omf
share/omf/gnome-applets/mailcheck-C.omf
share/omf/gnome-applets/mailcheck-de.omf
share/omf/gnome-applets/mailcheck-es.omf
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/distinfo
--- a/x11/gnome2-applets/distinfo Sat Jan 17 01:08:31 2004 +0000
+++ b/x11/gnome2-applets/distinfo Sat Jan 17 01:12:43 2004 +0000
@@ -1,10 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
-SHA1 (gnome-applets-2.4.1.tar.bz2) = 2427cff71e223f8b0a82e9831d623677c33633f3
-Size (gnome-applets-2.4.1.tar.bz2) = 4022786 bytes
-SHA1 (patch-aa) = 129c94a7b7614414be5f471789ab294829f2385c
-SHA1 (patch-ab) = 32dc492dd3502fed95b26ee2f9a572d462a84e29
-SHA1 (patch-ac) = b5a1b8da7bd30fae2d47ddf8e391087fea59d7b6
-SHA1 (patch-ad) = 24ab88d442f3f974d67b8d48bce0e9934743be05
-SHA1 (patch-ae) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
-SHA1 (patch-af) = 9532d2e30a375efc22194e92347b67aa876fee8e
+SHA1 (gnome-applets-2.4.2.tar.bz2) = bf752ae4caca9851bd4c1d64b244e3da24092b21
+Size (gnome-applets-2.4.2.tar.bz2) = 4057266 bytes
+SHA1 (patch-aa) = 675bb1b89eb8fd3abec24020959ffbfa36ea5872
+SHA1 (patch-ab) = 9532d2e30a375efc22194e92347b67aa876fee8e
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/patches/patch-aa
--- a/x11/gnome2-applets/patches/patch-aa Sat Jan 17 01:08:31 2004 +0000
+++ b/x11/gnome2-applets/patches/patch-aa Sat Jan 17 01:12:43 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: patch-aa,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
---- charpick/charpick.c.orig 2003-10-26 20:07:40.000000000 +0000
-+++ charpick/charpick.c 2003-10-26 20:08:17.000000000 +0000
-@@ -3,7 +3,7 @@
- */
+--- battstat/sounds/Makefile.in.orig 2003-12-13 15:42:24.000000000 -0600
++++ battstat/sounds/Makefile.in
+@@ -148,7 +148,7 @@ WARN_CXXFLAGS = @WARN_CXXFLAGS@
+ X_LIBS = @X_LIBS@
+ gnomelocaledir = @gnomelocaledir@
- #include <config.h>
--#ifndef sun
-+#ifdef __Linux__
- #include <tgmath.h>
- #endif
- #include <panel-applet.h>
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = battstat_applet.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/patches/patch-ab
--- a/x11/gnome2-applets/patches/patch-ab Sat Jan 17 01:08:31 2004 +0000
+++ b/x11/gnome2-applets/patches/patch-ab Sat Jan 17 01:12:43 2004 +0000
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/12/29 12:05:20 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/17 01:12:43 xtraeme Exp $
---- configure.orig 2003-10-26 20:27:25.000000000 +0000
-+++ configure 2003-10-26 20:29:06.000000000 +0000
-@@ -22265,7 +22265,8 @@
- case "$host" in
- *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
- *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
--*netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
-+*freebsd*) CDROM_HOST=bsd;cd_device_path="/dev/acd0";;
-+*netbsd*|*openbsd*) CDROM_HOST=bsd;cd_device_path="/dev/rcd0d";;
- *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
- esac
- case "$host" in
+--- mailcheck/Makefile.in.orig 2003-12-13 15:40:45.000000000 -0600
++++ mailcheck/Makefile.in
+@@ -198,7 +198,7 @@ MAILCHECK_BITMAPS = \
+ mailcheckbitmapsdir = $(datadir)/pixmaps/mailcheck
+ mailcheckbitmaps_DATA = $(MAILCHECK_BITMAPS)
+
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/gnome-applets/sound/events
+ soundlist_in_files = mailcheck.soundlist.in
+ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
+
diff -r 94e3440df685 -r 2f3839ca8c06 x11/gnome2-applets/patches/patch-ac
--- a/x11/gnome2-applets/patches/patch-ac Sat Jan 17 01:08:31 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,352 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/12/29 12:05:20 xtraeme Exp $
-
---- /dev/null 2003-10-26 20:58:41.000000000 +0000
-+++ cdplayer/cdrom-bsd.c 2003-10-26 20:58:37.000000000 +0000
-@@ -0,0 +1,347 @@
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <glib.h>
-+#include <sys/ioctl.h>
-+#include <unistd.h>
-+
-+#include <sys/types.h>
-+#include <sys/cdio.h>
-+#include "cdrom-interface.h"
-+
-+#define ASSIGN_MSF(dest, src) \
-+{ \
-+ (dest).minute = (src).minute; \
-+ (dest).second = (src).second; \
-+ (dest).frame = (src).frame; \
-+}
-+
-+int
-+cdrom_play(cdrom_device_t cdp, int start, int stop)
-+{
-+ struct ioc_play_track ti;
-+
-+ ti.start_track = start;
-+ ti.start_index = 1;
-+ ti.end_track = stop;
-+ ti.end_index = 1;
-+
-+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+ (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) {
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
-+{
-+ struct ioc_play_msf msf;
-+
-+ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+ return DISC_IO_ERROR;
-+ msf.start_m = start->minute;
-+ msf.start_s = start->second;
-+ msf.start_f = start->frame;
-+
-+ msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
-+ msf.end_s = cdp->track_info[cdp->nr_track].address.second;
-+ msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
-+
-+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+ (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) {
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_pause(cdrom_device_t cdp)
-+{
-+ if (ioctl(cdp->device, CDIOCPAUSE) == -1) {
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ return DISC_IO_ERROR;
-+}
-+
-+int
-+cdrom_resume(cdrom_device_t cdp)
-+{
-+ if (ioctl(cdp->device, CDIOCRESUME) == -1) {
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ return DISC_NO_ERROR;
-+}
-+
-+
-+int
-+cdrom_stop(cdrom_device_t cdp)
-+{
-+ if ((ioctl(cdp->device, CDIOCSTOP) == -1) ||
-+ (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+ cdp->my_errno = errno;
-+ return DISC_IO_ERROR;
-+ }
-+ return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_read_track_info(cdrom_device_t cdp)
-+{
-+ struct ioc_toc_header toc;
-+#ifdef __FreeBSD__
-+ struct ioc_read_toc_single_entry tocentry;
-+#else
-+ struct ioc_read_toc_entry tocentry;
-+#endif
-+ int i, j, nr_track;
-+
-+ if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) {
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ cdp->track0 = toc.starting_track;
-+ cdp->track1 = toc.ending_track;
-+ nr_track = cdp->track1 - cdp->track0;
-+ if (nr_track <= 0)
-+ return DISC_IO_ERROR;
-+
-+ if (nr_track != cdp->nr_track) {
-+ if (cdp->track_info)
-+ g_free(cdp->track_info);
-+ cdp->nr_track = nr_track;
-+ cdp->track_info = g_malloc((cdp->nr_track) * sizeof(track_info_t));
-+ }
-+ for (i = 0, j = cdp->track0; i < cdp->nr_track; i, j) {
-+ tocentry.starting_track = j;
-+ tocentry.address_format = CD_MSF_FORMAT;
-+
-+#ifdef __FreeBSD__
-+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+#else
-+ if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+#endif
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ /* fill the trackinfo field */
-+ cdp->track_info[i].track = j;
-+ cdp->track_info[i].audio_track = tocentry.data->control !=
-+ 0x04 ? 1 : 0;
-+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
-+ }
-+
-+ tocentry.starting_track = 0xAA;
-+ tocentry.address_format = CD_MSF_FORMAT;
-+#ifdef __FreeBSD__
-+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+#else
-+ if (ioctl(cdp->device, CDIOREADTOCENTRYS, &tocentry) == -1) {
-+#endif
-+ cdp->my_errno = errno;
-+ ioctl(cdp->device, CDIOCALLOW);
-+ return DISC_IO_ERROR;
-+ }
-+ cdp->track_info[i].track = j;
-+ cdp->track_info[i].audio_track = 0;
-+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.data->addr.msf);
-+
-+ return DISC_NO_ERROR;
-+}
-+
-+int
Home |
Main Index |
Thread Index |
Old Index