head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.52 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.50 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.48 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.46 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.44 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.42 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.40 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.38 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.36 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.34 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.32 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.30 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.28 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.5.0.26 pkgsrc-2007Q1-base:1.5 pkgsrc-2006Q4:1.5.0.24 pkgsrc-2006Q4-base:1.5 pkgsrc-2006Q3:1.5.0.22 pkgsrc-2006Q3-base:1.5 pkgsrc-2006Q2:1.5.0.20 pkgsrc-2006Q2-base:1.5 pkgsrc-2006Q1:1.5.0.18 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.16 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.14 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.12 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.5.0.10 pkgsrc-2005Q1-base:1.5 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 pkgsrc-2004Q3:1.5.0.6 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.4 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.2 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 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.5 date 2004.01.26.15.45.22; author jmmv; state dead; branches; next 1.4; 1.4 date 2004.01.15.10.30.03; author markd; state Exp; branches; next 1.3; 1.3 date 2003.07.30.14.56.03; 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.5 log @kdemultimedia[23] moved to the multimedia category. @ text @$NetBSD: patch-bl,v 1.4 2004/01/15 10:30:03 markd Exp $ --- noatun/modules/infrared/Makefile.in.orig 2003-12-29 11:29:39.000000000 +1300 +++ noatun/modules/infrared/Makefile.in @@@@ -385,7 +385,7 @@@@ noatun_infrared_la_SOURCES = infrared.cp noinst_HEADERS = infrared.h lirc.h irprefs.h noatun_infrared_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun.la \ +noatun_infrared_la_LIBADD = $(LIB_KFILE) $(top_builddir)/noatun/library/libnoatun_core.la \ -lqtmcop -lkmedia2_idl -lsoundserver_idl @@@@ -400,7 +400,7 @@@@ CONFIG_CLEAN_FILES = LTLIBRARIES = $(kde_module_LTLIBRARIES) noatun_infrared_la_DEPENDENCIES = \ - $(top_builddir)/noatun/library/libnoatun.la + $(top_builddir)/noatun/library/libnoatun_core.la am_noatun_infrared_la_OBJECTS = infrared.lo lirc.lo irprefs.lo #>- noatun_infrared_la_OBJECTS = $(am_noatun_infrared_la_OBJECTS) #>+ 4 @@@@ -624,7 +624,7 @@@@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=infrared.plugin +KDE_DIST=infrared.plugin Makefile.in.rej DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @@@@ -779,20 +779,20 @@@@ irprefs.moc: $(srcdir)/irprefs.h #>+ 1 mocs: irprefs.moc #>+ 3 -lirc.moc: $(srcdir)/lirc.h - $(MOC) $(srcdir)/lirc.h -o lirc.moc - -#>+ 1 -mocs: lirc.moc -#>+ 3 infrared.moc: $(srcdir)/infrared.h $(MOC) $(srcdir)/infrared.h -o infrared.moc #>+ 1 mocs: infrared.moc #>+ 3 +lirc.moc: $(srcdir)/lirc.h + $(MOC) $(srcdir)/lirc.h -o lirc.moc + +#>+ 1 +mocs: lirc.moc +#>+ 3 clean-metasources: - -rm -f irprefs.moc lirc.moc infrared.moc + -rm -f irprefs.moc infrared.moc lirc.moc #>+ 3 clean-closures: @@@@ -845,9 +845,9 @@@@ kde-rpo-clean: -rm -f *.rpo #>+ 7 +infrared.o: infrared.moc lirc.o: lirc.moc -irprefs.o: irprefs.moc -infrared.lo: infrared.moc irprefs.lo: irprefs.moc +infrared.lo: infrared.moc lirc.lo: lirc.moc -infrared.o: infrared.moc +irprefs.o: irprefs.moc @ 1.4 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.3 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/infrared/Makefile.in.orig 2003-07-15 22:14:00.000000000 +1200 d5 1 a5 1 @@@@ -384,7 +384,7 @@@@ noatun_infrared_la_SOURCES = infrared.cp d14 1 a14 1 @@@@ -398,7 +398,7 @@@@ CONFIG_CLEAN_FILES = d23 1 a23 1 @@@@ -622,7 +622,7 @@@@ distclean-tags: d32 3 a34 3 @@@@ -772,12 +772,6 @@@@ noatun_infrared.la.closure: $(noatun_inf d42 2 a43 2 irprefs.moc: $(srcdir)/irprefs.h $(MOC) $(srcdir)/irprefs.h -o irprefs.moc a44 1 @@@@ -790,8 +784,14 @@@@ infrared.moc: $(srcdir)/infrared.h d55 1 a55 1 - -rm -f lirc.moc irprefs.moc infrared.moc d60 1 a60 10 @@@@ -808,7 +808,7 @@@@ force-reedit: #>+ 11 -noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp lirc.moc irprefs.moc infrared.moc +noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp irprefs.moc infrared.moc lirc.moc @@echo 'creating noatun_infrared_la.all_cpp.cpp ...'; \ rm -f noatun_infrared_la.all_cpp.files noatun_infrared_la.all_cpp.final; \ echo "#define KDE_USE_FINAL 1" >> noatun_infrared_la.all_cpp.final; \ @@@@ -844,9 +844,9 @@@@ kde-rpo-clean: d65 3 a67 1 +lirc.o: lirc.moc d69 2 a70 3 infrared.lo: infrared.moc -irprefs.o: irprefs.moc -lirc.o: lirc.moc a71 1 lirc.lo: lirc.moc @ 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/infrared/Makefile.in.orig Sat Dec 28 14:04:00 2002 d5 1 a5 1 @@@@ -295,7 +295,7 @@@@ noatun_infrared_la_SOURCES = infrared.cp d14 1 a14 1 @@@@ -309,7 +309,7 @@@@ CONFIG_CLEAN_FILES = d23 10 a32 1 @@@@ -624,10 +624,6 @@@@ noatun_infrared.la.closure: $(noatun_inf d39 2 d45 3 a47 3 @@@@ -636,8 +632,12 @@@@ infrared.moc: $(srcdir)/infrared.h $(MOC) $(srcdir)/infrared.h -o infrared.moc d52 2 d61 1 a61 1 @@@@ -654,7 +654,7 @@@@ force-reedit: d70 1 a70 1 @@@@ -690,9 +690,9 @@@@ kde-rpo-clean: @ 1.1 log @Fix the noatun.la lossage. @ text @d3 1 a3 1 --- noatun/modules/infrared/Makefile.in.orig Sun Jun 9 12:19:30 2002 d5 1 a5 1 @@@@ -296,7 +296,7 @@@@ d11 1 a11 1 -lqtmcop -lkmedia2_idl -lsoundserver_idl d14 1 a14 1 @@@@ -310,7 +310,7 @@@@ d22 28 a49 3 #>+ 5 @@@@ -667,7 +667,7 @@@@ -rm -f noatun_infrared_la_meta_unload.cpp d52 2 a53 2 -noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp noatun_infrared_la_meta_unload.cpp irprefs.moc infrared.moc lirc.moc +noatun_infrared_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/infrared.cpp $(srcdir)/lirc.cpp $(srcdir)/irprefs.cpp $(srcdir)/noatun_infrared_la_meta_unload.cpp irprefs.moc infrared.moc lirc.moc d57 13 @