rev 4535 - in trunk/packages/kdegraphics/debian: . patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-09-19 22:42:25 +0000 (Tue, 19 Sep 2006)
New Revision: 4535

Added:
   trunk/packages/kdegraphics/debian/patches/99_djvu-alpha-hack.diff
Modified:
   trunk/packages/kdegraphics/debian/changelog
Log:
Note the location of this silly patch after the buildprep.


Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog	2006-09-19 21:49:40 UTC (rev 4534)
+++ trunk/packages/kdegraphics/debian/changelog	2006-09-19 22:42:25 UTC (rev 4535)
@@ -1,3 +1,10 @@
+kdegraphics (4:3.5.4-3) UNRELEASED; urgency=low
+
+  * Use a -O0 hack to work around a gcc-4.1 ICE on alpha, since using
+    gcc-4.0 incurred the wrath of the gods. (Closes: #386031)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Sep 2006 18:05:56 -0400
+
 kdegraphics (4:3.5.4-2) unstable; urgency=low
 
   +++ Changes by Christopher Martin:

Added: trunk/packages/kdegraphics/debian/patches/99_djvu-alpha-hack.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/99_djvu-alpha-hack.diff	                        (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/99_djvu-alpha-hack.diff	2006-09-19 22:42:25 UTC (rev 4535)
@@ -0,0 +1,16 @@
+--- kde.orig/kviewshell/plugins/djvu/libdjvu/Makefile.in
++++ kde.patched/kviewshell/plugins/djvu/libdjvu/Makefile.in
+@@ -634,6 +634,13 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ZPCodec.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/debug.Plo at am__quote@
+ 
++ifneq (,$(findstring alpha, $(shell uname -m)))
++GString.o: GString.cpp
++	$(CXXCOMPILE) -O0 -c -o $@ $<
++GString.lo: GString.cpp
++	$(LTCXXCOMPILE) -O0 -c -o $@ $<
++endif
++
+ .cpp.o:
+ @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+ @am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi