head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.52 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.50 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.48 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.46 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.44 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.42 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.40 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.38 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.36 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.34 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.32 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.30 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.28 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.26 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.24 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.22 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.20 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.18 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.16 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.14 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.12 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.10 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.8 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.6 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.4 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.2 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.2.0.2 netbsd-1-6-1-base:1.2 netbsd-1-6:1.1.0.6 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.0.2 pkgviews-base:1.1; locks; strict; comment @# @; 1.7 date 2004.01.26.15.45.22; author jmmv; state dead; branches; next 1.6; 1.6 date 2004.01.15.10.30.03; author markd; state Exp; branches; next 1.5; 1.5 date 2003.07.30.14.56.03; author markd; state Exp; branches; next 1.4; 1.4 date 2003.05.22.03.05.41; author markd; state Exp; branches; next 1.3; 1.3 date 2003.03.11.13.33.55; author markd; state Exp; branches; next 1.2; 1.2 date 2003.01.02.09.12.22; author skrll; state Exp; branches; next 1.1; 1.1 date 2002.06.25.06.34.36; author skrll; state Exp; branches; next ; desc @@ 1.7 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-bn,v 1.6 2004/01/15 10:30:03 markd Exp $ --- noatun/modules/kaiman/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 +++ noatun/modules/kaiman/Makefile.in @@@@ -389,7 +389,7 @@@@ noatun_kaiman_la_SOURCES = \ noatun_kaiman_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_kaiman_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl @@@@ -410,7 +410,7 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_kaiman_la_DEPENDENCIES = \ - $(top_builddir)/noatun/library/libnoatun.la + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_kaiman_la_OBJECTS = noatunui.lo style.lo userinterface.lo \ pref.lo #>- noatun_kaiman_la_OBJECTS = $(am_noatun_kaiman_la_OBJECTS) @@@@ -714,7 +714,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin +KDE_DIST=kaimanui.rc SKIN-SPECS Makefile.in.rej kaiman.plugin DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -886,12 +886,6 @@@@ noatun_kaiman.la.closure: $(noatun_kaima #>+ 3 -userinterface.moc: $(srcdir)/userinterface.h - $(MOC) $(srcdir)/userinterface.h -o userinterface.moc - -#>+ 1 -mocs: userinterface.moc -#>+ 3 style.moc: $(srcdir)/style.h $(MOC) $(srcdir)/style.h -o style.moc @@@@ -904,8 +898,14 @@@@ pref.moc: $(srcdir)/pref.h #>+ 1 mocs: pref.moc #>+ 3 +userinterface.moc: $(srcdir)/userinterface.h + $(MOC) $(srcdir)/userinterface.h -o userinterface.moc + +#>+ 1 +mocs: userinterface.moc +#>+ 3 clean-metasources: - -rm -f userinterface.moc style.moc pref.moc + -rm -f style.moc pref.moc userinterface.moc #>+ 3 clean-closures: @@@@ -922,7 +922,7 @@@@ force-reedit: #>+ 11 -noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp userinterface.moc style.moc pref.moc +noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp style.moc pref.moc userinterface.moc @@echo 'creating noatun_kaiman_la.all_cpp.cpp ...'; \ rm -f noatun_kaiman_la.all_cpp.files noatun_kaiman_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> noatun_kaiman_la.all_cpp.final; \ @@@@ -958,9 +958,9 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 7 -style.o: style.moc +pref.lo: pref.moc style.lo: style.moc -userinterface.lo: userinterface.moc userinterface.o: userinterface.moc +style.o: style.moc pref.o: pref.moc -pref.lo: pref.moc +userinterface.lo: userinterface.moc @ 1.6 log @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. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update kdemultimedia to 3.1.3. Changes: * kscd: add method to determine if KsCD is playing * noatun: memory leak and memory corruption fixes * noatun: Add volume slider for "simple" module * artsbuilder: fix several corruptsions and other crashes @ text @d3 1 a3 1 --- noatun/modules/kaiman/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200 d5 1 a5 1 @@@@ -388,7 +388,7 @@@@ noatun_kaiman_la_SOURCES = \ d14 1 a14 1 @@@@ -408,7 +408,7 @@@@ CONFIG_CLEAN_FILES = d23 1 a23 1 @@@@ -706,7 +706,7 @@@@ distclean-tags: d27 1 a27 1 -KDE_DIST=kaiman.plugin kaimanui.rc SKIN-SPECS d32 1 a32 1 @@@@ -878,11 +878,11 @@@@ noatun_kaiman.la.closure: $(noatun_kaima d38 6 a43 2 +style.moc: $(srcdir)/style.h + $(MOC) $(srcdir)/style.h -o style.moc d45 1 a45 7 #>+ 1 -mocs: userinterface.moc +mocs: style.moc #>+ 3 pref.moc: $(srcdir)/pref.h $(MOC) $(srcdir)/pref.h -o pref.moc @@@@ -890,14 +890,14 @@@@ pref.moc: $(srcdir)/pref.h a48 2 -style.moc: $(srcdir)/style.h - $(MOC) $(srcdir)/style.h -o style.moc d51 2 a52 3 #>+ 1 -mocs: style.moc d54 1 a54 1 #>+ 3 d56 1 a56 1 - -rm -f userinterface.moc pref.moc style.moc d61 1 a61 1 @@@@ -914,7 +914,7 @@@@ force-reedit: d70 1 a70 1 @@@@ -950,9 +950,9 @@@@ kde-rpo-clean: d74 3 a77 3 -style.lo: style.moc pref.lo: pref.moc +style.lo: style.moc d79 1 a79 1 style.o: style.moc d81 1 @ 1.4 log @Update KDE to 3.1.2. Changes: kdemultimedia: * Ogg Vorbis Info List view column titles were incorrect. * kmix: Vertical label widget to sliders in replacement of large horizontal labels * kmix: Fixed alsa 0.9x to restore current volumes * kmix: Fixed multiple alsa 0.9x cards detection @ text @d3 1 a3 1 --- noatun/modules/kaiman/Makefile.in.orig Thu May 8 00:05:29 2003 d5 1 a5 1 @@@@ -387,7 +387,7 @@@@ noatun_kaiman_la_SOURCES = \ d14 1 a14 1 @@@@ -407,7 +407,7 @@@@ CONFIG_CLEAN_FILES = d23 1 a23 1 @@@@ -705,7 +705,7 @@@@ distclean-tags: d28 1 a28 1 +KDE_DIST=kaimanui.rc SKIN-SPECS kaiman.plugin d32 1 a32 1 @@@@ -877,20 +877,20 @@@@ noatun_kaiman.la.closure: $(noatun_kaima d41 3 d47 3 a49 1 d56 3 d66 1 a66 1 @@@@ -907,7 +907,7 @@@@ force-reedit: d75 1 a75 1 @@@@ -943,9 +943,9 @@@@ kde-rpo-clean: @ 1.3 log @Update KDE to 3.1. Many bugfixes and functionality enhancements including: kdemultimedia Started a video framework More consistent internationalisation in many applications. NEW IN KDE: KAudioCreator, a CD ripper and audio encoder frontend. NEW IN KDE: KRec, an audio recorder using aRts. KMediaPlayer interface added to kdelibs to reuse Kaboodle. Noatun: Added option to clear the playlist when running with a file as command line option. Added video thumbnail creator using xine-arts. KMix: Added mute control support. @ text @d3 1 a3 1 --- noatun/modules/kaiman/Makefile.in.orig Fri Jan 17 08:49:42 2003 d5 1 a5 1 @@@@ -336,7 +336,7 @@@@ noatun_kaiman_la_SOURCES = \ d14 1 a14 1 @@@@ -356,7 +356,7 @@@@ CONFIG_CLEAN_FILES = d23 2 a24 2 @@@@ -621,7 +621,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH d32 1 a32 1 @@@@ -778,20 +778,20 @@@@ noatun_kaiman.la.closure: $(noatun_kaima d58 1 a58 1 @@@@ -808,7 +808,7 @@@@ force-reedit: d67 1 a67 1 @@@@ -844,9 +844,9 @@@@ kde-rpo-clean: @ 1.2 log @Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or 1.0.5.1 accordingly. Fixes and changes are: Multiple vulnerabilities. kdelibs KHTML : Fixed several crashes and misrenderings. rlogin.protocol: fixed command execution in specially crafted urls. kdebase KAddressbook: Don't squeeze columns on startup/properly restore column width settings. kdenetwork lisa, reslisa: Fixed several security vulnerabilities. kdesdk Cervisia: Show long lines in diff view always completely. @ text @d3 1 a3 1 --- noatun/modules/kaiman/Makefile.in.orig Sat Dec 28 14:04:00 2002 d5 1 a5 1 @@@@ -300,7 +300,7 @@@@ noatun_kaiman_la_SOURCES = \ d14 1 a14 1 @@@@ -320,7 +320,7 @@@@ CONFIG_CLEAN_FILES = d23 2 a24 2 @@@@ -574,7 +574,7 @@@@ distclean-tags: d32 1 a32 1 @@@@ -725,20 +725,20 @@@@ noatun_kaiman.la.closure: $(noatun_kaima d58 1 a58 1 @@@@ -755,7 +755,7 @@@@ force-reedit: d67 1 a67 1 @@@@ -791,9 +791,9 @@@@ kde-rpo-clean: @ 1.1 log @Fix the noatun.la lossage. @ text @d3 1 a3 1 --- noatun/modules/kaiman/Makefile.in.orig Sun Jun 9 12:21:18 2002 d5 1 a5 1 @@@@ -301,7 +301,7 @@@@ d11 1 a11 1 -lqtmcop -lkmedia2_idl -lsoundserver_idl d14 1 a14 1 @@@@ -321,7 +321,7 @@@@ d23 1 a23 1 @@@@ -570,7 +570,7 @@@@ d27 1 a27 1 -KDE_DIST=kaimanui.rc kaiman.plugin SKIN-SPECS d32 28 a59 2 @@@@ -768,7 +768,7 @@@@ -rm -f noatun_kaiman_la_meta_unload.cpp d62 2 a63 2 -noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp noatun_kaiman_la_meta_unload.cpp style.moc pref.moc userinterface.moc +noatun_kaiman_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/noatunui.cpp $(srcdir)/style.cpp $(srcdir)/userinterface.cpp $(srcdir)/pref.cpp $(srcdir)/noatun_kaiman_la_meta_unload.cpp style.moc pref.moc userinterface.moc d67 12 @