[pkgsrc/trunk]: pkgsrc/audio/kdemultimedia3 Update to KDE-3.1.5.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/kdemultimedia3 Update to KDE-3.1.5.
From: markd <markd%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:22:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/640bc3cc714c
branches:  trunk
changeset: 466307:640bc3cc714c
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 15 10:30:03 2004 +0000

description:
Update to KDE-3.1.5.

Also move patch-bh to patch-da so it applies after patch-co so
autoconf doesn't kick in to redo it.

diffstat:

 audio/kdemultimedia3/Makefile         |    6 +-
 audio/kdemultimedia3/distinfo         |   40 ++--
 audio/kdemultimedia3/patches/patch-ac |  154 +++++++++-----------
 audio/kdemultimedia3/patches/patch-ak |  179 +++++++++++------------
 audio/kdemultimedia3/patches/patch-az |   38 ++--
 audio/kdemultimedia3/patches/patch-bb |  120 ++++++++-------
 audio/kdemultimedia3/patches/patch-bh |   31 ----
 audio/kdemultimedia3/patches/patch-bl |   44 ++---
 audio/kdemultimedia3/patches/patch-bn |   54 +++---
 audio/kdemultimedia3/patches/patch-bp |   22 +-
 audio/kdemultimedia3/patches/patch-br |   71 ++++----
 audio/kdemultimedia3/patches/patch-bv |   30 +--
 audio/kdemultimedia3/patches/patch-bz |   22 +-
 audio/kdemultimedia3/patches/patch-cd |   52 ++----
 audio/kdemultimedia3/patches/patch-cf |   57 +++----
 audio/kdemultimedia3/patches/patch-ch |   59 +++++++-
 audio/kdemultimedia3/patches/patch-cj |  252 +++++++++++++++++-----------------
 audio/kdemultimedia3/patches/patch-cn |   14 +-
 audio/kdemultimedia3/patches/patch-cq |   33 +--
 audio/kdemultimedia3/patches/patch-da |   31 ++++
 20 files changed, 647 insertions(+), 662 deletions(-)

diffs (truncated from 2543 to 300 lines):

diff -r cedfc6d486e3 -r 640bc3cc714c audio/kdemultimedia3/Makefile
--- a/audio/kdemultimedia3/Makefile     Thu Jan 15 10:15:14 2004 +0000
+++ b/audio/kdemultimedia3/Makefile     Thu Jan 15 10:30:03 2004 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2004/01/03 18:49:34 reed Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/15 10:30:03 markd Exp $
 
-DISTNAME=      kdemultimedia-3.1.4
-PKGREVISION=   1
+DISTNAME=      kdemultimedia-3.1.5
 CATEGORIES=    audio
 COMMENT=       Audio tools for the KDE integrated X11 desktop
-PKGREVISION=   1
 
 CONFLICTS=     timidity-[0-9]*
 
diff -r cedfc6d486e3 -r 640bc3cc714c audio/kdemultimedia3/distinfo
--- a/audio/kdemultimedia3/distinfo     Thu Jan 15 10:15:14 2004 +0000
+++ b/audio/kdemultimedia3/distinfo     Thu Jan 15 10:30:03 2004 +0000
@@ -1,61 +1,60 @@
-$NetBSD: distinfo,v 1.21 2003/11/08 16:05:49 jdolecek Exp $
+$NetBSD: distinfo,v 1.22 2004/01/15 10:30:03 markd Exp $
 
-SHA1 (kdemultimedia-3.1.4.tar.bz2) = 62263f8d12a460043114ea87da0171497efff511
-Size (kdemultimedia-3.1.4.tar.bz2) = 5932776 bytes
+SHA1 (kdemultimedia-3.1.5.tar.bz2) = 82e0e811e8fcfbffd29c4d8784d0ba91ac5edba3
+Size (kdemultimedia-3.1.5.tar.bz2) = 5925820 bytes
 SHA1 (patch-aa) = 90e7cc0a6a505a2c69b25eadf5ca9050afd8afd0
 SHA1 (patch-ab) = 4f022376559ea30fee9f88aebb65d7f2b89c6c25
-SHA1 (patch-ac) = 3daad6de448c274d7832842aff04c7fb9625263d
+SHA1 (patch-ac) = 531f71710ee4e441172eb4f3f2c51839cae55de4
 SHA1 (patch-ae) = 17fdcfa2d0861bf53404d7ce315a2a315a68a459
 SHA1 (patch-af) = 95bf9890b803b49e102d4248c0fbd52427a8c6c0
 SHA1 (patch-ag) = de3a0ae4e93423a89f2d1ee161b51db2aa265ed3
 SHA1 (patch-aj) = 0b6ac2ade3559a34b54d171aace55af64caa376b
-SHA1 (patch-ak) = 7f43d0915bb65a506e42d8bdc2c59eeb1920f8ad
+SHA1 (patch-ak) = 0d96ae3218b2c58ebcbec9d725cc016634863140
 SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
 SHA1 (patch-ao) = a31e51c87c76664188515fd1640608cef3a33927
 SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472
 SHA1 (patch-ay) = 2ce3604aef6a9d79b58fda7e969f79d3e48b6ce8
-SHA1 (patch-az) = 5b6bbc2382ee7381f756065576602697453a8303
+SHA1 (patch-az) = e5432b7f2320b4ff33e48f528936d9cd98ee88a5
 SHA1 (patch-ba) = 5a096a6639867541b8ad11baa798b1ba8c856e10
-SHA1 (patch-bb) = 0ad79b0a9f79fc2a822dab4f670dbe89b0cb1d6d
+SHA1 (patch-bb) = 536ed336465e510b901e4eb549f24ff74abb6c42
 SHA1 (patch-bc) = 82424e524f316f55524c5367ce42fe4194f935c6
 SHA1 (patch-bd) = 7cd66c4d019bb2c944ae94fd9b600d9131797047
 SHA1 (patch-be) = 5cee048125a71eb5a1358966c0a61c4553eff24c
 SHA1 (patch-bf) = 1f8b40c914d27c34b0fff876682b9402c6815d42
 SHA1 (patch-bg) = 2b421f103773c6f2bb3ce6c51134a78c5ac20412
-SHA1 (patch-bh) = 7098211c3bde4e695cbc2d71454312ca2cf6f4b4
 SHA1 (patch-bi) = 92fd0e6d2883d715b49e32c28dcdcfa23272b78e
 SHA1 (patch-bj) = 160aebbe402d7ecfc91a22717a3a3813be0c29e9
 SHA1 (patch-bk) = e594440c63e8038b660dcd75e89f61c6cf62a766
-SHA1 (patch-bl) = 408edc055cd0bc4b1aea6ae37f6c367c4cfe2652
+SHA1 (patch-bl) = 28b79be3001edc665310ecf111c2aca715ebe37c
 SHA1 (patch-bm) = a50a8d722ebc48fce19d7052749795efbe543303
-SHA1 (patch-bn) = 606b92c31d475b81db00f8b009ae568c900653b0
+SHA1 (patch-bn) = c40dbacaeb81c4f78bb1453b1da7042ee1c44188
 SHA1 (patch-bo) = b67167bfe6e9810208f1f74d3e3fea2ddfb32f88
-SHA1 (patch-bp) = b59ce7619ea0bdfdd375cf5691650026ef27e176
+SHA1 (patch-bp) = e72743bbfad78f9ba657c1a947b09dc7f72ed140
 SHA1 (patch-bq) = 996c97dd2da67b481cf5101a220e35850009abc8
-SHA1 (patch-br) = 57cfac7398a59ab663f10eb478a6b8f65d28994b
+SHA1 (patch-br) = b06b333f72e621bd2298613653d328e99036fd4b
 SHA1 (patch-bs) = fb23d5297589b87946642bfbfd857c04f81027e3
 SHA1 (patch-bt) = b59041f0f87e2b92e8838f9868e5d33ae97fa689
 SHA1 (patch-bu) = 6e183a9c5caf7641304efdb409ac414de4b88947
-SHA1 (patch-bv) = 3c3fb414627ad6fed3028ca7e0babe7dcfce4953
+SHA1 (patch-bv) = 7c5bb24dc5d6f159af9b3f02687603f3572a0791
 SHA1 (patch-bw) = a28609eb68746f45013dae50556fb19829f890f4
 SHA1 (patch-bx) = a53f70f46fbb61c25b60494ec5f60942b87e49a7
 SHA1 (patch-by) = e451c595628e500f86085744798af78ef70c28df
-SHA1 (patch-bz) = 1f24fa478f7f7544719e04a427d4d61a0eef9f1e
+SHA1 (patch-bz) = 5e7708a2582b7cb500e52787b5e684734809b2c0
 SHA1 (patch-ca) = a1fedc7a4a507e71b0e6fff34056e414b7f119c7
 SHA1 (patch-cb) = 3a82b1fc52e8e32fb99e7427e24bd497ad323334
 SHA1 (patch-cc) = af970c41d730fe1b7e2403942ab39746b3b0e2af
-SHA1 (patch-cd) = 82ea75f6ee917936506e4dd703b5eda73d48d5e0
+SHA1 (patch-cd) = 67a34f19a22016bbc27dd1a8fc15eceff8bf2eca
 SHA1 (patch-ce) = 4f2c176ef04efa22ae034c5c5bd85eab329e187b
-SHA1 (patch-cf) = cb13c0c77a22586871764c69f8914cb0ea644b84
+SHA1 (patch-cf) = 7cb4374ec3cc92ae4d0316339ecbb808e98d50b5
 SHA1 (patch-cg) = 0e7f0cdcd55a06bc60c5c617f9ad33201bda1f9d
-SHA1 (patch-ch) = 78d86400c2b4d51fe1363ccc770b4cbab56b45eb
+SHA1 (patch-ch) = e8ce01b5df11cf36d805e5fe766a82f63f8ae4ce
 SHA1 (patch-ci) = 905b15e9e8de4954174dab769b3a2c634b094288
-SHA1 (patch-cj) = 002687434b44b1d78528ad49d454311dd118a2e4
+SHA1 (patch-cj) = 706a10730e8b078775703222477c7d1616eda58c
 SHA1 (patch-cm) = 2d539df6011c977c0b984233f45b99eeb838e7b3
-SHA1 (patch-cn) = 2f063015327d40d77b764397819db9260152407b
+SHA1 (patch-cn) = 93fa0422c206053ebb3ec9e95fd483c1f8f02144
 SHA1 (patch-co) = b484ad7c770a3bd9554051af64e2545fac5a677f
 SHA1 (patch-cp) = 8b16a472b150d54810c09126a01723d9a9d9f0d5
-SHA1 (patch-cq) = ad009ff763b321eaa07c8e23a9ad386040c4e897
+SHA1 (patch-cq) = 54f8022c66ac49591e978c6a23f71ae2f65d2d3e
 SHA1 (patch-cr) = 6159763aaf0ae2b738e31c06ada0da5c47d0692c
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
@@ -65,3 +64,4 @@
 SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c
 SHA1 (patch-cy) = 949d3ae7b9037213f5a737018a0dcabe2200dd57
 SHA1 (patch-cz) = 5f4909bbc6f0828aa1d69ed4437622e35e116c46
+SHA1 (patch-da) = e75c5be1e86c8e8214d4c38882efd4da8e6164ec
diff -r cedfc6d486e3 -r 640bc3cc714c audio/kdemultimedia3/patches/patch-ac
--- a/audio/kdemultimedia3/patches/patch-ac     Thu Jan 15 10:15:14 2004 +0000
+++ b/audio/kdemultimedia3/patches/patch-ac     Thu Jan 15 10:30:03 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2003/07/30 14:56:01 markd Exp $
+$NetBSD: patch-ac,v 1.6 2004/01/15 10:30:03 markd Exp $
 
---- kaboodle/Makefile.in.orig  2003-07-15 22:13:57.000000000 +1200
+--- kaboodle/Makefile.in.orig  2003-12-29 11:29:36.000000000 +1300
 +++ kaboodle/Makefile.in
-@@ -380,7 +380,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
+@@ -381,7 +381,7 @@ INCLUDES = -I$(kde_includes)/kio -I$(kde
  
  SUBDIRS = pics actions
  
@@ -11,7 +11,7 @@
  
  kde_module_LTLIBRARIES = libkaboodlepart.la
  
-@@ -395,24 +395,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
+@@ -396,24 +396,26 @@ libkaboodlepart_la_SOURCES = conf.cpp \
  libkaboodlepart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
  libkaboodlepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde -lkmediaplayer
  
@@ -44,7 +44,7 @@
  applnk_DATA = kaboodle.desktop
  applnkdir = $(kde_appsdir)/Multimedia
  
-@@ -425,14 +427,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -427,14 +429,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
  
@@ -70,7 +70,7 @@
  libkaboodlepart_la_DEPENDENCIES =
  am_libkaboodlepart_la_OBJECTS = conf.lo controls.lo engine.lo \
        kaboodle_factory.lo player.lo view.lo
-@@ -446,31 +453,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
+@@ -448,31 +455,37 @@ libkaboodlepart_la_nofinal_OBJECTS = con
  bin_PROGRAMS = kaboodle$(EXEEXT)
  PROGRAMS = $(bin_PROGRAMS)
  
@@ -116,7 +116,7 @@
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/kaboodleapp.Plo ./$(DEPDIR)/main.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/player.Plo \
  @AMDEP_TRUE@@KDE_USE_FINAL_FALSE@     @AMDEP_TRUE@    ./$(DEPDIR)/userinterface.Plo ./$(DEPDIR)/view.Plo
-@@ -493,8 +506,8 @@ CXXLD = $(CXX)
+@@ -495,8 +508,8 @@ CXXLD = $(CXX)
  #>+ 2
  CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -127,7 +127,7 @@
  DATA = $(applnk_DATA) $(data_DATA) $(kde_services_DATA)
  
  
-@@ -505,7 +518,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
+@@ -507,7 +520,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
        check-recursive installcheck-recursive
  DIST_COMMON = AUTHORS Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -136,7 +136,7 @@
  
  #>- all: all-recursive
  #>+ 1
-@@ -580,6 +593,8 @@ clean-libLTLIBRARIES:
+@@ -582,6 +595,8 @@ clean-libLTLIBRARIES:
        done
  kaboodle.la: $(kaboodle_la_OBJECTS) $(kaboodle_la_DEPENDENCIES) 
        $(CXXLINK) -rpath $(libdir) $(kaboodle_la_LDFLAGS) $(kaboodle_la_OBJECTS) $(kaboodle_la_LIBADD) $(LIBS)
@@ -145,7 +145,7 @@
  #>- libkaboodlepart.la: $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) 
  #>+ 2
  @KDE_USE_CLOSURE_TRUE%libkaboodlepart.la@localhost: libkaboodlepart.la.closure $(libkaboodlepart_la_OBJECTS) $(libkaboodlepart_la_DEPENDENCIES) 
-@@ -626,9 +641,10 @@ distclean-compile:
+@@ -628,9 +643,10 @@ distclean-compile:
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controls.Plo@am__quote@
@@ -157,16 +157,16 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kaboodleapp.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Plo@am__quote@
-@@ -854,7 +870,7 @@ distclean-tags:
+@@ -862,7 +878,7 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=engine.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h userinterface.h controls.h conf.h player.h kaboodleui.rc kaboodle.desktop view.h kaboodlepartui.rc uninstall.desktop 
kaboodle_component.desktop 
+-KDE_DIST=uninstall.desktop kaboodle.desktop player.h controls.h kaboodle_component.desktop conf.h kaboodleengine.desktop kaboodle_factory.h kaboodleapp.h view.h kaboodleui.rc engine.h 
userinterface.h kaboodlepartui.rc 
 +KDE_DIST=view.h kaboodleapp.h kaboodle_factory.h engine.h controls.h kaboodlepartui.rc kaboodleui.rc kaboodle.desktop kaboodle_component.desktop Makefile.in.rej kaboodleengine.desktop conf.h 
uninstall.desktop player.h userinterface.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -928,7 +944,6 @@ install-strip:
+@@ -936,7 +952,6 @@ install-strip:
  mostlyclean-generic:
  
  clean-generic:
@@ -174,7 +174,7 @@
  
  distclean-generic:
        -rm -f Makefile $(CONFIG_CLEAN_FILES)
-@@ -1024,9 +1039,6 @@ uninstall-info: uninstall-info-recursive
+@@ -1032,9 +1047,6 @@ uninstall-info: uninstall-info-recursive
        uninstall-libLTLIBRARIES uninstall-recursive
  
  
@@ -184,83 +184,68 @@
  install-data-local: uninstall.desktop
        $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Multimedia/More
        $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Multimedia/More/kaboodle.desktop
-@@ -1047,23 +1059,17 @@ libkaboodlepart.la.closure: $(libkaboodl
+@@ -1055,17 +1067,11 @@ libkaboodlepart.la.closure: $(libkaboodl
  
  
  #>+ 3
+-userinterface.moc: $(srcdir)/userinterface.h
+-      $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
+-
+-#>+ 1
+-mocs: userinterface.moc
+-#>+ 3
+-kaboodleapp.moc: $(srcdir)/kaboodleapp.h
+-      $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
++view.moc: $(srcdir)/view.h
++      $(MOC) $(srcdir)/view.h -o view.moc
+ 
+ #>+ 1
+-mocs: kaboodleapp.moc
++mocs: view.moc
+ #>+ 3
+ controls.moc: $(srcdir)/controls.h
+       $(MOC) $(srcdir)/controls.h -o controls.moc
+@@ -1073,11 +1079,17 @@ controls.moc: $(srcdir)/controls.h
+ #>+ 1
+ mocs: controls.moc
+ #>+ 3
 -engine.moc: $(srcdir)/engine.h
 -      $(MOC) $(srcdir)/engine.h -o engine.moc
--
--#>+ 1
--mocs: engine.moc
--#>+ 3
- view.moc: $(srcdir)/view.h
-       $(MOC) $(srcdir)/view.h -o view.moc
++kaboodleapp.moc: $(srcdir)/kaboodleapp.h
++      $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
  
  #>+ 1
- mocs: view.moc
- #>+ 3
--userinterface.moc: $(srcdir)/userinterface.h
--      $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
-+controls.moc: $(srcdir)/controls.h
-+      $(MOC) $(srcdir)/controls.h -o controls.moc
- 
- #>+ 1
--mocs: userinterface.moc
-+mocs: controls.moc
- #>+ 3
- kaboodleapp.moc: $(srcdir)/kaboodleapp.h
-       $(MOC) $(srcdir)/kaboodleapp.h -o kaboodleapp.moc
-@@ -1071,32 +1077,38 @@ kaboodleapp.moc: $(srcdir)/kaboodleapp.h
- #>+ 1
- mocs: kaboodleapp.moc
- #>+ 3
+-mocs: engine.moc
++mocs: kaboodleapp.moc
++#>+ 3
 +userinterface.moc: $(srcdir)/userinterface.h
 +      $(MOC) $(srcdir)/userinterface.h -o userinterface.moc
 +
 +#>+ 1
 +mocs: userinterface.moc
-+#>+ 3
+ #>+ 3
  kaboodle_factory.moc: $(srcdir)/kaboodle_factory.h
        $(MOC) $(srcdir)/kaboodle_factory.h -o kaboodle_factory.moc
- 
- #>+ 1
- mocs: kaboodle_factory.moc
- #>+ 3
--player.moc: $(srcdir)/player.h
--      $(MOC) $(srcdir)/player.h -o player.moc
-+conf.moc: $(srcdir)/conf.h
-+      $(MOC) $(srcdir)/conf.h -o conf.moc
- 
+@@ -1097,14 +1109,14 @@ player.moc: $(srcdir)/player.h
  #>+ 1
--mocs: player.moc
-+mocs: conf.moc
+ mocs: player.moc
  #>+ 3
--controls.moc: $(srcdir)/controls.h
--      $(MOC) $(srcdir)/controls.h -o controls.moc
Prev by Date: [pkgsrc/trunk]: pkgsrc kth-krb4: add CONFLICT on tnftp.
Next by Date: [pkgsrc/trunk]: pkgsrc/games/kdegames3 Update to KDE 3.1.5
Previous by Thread: [pkgsrc/trunk]: pkgsrc kth-krb4: add CONFLICT on tnftp.
Next by Thread: [pkgsrc/trunk]: pkgsrc/games/kdegames3 Update to KDE 3.1.5
Indexes:
Home | Main Index | Thread Index | Old Index