From 25d815da87669cdd2bbf8f0f31a5267d4f535ce2 Mon Sep 17 00:00:00 2001 From: markd Date: Wed, 17 Sep 2003 23:04:32 +0000 Subject: Update to KDE 3.1.4. Changes: * compile fixes with newer gcc 3.3 releases. * compile fixes for upcoming gcc 3.4 release. * noatun: memory leak fix. * kscd: massive memory leak fix. * kaboodle: fix segfault during exit. * noatun: fix rare crash when playlist entries are deleted. --- audio/kdemultimedia3/Makefile | 5 ++--- audio/kdemultimedia3/distinfo | 8 ++++---- audio/kdemultimedia3/patches/patch-ag | 25 ++++--------------------- 3 files changed, 10 insertions(+), 28 deletions(-) diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index 014b221fc8e..5c69c43fa06 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2003/08/24 12:17:35 markd Exp $ +# $NetBSD: Makefile,v 1.27 2003/09/17 23:04:32 markd Exp $ -DISTNAME= kdemultimedia-3.1.3 -PKGREVISION= 1 +DISTNAME= kdemultimedia-3.1.4 CATEGORIES= audio COMMENT= Audio tools for the KDE integrated X11 desktop diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index c3c5f1da457..849012c2866 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.19 2003/07/30 14:56:00 markd Exp $ +$NetBSD: distinfo,v 1.20 2003/09/17 23:04:32 markd Exp $ -SHA1 (kdemultimedia-3.1.3.tar.bz2) = cf7b5e4d08c7ca2071315fba532eac6ebdfe6601 -Size (kdemultimedia-3.1.3.tar.bz2) = 5932079 bytes +SHA1 (kdemultimedia-3.1.4.tar.bz2) = 62263f8d12a460043114ea87da0171497efff511 +Size (kdemultimedia-3.1.4.tar.bz2) = 5932776 bytes SHA1 (patch-aa) = 90e7cc0a6a505a2c69b25eadf5ca9050afd8afd0 SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25 SHA1 (patch-ac) = 3daad6de448c274d7832842aff04c7fb9625263d SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459 SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0 -SHA1 (patch-ag) = 69b25f891e96f470282140a031eb34a7352aeefe +SHA1 (patch-ag) = de3a0ae4e93423a89f2d1ee161b51db2aa265ed3 SHA1 (patch-aj) = 0b6ac2ade3559a34b54d171aace55af64caa376b SHA1 (patch-ak) = 7f43d0915bb65a506e42d8bdc2c59eeb1920f8ad SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa diff --git a/audio/kdemultimedia3/patches/patch-ag b/audio/kdemultimedia3/patches/patch-ag index 9f570e0a772..24be041927f 100644 --- a/audio/kdemultimedia3/patches/patch-ag +++ b/audio/kdemultimedia3/patches/patch-ag @@ -1,30 +1,13 @@ -$NetBSD: patch-ag,v 1.3 2003/05/22 03:05:40 markd Exp $ +$NetBSD: patch-ag,v 1.4 2003/09/17 23:04:33 markd Exp $ ---- kmidi/TIMIDITY/Makefile.in.orig Thu May 8 00:05:28 2003 +--- kmidi/TIMIDITY/Makefile.in.orig 2003-09-10 14:32:05.000000000 +1200 +++ kmidi/TIMIDITY/Makefile.in -@@ -149,7 +149,6 @@ KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET - LAME_INCS = @LAME_INCS@ - LAME_LIBS = @LAME_LIBS@ - LAME_RPATH = @LAME_RPATH@ --LDFLAGS = `$(ARTSCCONFIG) --libs` - LIBALIB = @LIBALIB@ - LIBASOUND = @LIBASOUND@ - LIBAUDIO = @LIBAUDIO@ -@@ -388,7 +387,8 @@ xine_artsplugin_SUBDIR_included_TRUE = @ - +@@ -390,7 +390,7 @@ xine_artsplugin_SUBDIR_included_TRUE = @ INCLUDES = $(X_INCLUDES) `$(ARTSCCONFIG) --cflags` AM_CFLAGS = -DDEFAULT_PATH=\"$(TIMID_DIR)\" $(EXTRATDEFS) $(EXTRATCFLAGS) + AM_LDFLAGS = `$(ARTSCCONFIG) --libs` -LDADD = $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm -+timidity_LDFLAGS = `$(ARTSCCONFIG) --libs` +LDADD = $(LIBOSSAUDIO) $(LIBALIB) $(LIBAUDIO) $(LIBMME) $(EXTRATLIBS) $(X_LIBS) -lkdefakes -lm # Where to install the patches, config files, and MIDI files. # If you change this, it's a good idea to recompile the binary, -@@ -470,7 +470,6 @@ timidity_nofinal_OBJECTS = timidity.$(OB - @KDE_USE_FINAL_TRUE@timidity_OBJECTS = $(timidity_final_OBJECTS) - timidity_LDADD = $(LDADD) - timidity_DEPENDENCIES = --timidity_LDFLAGS = - - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/admin/depcomp -- cgit v1.2.3