compile two problem files without optimization to work around a compiler

bug that was noted with gcc-2.95.3 on alpha.  Fixes recently noted bulk
build problems.

3 files changed, 109 insertions, 1 deletions

diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 0fbf65280a6..04df61b09be 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2003/01/20 10:04:19 skrll Exp $
+$NetBSD: distinfo,v 1.15 2003/02/08 11:13:12 dmcmahill Exp $
 
 SHA1 (kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad
 Size (kdelibs-3.0.5a.tar.bz2) = 7647507 bytes
@@ -44,3 +44,5 @@ SHA1 (patch-bv) = d4c53ba2add053db87a8d382080535ce1c536cbb
 SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51
 SHA1 (patch-cb) = 1db71d0236955d07c3b246f1c4810a9378eace3f
 SHA1 (patch-cc) = f0154cf753a61271366ec3f57d62c1cf21bffc14
+SHA1 (patch-cd) = 4b4b5917fb70b997fd6838e94e47772d5f0d07de
+SHA1 (patch-ce) = 54dd7c379d79781f5aa9c1d669d0ebf974ecdfda
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
new file mode 100644
index 00000000000..2ea2342664c
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-cd
@@ -0,0 +1,57 @@
+$NetBSD: patch-cd,v 1.3 2003/02/08 11:13:13 dmcmahill Exp $
+
+--- kdefx/Makefile.in.orig	Tue Dec 17 05:43:25 2002
++++ kdefx/Makefile.in
+@@ -359,12 +359,15 @@ HEADERS = $(include_HEADERS)
+ DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
+ SOURCES = $(libkdefx_la_SOURCES)
+ 
++CXXCOMPILE_NOOPT=${CXXCOMPILE:-O%=}
++LTCXXCOMPILE_NOOPT=${LTCXXCOMPILE:-O%=}
++
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .cpp .lo .o .obj
++.SUFFIXES: .cc .cpp .lo .o .obj
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -443,6 +446,28 @@ distclean-depend:
+ @AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ @AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ 	$(LTCXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++
++.cc.o:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++
++.cc.obj:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(CXXCOMPILE_NOOPT) -c -o $@ `cygpath -w $<`
++
++.cc.lo:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++
++.cpp.cc:
++	cp -f $< $@
++
+ CXXDEPMODE = @CXXDEPMODE@
+ uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+@@ -683,3 +708,6 @@ kde-rpo-clean:
+ #>+ 3
+ kstyle.lo: kstyle.moc 
+ kstyle.o: kstyle.moc 
++
++kpixmap.o: kpixmap.cc
++
diff --git a/x11/kdelibs3/patches/patch-ce b/x11/kdelibs3/patches/patch-ce
new file mode 100644
index 00000000000..a3e956607e8
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ce
@@ -0,0 +1,49 @@
+$NetBSD: patch-ce,v 1.1 2003/02/08 11:13:13 dmcmahill Exp $
+
+--- kioslave/file/Makefile.in.orig	Fri Feb  7 14:51:42 2003
++++ kioslave/file/Makefile.in
+@@ -336,7 +336,7 @@ SOURCES = $(kio_file_la_SOURCES)
+ all: docs-am  all-am
+ 
+ .SUFFIXES:
+-.SUFFIXES: .cc .lo .o .obj
++.SUFFIXES: .cpp .cc .lo .o .obj
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -658,3 +658,35 @@ kde-rpo-clean:
+ #>+ 3
+ file.lo: file.moc 
+ file.o: file.moc 
++
++# no optimization rules
++
++CXXCOMPILE_NOOPT=${CXXCOMPILE:-O%=}
++LTCXXCOMPILE_NOOPT=${LTCXXCOMPILE:-O%=}
++
++.cpp.o:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++
++.cpp.obj:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(CXXCOMPILE_NOOPT) -c -o $@ `cygpath -w $<`
++
++.cpp.lo:
++@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
++@AMDEP_TRUE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
++
++.cc.cpp:
++	cp -f $< $@
++
++# problem files when compiled with optimization
++
++file.lo: file.cpp
++file.o: file.cpp
++