From abd74359b9ecc2440300c2a773b9e665b66a7441 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 27 Aug 2004 09:18:12 +0000 Subject: Changes 2.2.10: * Fixes a bug in alignment * A lot of submitted patches were applied --- x11/xosd/Makefile.common | 5 ++--- x11/xosd/PLIST | 4 ++-- x11/xosd/distinfo | 12 ++++++------ x11/xosd/patches/patch-aa | 8 ++++---- x11/xosd/patches/patch-ab | 28 ++++++++++++++-------------- x11/xosd/patches/patch-ac | 16 ++++++++-------- 6 files changed, 36 insertions(+), 37 deletions(-) (limited to 'x11') diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common index 03e077e5a04..7a5a1c1e5a8 100644 --- a/x11/xosd/Makefile.common +++ b/x11/xosd/Makefile.common @@ -1,7 +1,6 @@ -# $NetBSD: Makefile.common,v 1.13 2004/07/05 08:00:01 jmmv Exp $ -# +# $NetBSD: Makefile.common,v 1.14 2004/08/27 09:18:12 adam Exp $ -DISTNAME= xosd-2.2.8 +DISTNAME= xosd-2.2.10 CATEGORIES= x11 MASTER_SITES= http://www.ignavus.net/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xosd/PLIST b/x11/xosd/PLIST index a9fcc22d9fe..8c6817f8afc 100644 --- a/x11/xosd/PLIST +++ b/x11/xosd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2004/07/05 08:00:01 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.8 2004/08/27 09:18:12 adam Exp $ bin/osd_cat bin/xosd-config include/xosd.h @@ -6,7 +6,7 @@ lib/libxosd.a lib/libxosd.la lib/libxosd.so lib/libxosd.so.4 -lib/libxosd.so.4.8 +lib/libxosd.so.4.10 man/man1/osd_cat.1 man/man1/xosd-config.1 man/man3/xosd.3 diff --git a/x11/xosd/distinfo b/x11/xosd/distinfo index 504bd0264f2..45193b4e06b 100644 --- a/x11/xosd/distinfo +++ b/x11/xosd/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2004/07/05 08:00:01 jmmv Exp $ +$NetBSD: distinfo,v 1.9 2004/08/27 09:18:12 adam Exp $ -SHA1 (xosd-2.2.8.tar.bz2) = c8261cb6bfc957ba4a91e6b1d118d23e8180882e -Size (xosd-2.2.8.tar.bz2) = 281156 bytes -SHA1 (patch-aa) = 0d3f003e6465d9c6b9af4cdfc1992ab403bdc3cb -SHA1 (patch-ab) = e32cc6675f4758183488d1d00d45d1b93d08d0e1 -SHA1 (patch-ac) = cc28d482cf7b8db2a3c3f74efc70aa22e9bfc043 +SHA1 (xosd-2.2.10.tar.bz2) = 13d1482adaed6391702548bc18ec61a70ca5e985 +Size (xosd-2.2.10.tar.bz2) = 285927 bytes +SHA1 (patch-aa) = 11399ad28cd5602905d6aff60eacb1e3f50f0a36 +SHA1 (patch-ab) = 435084167cafb81f6b87d9e11b57fc021583610f +SHA1 (patch-ac) = 7f18d750094cec5c02a953fed1a2173f5d5a306b diff --git a/x11/xosd/patches/patch-aa b/x11/xosd/patches/patch-aa index 01dbf1c1bdf..80539ecff22 100644 --- a/x11/xosd/patches/patch-aa +++ b/x11/xosd/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2003/04/22 19:06:12 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2004/08/27 09:18:12 adam Exp $ ---- configure.orig Tue Apr 15 00:53:54 2003 +--- configure.orig 2004-08-26 22:16:19.000000000 +0000 +++ configure -@@ -9100,6 +9100,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall" +@@ -20632,6 +20632,7 @@ CFLAGS="$CFLAGS $X_CFLAGS -Wall" M4DATADIR="$datadir/aclocal" @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2003/04/22 19:06:12 jmmv Exp $ # Check whether --with-gtk-prefix or --without-gtk-prefix was given. if test "${with_gtk_prefix+set}" = set; then -@@ -9406,6 +9407,7 @@ echo "$as_me: WARNING: *** GTK+ >= 1.2.2 +@@ -20947,6 +20948,7 @@ echo "$as_me: WARNING: *** GTK+ >= 1.2.2 rm -f conf.gtktest diff --git a/x11/xosd/patches/patch-ab b/x11/xosd/patches/patch-ab index e1c92e419fa..55cb05401df 100644 --- a/x11/xosd/patches/patch-ab +++ b/x11/xosd/patches/patch-ab @@ -1,22 +1,22 @@ -$NetBSD: patch-ab,v 1.2 2003/04/22 19:06:12 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2004/08/27 09:18:12 adam Exp $ ---- src/xmms_plugin/Makefile.in.orig Tue Apr 15 00:53:52 2003 +--- src/xmms_plugin/Makefile.in.orig 2004-08-26 22:16:25.000000000 +0000 +++ src/xmms_plugin/Makefile.in -@@ -166,7 +166,7 @@ xmmsplugindir = @XMMS_PLUGIN_DIR@ - xmmsplugin_LTLIBRARIES = $(am__append_1) $(am__append_2) - - libxmms_osd_la_SOURCES = xmms_osd.c dlg_config.c dlg_font.c dlg_colour.c xmms_osd.h --libxmms_osd_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la -+libxmms_osd_la_LIBADD = -lxosd - libxmms_osd_la_LDFLAGS = -module -avoid-version @GDK_PIXBUF_LIBS@ - - libxmms_osd_old_la_SOURCES = xmms_osd.c dlg_config_old.c dlg_font.c dlg_colour.c xmms_osd.h -@@ -177,7 +177,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m - CONFIG_CLEAN_FILES = +@@ -50,7 +50,7 @@ CONFIG_CLEAN_FILES = + am__installdirs = "$(DESTDIR)$(xmmsplugindir)" + xmmspluginLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(xmmsplugin_LTLIBRARIES) - -libxmms_osd_la_DEPENDENCIES = $(top_builddir)/src/libxosd/libxosd.la +libxmms_osd_la_DEPENDENCIES = am_libxmms_osd_la_OBJECTS = xmms_osd.lo dlg_config.lo dlg_font.lo \ dlg_colour.lo libxmms_osd_la_OBJECTS = $(am_libxmms_osd_la_OBJECTS) +@@ -216,7 +216,7 @@ xmmsplugindir = @XMMS_PLUGIN_DIR@ + @BUILD_OLD_PLUGIN_TRUE@OLD_xmmsplugin = libxmms_osd_old.la + xmmsplugin_LTLIBRARIES = $(NEW_xmmsplugin) $(OLD_xmmsplugin) + libxmms_osd_la_SOURCES = xmms_osd.c dlg_config.c dlg_font.c dlg_colour.c xmms_osd.h +-libxmms_osd_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la ++libxmms_osd_la_LIBADD = -lxosd + libxmms_osd_la_LDFLAGS = -module -avoid-version @GDK_PIXBUF_LIBS@ + libxmms_osd_old_la_SOURCES = xmms_osd.c dlg_config_old.c dlg_font.c dlg_colour.c xmms_osd.h + libxmms_osd_old_la_LIBADD = $(top_builddir)/src/libxosd/libxosd.la diff --git a/x11/xosd/patches/patch-ac b/x11/xosd/patches/patch-ac index 3a1202303ea..1c2b008dc27 100644 --- a/x11/xosd/patches/patch-ac +++ b/x11/xosd/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.1 2003/06/29 11:45:02 jmmv Exp $ +$NetBSD: patch-ac,v 1.2 2004/08/27 09:18:12 adam Exp $ ---- src/Makefile.in.orig 2003-06-27 06:14:43.000000000 +0200 +--- src/Makefile.in.orig 2004-08-26 22:16:24.000000000 +0000 +++ src/Makefile.in -@@ -165,7 +165,8 @@ include_HEADERS = xosd.h - +@@ -217,7 +217,8 @@ osd_cat_LDADD = libxosd/libxosd.la + testprog_LDADD = libxosd/libxosd.la + include_HEADERS = xosd.h AM_CFLAGS = ${GTK_CFLAGS} - -SUBDIRS = libxosd xmms_plugin +@BUILD_NEW_PLUGIN_TRUE@SUBDIRS = libxosd xmms_plugin +@BUILD_NEW_PLUGIN_FALSE@SUBDIRS = libxosd - subdir = src - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + all: all-recursive + + .SUFFIXES: -- cgit v1.2.3